From 3b669aa468a89b273e3b7f7e6efbd9ba2836b772 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sun, 11 Nov 2012 07:09:20 +0200 Subject: [mate-bg] don't try to use a null format upstream commit: http://git.gnome.org/browse/gnome-desktop/commit/?id=9a2c931869214d5113e3c9246cc36c094bd211fe "introduced a bug that would cause a warning to spew in gnome-screensaver" http://git.gnome.org/browse/gnome-desktop/commit/?id=f2a6d5ea97b98ea3b1d36bb1de83f3bfc92c5c73 --- libmate-desktop/mate-bg.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c index 3cae227..a02eb95 100644 --- a/libmate-desktop/mate-bg.c +++ b/libmate-desktop/mate-bg.c @@ -1758,9 +1758,12 @@ get_as_pixbuf_for_size (MateBG *bg, /* If scalable choose maximum size */ format = gdk_pixbuf_get_file_info (filename, NULL, NULL); - if (format != NULL) - tmp = gdk_pixbuf_format_get_name (format); - if (format != NULL && + if (format != NULL) { + tmp = gdk_pixbuf_format_get_name (format); + } else { + tmp = NULL; + } + if (tmp != NULL && g_strcmp0 (tmp, "svg") == 0 && (best_width > 0 && best_height > 0) && (bg->placement == MATE_BG_PLACEMENT_FILL_SCREEN || -- cgit v1.2.1