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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2010-08-09 18:04:38 +00:00
parent 893ea3af02
commit f16f8b48cd
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/phone.c
View File

@ -233,6 +233,7 @@ static void _phone_config_foreach(Phone * phone, char const * section,
static char * _phone_config_filename(void);
static char const * _phone_config_get(Phone * phone, char const * section,
char const * variable);
static int _phone_config_save(Phone * phone);
static int _phone_config_set(Phone * phone, char const * section,
char const * variable, char const * value);
@ -2159,7 +2160,6 @@ static void _on_system_ok(gpointer data)
{
Phone * phone = data;
char const * p;
char * filename;
/* FIXME requires a restart to be applied at the moment */
if((p = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(
@ -2168,11 +2168,7 @@ static void _on_system_ok(gpointer data)
config_set(phone->config, NULL, "hwflow", gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(phone->sy_hwflow))
? "1" : "0");
if((filename = _phone_config_filename()) != NULL)
{
config_save(phone->config, filename);
free(filename);
}
_phone_config_save(phone);
gtk_widget_hide(phone->sy_window);
}
@ -2450,20 +2446,26 @@ static char const * _phone_config_get(Phone * phone, char const * section,
}
/* phone_config_save */
static int _phone_config_save(Phone * phone)
{
char * filename;
if((filename = _phone_config_filename()) == NULL)
return -1; /* XXX warn the user */
config_save(phone->config, filename);
free(filename);
return 0;
}
/* phone_config_set */
static int _phone_config_set(Phone * phone, char const * section,
char const * variable, char const * value)
{
int ret;
char * filename;
if(config_set(phone->config, section, variable, value) != 0)
return -1;
if((filename = _phone_config_filename()) == NULL)
return -1;
ret = config_save(phone->config, filename);
free(filename);
return ret;
return _phone_config_save(phone);
}