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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-05-28 08:30:23 +0000 (Sat, 28 May 2011)
New Revision: 5778

Added:
   desktop/trunk/thunar/debian/patches/01_retrieve-the-translated-desktop-file-name.patch
Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/patches/series
Log:
* debian/patches:
  - 01_retrieve-the-translated-desktop-file-name.patch: fixes untranslated
    .desktop display name.
  - series: refreshed.

Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2011-05-27 06:00:15 UTC (rev 5777)
+++ desktop/trunk/thunar/debian/changelog	2011-05-28 08:30:23 UTC (rev 5778)
@@ -1,5 +1,6 @@
 thunar (1.2.2-1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * New upstream release.
     - load network stuff later to speed up start (Xfce #7373).  closes: #626200
   * debian/patches:
@@ -13,6 +14,12 @@
   * debian/rules:
     - don't run xdt-autogen anymore.
 
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 01_retrieve-the-translated-desktop-file-name.patch: fixes untranslated
+      .desktop display name.
+    - series: refreshed.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 27 May 2011 07:59:39 +0200
 
 thunar (1.2.1-6) unstable; urgency=low

Added: 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	                        (rev 0)
+++ desktop/trunk/thunar/debian/patches/01_retrieve-the-translated-desktop-file-name.patch	2011-05-28 08:30:23 UTC (rev 5778)
@@ -0,0 +1,32 @@
+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
+

Modified: desktop/trunk/thunar/debian/patches/series
===================================================================
--- desktop/trunk/thunar/debian/patches/series	2011-05-27 06:00:15 UTC (rev 5777)
+++ desktop/trunk/thunar/debian/patches/series	2011-05-28 08:30:23 UTC (rev 5778)
@@ -1 +1,2 @@
+01_retrieve-the-translated-desktop-file-name.patch
 04_fix-maxpathlen-hurd.patch