[Pkg-xfce-commits] r6041 - in desktop/trunk/thunar/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-09-20 22:12:13 +0000 (Tue, 20 Sep 2011)
New Revision: 6041

Removed:
   desktop/trunk/thunar/debian/patches/01_retrieve-the-translated-desktop-file-name.patch
   desktop/trunk/thunar/debian/patches/04_fix-maxpathlen-hurd.patch
   desktop/trunk/thunar/debian/patches/series
Modified:
   desktop/trunk/thunar/debian/changelog
Log:
* New upstream release, including:
  - Prevent falling back to an unexpected locale.                 lp: #557255
  - Fix regression in 1.2.2 wrt SMB shares.      Closes: #633772, lp: #846907
* debian/patches:
  - 01_retrieve-the-translated-desktop-file-name.patch,
    04_fix-maxpathlen-hurd.patch: dropped, included upstream.

Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2011-09-16 06:44:21 UTC (rev 6040)
+++ desktop/trunk/thunar/debian/changelog	2011-09-20 22:12:13 UTC (rev 6041)
@@ -1,3 +1,14 @@
+thunar (1.2.3-1) UNRELEASED; urgency=low
+
+  * New upstream release, including:
+    - Prevent falling back to an unexpected locale.                 lp: #557255
+    - Fix regression in 1.2.2 wrt SMB shares.      Closes: #633772, lp: #846907
+  * debian/patches:
+    - 01_retrieve-the-translated-desktop-file-name.patch,
+      04_fix-maxpathlen-hurd.patch: dropped, included upstream.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 20 Sep 2011 23:53:31 +0200
+
 thunar (1.2.2-1) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Deleted: desktop/trunk/thunar/debian/patches/01_retrieve-the-translated-desktop-file-name.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/01_retrieve-the-translated-desktop-file-name.patch	2011-09-16 06:44:21 UTC (rev 6040)
+++ desktop/trunk/thunar/debian/patches/01_retrieve-the-translated-desktop-file-name.patch	2011-09-20 22:12:13 UTC (rev 6041)
@@ -1,32 +0,0 @@
-From e3b04ef343e1f88d8e284076443f2d15ee6c690d Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit at gmail.com>
-Date: Wed, 9 Mar 2011 14:16:31 +0100
-Subject: Retrieve the translated desktop file name
-
----
- thunar/thunar-file.c |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
-index 506713c..d7970c7 100644
---- a/thunar/thunar-file.c
-+++ b/thunar/thunar-file.c
-@@ -822,10 +822,11 @@ thunar_file_load (ThunarFile   *file,
- 
-           /* read the display name from the .desktop file (will be overwritten later
-            * if it's undefined here) */
--          file->display_name = g_key_file_get_string (key_file,
--                                                      G_KEY_FILE_DESKTOP_GROUP,
--                                                      G_KEY_FILE_DESKTOP_KEY_NAME,
--                                                      NULL);
-+          file->display_name = g_key_file_get_locale_string (key_file,
-+                                                             G_KEY_FILE_DESKTOP_GROUP,
-+                                                             G_KEY_FILE_DESKTOP_KEY_NAME,
-+                                                             NULL,
-+                                                             NULL);
-           
-           /* check if we have a display name now */
-           if (file->display_name != NULL)
--- 
-1.7.4.1
-

Deleted: desktop/trunk/thunar/debian/patches/04_fix-maxpathlen-hurd.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/04_fix-maxpathlen-hurd.patch	2011-09-16 06:44:21 UTC (rev 6040)
+++ desktop/trunk/thunar/debian/patches/04_fix-maxpathlen-hurd.patch	2011-09-20 22:12:13 UTC (rev 6041)
@@ -1,52 +0,0 @@
-commit 9b80264fa596e18468066ffb3f03804421f3872e
-Author: Yves-Alexis Perez <corsac at debian.org>
-Date:   Thu Apr 21 16:59:40 2011 +0200
-
-    Use glib functions for get/set cwd (bug #7522).
-    
-    MAXPATHLEN isn't defined on all platforms and there
-    are glib functions to handle the platform specific code.
-
-diff --git a/thunar/thunar-util.c b/thunar/thunar-util.c
-index b49a954..577bc27 100644
---- a/thunar/thunar-util.c
-+++ b/thunar/thunar-util.c
-@@ -57,6 +57,8 @@
- #include <thunar/thunar-private.h>
- #include <thunar/thunar-util.h>
- 
-+#include <glib.h>
-+#include <glib/gstdio.h>
- 
- 
- /**
-@@ -404,27 +406,11 @@ thunar_util_change_working_directory (const gchar *new_directory)
- 
-   _thunar_return_val_if_fail (new_directory != NULL && *new_directory != '\0', NULL);
- 
--  /* allocate a path buffer for the old working directory */
--  old_directory = g_malloc0 (sizeof (gchar) * MAXPATHLEN);
--
-   /* try to determine the current working directory */
--#ifdef G_PLATFORM_WIN32
--  if (_getcwd (old_directory, MAXPATHLEN) == NULL)
--#else
--  if (getcwd (old_directory, MAXPATHLEN) == NULL)
--#endif
--    {
--      /* working directory couldn't be determined, reset the buffer */
--      g_free (old_directory);
--      old_directory = NULL;
--    }
-+  old_directory = g_get_current_dir();
- 
-   /* try switching to the new working directory */
--#ifdef G_PLATFORM_WIN32
--  if (_chdir (new_directory) != 0)
--#else
--  if (chdir (new_directory) != 0)
--#endif
-+  if (g_chdir (new_directory) != 0)
-     {
-       /* switching failed, we don't need to return the old directory */
-       g_free (old_directory);

Deleted: desktop/trunk/thunar/debian/patches/series
===================================================================
--- desktop/trunk/thunar/debian/patches/series	2011-09-16 06:44:21 UTC (rev 6040)
+++ desktop/trunk/thunar/debian/patches/series	2011-09-20 22:12:13 UTC (rev 6041)
@@ -1,2 +0,0 @@
-01_retrieve-the-translated-desktop-file-name.patch
-04_fix-maxpathlen-hurd.patch