| 1 |
ssuominen 10/12/02 17:08:37 |
| 2 |
|
| 3 |
Added: xfce4-notifyd-0.2.0-load_icon_with_path.patch |
| 4 |
Log: |
| 5 |
Upstream patch to fix loading of icons with path (#6895). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 xfce-extra/xfce4-notifyd/files/xfce4-notifyd-0.2.0-load_icon_with_path.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-notifyd/files/xfce4-notifyd-0.2.0-load_icon_with_path.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-notifyd/files/xfce4-notifyd-0.2.0-load_icon_with_path.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xfce4-notifyd-0.2.0-load_icon_with_path.patch |
| 16 |
=================================================================== |
| 17 |
From 2529fb74ca78c52e8c66620e10ad275373d988bb Mon Sep 17 00:00:00 2001 |
| 18 |
From: Yves-Alexis Perez <corsac@××××××.org> |
| 19 |
Date: Mon, 29 Nov 2010 22:39:20 +0000 |
| 20 |
Subject: Fix icon loading with path (bug #6895). |
| 21 |
|
| 22 |
--- |
| 23 |
diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c |
| 24 |
index d10ef1c..a7c7289 100644 |
| 25 |
--- a/xfce4-notifyd/xfce-notify-window.c |
| 26 |
+++ b/xfce4-notifyd/xfce-notify-window.c |
| 27 |
@@ -1041,7 +1041,11 @@ xfce_notify_window_set_icon_name(XfceNotifyWindow *window, |
| 28 |
GdkPixbuf *pix; |
| 29 |
|
| 30 |
gtk_icon_size_lookup(GTK_ICON_SIZE_DIALOG, &w, &h); |
| 31 |
- pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), |
| 32 |
+ |
| 33 |
+ if(g_path_is_absolute(icon_name)) |
| 34 |
+ pix = gdk_pixbuf_new_from_file_at_size(icon_name, w, h, NULL); |
| 35 |
+ else |
| 36 |
+ pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), |
| 37 |
icon_name, |
| 38 |
w, |
| 39 |
GTK_ICON_LOOKUP_FORCE_SIZE, |
| 40 |
@@ -1056,7 +1060,7 @@ xfce_notify_window_set_icon_name(XfceNotifyWindow *window, |
| 41 |
} |
| 42 |
|
| 43 |
if(!icon_set) { |
| 44 |
- gtk_image_set_from_pixbuf(GTK_IMAGE(window->icon), NULL); |
| 45 |
+ gtk_image_clear(GTK_IMAGE(window->icon)); |
| 46 |
gtk_widget_hide(window->icon_box); |
| 47 |
} |
| 48 |
|
| 49 |
-- |
| 50 |
cgit v0.8.3.4 |
Archives