Merge lp:~dobey/gwibber/gwibber-keyring-unthreaded into lp:gwibber

[dobey]

[dobey (dobey)]

It appears that the association to gnome-keyring for this issue in gwibber is only somewhat incidental. The Dispatcher class in gwibber was mixing Threads and the gobject main loop with out mutex locking or any means of protecting against thread locks. There's really no good reason to derive the Dispatcher class from threading.Thread anyway, so I've just removed it instead.

If you want to re-introduce the use of threading.Thread here though, you should implement proper entry/exit to the main loop for calling gobject things (like idle_add/timeout_add*). And you should probably do it via a more generic class which all your dbus.Object implementations derive from (so that they are all separate threads).

[Ken VanDine (ken-vandine)]

Partially used, thanks!

review: Disapprove

Unmerged revisions

705. By dobey on 2010-04-02

Remove the use of Thread from the Dispatcher

704. By dobey on 2010-03-31

Use the with statement and gtk main loop lock to call gnomekeyring with

=== modified file 'bin/gwibber-service'
--- bin/gwibber-service	2010-03-11 20:05:07 +0000
+++ bin/gwibber-service	2010-04-02 15:48:19 +0000
@@ -80,6 +80,4 @@
 log.logger.debug("Monitors are up")
 
 dispatcher = dispatcher.Dispatcher(loop)
-dispatcher.daemon = True
-dispatcher.start()
 loop.run()
 
=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2010-03-31 16:51:12 +0000
+++ gwibber/microblog/dispatcher.py	2010-04-02 15:48:19 +0000
@@ -24,8 +24,6 @@
 except:
   indicate = None
 
-gobject.threads_init()
-
 log.logger.name = "Gwibber Dispatcher"
 
 PROTOCOLS = {
@@ -54,8 +52,8 @@
       if isinstance(val, str) and val.startswith(":KEYRING:"):
         try:
           value = gnomekeyring.find_items_sync(
-              gnomekeyring.ITEM_GENERIC_SECRET,
-              {"id": str("%s/%s" % (account["_id"], key))})[0].secret
+            gnomekeyring.ITEM_GENERIC_SECRET,
+            {"id": str("%s/%s" % (account["_id"], key))})[0].secret
         except gnomekeyring.NoMatchError:
           raise exceptions.GwibberProtocolError("keyring")
           return ("Failure", 0)
@@ -345,7 +343,7 @@
     except Exception as e:
       self.failure(e, traceback.format_exc())
 
-class Dispatcher(dbus.service.Object, threading.Thread):
+class Dispatcher(dbus.service.Object):
   """
   The Gwibber Dispatcher handles all the backend operations.
   """
@@ -355,7 +353,6 @@
     self.bus = dbus.SessionBus()
     bus_name = dbus.service.BusName("com.Gwibber.Service", bus=self.bus)
     dbus.service.Object.__init__(self, bus_name, self.__dbus_object_path__)
-    threading.Thread.__init__(self)
     
     self.collector = OperationCollector()