DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Let the configuration vendor be overridden

Browse Source
This commit is contained in:
Pierre Pronchery 2021-01-24 17:18:48 +01:00
parent 6fdb361bb8
commit d3fa5f8a70
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/browser/browser.c
View File

@ -820,8 +820,8 @@ int browser_config_load(Browser * browser)
if(browser->config == NULL) if(browser->config == NULL)
return 0; /* XXX ignore error */ return 0; /* XXX ignore error */
if(config_load_preferences(browser->config, "DeforaOS/" VENDOR, PACKAGE, if(config_load_preferences(browser->config, BROWSER_CONFIG_VENDOR,
BROWSER_CONFIG_FILE) != 0) PACKAGE, BROWSER_CONFIG_FILE) != 0)
browser_error(NULL, error_get(NULL), 1); browser_error(NULL, error_get(NULL), 1);
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
/* XXX deserves a rework (enum) */ /* XXX deserves a rework (enum) */
@ -878,7 +878,7 @@ int browser_config_save(Browser * browser)
browser->prefs.show_hidden_files); browser->prefs.show_hidden_files);
if(ret == 0) if(ret == 0)
ret |= config_save_preferences_user(browser->config, ret |= config_save_preferences_user(browser->config,
"DeforaOS/" VENDOR, PACKAGE, BROWSER_CONFIG_VENDOR, PACKAGE,
BROWSER_CONFIG_FILE); BROWSER_CONFIG_FILE);
return ret; return ret;
} }
@ -2528,7 +2528,7 @@ static int _browser_config_set(Browser * browser, char const * section,
if((ret = config_set(browser->config, s, variable, value)) == 0) if((ret = config_set(browser->config, s, variable, value)) == 0)
{ {
if(config_save_preferences_user(browser->config, if(config_save_preferences_user(browser->config,
"DeforaOS/" VENDOR, PACKAGE, BROWSER_CONFIG_VENDOR, PACKAGE,
BROWSER_CONFIG_FILE) != 0) BROWSER_CONFIG_FILE) != 0)
browser_error(NULL, error_get(NULL), 1); browser_error(NULL, error_get(NULL), 1);
} }

2
src/browser/browser.h
View File

@ -33,11 +33,13 @@
# include <System.h> # include <System.h>
# include <Desktop.h> # include <Desktop.h>
# include "../../include/Browser.h" # include "../../include/Browser.h"
# include "../../config.h"
/* Browser */ /* Browser */
/* defaults */ /* defaults */
# define BROWSER_CONFIG_FILE "Browser.conf" # define BROWSER_CONFIG_FILE "Browser.conf"
# define BROWSER_CONFIG_VENDOR "DeforaOS/" VENDOR
# define BROWSER_ICON_WRAP_WIDTH 96 # define BROWSER_ICON_WRAP_WIDTH 96
# define BROWSER_LIST_WRAP_WIDTH 118 # define BROWSER_LIST_WRAP_WIDTH 118
# define BROWSER_THUMBNAIL_WRAP_WIDTH 112 # define BROWSER_THUMBNAIL_WRAP_WIDTH 112

2
src/properties.c
View File

@ -237,7 +237,7 @@ static int _new_load(Properties * properties, char const * plugin)
if((properties->config = config_new()) != NULL if((properties->config = config_new()) != NULL
&& config_load_preferences(properties->config, && config_load_preferences(properties->config,
"DeforaOS/" VENDOR, PACKAGE, BROWSER_CONFIG_VENDOR, PACKAGE,
BROWSER_CONFIG_FILE) == 0 BROWSER_CONFIG_FILE) == 0
&& (plugins = config_get(properties->config, NULL, && (plugins = config_get(properties->config, NULL,
"properties")) == NULL) "properties")) == NULL)