[Xfce4-commits] [xfce/garcon] 03/12: Fix assertion 'GTK_IS_WIDGET (widget)' failed.

[noreply at xfce.org]

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

eric pushed a commit to branch master
in repository xfce/garcon.

commit d46becb0e7989fe3befc95a72c27dd76355fb176
Author: John Lindgren <john.lindgren at aol.com>
Date:   Fri Jul 10 12:55:36 2015 -0400

    Fix assertion 'GTK_IS_WIDGET (widget)' failed.
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 garcon-gtk/garcon-gtk-menu.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
index 3a71c90..d63511e 100644
--- a/garcon-gtk/garcon-gtk-menu.c
+++ b/garcon-gtk/garcon-gtk-menu.c
@@ -504,11 +504,7 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
   gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
   size = MIN (w, h);
 
-  if (gtk_icon_theme_has_icon (icon_theme, icon_name))
-    {
-      image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
-    }
-  else
+  if (! gtk_icon_theme_has_icon (icon_theme, icon_name))
     {
       if (g_path_is_absolute (icon_name))
         {
@@ -556,6 +552,9 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
         }
     }
 
+  if (image == NULL)
+    image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+
   return image;
 }
 

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