[Pkg-xfce-commits] r4365 - in desktop/branches/experimental/thunar/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-03 21:12:09 +0000 (Wed, 03 Nov 2010)
New Revision: 4365

Removed:
   desktop/branches/experimental/thunar/debian/patches/01_fix-file-handling.patch
Modified:
   desktop/branches/experimental/thunar/debian/changelog
   desktop/branches/experimental/thunar/debian/patches/series
Log:
01_fix-file-handling.patch removed, merged upstream


Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog	2010-11-03 21:10:33 UTC (rev 4364)
+++ desktop/branches/experimental/thunar/debian/changelog	2010-11-03 21:12:09 UTC (rev 4365)
@@ -27,8 +27,6 @@
     - 06_fix-sidepane-width.patch: dropped, included upstream.
     - 07_update-cursor-on-delete.patch: dropped.
     - 08_refilter-tree-hidden-dir.patch: dropped.
-    - 01_fix-file-handling added, fix file handling so Thunar doesn't ask   
-      about file association everytime a file is opened.
     - 03_fix-build-as-needed added, fix build with -Wl,--as-needed.
     + add build-dep on xfce4-dev-tools and run it before configure
     - debian/patches/04_fix-link-twp added fix flags for wallpaper plugin.
@@ -76,7 +74,7 @@
   * debian/libthunarx-2-0.symbols: added.
   * debian/libthunarx-2-0.shlib: dropped.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 19 Oct 2010 19:15:56 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 03 Nov 2010 22:11:26 +0100
 
 thunar (1.0.2-1) unstable; urgency=low
 

Deleted: desktop/branches/experimental/thunar/debian/patches/01_fix-file-handling.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/01_fix-file-handling.patch	2010-11-03 21:10:33 UTC (rev 4364)
+++ desktop/branches/experimental/thunar/debian/patches/01_fix-file-handling.patch	2010-11-03 21:12:09 UTC (rev 4365)
@@ -1,66 +0,0 @@
-commit 8fae46156ce617d3639486e10a3d91b878c75f17
-Author: Jannis Pohlmann <jannis at xfce.org>
-Date:   Tue Oct 19 15:53:11 2010 +0200
-
-    Change how Thunar picks the default handler for a file (bug #6167).
-    
-    It appears that g_file_query_default_handler() prefers URI scheme
-    handlers over content type handlers. This is inappropriate if we want to
-    open a file for which we already know the content type (as is the case
-    with most local files).
-    
-    Using g_file_query_default_handler() as the only way to pick the default
-    handler for a file somewhat collides with exo-gio-module, which sets the
-    default handler for a few URI schemes, such as http:// and file://.
-    
-    This was problematic only when launching a file from outside (e.g. by
-    running "Thunar <file>" or by calling the D-Bus Launch() method. In
-    internal situations, Thunar used thunar_file_list_get_applications()
-    which prioritizes the content type.
-    
-    We now use g_app_info_get_default_for_content_type() first and only fall
-    back to g_file_query_default_handler() if the content type is unknown or
-    we don't have a default handler for it.
-
-diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
-index b8b80fb..75b0a02 100644
---- a/thunar/thunar-file.c
-+++ b/thunar/thunar-file.c
-@@ -1,7 +1,7 @@
- /* $Id$ */
- /*-
-  * Copyright (c) 2005-2007 Benedikt Meurer <benny at xfce.org>
-- * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
-+ * Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License as published by the Free
-@@ -1797,8 +1797,27 @@ thunar_file_get_size (const ThunarFile *file)
- GAppInfo *
- thunar_file_get_default_handler (const ThunarFile *file) 
- {
-+  const gchar *content_type;
-+  GAppInfo    *app_info = NULL;
-+  gboolean     must_support_uris = FALSE;
-+  gchar       *path;
-+
-   _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
--  return g_file_query_default_handler (THUNAR_FILE ((file))->gfile, NULL, NULL);
-+
-+  content_type = thunar_file_get_content_type (file);
-+  if (content_type != NULL)
-+    {
-+      path = g_file_get_path (file->gfile);
-+      must_support_uris = (path == NULL);
-+      g_free (path);
-+
-+      app_info = g_app_info_get_default_for_type (content_type, must_support_uris);
-+    }
-+
-+  if (app_info == NULL)
-+    app_info = g_file_query_default_handler (file->gfile, NULL, NULL);
-+
-+  return app_info;
- }
- 
- 

Modified: desktop/branches/experimental/thunar/debian/patches/series
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/series	2010-11-03 21:10:33 UTC (rev 4364)
+++ desktop/branches/experimental/thunar/debian/patches/series	2010-11-03 21:12:09 UTC (rev 4365)
@@ -1,4 +1,3 @@
-01_fix-file-handling.patch
 02_thunar-icon-naming-spec-compliance.patch
 03_fix-build-as-needed.patch
 04_fix-link-twp.patch