[Pkg-xfce-commits] r1438 - in desktop/trunk/xfdesktop4/debian: . patches

[corsac-guest at alioth.debian.org]

Author: corsac-guest
Date: 2007-11-28 07:30:05 +0000 (Wed, 28 Nov 2007)
New Revision: 1438

Removed:
   desktop/trunk/xfdesktop4/debian/patches/02_fix-icon-size.patch
Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/patches/series
Log:
remove patch merged upstream


Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2007-11-27 19:15:27 UTC (rev 1437)
+++ desktop/trunk/xfdesktop4/debian/changelog	2007-11-28 07:30:05 UTC (rev 1438)
@@ -6,8 +6,6 @@
   * use exo-open to run terminal from menu so we respect user choice.
   * debian/xfdesktop4.postinst: use posix kill -s to avoid problems on hurd.
   * debian/rules: don't ignore all make errors at clean stage.
-  * debian/patches:
-    - 02_fix-icon-size.patch added, correct wrong icon size in menus.
 
   [ Simon Huggins ]
   * debian/prerm: Use kill -s to keep Hurd and lintian happy at the same time.
@@ -15,7 +13,7 @@
     supports it.
   * Add Vcs-* headers to debian/control
 
- -- Simon Huggins <huggie at earth.li>  Tue, 27 Nov 2007 16:39:20 +0000
+ -- Yves-Alexis Perez <corsac at corsac.net>  Wed, 28 Nov 2007 07:56:19 +0100
 
 xfdesktop4 (4.4.1-5) unstable; urgency=low
 

Deleted: desktop/trunk/xfdesktop4/debian/patches/02_fix-icon-size.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/02_fix-icon-size.patch	2007-11-27 19:15:27 UTC (rev 1437)
+++ desktop/trunk/xfdesktop4/debian/patches/02_fix-icon-size.patch	2007-11-28 07:30:05 UTC (rev 1438)
@@ -1,10 +0,0 @@
---- xfdesktop-4.4.2/modules/menu/desktop-menu.c	2007-11-17 20:31:43.000000000 +0100
-+++ xfdesktop-4.4.1/modules/menu/desktop-menu.c	2007-01-25 21:53:29.000000000 +0100
-@@ -426,6 +426,7 @@
-     
-     gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h);
-     _xfce_desktop_menu_icon_size = w;
-+    xfce_app_menu_item_set_icon_size(_xfce_desktop_menu_icon_size);
-     
-     if(dummy_icon)
-         g_object_unref(G_OBJECT(dummy_icon));

Modified: desktop/trunk/xfdesktop4/debian/patches/series
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/series	2007-11-27 19:15:27 UTC (rev 1437)
+++ desktop/trunk/xfdesktop4/debian/patches/series	2007-11-28 07:30:05 UTC (rev 1438)
@@ -1,2 +1 @@
 01_show-backdrop-by-default.patch
-02_fix-icon-size.patch