[Xfce4-commits] [xfce/xfce4-settings] 01/01: Handle missing image-missing icon, free and reinit error (bug 11568)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

bluesabre pushed a commit to branch master
in repository xfce/xfce4-settings.

commit 8e8c49258bd1f9dade8508f59346f6ee6327a663
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Feb 23 20:46:52 2015 -0500

    Handle missing image-missing icon, free and reinit error (bug 11568)
---
 dialogs/appearance-settings/main.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dialogs/appearance-settings/main.c b/dialogs/appearance-settings/main.c
index a946515..cbbb841 100644
--- a/dialogs/appearance-settings/main.c
+++ b/dialogs/appearance-settings/main.c
@@ -723,13 +723,14 @@ appearance_settings_load_icon_themes (preview_data *pd)
                     {
                         if (gtk_icon_theme_has_icon (icon_theme, preview_icons[p]))
                             icon = gtk_icon_theme_load_icon (icon_theme, preview_icons[p], 16, 0, &error);
-                        else
+                        else if (gtk_icon_theme_has_icon (icon_theme, "image-missing"))
                             icon = gtk_icon_theme_load_icon (icon_theme, "image-missing", 16, 0, &error);
 
                         if (!icon)
                         {
                             g_warning ("Couldn't load icon: %s", error->message);
                             g_error_free (error);
+                            error = NULL;
                         }
                         else
                         {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.