[Xfce4-commits] [xfce/xfdesktop] 01/04: Handle icons with preset emblems (Bug #7417)

[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/xfdesktop.

commit d98a8fddf4a0a875ea4843bcff5f69b9f6254c53
Author: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
Date:   Tue Feb 24 18:44:52 2015 +0100

    Handle icons with preset emblems (Bug #7417)
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 src/xfdesktop-file-icon.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xfdesktop-file-icon.c b/src/xfdesktop-file-icon.c
index 546ebf1..2f975cb 100644
--- a/src/xfdesktop-file-icon.c
+++ b/src/xfdesktop-file-icon.c
@@ -264,7 +264,9 @@ xfdesktop_file_icon_add_emblems(XfdesktopFileIcon *icon)
 
     g_return_val_if_fail(XFDESKTOP_IS_FILE_ICON(icon), NULL);
 
-    if(G_IS_ICON(icon->priv->gicon))
+    if(G_IS_EMBLEMED_ICON(icon->priv->gicon))
+        emblemed_icon = icon->priv->gicon;
+    else if(G_IS_ICON(icon->priv->gicon))
         emblemed_icon = g_emblemed_icon_new(icon->priv->gicon, NULL);
     else
         return NULL;
@@ -288,7 +290,7 @@ xfdesktop_file_icon_add_emblems(XfdesktopFileIcon *icon)
             g_object_unref(emblem);
             g_object_unref(themed_icon);
         }
-    } else
+    }
 
     /* Clear out the old icon and set the new one */
     xfdesktop_file_icon_invalidate_icon(icon);

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