[Pkg-xfce-commits] r8702 - in /desktop/trunk/thunar/debian: changelog patches/02_fix-default-application-selection.patch patches/series

[Yves-Alexis Perez]

Author: corsac
Date: Thu Oct 30 09:59:05 2014
New Revision: 8702

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8702
Log:
* debian/patches:
  - 02_fix-default-application-selection added, fix selection of default
    application for opening files, broken since glib 2.42.    closes: #763726

Added:
    desktop/trunk/thunar/debian/patches/02_fix-default-application-selection.patch
Modified:
    desktop/trunk/thunar/debian/changelog
    desktop/trunk/thunar/debian/patches/series

Modified: desktop/trunk/thunar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/debian/changelog?rev=8702&op=diff
==============================================================================
--- desktop/trunk/thunar/debian/changelog	(original)
+++ desktop/trunk/thunar/debian/changelog	Thu Oct 30 09:59:05 2014
@@ -9,6 +9,9 @@
   [ Yves-Alexis Perez ]
   * debian/control:
     - update long descriptions.
+  * debian/patches:
+    - 02_fix-default-application-selection added, fix selection of default
+      application for opening files, broken since glib 2.42.    closes: #763726
 
  -- Jackson Doak <noskcaj at ubuntu.com>  Sun, 18 Aug 2013 18:30:32 +1000
 

Added: desktop/trunk/thunar/debian/patches/02_fix-default-application-selection.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/debian/patches/02_fix-default-application-selection.patch?rev=8702&op=file
==============================================================================
--- desktop/trunk/thunar/debian/patches/02_fix-default-application-selection.patch	(added)
+++ desktop/trunk/thunar/debian/patches/02_fix-default-application-selection.patch	Thu Oct 30 09:59:05 2014
@@ -0,0 +1,39 @@
+Index: Thunar-1.6.3/thunar/thunar-file.c
+===================================================================
+--- Thunar-1.6.3.orig/thunar/thunar-file.c
++++ Thunar-1.6.3/thunar/thunar-file.c
+@@ -3963,6 +3963,7 @@ thunar_file_list_get_applications (GList
+   GList       *next;
+   GList       *ap;
+   GList       *lp;
++  GAppInfo    *default_application;
+   const gchar *previous_type = NULL;
+   const gchar *current_type;
+ 
+@@ -3981,7 +3982,25 @@ thunar_file_list_get_applications (GList
+ 
+       /* determine the list of applications that can open this file */
+       if (G_UNLIKELY (current_type != NULL))
+-        list = g_app_info_get_all_for_type (current_type);
++        {
++          list = g_app_info_get_all_for_type (current_type);
++
++          /* move any default application in front of the list */
++          default_application = g_app_info_get_default_for_type (current_type, FALSE);
++          if (G_LIKELY (default_application != NULL))
++            {
++              for (ap = list; ap != NULL; ap = ap->next)
++                {
++                  if (g_app_info_equal (ap->data, default_application))
++                    {
++                      g_object_unref (ap->data);
++                      list = g_list_delete_link (list, ap);
++                      break;
++                    }
++                }
++              list = g_list_prepend (list, default_application);
++            }
++        }
+       else
+         list = NULL;
+ 

Modified: desktop/trunk/thunar/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/debian/patches/series?rev=8702&op=diff
==============================================================================
--- desktop/trunk/thunar/debian/patches/series	(original)
+++ desktop/trunk/thunar/debian/patches/series	Thu Oct 30 09:59:05 2014
@@ -1 +1,2 @@
 01_support-non-multiarch-modules.patch
+02_fix-default-application-selection.patch