← Back to branch summary

~ubuntu-branches/debian/squeeze/glib2.0/squeeze

« back to all changes in this revision

Viewing changes to debian/patches/02_usr_share_gnome_applications.patch

  • Committer: Bazaar Package Importer
  • Author(s): Loic Minier
  • Date: 2008-03-20 16:42:00 UTC
  • Revision ID: james.westby@ubuntu.com-20080320164200-t5fsm3wsxyr3538y
Tags: 2.16.1-2~hardy1
* Drop nautilus conflicts as it triggers a bug in the APT resolver on
  dist-upgrade.
* Update patch 01_gettext-desktopfiles with a newer version taken from the
  Ubuntu package.
* Update and enable patch 01_gettext-desktopfiles to also look for
  X-Debian-Gettext-Domain if X-Ubuntu-Gettext-Domain isn't present.
* Snapshot to hardy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_usr_share_gnome_applications.patch
 
1
Index: glib-2.16.1/gio/gdesktopappinfo.c
 
2
===================================================================
 
3
--- glib-2.16.1.orig/gio/gdesktopappinfo.c      2008-03-11 20:58:33.600196803 +0100
 
4
+++ glib-2.16.1/gio/gdesktopappinfo.c   2008-03-11 20:59:26.728196738 +0100
 
5
@@ -110,11 +110,12 @@ search_path_init (gpointer data)
 
6
   data_dirs = g_get_system_data_dirs ();
 
7
   length = g_strv_length ((char **) data_dirs);
 
8
   
 
9
-  args = g_new (char *, length + 2);
 
10
+  args = g_new (char *, length + 3);
 
11
   
 
12
   j = 0;
 
13
   user_data_dir = g_get_user_data_dir ();
 
14
   args[j++] = g_build_filename (user_data_dir, "applications", NULL);
 
15
+  args[j++] = g_strdup("/usr/share/gnome/applications");
 
16
   for (i = 0; i < length; i++)
 
17
     args[j++] = g_build_filename (data_dirs[i],
 
18
                                  "applications", NULL);