deskbar-applet r2580 - in trunk: . deskbar/handlers

[sebp svn gnome org]

Author: sebp
Date: Wed Feb 18 22:42:56 2009
New Revision: 2580
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2580&view=rev

Log:
Fixed bug #572291: Bookmark search doesn't match on Epiphany topics

Modified:
   trunk/ChangeLog
   trunk/deskbar/handlers/epiphany.py

Modified: trunk/deskbar/handlers/epiphany.py
==============================================================================
--- trunk/deskbar/handlers/epiphany.py	(original)
+++ trunk/deskbar/handlers/epiphany.py	Wed Feb 18 22:42:56 2009
@@ -173,6 +173,7 @@
         self.title = None
         self.href = None
         self.smarthref = None
+        self.tags = []
         
         self._indexer = deskbar.core.Indexer.Indexer()
         self._smart_bookmarks = []
@@ -211,6 +212,7 @@
             self.title = None
             self.href = None
             self.smarthref = None
+            self.tags = []
 
     def endElement(self, name):
         if name == "title":
@@ -219,6 +221,8 @@
             self.href = self.chars.encode('utf8')
         elif name == "ephy:smartlink":
             self.smarthref = self.chars.encode('utf8')
+        elif name == "dc:subject":
+            self.tags.append(self.chars.encode('utf8'))
         elif name == "item":
             if self.href.startswith("javascript:"):
                 return
@@ -233,7 +237,8 @@
                 bookmark = BrowserSmartMatch(self.title, self.smarthref, icon=icon, bookmark=bookmark)
                 self._smart_bookmarks.append(bookmark)
             else:
-                self._indexer.add("%s %s" % (self.title, self.href), bookmark)
+                tags = " ".join(self.tags)
+                self._indexer.add("%s %s %s" % (self.title, self.href, tags), bookmark)
 
 class EpiphanyFaviconCacheParser(xml.sax.ContentHandler):
     def __init__(self):