[Pkg-xfce-commits] r5660 - desktop/trunk/xfce4-settings/debian/patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-21 15:19:35 +0000 (Thu, 21 Apr 2011)
New Revision: 5660

Modified:
   desktop/trunk/xfce4-settings/debian/patches/02_fix-path_max-undefined-hurd.patch
Log:
update patch to the comitted one


Modified: desktop/trunk/xfce4-settings/debian/patches/02_fix-path_max-undefined-hurd.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/02_fix-path_max-undefined-hurd.patch	2011-04-21 15:18:49 UTC (rev 5659)
+++ desktop/trunk/xfce4-settings/debian/patches/02_fix-path_max-undefined-hurd.patch	2011-04-21 15:19:35 UTC (rev 5660)
@@ -1,32 +1,34 @@
+commit 57ade33f4b612b03ba14692aef5a5b31d7e7fc1a
+Author: Yves-Alexis Perez <corsac at debian.org>
+Date:   Thu Apr 21 16:47:11 2011 +0200
+
+    Dynamically allocate the filename (bug #7521).
+    
+    PATH_MAX isn't available on hurd and not needed as well.
+
 diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c
-index 90d34c8..12bccfa 100644
+index 90d34c8..044e94a 100644
 --- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
 +++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
-@@ -384,7 +384,7 @@ xfce_settings_manager_dialog_sort_icons(GtkTreeModel *model,
+@@ -384,7 +384,8 @@ xfce_settings_manager_dialog_sort_icons(GtkTreeModel *model,
  static void
  xfce_settings_manager_dialog_create_liststore(XfceSettingsManagerDialog *dialog)
  {
 -    gchar **dirs, buf[PATH_MAX];
-+    gchar **dirs, *buf;
++    gchar **dirs;
++    gchar *filename;
      gint i, icon_size;
      GList *dialog_name_list = NULL;
  
-@@ -424,10 +424,16 @@ xfce_settings_manager_dialog_create_liststore(XfceSettingsManagerDialog *dialog)
+@@ -424,8 +425,9 @@ xfce_settings_manager_dialog_create_liststore(XfceSettingsManagerDialog *dialog)
              if(!g_str_has_suffix(file, ".desktop"))
                  continue;
  
 -            g_snprintf(buf, sizeof(buf), "%s/%s", dirs[i], file);
-+            buf = g_strdup_printf("%s/%s", dirs[i], file);
-+            if(!buf)
-+                continue;
-+
-             rcfile = xfce_rc_simple_open(buf, TRUE);
--            if(!rcfile)
-+            if(!rcfile) {
-+                g_free(buf);
+-            rcfile = xfce_rc_simple_open(buf, TRUE);
++            filename = g_build_filename(dirs[i], file, NULL);
++            rcfile = xfce_rc_simple_open(filename, TRUE);
++            g_free (filename);
+             if(!rcfile)
                  continue;
-+            }
-+            g_free(buf);
  
-             if(!xfce_rc_has_group(rcfile, "Desktop Entry")) {
-                 xfce_rc_close(rcfile);