[Pkg-xfce-commits] r2489 - in desktop/trunk/libxfcegui4/debian: . patches

[ncommander-guest at alioth.debian.org]

Author: ncommander-guest
Date: 2008-11-04 20:06:42 +0000 (Tue, 04 Nov 2008)
New Revision: 2489

Added:
   desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch
Modified:
   desktop/trunk/libxfcegui4/debian/changelog
   desktop/trunk/libxfcegui4/debian/control
   desktop/trunk/libxfcegui4/debian/patches/series
Log:
Added 01_fix-menu-icons.patch to fix Xfce #3614

Modified: desktop/trunk/libxfcegui4/debian/changelog
===================================================================
--- desktop/trunk/libxfcegui4/debian/changelog	2008-11-04 07:15:34 UTC (rev 2488)
+++ desktop/trunk/libxfcegui4/debian/changelog	2008-11-04 20:06:42 UTC (rev 2489)
@@ -1,13 +1,17 @@
 libxfcegui4 (4.4.3-1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * new upstrean bugfix release.
   * debian/rules:
     - stop messing with config.{guess,sub}.
   * debian/control:
     - update standards version.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 28 Oct 2008 07:25:38 +0100
+  [ Michael Casadevall ]
+  * Added 01_fix-menu-icons.patch to fix Xfce #3614
 
+ -- Michael Casadevall <sonicmctails at gmail.com>  Tue, 04 Nov 2008 14:57:01 -0500
+
 libxfcegui4 (4.4.2-4) unstable; urgency=low
 
   * another “brown paper bag” release.

Modified: desktop/trunk/libxfcegui4/debian/control
===================================================================
--- desktop/trunk/libxfcegui4/debian/control	2008-11-04 07:15:34 UTC (rev 2488)
+++ desktop/trunk/libxfcegui4/debian/control	2008-11-04 20:06:42 UTC (rev 2489)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
 Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev (>= 2.10.6), bison, libxft-dev, libxfce4util-dev (>= 4.4.2), libxt-dev, libxml2-dev, libstartup-notification0-dev, chrpath, quilt
 Standards-Version: 3.8.0
 Homepage: http://www.xfce.org/

Added: desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch	                        (rev 0)
+++ desktop/trunk/libxfcegui4/debian/patches/02_fix-menu-icons.patch	2008-11-04 20:06:42 UTC (rev 2489)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix-menu-icons.dpatch by  <gauvain at ulteo.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libxfcegui4-4.4.2-4ubuntu1~/libxfcegui4/icons.c libxfcegui4-4.4.2-4ubuntu1/libxfcegui4/icons.c
+--- libxfcegui4-4.4.2-4ubuntu1~/libxfcegui4/icons.c	2008-05-05 00:45:52.000000000 +0200
++++ libxfcegui4-4.4.2-4ubuntu1/libxfcegui4/icons.c	2008-05-08 21:12:07.000000000 +0200
+@@ -143,8 +143,12 @@
+     ensure_gtk_icon_theme();
+ 
+     /* GtkIconTheme doesn't like extensions */
+-    if((p = g_strrstr(name, ".")) && strlen(p) < 6)
+-        name_fixed = g_strndup(name, p-name);
++    if (g_str_has_suffix (name, ".png") || g_str_has_suffix (name, ".svg")
++        || g_str_has_suffix (name, ".xpm"))
++    {
++        if((p = g_strrstr(name, ".")) && strlen(p) < 6)
++            name_fixed = g_strndup(name, p-name);
++    }
+     
+     pix = gtk_icon_theme_load_icon(icon_theme, name_fixed ? name_fixed : name,
+                                    size,
+@@ -221,9 +225,13 @@
+     ensure_gtk_icon_theme();
+     
+     /* GtkIconTheme doesn't like extensions */
+-    if((p = g_strrstr(name, ".")) && strlen(p) < 6)
+-        name_fixed = g_strndup(name, p-name);
+-    
++    if (g_str_has_suffix (name, ".png") || g_str_has_suffix (name, ".svg")
++        || g_str_has_suffix (name, ".xpm"))
++    {   
++        if((p = g_strrstr(name, ".")) && strlen(p) < 6)
++            name_fixed = g_strndup(name, p-name);
++    }   
++ 
+     info = gtk_icon_theme_lookup_icon(icon_theme,
+                                       name_fixed ? name_fixed : name,
+                                       size, 0);

Modified: desktop/trunk/libxfcegui4/debian/patches/series
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/series	2008-11-04 07:15:34 UTC (rev 2488)
+++ desktop/trunk/libxfcegui4/debian/patches/series	2008-11-04 20:06:42 UTC (rev 2489)
@@ -1 +1,2 @@
 01_xfce-exec-use-thunar.patch
+02_fix-menu-icons.patch