rpms/deskbar-applet/F-7 deskbar-applet-beagle-live.patch, NONE, 1.1 deskbar-applet.spec, 1.52, 1.53

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/pkgs/rpms/deskbar-applet/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20362

Modified Files:
	deskbar-applet.spec 
Added Files:
	deskbar-applet-beagle-live.patch 
Log Message:
* Fri Jul 20 2007 Luke Macken <lmacken at redhat.com> - 2.19.3-5
- Add deskbar-applet-beagle-live.patch to fix a problem when opening beagle live
  search results (Bug #248249).


deskbar-applet-beagle-live.patch:

--- NEW FILE deskbar-applet-beagle-live.patch ---
--- deskbar/handlers/beagle-live.py.orig	2007-07-20 15:23:56.000000000 -0400
+++ deskbar/handlers/beagle-live.py	2007-07-20 15:25:10.000000000 -0400
@@ -103,7 +103,7 @@
 		},
 	"File" 		: {
 		"name"	: ("beagle:ExactFilename",), 
-		"action": lambda d: url_show_file("file://"+d["uri"]),
+		"action": lambda d: url_show_file(d["escaped_uri"], escaped=True),
 		"icon"	: "stock_new",
 		#translators: This is a file.
 		"description": _("Open %s") % "<b>%(name)s</b>",
--- deskbar/Utils.py.orig	2007-07-20 15:24:14.000000000 -0400
+++ deskbar/Utils.py	2007-07-20 15:25:52.000000000 -0400
@@ -120,9 +120,12 @@
 		manager = gtk.recent_manager_get_default()
 		manager.add_item(uri)
 
-def url_show_file(url):
+def url_show_file(url, escaped=False):
 	try:
-		uri = gnomevfs.escape_host_and_path_string(url)
+		if escaped:
+			uri = url
+		else:
+			uri = gnomevfs.escape_host_and_path_string(url)
 		gnomevfs.url_show(uri)
 		add_to_recent(uri)
 	except Exception, e:


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/F-7/deskbar-applet.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- deskbar-applet.spec	18 Jul 2007 01:32:08 -0000	1.52
+++ deskbar-applet.spec	20 Jul 2007 21:37:06 -0000	1.53
@@ -3,7 +3,7 @@
 
 Name:           deskbar-applet
 Version:        2.19.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -15,6 +15,7 @@
 Patch0:         %{name}-firefox-searchplugins.patch
 Patch1:         %{name}-gdmclient.patch
 Patch2:         %{name}-devhelp.patch
+Patch3:         %{name}-beagle-live.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras
 BuildRequires:  gettext evolution-data-server-devel gnome-desktop-devel
@@ -42,6 +43,7 @@
 %patch0
 %patch1
 %patch2
+%patch3
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -107,6 +109,10 @@
 %{_datadir}/omf/deskbar/
 
 %changelog
+* Fri Jul 20 2007 Luke Macken <lmacken at redhat.com> - 2.19.3-5
+- Add deskbar-applet-beagle-live.patch to fix a problem when opening beagle live
+  search results (Bug #248249).
+
 * Tue Jul 17 2007 Luke Macken <lmacken at redhat.com> - 2.19.3-4
 - Patch from Kai Thomsen to fix the Developer Documentation extension (#248318)