[Xfce4-commits] [apps/xfce4-notifyd] 01/01: Fix fallback icon-size again and empty app_icon strings

[noreply at xfce.org]

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

ochosi pushed a commit to branch master
in repository apps/xfce4-notifyd.

commit 1beddc2ca7787daf9c58b3cc7038ffbcb3f5cc83
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Oct 3 23:17:44 2016 +0200

    Fix fallback icon-size again and empty app_icon strings
    
    This should fix notifications of e.g. Gnome Software not showing an
    application icon.
---
 xfce4-notifyd/xfce-notify-daemon.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
index 8a296c7..c8bdafb 100644
--- a/xfce4-notifyd/xfce-notify-daemon.c
+++ b/xfce4-notifyd/xfce-notify-daemon.c
@@ -1167,7 +1167,7 @@ static gboolean notify_notify (XfceNotifyGBus *skeleton,
     else if (image_path) {
         xfce_notify_window_set_icon_name (window, image_path);
     }
-    else if (app_icon) {
+    else if (app_icon && (g_strcmp0 (app_icon, "") != 0)) {
         xfce_notify_window_set_icon_name(window, app_icon);
     }
     else {
@@ -1185,7 +1185,7 @@ static gboolean notify_notify (XfceNotifyGBus *skeleton,
                     if(icon_file) {
                         pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
                                                        icon_file,
-                                                       GTK_ICON_SIZE_DIALOG,
+                                                       48,
                                                        GTK_ICON_LOOKUP_FORCE_SIZE,
                                                        NULL);
 

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