Re: [Deskbar] A few comments/quirks

[Raphael Slinckx <raphael slinckx net>]

On Sun, 2006-02-05 at 17:24 +0100, Bjørn Haagensen wrote:
> Hi,
> 
> > > 2. Webhistory items are listed as "Open history item: ?"
> > > 
> > Interesting, are these from the web browser (epiphany) or from the
> > firefox beagle plugin ?
> > 
> > If it's from beagle's firefox, could you atach the output of
> > 'beagle-query --verbose searchterm|grep -C10 WebHistory' with searchterm
> > returning some history items.
> 
> Beagle and firefox. Here's some output.

Weird, it should work that way..
Can you try the attached patch ?

Raf

Index: deskbar/handlers/beagle-live.py
===================================================================
RCS file: /cvs/gnome/deskbar-applet/deskbar/handlers/beagle-live.py,v
retrieving revision 1.35
diff -u -p -r1.35 beagle-live.py
--- deskbar/handlers/beagle-live.py	5 Feb 2006 00:57:43 -0000	1.35
+++ deskbar/handlers/beagle-live.py	5 Feb 2006 17:01:43 -0000
@@ -250,7 +250,8 @@ class BeagleLiveHandler(deskbar.Handler.
 			result["snippet"] = "\n<span foreground='grey' size='small'>%s</span>" % cgi.escape(tmp)
 		else:
 			result["snippet"] = ""
-			
+		
+		name = None
 		for prop in hit_type["name"]:
 			try:
 				name = hit.get_one_property(prop)
@@ -259,18 +260,20 @@ class BeagleLiveHandler(deskbar.Handler.
 					# Beagle < 0.2
 					name = hit.get_property(prop)
 				except:
-					continue
+					pass
 					
 			if name != None:
 				result["name"] = cgi.escape(name)
 				break
-		else:
+		
+		if name == None:
 			#translators: This is used for unknown values returned by beagle
 			#translators: for example unknown email sender, or unknown note title
 			result["name"] = _("?")
 			
 		if "extra" in hit_type:
 			for prop, keys in hit_type["extra"].items():
+				val = None
 				for key in keys:
 					try:
 						val = hit.get_one_property(key)
@@ -279,11 +282,13 @@ class BeagleLiveHandler(deskbar.Handler.
 							# Beagle < 0.2
 							val = hit.get_property(key)
 						except:
-							continue
+							pass
+							
 					if val != None:
 						result[prop] = cgi.escape(val)
 						break
-				else:
+					
+				if val == None:
 					#translators: This is used for unknown values returned by beagle
 					#translators: for example unknown email sender, or unknown note title
 					result[prop] = _("?")