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

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-05-17 15:42:05 +0000 (Sat, 17 May 2008)
New Revision: 2031

Added:
   desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch
   desktop/trunk/xfdesktop4/debian/patches/06_fix-size-warning-amd64.patch
Modified:
   desktop/trunk/xfdesktop4/debian/changelog
Log:
06_fix-size-warning-amd64 added. (Xfce r26631)

Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2008-05-17 15:40:47 UTC (rev 2030)
+++ desktop/trunk/xfdesktop4/debian/changelog	2008-05-17 15:42:05 UTC (rev 2031)
@@ -4,8 +4,9 @@
     session bus.
   * debian/patches:
     - 05_simplify-free-code added, simplify some free()ing code. (Xfce r26651)
+    - 06_fix-size-warning-amd64 added. (Xfce r26631)
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 17 May 2008 17:40:04 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 17 May 2008 17:41:26 +0200
 
 xfdesktop4 (4.4.2-5) unstable; urgency=low
 

Added: desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch	2008-05-17 15:42:05 UTC (rev 2031)
@@ -0,0 +1,28 @@
+Index: xfce_4_4/modules/menu/desktop-menu-cache.c
+===================================================================
+--- xfce_4_4/modules/menu/desktop-menu-cache.c	(revision 26650)
++++ xfce_4_4/modules/menu/desktop-menu-cache.c	(revision 26651)
+@@ -453,17 +453,11 @@
+         menu_tree = NULL;
+     }
+     
+-    for(l = menu_files; l; l = l->next)
+-        g_free(l->data);
+-    if(menu_files) {
+-        g_list_free(menu_files);
+-        menu_files = NULL;
+-    }
++    g_list_foreach(menu_files, (GFunc)g_free, NULL);
++    g_list_free(menu_files);
++    menu_files = NULL;
+     
+-    for(l = dentry_dirs; l; l = l->next)
+-        g_free(l->data);
+-    if(dentry_dirs) {
+-        g_list_free(dentry_dirs);
+-        dentry_dirs = NULL;
+-    }
++    g_list_foreach(dentry_dirs, (GFunc)g_free, NULL);
++    g_list_free(dentry_dirs);
++    dentry_dirs = NULL;
+ }

Added: desktop/trunk/xfdesktop4/debian/patches/06_fix-size-warning-amd64.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/06_fix-size-warning-amd64.patch	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/patches/06_fix-size-warning-amd64.patch	2008-05-17 15:42:05 UTC (rev 2031)
@@ -0,0 +1,22 @@
+Index: xfce_4_4/src/xfdesktop-icon-view.c
+===================================================================
+--- xfce_4_4/src/xfdesktop-icon-view.c	(revision 26630)
++++ xfce_4_4/src/xfdesktop-icon-view.c	(revision 26631)
+@@ -1202,7 +1202,7 @@
+         if(target == GDK_NONE)
+             return FALSE;
+     }
+-    DBG("target=%d (%s)", (gint)target, gdk_atom_name(target));
++    DBG("target=%ld (%s)", (glong)target, gdk_atom_name(target));
+     
+     xfdesktop_xy_to_rowcol(icon_view, x, y, &row, &col);
+     icon_on_dest = xfdesktop_icon_view_icon_in_cell(icon_view, row, col);
+@@ -1698,7 +1698,7 @@
+     } else
+         icon_view->priv->grid_layout = g_malloc0(new_size);
+     
+-    DBG("created grid_layout with %d positions", new_size/sizeof(gpointer));
++    DBG("created grid_layout with %ld positions", new_size/sizeof(gpointer));
+     DUMP_GRID_LAYOUT(icon_view);
+     
+     xfdesktop_icon_view_setup_grids_xinerama(icon_view);