r29573 - in /desktop/experimental/glib2.0/debian: changelog patches/10_gdesktopappinfo_set_last_used.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Sep  4 17:12:06 2011
New Revision: 29573

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29573
Log:
10_gdesktopappinfo_set_last_used.patch: new patch. When calling 
g_app_info_set_as_last_used_for_type, correctly inherit the default 
filled in the file from the system default. This avoids 
gnome-control-center breaking file associations just by opening the 
info dialog.

Added:
    desktop/experimental/glib2.0/debian/patches/10_gdesktopappinfo_set_last_used.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=29573&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Sun Sep  4 17:12:06 2011
@@ -3,6 +3,11 @@
   * Break gnome-session < 3.0.0-3 for the updated defaults.list taking 
     x-scheme-* into account.
   * Break gdm < 3.0.3 to avoid adding a security hole to it.
+  * 10_gdesktopappinfo_set_last_used.patch: new patch. When calling 
+    g_app_info_set_as_last_used_for_type, correctly inherit the default 
+    filled in the file from the system default. This avoids 
+    gnome-control-center breaking file associations just by opening the 
+    info dialog.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 01 Jun 2011 00:15:30 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/10_gdesktopappinfo_set_last_used.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/10_gdesktopappinfo_set_last_used.patch?rev=29573&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/10_gdesktopappinfo_set_last_used.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/10_gdesktopappinfo_set_last_used.patch [utf-8] Sun Sep  4 17:12:06 2011
@@ -1,0 +1,37 @@
+Index: glib-2.28.6/gio/gdesktopappinfo.c
+===================================================================
+--- glib-2.28.6.orig/gio/gdesktopappinfo.c	2011-09-04 16:39:27.432588259 +0200
++++ glib-2.28.6/gio/gdesktopappinfo.c	2011-09-04 18:54:18.100141524 +0200
+@@ -1515,18 +1515,29 @@ update_mimeapps_list (const char  *deskt
+            */
+           if (!explicit_default)
+             {
+-              system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, NULL);
++              char *user_default;
++              /* The system default can be in the list, don't exclude it */
++              system_list = get_all_desktop_entries_for_mime_type (content_type, NULL, FALSE, &user_default);
+ 
+-              if (system_list != NULL)
++              string = NULL;
++              if (user_default != NULL)
++                {
++                  /* There is an existing default set in a lower priority defaults file, re-use it */
++                  string = user_default;
++                }
++              else if (system_list != NULL)
+                 {
+                   string = system_list->data;
+-
++                }
++              if (string)
++                {
+                   g_key_file_set_string (key_file,
+                                          DEFAULT_APPLICATIONS_GROUP,
+                                          content_types[k],
+                                          string);
+                 }
+ 
++              g_free (user_default);
+               g_list_free_full (system_list, g_free);
+             }
+         }

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=29573&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Sun Sep  4 17:12:06 2011
@@ -3,5 +3,6 @@
 02_gettext-desktopfiles-ubuntu.patch
 03_blacklist-directories.patch
 04_homedir_env.patch
+10_gdesktopappinfo_set_last_used.patch
 60_wait-longer-for-threads-to-die.patch
 61_glib-compile-schemas-path.patch