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

Implement the configuration helpers for properties(1)

Browse Source
This commit is contained in:
Pierre Pronchery 2018-11-02 19:16:17 -03:00
parent ccf0763f7c
commit 81b0fac954
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/properties.c
View File

@ -68,6 +68,7 @@
struct _Browser struct _Browser
{ {
/* internal */ /* internal */
Config * config;
Mime * mime; Mime * mime;
char * filename; char * filename;
@ -165,6 +166,7 @@ static Properties * _properties_new(Mime * mime, char const * plugin,
_properties_error(NULL, strerror(errno), 1); _properties_error(NULL, strerror(errno), 1);
return NULL; return NULL;
} }
properties->config = NULL;
properties->mime = mime; properties->mime = mime;
properties->filename = strdup(filename); properties->filename = strdup(filename);
properties->helper.browser = properties; properties->helper.browser = properties;
@ -228,7 +230,6 @@ static Properties * _properties_new(Mime * mime, char const * plugin,
static int _new_load(Properties * properties, char const * plugin) static int _new_load(Properties * properties, char const * plugin)
{ {
Config * config;
char const * plugins = NULL; char const * plugins = NULL;
char * p; char * p;
char * q; char * q;
@ -236,9 +237,10 @@ static int _new_load(Properties * properties, char const * plugin)
int cnt = 0; int cnt = 0;
p = _common_config_filename(BROWSER_CONFIG_FILE); p = _common_config_filename(BROWSER_CONFIG_FILE);
if((config = config_new()) != NULL && config_load(config, p) == 0 if((properties->config = config_new()) != NULL
&& (plugins = config_get(config, NULL, "properties")) && config_load(properties->config, p) == 0
== NULL) && (plugins = config_get(properties->config, NULL,
"properties")) == NULL)
plugins = "properties,preview"; plugins = "properties,preview";
string_delete(p); string_delete(p);
if(plugin != NULL) if(plugin != NULL)
@ -275,8 +277,6 @@ static int _new_load(Properties * properties, char const * plugin)
if(_properties_load(properties, "preview") == 0) if(_properties_load(properties, "preview") == 0)
cnt++; cnt++;
} }
if(config != NULL)
config_delete(config);
/* consider ourselves successful if at least one plug-in was loaded */ /* consider ourselves successful if at least one plug-in was loaded */
return (cnt > 0) ? 0 : -1; return (cnt > 0) ? 0 : -1;
} }
@ -288,6 +288,8 @@ static void _properties_delete(Properties * properties)
if(properties->window != NULL) if(properties->window != NULL)
gtk_widget_destroy(properties->window); gtk_widget_destroy(properties->window);
free(properties->filename); free(properties->filename);
if(properties->config != NULL)
config_delete(properties->config);
free(properties); free(properties);
_properties_cnt--; _properties_cnt--;
} }
@ -298,8 +300,9 @@ static void _properties_delete(Properties * properties)
static char const * _properties_config_get(Properties * properties, static char const * _properties_config_get(Properties * properties,
char const * section, char const * variable) char const * section, char const * variable)
{ {
/* FIXME implement */ if(properties->config == NULL)
return NULL; return NULL;
return config_get(properties->config, section, variable);
} }
@ -307,8 +310,9 @@ static char const * _properties_config_get(Properties * properties,
static int _properties_config_set(Properties * properties, char const * section, static int _properties_config_set(Properties * properties, char const * section,
char const * variable, char const * value) char const * variable, char const * value)
{ {
/* FIXME implement */ if(properties->config == NULL)
return -1; return -1;
return config_set(properties->config, section, variable, value);
} }