diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/ephy-dialog.c | 53 |
2 files changed, 34 insertions, 27 deletions
@@ -1,3 +1,11 @@ +2003-06-13 Christian Persch <chpe@cvs.gnome.org> + + * lib/ephy-dialog.c: (get_index), (set_optionmenu_from_config), + (set_radiobuttongroup_from_config): + + Handle NULL return from eel_gconf_get_string. + Oh, and fix yet another mem leak. + 2003-06-13 Marco Pesenti Gritti <marco@it.gnome.org> * src/bookmarks/ephy-bookmarks-import.c: diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c index a21e03bba..07126f7ce 100644 --- a/lib/ephy-dialog.c +++ b/lib/ephy-dialog.c @@ -351,53 +351,52 @@ set_editable_from_config (GtkWidget *editable, const char *config_name) g_free (value); } -static void -set_optionmenu_from_config (GtkWidget *optionmenu, const char *config_name, GList *senum) +static int +get_index (const char *config_name, GList *senum) { - int index; + int index = 0; + char *val; + GList *s = NULL; if (senum) { - char *val; - GList *s; - val = eel_gconf_get_string (config_name); - s = g_list_find_custom (senum, val, (GCompareFunc)strcmp); + if (val) + { + s = g_list_find_custom (senum, val, (GCompareFunc)strcmp); + g_free (val); + } + + if (s) + { + index = g_list_position (senum, s); + } - index = g_list_position (senum, s); } else { index = eel_gconf_get_integer (config_name); } - gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), index); + return index; } + static void -set_radiobuttongroup_from_config (GtkWidget *radiobutton, const char *config_name, GList *senum) +set_optionmenu_from_config (GtkWidget *optionmenu, const char *config_name, GList *senum) { - int index; - - if (senum) - { - char *val; - GList *s; - - val = eel_gconf_get_string (config_name); + gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), + get_index (config_name, senum)); +} - s = g_list_find_custom (senum, val, (GCompareFunc)strcmp); - - index = g_list_position (senum, s); - } - else - { - index = eel_gconf_get_integer (config_name); - } +static void +set_radiobuttongroup_from_config (GtkWidget *radiobutton, const char *config_name, GList *senum) +{ /* set it (finds the group for us) */ - ephy_gui_gtk_radio_button_set (GTK_RADIO_BUTTON (radiobutton), index); + ephy_gui_gtk_radio_button_set (GTK_RADIO_BUTTON (radiobutton), + get_index (config_name, senum)); } static void |