rpms/deskbar-applet/devel deskbar-applet-beagle-live.patch, NONE, 1.1 deskbar-applet-desklicious-name.patch, NONE, 1.1 deskbar-applet-desklicious-results.patch, NONE, 1.1 deskbar-applet-desklicious-utils.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 deskbar-applet.spec, 1.51, 1.52 sources, 1.24, 1.25

Sun Jul 15 16:02:57 UTC 2007

Author: lmacken

Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19686

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Added Files:
	deskbar-applet-beagle-live.patch 
	deskbar-applet-desklicious-name.patch 
	deskbar-applet-desklicious-results.patch 
	deskbar-applet-desklicious-utils.patch 
Log Message:
* Sat Jul 14 2007 Luke Macken <lmacken at redhat.com> - 2.19.5-1
- 2.19.5
- Add patch to fix beagle-live issue (Bug #248249) based on recommendations from
  upstream bug http://bugzilla.gnome.org/show_bug.cgi?id=429107
- Add the following temporary patches that I wrote and submitted upstream.
      deskbar-applet-desklicious-utils.patch (committed upstream, #456969)
      deskbar-applet-desklicious-results.patch (committed upstream, #456971)
      deskbar-applet-desklicious-name.patch (pending, #457133)
- Remove deskbar-applet-gdmclient.patch


deskbar-applet-beagle-live.patch:

--- NEW FILE deskbar-applet-beagle-live.patch ---
--- deskbar/handlers/beagle-live.py.orig	2007-07-14 15:58:49.000000000 -0400
+++ deskbar/handlers/beagle-live.py	2007-07-14 17:30:36.000000000 -0400
@@ -50,7 +50,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/core/Utils.py.orig	2007-07-14 17:30:22.000000000 -0400
+++ deskbar/core/Utils.py	2007-07-14 17:32:59.000000000 -0400
@@ -119,9 +119,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:

deskbar-applet-desklicious-name.patch:

--- NEW FILE deskbar-applet-desklicious-name.patch ---
--- deskbar/handlers/desklicious.py.orig	2007-07-15 11:38:23.000000000 -0400
+++ deskbar/handlers/desklicious.py	2007-07-15 11:38:33.000000000 -0400
@@ -23,7 +23,7 @@
 	
 	def get_name(self, text=None):
 		return {
-			"name": self.name,
+			"name": self._name,
 			"tags": ' '.join(self.tags),
 		}
 		

deskbar-applet-desklicious-results.patch:

--- NEW FILE deskbar-applet-desklicious-results.patch ---
--- deskbar/handlers/desklicious.py.orig	2007-07-14 18:10:27.000000000 -0400
+++ deskbar/handlers/desklicious.py	2007-07-14 18:11:04.000000000 -0400
@@ -137,8 +137,8 @@
 					name=item.getElementsByTagName("title")[0].firstChild.nodeValue,
 					url=item.getElementsByTagName("link")[0].firstChild.nodeValue,
 					tags=item.getElementsByTagName("dc:subject")[0].firstChild.nodeValue.split(" "),
-					author=item.getElementsByTagName("dc:creator")[0].firstChild.nodeValue),
-					category="web")
+					author=item.getElementsByTagName("dc:creator")[0].firstChild.nodeValue,
+					category="web"))
 		
 		return posts
 

deskbar-applet-desklicious-utils.patch:

--- NEW FILE deskbar-applet-desklicious-utils.patch ---
--- deskbar/handlers/desklicious.py.orig	2007-07-14 17:56:05.000000000 -0400
+++ deskbar/handlers/desklicious.py	2007-07-14 17:56:24.000000000 -0400
@@ -28,7 +28,7 @@
 		}
 		
 	def action(self, text=None):
-		deskbar.Utils.url_show(self.url)
+		deskbar.core.Utils.url_show(self.url)
 
 	def get_hash(self, text=None):
 		return self.url
@@ -125,7 +125,7 @@
 		#Get the info from del.icio.us and parse
 		url = DEFAULT_QUERY_TAG % (urllib.quote_plus(self._user), urllib.quote_plus(tag))
 
-		stream = urllib.urlopen(url, proxies=deskbar.Utils.get_proxy())
+		stream = urllib.urlopen(url, proxies=deskbar.core.Utils.get_proxy())
 		dom = xml.dom.minidom.parse(stream)
 		stream.close()
 		


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	6 Jun 2007 01:55:17 -0000	1.24
+++ .cvsignore	15 Jul 2007 16:02:24 -0000	1.25
@@ -1 +1 @@
-deskbar-applet-2.19.3.tar.bz2
+deskbar-applet-2.19.5.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- deskbar-applet.spec	29 Jun 2007 15:41:38 -0000	1.51
+++ deskbar-applet.spec	15 Jul 2007 16:02:25 -0000	1.52
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.19.3
-Release:        3%{?dist}
+Version:        2.19.5
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -13,7 +13,10 @@
 Source1:        fedorabz.py
 Source2:        fedorabz.png
 Patch0:         %{name}-firefox-searchplugins.patch
-Patch1:         %{name}-gdmclient.patch
+Patch1:         %{name}-beagle-live.patch
+Patch2:         %{name}-desklicious-utils.patch
+Patch3:         %{name}-desklicious-results.patch
+Patch4:         %{name}-desklicious-name.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
@@ -38,8 +41,11 @@
 
 %prep
 %setup -q
-%patch0
-%patch1
+%patch0 -b .firefox
+%patch1 -b .beagle-live
+%patch2 -b .desklicious-utils
+%patch3 -b .desklicious-results
+%patch4 -b .desklicious-name
 
 %build
 %configure --disable-schemas-install --disable-scrollkeeper
@@ -105,6 +111,16 @@
 %{_datadir}/omf/deskbar/
 
 %changelog
+* Sat Jul 14 2007 Luke Macken <lmacken at redhat.com> - 2.19.5-1
+- 2.19.5
+- Add patch to fix beagle-live issue (Bug #248249) based on recommendations from
+  upstream bug http://bugzilla.gnome.org/show_bug.cgi?id=429107
+- Add the following temporary patches that I wrote and submitted upstream.
+      deskbar-applet-desklicious-utils.patch (committed upstream, #456969)
+      deskbar-applet-desklicious-results.patch (committed upstream, #456971)
+      deskbar-applet-desklicious-name.patch (pending, #457133)
+- Remove deskbar-applet-gdmclient.patch
+
 * Fri Jun 29 2007 Luke Macken <lmacken at redhat.com> - 2.19.3-3
 - Add deskbar-applet-gdmclient.patch to fix a nonfatal traceback on startup.
   (Upstream bug #452256)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Jun 2007 01:55:17 -0000	1.24
+++ sources	15 Jul 2007 16:02:25 -0000	1.25
@@ -1 +1 @@
-8c20c95a9d231a6df7fef32d6d09f24e  deskbar-applet-2.19.3.tar.bz2
+d882cf0616af56f2aeed6002d468ee66  deskbar-applet-2.19.5.tar.bz2


