← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-desktop/trusty

« back to all changes in this revision

Viewing changes to debian/patches/01_desktopfile_gettext.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-04-13 11:23:46 UTC
  • Revision ID: james.westby@ubuntu.com-20110413112346-22er98k8heuzzl33
Tags: 1:2.32.1-0ubuntu6
https://launchpad.net/bugs/587485
* debian/patches/01_desktopfile_gettext.patch:
  - the Gettext-Domain key can be a X-GNOME one (lp: #587485).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_desktopfile_gettext.patch
1
1
Description: Gettext support for desktop files
2
2
Author: ?
3
3
 
4
 
Index: gnome-desktop-2.32.0/libgnome-desktop/gnome-desktop-item.c
 
4
Index: gnome-desktop-2.32.1/libgnome-desktop/gnome-desktop-item.c
5
5
===================================================================
6
 
--- gnome-desktop-2.32.0.orig/libgnome-desktop/gnome-desktop-item.c     2010-09-24 11:24:03.000000000 +0200
7
 
+++ gnome-desktop-2.32.0/libgnome-desktop/gnome-desktop-item.c  2010-10-15 16:38:41.156592194 +0200
 
6
--- gnome-desktop-2.32.1.orig/libgnome-desktop/gnome-desktop-item.c     2010-10-04 23:32:19.000000000 +0200
 
7
+++ gnome-desktop-2.32.1/libgnome-desktop/gnome-desktop-item.c  2011-03-30 12:39:49.952933487 +0200
8
8
@@ -83,6 +83,7 @@
9
9
        GHashTable *main_hash;
10
10
 
34
34
 /**
35
35
  * gnome_desktop_item_new_from_uri:
36
36
  * @uri: URI to load the GnomeDesktopItem from
37
 
@@ -682,6 +690,7 @@
 
37
@@ -682,6 +690,9 @@
38
38
 
39
39
        g_object_unref (subfn);
40
40
 
41
 
+    retval->gettext_domain = lookup(retval, GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN);
 
41
+       retval->gettext_domain = lookup(retval, GNOME_DESKTOP_ITEM_GNOME_GETTEXT_DOMAIN);
 
42
+       if (!retval->gettext_domain)
 
43
+               retval->gettext_domain = lookup(retval, GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN);
42
44
        return retval;
43
45
 }
44
46
 
45
 
@@ -725,6 +734,7 @@
 
47
@@ -725,6 +736,9 @@
46
48
        
47
49
        /* FIXME: Sort order? */
48
50
 
49
 
+    retval->gettext_domain = lookup(retval, GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN);
 
51
+       retval->gettext_domain = lookup(retval, GNOME_DESKTOP_ITEM_GNOME_GETTEXT_DOMAIN);
 
52
+       if (!retval->gettext_domain)
 
53
+               retval->gettext_domain = lookup(retval, GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN);
50
54
        return retval;
51
55
 }
52
56
 
53
 
@@ -994,6 +1004,14 @@
 
57
@@ -994,6 +1008,14 @@
54
58
            strcmp (locale, "C") == 0) {
55
59
                return lookup (item, key);
56
60
        } else {
65
69
                const char *ret;
66
70
                char *full = g_strdup_printf ("%s[%s]", key, locale);
67
71
                ret = lookup (item, full);
68
 
Index: gnome-desktop-2.32.0/libgnome-desktop/libgnome/gnome-desktop-item.h
 
72
Index: gnome-desktop-2.32.1/libgnome-desktop/libgnome/gnome-desktop-item.h
69
73
===================================================================
70
 
--- gnome-desktop-2.32.0.orig/libgnome-desktop/libgnome/gnome-desktop-item.h    2010-09-24 11:24:03.000000000 +0200
71
 
+++ gnome-desktop-2.32.0/libgnome-desktop/libgnome/gnome-desktop-item.h 2010-10-15 16:38:41.160592196 +0200
72
 
@@ -95,6 +95,7 @@
 
74
--- gnome-desktop-2.32.1.orig/libgnome-desktop/libgnome/gnome-desktop-item.h    2010-10-04 23:32:19.000000000 +0200
 
75
+++ gnome-desktop-2.32.1/libgnome-desktop/libgnome/gnome-desktop-item.h 2011-03-30 12:36:39.796933399 +0200
 
76
@@ -95,6 +95,8 @@
73
77
 #define GNOME_DESKTOP_ITEM_SORT_ORDER  "SortOrder" /* strings */
74
78
 #define GNOME_DESKTOP_ITEM_URL         "URL" /* string */
75
79
 #define GNOME_DESKTOP_ITEM_DOC_PATH    "X-GNOME-DocPath" /* string */
76
80
+#define GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN      "X-Ubuntu-Gettext-Domain" /* string */
 
81
+#define GNOME_DESKTOP_ITEM_GNOME_GETTEXT_DOMAIN        "X-GNOME-Gettext-Domain" /* string */
77
82
 
78
83
 /* The vfolder proposal */
79
84
 #define GNOME_DESKTOP_ITEM_CATEGORIES  "Categories" /* string */