2002-03-29  Jody Goldberg <jody@gnome.org>

	* gnome-keybinding-properties.c (create_dialog) : remove the startup
	  warning caused by looking in the current directory for the glade file.
	(key_theme_changed) : add some protection for missing schemas.
This commit is contained in:
Jody Goldberg 2002-03-29 19:17:20 +00:00 committed by Jody Goldberg
parent c00e3a749c
commit efa1999827
2 changed files with 10 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2002-03-29 Jody Goldberg <jody@gnome.org>
* gnome-keybinding-properties.c (create_dialog) : remove the startup
warning caused by looking in the current directory for the glade file.
(key_theme_changed) : add some protection for missing schemas.
Tue Mar 26 23:27:24 2002 Jonathan Blandford <jrb@redhat.com> Tue Mar 26 23:27:24 2002 Jonathan Blandford <jrb@redhat.com>
* gnome-keybinding-properties.c (setup_dialog): Only show themes * gnome-keybinding-properties.c (setup_dialog): Only show themes

View file

@ -70,9 +70,7 @@ create_dialog (void)
{ {
GladeXML *dialog; GladeXML *dialog;
dialog = glade_xml_new ("gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL); dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
if (dialog == NULL)
dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
return dialog; return dialog;
} }
@ -346,6 +344,9 @@ key_theme_changed (GConfClient *client,
menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (omenu)); menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (omenu));
value = gconf_entry_get_value (entry); value = gconf_entry_get_value (entry);
g_return_if_fail (value != NULL);
new_key_theme = gconf_value_get_string (value); new_key_theme = gconf_value_get_string (value);
for (list = GTK_MENU_SHELL (menu)->children; list; list = list->next, i++) for (list = GTK_MENU_SHELL (menu)->children; list; list = list->next, i++)