deskbar-applet r2142 - in branches/gnome-2-22: . deskbar/handlers

[sebp svn gnome org]

Author: sebp
Date: Tue Apr 29 09:07:41 2008
New Revision: 2142
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2142&view=rev

Log:
Fixed bug #530057: Catch GError when making	beagle call

Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/deskbar/handlers/beagle-live.py

Modified: branches/gnome-2-22/deskbar/handlers/beagle-live.py
==============================================================================
--- branches/gnome-2-22/deskbar/handlers/beagle-live.py	(original)
+++ branches/gnome-2-22/deskbar/handlers/beagle-live.py	Tue Apr 29 09:07:41 2008
@@ -7,6 +7,7 @@
 from deskbar.handlers.actions.ShowUrlAction import ShowUrlAction
 from gettext import gettext as _
 from os.path import basename
+from gobject import GError
 import cgi, re
 import deskbar, deskbar.interfaces.Module
 import deskbar.interfaces.Match
@@ -318,7 +319,11 @@
         self.beagle_query = beagle.Query()
         self.beagle_query.add_text(qstring)
         self.beagle_query.connect("hits-added", self.hits_added, qstring, MAX_RESULTS)
-        self.beagle.send_request_async(self.beagle_query)
+        try:
+            self.beagle.send_request_async(self.beagle_query)
+        except GError, e:
+            LOGGER.exception(e)
+            del self.counter[qstring]
        
     def hits_added(self, query, response, qstring, qmax):
         hit_matches = []
@@ -335,7 +340,13 @@
                 hit.ref()
                 snippet_request.connect('response', self._on_snippet_received, query, container, qstring, qmax)
                 snippet_request.connect('closed', self._on_snippet_closed, query, container, qstring, qmax)
-                self.beagle.send_request_async(snippet_request)
+                try:
+                    self.beagle.send_request_async(snippet_request)
+                except GError, e:
+                    LOGGER.exception(e)
+                    hit.unref()
+                    continue
+                    
                 try:
                     self.__lock.acquire()
                     self.hits[hit] = snippet_request