[Pkg-xfce-commits] r5798 - in desktop/trunk/libxfce4util/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-06-18 20:58:36 +0000 (Sat, 18 Jun 2011)
New Revision: 5798

Added:
   desktop/trunk/libxfce4util/debian/patches/ubuntu.series
   desktop/trunk/libxfce4util/debian/patches/xubuntu_desktop-x-ubuntu-gettext.patch
Modified:
   desktop/trunk/libxfce4util/debian/changelog
Log:
* debian/patches:
  - xubuntu_desktop-x-ubuntu-gettext.patch: added from ubuntu.
  - ubuntu.series: list this patch only.

Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog	2011-06-18 20:48:42 UTC (rev 5797)
+++ desktop/trunk/libxfce4util/debian/changelog	2011-06-18 20:58:36 UTC (rev 5798)
@@ -1,3 +1,11 @@
+libxfce4util (4.8.1-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - xubuntu_desktop-x-ubuntu-gettext.patch: added from ubuntu.
+    - ubuntu.series: list this patch only.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 18 Jun 2011 22:12:51 +0200
+
 libxfce4util (4.8.1-2) unstable; urgency=low
 
   * Upload to unstable.

Added: desktop/trunk/libxfce4util/debian/patches/ubuntu.series
===================================================================
--- desktop/trunk/libxfce4util/debian/patches/ubuntu.series	                        (rev 0)
+++ desktop/trunk/libxfce4util/debian/patches/ubuntu.series	2011-06-18 20:58:36 UTC (rev 5798)
@@ -0,0 +1 @@
+xubuntu_desktop-x-ubuntu-gettext.patch

Added: desktop/trunk/libxfce4util/debian/patches/xubuntu_desktop-x-ubuntu-gettext.patch
===================================================================
--- desktop/trunk/libxfce4util/debian/patches/xubuntu_desktop-x-ubuntu-gettext.patch	                        (rev 0)
+++ desktop/trunk/libxfce4util/debian/patches/xubuntu_desktop-x-ubuntu-gettext.patch	2011-06-18 20:58:36 UTC (rev 5798)
@@ -0,0 +1,32 @@
+Display translations for patched desktop files from Ubuntu whose
+translations are stored in a different place ("X-Ubuntu-Gettext-Domain"
+key is used to find it).
+
+--- libxfce4util-4.6.0.orig/libxfce4util/xfce-rc.c
++++ libxfce4util-4.6.0/libxfce4util/xfce-rc.c
+@@ -506,11 +506,25 @@
+                     const gchar  *fallback)
+ {
+   const gchar *value;
++  gboolean     has_gettext_domain;
++  const gchar *gettext_domain;
+ 
+   g_return_val_if_fail (rc != NULL, fallback);
+   g_return_val_if_fail (rc->read_entry != NULL, fallback);
+   g_return_val_if_fail (key != NULL, fallback);
+ 
++  has_gettext_domain = xfce_rc_has_entry (rc, "X-Ubuntu-Gettext-Domain");
++
++  if (has_gettext_domain == TRUE && (strcmp (key, "Name") == 0 || strcmp (key, "GenericName") == 0 || strcmp (key, "Comment") == 0))
++  {
++    gettext_domain = (*rc->read_entry) (rc, "X-Ubuntu-Gettext-Domain", FALSE);
++
++    if (gettext_domain != NULL)
++    {
++      value = dgettext (gettext_domain, xfce_rc_read_entry_untranslated (rc, key, fallback));
++      return value;
++    }
++  }
+   value = (*rc->read_entry) (rc, key, TRUE);
+   if (value == NULL)
+     value = fallback;