[Pkg-xfce-commits] r4597 - in goodies/branches/experimental/xfce4-notifyd/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-29 21:30:28 +0000 (Mon, 29 Nov 2010)
New Revision: 4597

Added:
   goodies/branches/experimental/xfce4-notifyd/debian/patches/01_fix-loading-icon-with-paths.patch
   goodies/branches/experimental/xfce4-notifyd/debian/patches/series
Modified:
   goodies/branches/experimental/xfce4-notifyd/debian/changelog
   goodies/branches/experimental/xfce4-notifyd/debian/rules
Log:
01_fix-loading-icon-with-paths added.

Modified: goodies/branches/experimental/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/changelog	2010-11-28 15:28:34 UTC (rev 4596)
+++ goodies/branches/experimental/xfce4-notifyd/debian/changelog	2010-11-29 21:30:28 UTC (rev 4597)
@@ -16,9 +16,10 @@
       ported to libnotify 0.4.5.
     - 02_add-spec-version-to-GetServerInformation dropped as well, included
       upstream.
+    - 01_fix-loading-icon-with-paths added.
   * debian/copyright updated for new release.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 27 Nov 2010 15:49:44 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 29 Nov 2010 21:00:58 +0100
 
 xfce4-notifyd (0.1.0-5) unstable; urgency=low
 

Added: goodies/branches/experimental/xfce4-notifyd/debian/patches/01_fix-loading-icon-with-paths.patch
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/01_fix-loading-icon-with-paths.patch	                        (rev 0)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/01_fix-loading-icon-with-paths.patch	2010-11-29 21:30:28 UTC (rev 4597)
@@ -0,0 +1,26 @@
+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);
+     }
+ 

Added: goodies/branches/experimental/xfce4-notifyd/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/patches/series	                        (rev 0)
+++ goodies/branches/experimental/xfce4-notifyd/debian/patches/series	2010-11-29 21:30:28 UTC (rev 4597)
@@ -0,0 +1 @@
+01_fix-loading-icon-with-paths.patch

Modified: goodies/branches/experimental/xfce4-notifyd/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-notifyd/debian/rules	2010-11-28 15:28:34 UTC (rev 4596)
+++ goodies/branches/experimental/xfce4-notifyd/debian/rules	2010-11-29 21:30:28 UTC (rev 4597)
@@ -7,5 +7,13 @@
 LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
 CFLAGS+=$(HARDENING_CFLAGS)
 
+override_dh_auto_configure:
+	dh_auto_configure
+	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
+
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
+
 %:
 	dh $@