From 9f505d83cc9e8113095d5e017fee75f23161b6fd Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Sun, 7 Jan 2007 16:38:16 +0000 Subject: [PATCH] Patch by: Jens Granseuer 2007-01-07 Thomas Wood Patch by: Jens Granseuer * gnome-wp-capplet.c: (gnome_wp_update_preview): Fixes bug 388616 (Control center crashes when changing the image name) svn path=/trunk/; revision=7085 --- capplets/background/ChangeLog | 10 ++++++++++ capplets/background/gnome-wp-capplet.c | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index 6c32b22c5..2850bd9af 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,10 +1,20 @@ 2007-01-07 Thomas Wood + Patch by: Jens Granseuer + + * gnome-wp-capplet.c: (gnome_wp_update_preview): Fixes bug 388616 + (Control center crashes when changing the image name) + +2007-01-07 Thomas Wood + + Patch by: Jens Granseuer + * gnome-wp-item.c: (gnome_wp_item_get_thumbnail): * gnome-wp-xml.c: (gnome_wp_xml_load_list): Apply patch from bug 335220 (mem leaks in gnome-wp-item) + 2007-01-06 Lucas Rocha Fixes #336286 diff --git a/capplets/background/gnome-wp-capplet.c b/capplets/background/gnome-wp-capplet.c index bd9850144..113e6aa75 100644 --- a/capplets/background/gnome-wp-capplet.c +++ b/capplets/background/gnome-wp-capplet.c @@ -820,13 +820,15 @@ static void gnome_wp_update_preview (GtkFileChooser *chooser, uri = gtk_file_chooser_get_preview_uri (chooser); if (uri) { - GdkPixbuf *pixbuf; + GdkPixbuf *pixbuf = NULL; gchar *mime_type; mime_type = gnome_vfs_get_mime_type (uri); - pixbuf = gnome_thumbnail_factory_generate_thumbnail (capplet->thumbs, + if (mime_type) { + pixbuf = gnome_thumbnail_factory_generate_thumbnail (capplet->thumbs, uri, mime_type); + } if(pixbuf != NULL) { gtk_image_set_from_pixbuf (GTK_IMAGE (capplet->image), pixbuf);