>From 0716b40278b5acb9fea6a40e00178da71e23a52f Mon Sep 17 00:00:00 2001 From: Juan A. Suarez Romero Date: Fri, 23 Oct 2009 13:51:10 +0200 Subject: [PATCH 4/6] deskbar-handler: remove unused properties Get rid of properties used to manage old dbus interfaces. --- src/plugins/deskbar/tracker-module.py | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/plugins/deskbar/tracker-module.py b/src/plugins/deskbar/tracker-module.py index 0f3497e..9b9d70b 100644 --- a/src/plugins/deskbar/tracker-module.py +++ b/src/plugins/deskbar/tracker-module.py @@ -335,7 +335,7 @@ class TrackerLiveSearchHandler(deskbar.interfaces.Module): def __init__(self): deskbar.interfaces.Module.__init__(self) # initing on search request, see self.query - self.tracker = self.tracker_search = self.tracker_keywords = self.tracker_files = self.search_iface = self.keywords_iface = self.files_iface = None + self.tracker_resources = self.resources_iface = None self.conv_re = re.compile (r'^.*?/logs/([^/]+)/([^/]+)/([^/]+)/(.+?)\.(:?txt|html)$') # all, proto, account, to-whom, time def handle_email_hits (self, info, output): @@ -445,29 +445,21 @@ class TrackerLiveSearchHandler(deskbar.interfaces.Module): def query (self, qstring): max = MAX_RESULTS - if self.tracker: - try: self.tracker.GetStatus () - except: self.tracker = None # reconnect - if not self.tracker: + if not self.tracker_resources: try: print "Connecting to Tracker (first search or tracker-store restarted)" import dbus bus = dbus.SessionBus() - self.tracker = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1') - self.tracker_search = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1/Resources') - self.search_iface = dbus.Interface(self.tracker_search, 'org.freedesktop.Tracker1.Resources') - self.tracker_keywords = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1/Keywords') - self.keywords_iface = dbus.Interface(self.tracker_keywords, 'org.freedesktop.Tracker1.Keywords') - self.tracker_files = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1/Files') - self.files_iface = dbus.Interface(self.tracker_files, 'org.freedesktop.Tracker1.Files') + self.tracker_resources = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1/Resources') + self.resources_iface = dbus.Interface(self.tracker_resources, 'org.freedesktop.Tracker1.Resources') except: print >> sys.stderr, 'DBus connection to tracker failed, check your settings.' return - query = "SELECT ?uri \"Files\" ?mime WHERE { ?object fts:match \"%s*\". ?object a nfo:FileDataObject; nie:url ?uri; nie:mimeType ?mime } LIMIT %d" % (qstring, max) - self.search_iface.SparqlQuery (query, \ - reply_handler = lambda hits: self.receive_hits (qstring, hits, max), \ - error_handler = self.receive_error) + query = "SELECT ?uri \"Files\" ?mime WHERE { ?object fts:match \"%s*\". ?object a nfo:FileDataObject; nie:url ?uri; nie:mimeType ?mime } LIMIT %d" % (qstring, max) + self.resources_iface.SparqlQuery (query, \ + reply_handler = lambda hits: self.receive_hits (qstring, hits, max), \ + error_handler = self.receive_error) print 'Tracker query:', qstring -- 1.6.3.3