[Xfce4-commits] <xfce4-notifyd:master> Fix icon loading with path (bug #6895).
Jérôme Guelfucci
noreply at xfce.org
Mon Nov 29 23:42:01 CET 2010
Updating branch refs/heads/master
to 2529fb74ca78c52e8c66620e10ad275373d988bb (commit)
from d795f604ed1a614b2c48fca26dfd965fd6ea9ad4 (commit)
commit 2529fb74ca78c52e8c66620e10ad275373d988bb
Author: Yves-Alexis Perez <corsac at debian.org>
Date: Mon Nov 29 23:39:20 2010 +0100
Fix icon loading with path (bug #6895).
xfce4-notifyd/xfce-notify-window.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c
index d10ef1c..a7c7289 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -1041,7 +1041,11 @@ xfce_notify_window_set_icon_name(XfceNotifyWindow *window,
GdkPixbuf *pix;
gtk_icon_size_lookup(GTK_ICON_SIZE_DIALOG, &w, &h);
- pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
+
+ if(g_path_is_absolute(icon_name))
+ pix = gdk_pixbuf_new_from_file_at_size(icon_name, w, h, NULL);
+ else
+ pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
icon_name,
w,
GTK_ICON_LOOKUP_FORCE_SIZE,
@@ -1056,7 +1060,7 @@ xfce_notify_window_set_icon_name(XfceNotifyWindow *window,
}
if(!icon_set) {
- gtk_image_set_from_pixbuf(GTK_IMAGE(window->icon), NULL);
+ gtk_image_clear(GTK_IMAGE(window->icon));
gtk_widget_hide(window->icon_box);
}
More information about the Xfce4-commits
mailing list