don't crash if the GConf schema is missing (bug #430253). Also fix
2007-04-16 Jens Granseuer <jensgr@gmx.net> * gnome-wp-capplet.c: (gnome_wp_load_stuffs): don't crash if the GConf schema is missing (bug #430253). Also fix initialization of the secondary colour picker svn path=/trunk/; revision=7471
This commit is contained in:
parent
bbe22836be
commit
25fe0c1319
2 changed files with 15 additions and 5 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2007-04-16 Jens Granseuer <jensgr@gmx.net>
|
||||||
|
|
||||||
|
* gnome-wp-capplet.c: (gnome_wp_load_stuffs): don't crash if the
|
||||||
|
GConf schema is missing (bug #430253). Also fix initialization of
|
||||||
|
the secondary colour picker
|
||||||
|
|
||||||
2007-04-08 Jens Granseuer <jensgr@gmx.net>
|
2007-04-08 Jens Granseuer <jensgr@gmx.net>
|
||||||
|
|
||||||
Patch by: Kristof Vansant <de_lupus@pandora.be>
|
Patch by: Kristof Vansant <de_lupus@pandora.be>
|
||||||
|
|
|
@ -588,19 +588,23 @@ static gboolean gnome_wp_load_stuffs (void * data) {
|
||||||
gchar * imagepath, * style, * uri;
|
gchar * imagepath, * style, * uri;
|
||||||
GnomeWPItem * item;
|
GnomeWPItem * item;
|
||||||
|
|
||||||
style = gconf_client_get_string (capplet->client,
|
|
||||||
WP_OPTIONS_KEY,
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
gnome_wp_xml_load_list (capplet);
|
gnome_wp_xml_load_list (capplet);
|
||||||
g_hash_table_foreach (capplet->wphash, (GHFunc) wp_props_load_wallpaper,
|
g_hash_table_foreach (capplet->wphash, (GHFunc) wp_props_load_wallpaper,
|
||||||
capplet);
|
capplet);
|
||||||
|
|
||||||
gdk_window_set_cursor (capplet->window->window, NULL);
|
gdk_window_set_cursor (capplet->window->window, NULL);
|
||||||
|
|
||||||
|
style = gconf_client_get_string (capplet->client,
|
||||||
|
WP_OPTIONS_KEY,
|
||||||
|
NULL);
|
||||||
|
if (style == NULL)
|
||||||
|
style = g_strdup ("none");
|
||||||
|
|
||||||
uri = gconf_client_get_string (capplet->client,
|
uri = gconf_client_get_string (capplet->client,
|
||||||
WP_FILE_KEY,
|
WP_FILE_KEY,
|
||||||
NULL);
|
NULL);
|
||||||
|
if (uri == NULL)
|
||||||
|
uri = g_strdup ("(none)");
|
||||||
|
|
||||||
if (g_utf8_validate (uri, -1, NULL) && g_file_test (uri, G_FILE_TEST_EXISTS))
|
if (g_utf8_validate (uri, -1, NULL) && g_file_test (uri, G_FILE_TEST_EXISTS))
|
||||||
imagepath = g_strdup (uri);
|
imagepath = g_strdup (uri);
|
||||||
|
@ -622,7 +626,7 @@ static gboolean gnome_wp_load_stuffs (void * data) {
|
||||||
gnome_wp_option_menu_set (capplet, item->shade_type, TRUE);
|
gnome_wp_option_menu_set (capplet, item->shade_type, TRUE);
|
||||||
|
|
||||||
gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->pc_picker), item->pcolor);
|
gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->pc_picker), item->pcolor);
|
||||||
gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->sc_picker), item->pcolor);
|
gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->sc_picker), item->scolor);
|
||||||
|
|
||||||
} else if (strcmp (style, "none") != 0) {
|
} else if (strcmp (style, "none") != 0) {
|
||||||
item = gnome_wp_add_image (capplet, imagepath);
|
item = gnome_wp_add_image (capplet, imagepath);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue