r22263 - in /packages/unstable/gnome-shell/debian: changelog patches/02_allow_non_uri_apps.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Mon Nov  9 18:13:40 2009
New Revision: 22263

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22263
Log:
patch by Guido Günther <agx at sigxcpu.org> to drop the requirement that associated apps support URIs, for local files at least

Added:
    packages/unstable/gnome-shell/debian/patches/02_allow_non_uri_apps.diff
Modified:
    packages/unstable/gnome-shell/debian/changelog

Modified: packages/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/changelog?rev=22263&op=diff
==============================================================================
--- packages/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-shell/debian/changelog [utf-8] Mon Nov  9 18:13:40 2009
@@ -8,6 +8,10 @@
     regarding the server's GLX support; thanks to alex bodnaru
     <alexbodn at 012.net.il> for noticing this is needed
     (Closes: #553440)
+  * debian/patches/02_allow_non_uri_apps.diff:
+  - patch by Guido Günther <agx at sigxcpu.org> to drop the requirement that
+    associated apps support URIs, for local files at least
+    (Closes: #553618)
 
  -- Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>  Mon, 09 Nov 2009 15:32:14 -0200
 

Added: packages/unstable/gnome-shell/debian/patches/02_allow_non_uri_apps.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-shell/debian/patches/02_allow_non_uri_apps.diff?rev=22263&op=file
==============================================================================
--- packages/unstable/gnome-shell/debian/patches/02_allow_non_uri_apps.diff (added)
+++ packages/unstable/gnome-shell/debian/patches/02_allow_non_uri_apps.diff [utf-8] Mon Nov  9 18:13:40 2009
@@ -1,0 +1,35 @@
+From e33c4221616a9a0d37ee38c8a2c16a5fabb26471 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 9 Nov 2009 15:54:44 -0200
+Subject: [PATCH] Don't require applications to accept URIs for recent files
+
+This should not be required, since glib correctly deals with such
+applications by giving them the local gvfs path, and those
+applications which do support URIs keep being able to use the URIs in
+GFiles.
+---
+ js/misc/docInfo.js |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/js/misc/docInfo.js b/js/misc/docInfo.js
+index 021dce4..e059c50 100644
+--- a/js/misc/docInfo.js
++++ b/js/misc/docInfo.js
+@@ -36,8 +36,13 @@ DocInfo.prototype = {
+         // shorter in terms of lines of code, we are not doing so
+         // because that would duplicate the work of retrieving the
+         // mime type.
++        let needsUri = true;
+ 
+-        let appInfo = Gio.app_info_get_default_for_type(this.mimeType, true);
++        if  (this.uri.substring(0, 7) == "file://") {
++                needsUri = false;
++        }
++
++        let appInfo = Gio.app_info_get_default_for_type(this.mimeType, needsUri);
+ 
+         if (appInfo != null) {
+             appInfo.launch_uris([this.uri], Main.createAppLaunchContext());
+-- 
+1.6.5.2
+