Merge lp:~bigwhale/gwibber/threading into lp:gwibber

[David Klasinc]

Finished threading and logging.

[Ken VanDine (ken-vandine)]

I had a little feedback:
 * there was an old unused facelib.py which still had a curl import
 * tests/service-start.in needed tweaking for the logging changes

I went ahead and cleaned that up for the merge, thanks!

review: Approve

=== modified file 'bin/gwibber-service'
--- bin/gwibber-service	2011-11-01 13:54:06 +0000
+++ bin/gwibber-service	2012-02-10 17:26:15 +0000
@@ -1,9 +1,8 @@
 #!/usr/bin/python
 
 from gi.repository import Gio
-import sys, optparse, gobject, dbus
+import sys, gobject, dbus
 from os.path import join, dirname, exists, realpath, abspath
-from os import popen, getpid
 from dbus.mainloop.glib import DBusGMainLoop
 
 DBusGMainLoop(set_as_default=True)
@@ -13,31 +12,11 @@
 SOURCE_DIR = join(LAUNCH_DIR, "..", "gwibber")
 DISPATCHER = join(SOURCE_DIR, "microblog", "dispatcher.py")
 
-######################################################################
-# Setup path
-if exists(DISPATCHER):
-  sys.path.insert(0, realpath(dirname(SOURCE_DIR)))
-  try:
-    from gwibber.microblog.util import log
-    log.logger.name = "Gwibber Service"
-    log.logger.info("Running from the source tree")
-    from gwibber.microblog import dispatcher
-  finally:
-    del sys.path[0]
-
-else:
-  from gwibber.microblog.util import log
-  log.logger.name = "Gwibber Service"
-  log.logger.info("Running from the system path")
-  from gwibber.microblog import dispatcher
-
 gsettings = Gio.Settings.new("org.gwibber.preferences")
 debug = gsettings.get_boolean("debug")
-if debug:
-  log.logger.setLevel(log.logging.DEBUG)
 
 ######################################################################
-# Options 
+# Options
 from optparse import OptionParser
 parser = OptionParser()
 parser.add_option("-d", "--debug", action="store_true",
@@ -48,26 +27,42 @@
                   help="Log to stdout")
 (options, args) = parser.parse_args()
 
+if options.stdout:
+  console = True
+else:
+  console = False
 if options.debug or debug:
-  log.logger.setLevel(log.logging.DEBUG)
-else:
-  log.logger.setLevel(log.logging.INFO)
-
-if options.stdout:
-  # define a Handler which writes INFO messages or higher to the sys.stderr
-  console = log.logging.StreamHandler()
-  if options.debug or debug:
-    console.setLevel(log.logging.DEBUG)
-  else:
-    console.setLevel(log.logging.INFO)
-  # set a format which is simpler for console use
-  formatter = log.logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
-  console.setFormatter(formatter)
-  log.logger.addHandler(console)
+  debuglog = True
+else:
+  debuglog = False
+
+######################################################################
+# Setup path
+if exists(DISPATCHER):
+  sys.path.insert(0, realpath(dirname(SOURCE_DIR)))
+  try:
+    from gwibber.microblog.util.log import setup_logging
+    setup_logging(console, debuglog)
+    import logging
+    logger = logging.getLogger("Service")
+    logger.info("Service starting")
+    logger.info("Running from the source tree")
+    from gwibber.microblog import dispatcher
+  finally:
+    del sys.path[0]
+
+else:
+  from gwibber.microblog.util.log import setup_logging
+  import logging
+  setup_logging(console, debuglog)
+  logger = logging.getLogger("Service")
+  logger.info("Service starting")
+  logger.info("Running from the source tree")
+  from gwibber.microblog import dispatcher
 
 # if gwibber-serivce is already running, don't start
 if "com.Gwibber.Connection" in dbus.SessionBus().list_names():
-  log.logger.info("Found gwibber-service already running, exiting")
+  logger.info("Found gwibber-service already running, exiting")
   quit()
 
 """
@@ -79,7 +74,7 @@
 message_monitor = dispatcher.MessagesMonitor()
 """
 
-log.logger.debug("Setting up monitors")
+logger.debug("Setting up monitors")
 connection_monitor = dispatcher.ConnectionMonitor()
 urlshortener = dispatcher.URLShorten()
 translator = dispatcher.Translate()

=== modified file 'gwibber/client.py'
--- gwibber/client.py	2011-06-07 18:29:53 +0000
+++ gwibber/client.py	2012-02-10 17:26:15 +0000
@@ -6,13 +6,15 @@
 import microblog.util
 from microblog.util import resources
 
+import logging
+logger = logging.getLogger("Client")
+
 import gettext
 from gettext import lgettext as _
 if hasattr(gettext, 'bind_textdomain_codeset'):
     gettext.bind_textdomain_codeset('gwibber','UTF-8')
 gettext.textdomain('gwibber')
 
-from gwibber.microblog.util import log
 from microblog.util.const import *
 # Try to import * from custom, install custom.py to include packaging 
 # customizations like distro API keys, etc
@@ -104,7 +106,7 @@
 
     # set state online/offline
     if not self.connection.isConnected():
-      log.logger.info("Setting to Offline")
+      logger.info("Setting to Offline")
       self.actions.get_action("refresh").set_sensitive(False)
 
     # Delay resizing input area or else it doesn't work
@@ -477,13 +479,13 @@
       return True
     else:
       self.save_window_settings()
-      log.logger.info("Gwibber Client closed")
+      logger.info("Gwibber Client closed")
       gtk.main_quit()
 
   def on_quit(self, *args):
     self.service.Quit()
     self.save_window_settings()
-    log.logger.info("Gwibber Client quit")
+    logger.info("Gwibber Client quit")
     gtk.main_quit()
 
   def on_search(self, *args):
@@ -676,11 +678,11 @@
     self.update_view()
 
   def on_connection_online(self, *args):
-    log.logger.info("Setting to Online")
+    logger.info("Setting to Online")
     self.actions.get_action("refresh").set_sensitive(True)
 
   def on_connection_offline(self, *args):
-    log.logger.info("Setting to Offline")
+    logger.info("Setting to Offline")
     self.actions.get_action("refresh").set_sensitive(False)
 
 class Client(dbus.service.Object):

=== modified file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	2012-01-11 17:06:18 +0000
+++ gwibber/microblog/dispatcher.py	2012-02-10 17:26:15 +0000
@@ -1,20 +1,20 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import multiprocessing, traceback, json
+import traceback, json, random, string
 import gobject, dbus, dbus.service
 import sqlite3, mx.DateTime, re, uuid
 import urlshorter, storage, network, util, uploader
 from gettext import lgettext as _
-import signal
-
-from util import log
-from util import resources
-from util import exceptions
+from threading import Thread
+from datetime import datetime, timedelta
+
+import logging
+logger = logging.getLogger("Dispatcher")
+
 from util.const import *
 import subprocess
 
-
 try:
   from gi.repository import Unity, Dbusmenu
 except:
@@ -41,10 +41,10 @@
 PROTOCOLS = {}
 for p in util.resources.get_plugin_dirs()[0]:
     PROTOCOLS[str(p)] = __import__("%s" % p, fromlist='*')
-    print "Loading plugin %s version %s" % (PROTOCOLS[str(p)].PROTOCOL_INFO["name"], PROTOCOLS[str(p)].PROTOCOL_INFO["version"])
+    # print "Loading plugin %s version %s" % (PROTOCOLS[str(p)].PROTOCOL_INFO["name"], PROTOCOLS[str(p)].PROTOCOL_INFO["version"])
     #print "Path %s" % str(PROTOCOLS[str(p)].__file__)
     # FIXME: Figure out why the logger doesn't log here
-    #log.logger.info("Loading plugin for %s", p)
+    #logger.info("Loading plugin for %s", p)
 
 FEATURES = json.loads(GWIBBER_OPERATIONS)
 SERVICES = dict([(k, v.PROTOCOL_INFO) for k, v in PROTOCOLS.items()])
@@ -54,71 +54,85 @@
 if gsettings.get_int("interval") < 5:
   gsettings.set_int("interval", 5)
 
-log.logger.name = "Gwibber Dispatcher"
-
-def perform_operation((account, opname, args, transient)):
-  try:
-    stream = FEATURES[opname]["stream"] or opname
-    logtext = "<%s:%s>" % (account["service"], opname)
-
-    logtext = "<%s:%s>" % (account["service"], opname)
-    log.logger.debug("%s Performing operation", logtext)
-
-    args = dict((str(k), v) for k, v in args.items())
-    message_data = PROTOCOLS[account["service"]].Client(account)(opname, **args)
-    text_cleaner = re.compile(u"[: \n\t\r♻♺]+|@[^ ]+|![^ ]+|#[^ ]+") # signs, @nickname, !group, #tag
-    new_messages = []
-
-    if message_data is not None:
-      for m in message_data:
-        try: 
-          if isinstance(m, dict) and m.has_key("mid"):
-            m["id"] = uuid.uuid1().hex
-            m["operation"] = opname
-            m["stream"] = m.get("stream", stream)
-            m["transient"] = transient
-            m["time"] = m.get("time", 0)
-            if not m["text"]: m["text"] = ""
-            m["rtl"] = util.isRTL(re.sub(text_cleaner, "", m["text"].decode('utf-8')))
-            if m.has_key("type"):
-              if m["type"] == "link": m["stream"] = "links"
-              if m["type"] == "video": m["stream"] = "videos"
-              if m["type"] == "photo": m["stream"] = "images"
-
-            log.logger.debug("%s Adding record", logtext)
-
-            new_messages.insert(0, (
-              m["id"],
-              m["mid"],
-              m["account"],
-              account["service"],
-              opname,
-              transient,
-              m["stream"] or stream,
-              m["time"],
-              m["text"],
-              m.get("sender", {}).get("is_me", None), 
-              m.get("to_me", None),
-              m.get("sender", {}).get("nick", None),
-              m.get("reply", {}).get("nick", None),
-              json.dumps(m)
-            ))
-          elif isinstance(m, dict) and m.has_key("error"):
-            new_messages.insert(0, (
-              "error",
-              json.dumps(m)
-            ))
-        except Exception as e:
-          if not "logtext" in locals(): logtext = "<UNKNOWN>"
-          log.logger.error("%s Operation failed: %s", logtext, e)
-
-    log.logger.debug("%s Finished operation", logtext)
-    return ("Success", new_messages)
-  except Exception as e:
-    if not "logtext" in locals(): logtext = "<UNKNOWN>"
-    log.logger.error("%s Operation failed", logtext)
-    log.logger.debug("Traceback:\n%s", traceback.format_exc())
-    return ("Failure", traceback.format_exc())
+class perform_operation(Thread):
+  def __init__(self, job, callback_success, callback_failure):
+    Thread.__init__(self)
+    self.job = job
+    self.t_start = None
+    self.t_end = None
+    self.t_runtime = timedelta(0)
+    self.callback_success = callback_success
+    self.callback_failure = callback_failure
+
+  def run(self):
+    self.id = ''.join(random.choice(string.letters) for i in xrange(5))
+    self.t_start = datetime.now()
+    (account, opname, args, transient) = self.job
+    try:
+      stream = FEATURES[opname]["stream"] or opname
+      logtext = "<%s:%s>" % (account["service"], opname)
+
+      logtext = "<%s:%s>" % (account["service"], opname)
+      logger.debug("%s Performing operation", logtext)
+
+      args = dict((str(k), v) for k, v in args.items())
+      message_data = PROTOCOLS[account["service"]].Client(account)(opname, **args)
+      text_cleaner = re.compile(u"[: \n\t\r♻♺]+|@[^ ]+|![^ ]+|#[^ ]+") # signs, @nickname, !group, #tag
+      new_messages = []
+
+      if message_data is not None:
+        for m in message_data:
+          try:
+            if isinstance(m, dict) and m.has_key("mid"):
+              m["id"] = uuid.uuid1().hex
+              m["operation"] = opname
+              m["stream"] = m.get("stream", stream)
+              m["transient"] = transient
+              m["time"] = m.get("time", 0)
+              if not m["text"]: m["text"] = ""
+              m["rtl"] = util.isRTL(re.sub(text_cleaner, "", m["text"].decode('utf-8')))
+              if m.has_key("type"):
+                if m["type"] == "link": m["stream"] = "links"
+                if m["type"] == "video": m["stream"] = "videos"
+                if m["type"] == "photo": m["stream"] = "images"
+
+              logger.debug("%s Adding record", logtext)
+              new_messages.insert(0, (
+                                  m["id"],
+                                  m["mid"],
+                                  m["account"],
+                                  account["service"],
+                                  opname,
+                                  transient,
+                                  m["stream"] or stream,
+                                  m["time"],
+                                  m["text"],
+                                  m.get("sender", {}).get("is_me", None),
+                                  m.get("to_me", None),
+                                  m.get("sender", {}).get("nick", None),
+                                  m.get("reply", {}).get("nick", None),
+                                  json.dumps(m)
+              ))
+            elif isinstance(m, dict) and m.has_key("error"):
+              new_messages.insert(0, (
+                                  "error",
+                                  json.dumps(m)
+              ))
+          except Exception as e:
+            if not "logtext" in locals(): logtext = "<UNKNOWN>"
+            logger.error("%s Operation failed: %s", logtext, e)
+      self.callback_success(new_messages)
+
+    except Exception as e:
+      if not "logtext" in locals(): logtext = "<UNKNOWN>"
+      logger.error("%s Operation failed", logtext)
+      logger.debug("Traceback:\n%s", traceback.format_exc())
+      self.callback_failure("Error")
+
+    self.t_end = datetime.now()
+    self.t_runtime = self.t_end - self.t_start
+    logger.debug("%s Finished operation (%s)" % (logtext, str(self.t_runtime)))
+
 
 class OperationCollector:
   def __init__(self, dispatcher):
@@ -266,7 +280,9 @@
       self.unseen_counts[s] = 0
 
     self.indicate = None 
-    self.launcher = None 
+    self.launcher = None
+
+    self.job_list = []
 
     if indicate and util.resources.get_desktop_file():
       self.indicate = indicate.Server.ref_default ()
@@ -281,7 +297,7 @@
         menu_server = Dbusmenu.Server.new("/messaging/commands")
         root = Dbusmenu.Menuitem.new ()
         root.child_append (post_menu)
-        menu_server.set_root(root);
+        menu_server.set_root(root)
         self.indicate.set_menu (menu_server)
       self.indicate.connect("server-display", self.on_indicator_server_activate)
       self.indicate.connect("interest-added", self.on_indicator_interest_added)
@@ -383,7 +399,7 @@
     return False
     
   def on_connection_online(self, *args):
-    log.logger.info("Dispatcher Online, initiating a refresh")
+    logger.info("Dispatcher Online, initiating a refresh")
     if self.refresh_timer_id:
       gobject.source_remove(self.refresh_timer_id)
     # wait a few seconds before alerting the world we are online
@@ -391,7 +407,7 @@
 
   def on_connection_offline(self, *args):
     self.refreshRunning = False
-    log.logger.info("Dispatcher Offline, suspending operations")
+    logger.info("Dispatcher Offline, suspending operations")
     if self.refresh_timer_id:
       gobject.source_remove(self.refresh_timer_id)
 
@@ -445,7 +461,7 @@
     try: o = json.loads(opdata)
     except: return
     
-    log.logger.debug("** Starting Single Operation **")
+    logger.debug("** Starting Single Operation **")
     self.LoadingStarted()
     
     params = ["account", "operation", "args", "transient"]
@@ -490,6 +506,7 @@
   @dbus.service.method("com.Gwibber.Service", in_signature="s")
   def Send(self, opdata):
     try:
+      operations = []
       o = json.loads(opdata)
       if "target" in o:
         args = {"message": o["message"], "target": o["target"]}
@@ -501,11 +518,11 @@
         operations = [(self.collector.get_account(a), "send", {"message": o["message"]}, None) for a in o["accounts"]]
       self.send(operations)
     except:
-      log.logger.error("Sending failed:\n%s", traceback.format_exc())
+      logger.error("Sending failed:\n%s", traceback.format_exc())
 
   @dbus.service.method("com.Gwibber.Service", in_signature="ss")
   def Retweet(self, mid, account):
-    log.logger.debug("Retweeting %s", mid)
+    logger.debug("Retweeting %s", mid)
     self.PerformOp(json.dumps({
       "account": account,
       "operation": "retweet",
@@ -515,7 +532,7 @@
 
   @dbus.service.method("com.Gwibber.Service", in_signature="ss")
   def Like(self, mid, account):
-    log.logger.debug("Liking %s", mid)
+    logger.debug("Liking %s", mid)
     self.PerformOp(json.dumps({
       "account": account,
       "operation": "like",
@@ -582,7 +599,7 @@
             service = dbus.Interface(obj, "com.Gwibber.Service")
             service.Start()
     """
-    log.logger.info("Gwibber Service is starting")
+    logger.info("Gwibber Service is starting")
 
   @dbus.service.method("com.Gwibber.Service")
   def Quit(self): 
@@ -594,7 +611,7 @@
             service = dbus.Interface(obj, "com.Gwibber.Service")
             service.Quit()
     """
-    log.logger.info("Gwibber Service is being shutdown")
+    logger.info("Gwibber Service is being shutdown")
     self.mainloop.quit()
 
   @dbus.service.method("com.Gwibber.Service", out_signature="b")
@@ -629,7 +646,7 @@
     
   def send_error_notify(self, error):
     if not isinstance(error, dict):
-      log.logger.error("Failed to parse error message: %s", error)
+      logger.error("Failed to parse error message: %s", error)
       return
     if error.has_key("error"):
       error = json.loads(error)["error"]
@@ -646,35 +663,54 @@
       util.notify(error["account"]["service"], error["message"], icon, 2000)
     self.notified_errors[error["account"]["service"]] = error["message"]
 
-  def perform_async_operation (self, iterable):
-    pool = multiprocessing.Pool ()
-    try:
-      pool.map_async (perform_operation, iterable, callback = self.loading_complete)
-    except Exception as e:
-      self.loading_failed (e, traceback.format_exc())
-    pool.close ()
-    pool.join ()
-  
-  def loading_complete(self, output):
+  def perform_async_operation (self, jobs):
+    #
+    # Clean old, not running jobs ...
+    #
+    logger.info("Running Jobs: %s", len(self.job_list))
+
+    for job in reversed(self.job_list):
+      if not job.isAlive():
+        job.join()
+        self.job_list.remove(job)
+
+    logger.info("Running Jobs: %s", len(self.job_list))
+
+    #
+    # Start all jobs
+    #
+    #
+    for job in jobs:
+      thread = perform_operation(job, self.cb_loading_complete, self.cb_loading_failed)
+      self.job_list.append(thread)
+      thread.start ()
+
+    logger.info("Running Jobs: %s", len(self.job_list))
+
+  #
+  # TODO: Make me prettier
+  #
+  def cb_loading_failed(self, error):
+      logger.info("Loading Error: %s - %s", self.refresh_count, error)
+
+  def cb_loading_complete(self, messages):
     self.refresh_count += 1
-    
     items = []
     errors = []
-    for o in output:
-      for o2 in o[1]:
-        if len(o2) > 1:
-          if o2[0] != "error":
-            with sqlite3.connect(SQLITE_DB_FILENAME) as db:
-              if len(db.execute("""select * from messages where mid = '%s' and account = '%s' and stream = '%s'""" % (o2[1], o2[2], o2[6])).fetchall()) > 0:
-                self.messages.Message("update", o2[-1])
-              else:
-                self.messages.Message("new", o2[-1])
-                for s in "messages", "replies", "private":
-                  if o2[6] == s and o2[9] != 1:
-                    self.unseen_counts[s] = self.unseen_counts[s] + 1
-            items.append(o2)
-          else:
-            errors.append(o2)
+    for m in messages:
+      if len(m) > 1:
+        if m[0] != "error":
+          with sqlite3.connect(SQLITE_DB_FILENAME) as db:
+            if len(db.execute("""select * from messages where mid = '%s' and account = '%s' and stream = '%s'""" % (m[1], m[2], m[6])).fetchall()) > 0:
+              self.messages.Message("update", m[-1])
+            else:
+              self.messages.Message("new", m[-1])
+              for s in "messages", "replies", "private":
+                if m[6] == s and m[9] != 1:
+                  self.unseen_counts[s] += 1
+            items.append(m)
+        else:
+          errors.append(m)
     with sqlite3.connect(SQLITE_DB_FILENAME) as db:
       oldid = db.execute("select max(ROWID) from messages").fetchone()[0] or 0
       
@@ -683,11 +719,13 @@
             ",".join("?" * len(self.messages.columns))), items)
 
       gobject.idle_add (self.update_indicators, self.unseen_counts)
-
-      new_items = db.execute("""
-        select * from (select * from messages where operation == "receive" and ROWID > %s and to_me = 0 ORDER BY time DESC LIMIT 10) as a union
-        select * from (select * from messages where operation IN ("receive","private") and ROWID > %s and to_me != 0 ORDER BY time DESC LIMIT 10) as b
-        ORDER BY time ASC""" % (oldid, oldid)).fetchall()
+      query = """
+              SELECT * FROM messages WHERE rowid > {0} AND
+                                     ((operation == "receive" AND to_me = 0) OR
+                                     (operation IN ("receive", "private") AND to_me != 0))
+                                     ORDER BY time ASC LIMIT 10
+              """.format(oldid)
+      new_items = db.execute(query)
 
       for i in new_items:
           self.new_message(i)
@@ -706,7 +744,7 @@
       self.send_error_notify(error[1])
 
     self.LoadingComplete()
-    log.logger.info("Loading complete: %s - %s", self.refresh_count, [o[0] for o in output])
+    logger.info("Loading complete: %s - %s", self.refresh_count, output.rowcount if output.rowcount > 0 else 0)
 
   def update_indicators(self, counts):
     total_unseen = 0
@@ -722,7 +760,6 @@
         total_unseen += counts["messages"]
         if self.messages_indicator not in self.indicator_items:
           self.indicator_items["messages"] = self.messages_indicator
-        log.logger.debug("Messages Indicator count updated to %s", counts["messages"])
       if counts.has_key("replies"):
         if not self.replies_indicator:
           self.replies_indicator = indicate.Indicator() if hasattr(indicate, "Indicator") else indicate.IndicatorMessage()
@@ -734,7 +771,6 @@
         total_unseen += counts["replies"]
         if self.replies_indicator not in self.indicator_items:
           self.indicator_items["replies"] = self.replies_indicator
-        log.logger.debug("Replies Indicator count updated to %s", counts["replies"])
       if counts.has_key("private"):
         if not self.private_indicator:
           self.private_indicator = indicate.Indicator() if hasattr(indicate, "Indicator") else indicate.IndicatorMessage()
@@ -743,13 +779,11 @@
           self.private_indicator.set_property("stream", "private")
           self.private_indicator.show()
         self.private_indicator.set_property("count", str(counts["private"]))
-        total_unseen +- counts["private"]
+        total_unseen += counts["private"]
         if counts["private"] > 0:
           self.private_indicator.set_property_bool("draw-attention", True)
         if self.private_indicator not in self.indicator_items:
           self.indicator_items["private"] = self.private_indicator
-        log.logger.debug("Private Messages Indicator count updated to %s", counts["private"])
-    log.logger.debug ("Total unseen count: %d", total_unseen)
     if Unity and self.launcher:
       self.launcher.set_property("count", total_unseen)
       if total_unseen < 1:
@@ -767,7 +801,7 @@
   def on_indicator_server_activate(self, indicator, timestamp=None):
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
     client_bus = dbus.SessionBus()
-    log.logger.debug("Raising gwibber client")
+    logger.debug("Raising gwibber client")
     try:
       self.handle_indicator_counts()
     except:
@@ -777,7 +811,7 @@
   def on_indicator_activate(self, indicator, timestamp=None):
     if not indicate: return
     stream = indicator.get_property("stream")
-    log.logger.debug("Raising gwibber client, focusing %s stream", stream)
+    logger.debug("Raising gwibber client, focusing %s stream", stream)
     try:
       self.handle_indicator_counts(stream)
     except:
@@ -785,10 +819,10 @@
     self.show_client(stream=stream)
 
   def handle_focus_reply(self, *args):
-    log.logger.debug("Gwibber Client raised")
+    logger.debug("Gwibber Client raised")
 
   def handle_focus_error(self, *args):
-    log.logger.error("Failed to raise client %s", args)
+    logger.error("Failed to raise client %s", args)
 
   def handle_indicator_counts(self, stream=None):
     if indicate:
@@ -798,8 +832,9 @@
           self.unseen_counts[s] = 0
           if s == "private":
             self.private_indicator.set_property_bool("draw-attention", False)
-        self.launcher.set_property("count", 0)
-        self.launcher.set_property("count_visible", False)
+        if self.launcher:
+          self.launcher.set_property("count", 0)
+          self.launcher.set_property("count_visible", False)
         return
       if self.indicator_items.has_key(stream):
         self.indicator_items[stream].set_property("count", str(0))
@@ -811,12 +846,13 @@
       total_unseen = 0
       for s in self.unseen_counts.keys():
         total_unseen += self.unseen_counts[s]
-      log.logger.debug ("handle_indicator_counts total_unseen is %d", total_unseen)
-      self.launcher.set_property("count", total_unseen)
-      if total_unseen < 1:
-        self.launcher.set_property("count_visible", False)
-      else:
-        self.launcher.set_property("count_visible", True)
+      logger.debug ("handle_indicator_counts total_unseen is %d", total_unseen)
+      if self.launcher:
+        self.launcher.set_property("count", total_unseen)
+        if total_unseen < 1:
+          self.launcher.set_property("count_visible", False)
+        else:
+          self.launcher.set_property("count_visible", True)
     
 
   def new_search_message(self, data):
@@ -826,16 +862,13 @@
   def new_message(self, data):
     message = json.loads(data[-1])
     if message["transient"]:
-      log.logger.debug("Message %s is transient, not notifying", message["id"])
       return
 
     if util.can_notify and  str(message["mid"]) not in self.notified_items:
       self.notified_items.append(message["mid"])
       if gsettings.get_boolean("notify-mentions-only") and message["to_me"]: 
-        log.logger.debug("%s is a mention and notify_mentions_only is true", message["mid"])
         gobject.idle_add(self.handle_notify_item, message)
       elif gsettings.get_boolean("show-notifications") and not gsettings.get_boolean("notify-mentions-only"):
-        log.logger.debug("%s - show_notifications is true and notify_mentions_only is false", message["mid"])
         gobject.idle_add(self.handle_notify_item, message)
     gobject.idle_add(self.cache_avatar, message)
     
@@ -873,23 +906,24 @@
 
   def loading_failed(self, exception, tb):
     self.LoadingComplete()
-    log.logger.error("Loading failed: %s - %s", exception, tb)
+    logger.error("Loading failed: %s - %s", exception, tb)
 
   def send(self, operations):
     operations = util.compact(operations)
     if operations:
       self.LoadingStarted()
-      log.logger.debug("*** Sending Message ***")
+      logger.debug("*** Sending Message ***")
       self.perform_async_operation(operations)
 
   def refresh(self, *args):
+
     if self.refresh_timer_id:
       gobject.source_remove(self.refresh_timer_id)
 
     refresh_interval = gsettings.get_int("interval")
 
     if not self.maintRunning and not self.refreshRunning:
-      log.logger.debug("Refresh interval is set to %s", refresh_interval)
+      logger.debug("Refresh interval is set to %s", refresh_interval)
       operations = []
     
       for o in self.collector.get_operations():
@@ -898,12 +932,12 @@
           operations.append(o)
     
       if operations:
-        log.logger.debug("** Starting Refresh - %s **", mx.DateTime.now())
+        logger.debug("** Starting Refresh - %s **", mx.DateTime.now())
         self.LoadingStarted()
         self.perform_async_operation(operations)
 
 
-      self.refresh_timer_id = gobject.timeout_add_seconds(int(60 * refresh_interval), self.refresh)
+      self.refresh_timer_id = gobject.timeout_add_seconds(int(60 *  refresh_interval), self.refresh)
     else:
       self.refresh_timer_id = gobject.timeout_add_seconds(int(30), self.refresh)
 
@@ -938,15 +972,15 @@
 
 
     try:
-      log.logger.debug("NM Version is %s", str(self.nm.Get(NM_DBUS_INTERFACE, "Version")))
+      logger.debug("NM Version is %s", str(self.nm.Get(NM_DBUS_INTERFACE, "Version")))
       if str(self.nm.Get(NM_DBUS_INTERFACE, "Version")) >= "0.8.998":
-        log.logger.debug("NM Version is greater than 0.8.997")
+        logger.debug("NM Version is greater than 0.8.997")
         self.NM_STATE_ASLEEP = 10
         self.NM_STATE_DISCONNECTED = 20
         self.NM_STATE_CONNECTING = 40
         self.NM_STATE_CONNECTED = 70
       else:
-        log.logger.debug("NM Version is less than 0.8.998")
+        logger.debug("NM Version is less than 0.8.998")
         self.NM_STATE_ASLEEP = 1
         self.NM_STATE_CONNECTING = 2
         self.NM_STATE_CONNECTED = 3
@@ -957,13 +991,13 @@
 
 
   def on_connection_changed(self, state):
-    log.logger.debug("Network state changed, new state is %d", state)
+    logger.debug("Network state changed, new state is %d", state)
 
     if state == self.NM_STATE_CONNECTED:
-      log.logger.info("Network state changed to Online")
+      logger.info("Network state changed to Online")
       self.ConnectionOnline()
     elif state == self.NM_STATE_DISCONNECTED:
-      log.logger.info("Network state changed to Offline")
+      logger.info("Network state changed to Offline")
       self.ConnectionOffline()
 
   @dbus.service.signal("com.Gwibber.Connection")
@@ -975,7 +1009,7 @@
   @dbus.service.method("com.Gwibber.Connection")
   def isConnected(self):
     if not self.has_nm: 
-      log.logger.info("Can't determine network state, assuming online")
+      logger.info("Can't determine network state, assuming online")
       return True
     try:
       if self.nm.state() == self.NM_STATE_CONNECTED:
@@ -1006,7 +1040,7 @@
     """
     
     service = gsettings.get_string("urlshorter") or "is.gd"
-    log.logger.info("Shortening URL %s with %s", url, service)
+    logger.info("Shortening URL %s with %s", url, service)
     if self.IsShort(url): return url
     try:
       s = urlshorter.PROTOCOLS[service].URLShorter()
@@ -1053,16 +1087,16 @@
             sig_failed = uploader.connect_to_signal("UploadFailed", failed)
             uploader.Upload(filepath)
     """
-    log.logger.info("Uploading image %s", filepath)
+    logger.info("Uploading image %s", filepath)
     url = uploader.upload(filepath, self.UploadComplete, self.UploadFailed)
 
   @dbus.service.signal(dbus_interface="com.Gwibber.Uploader", signature="ss")
   def UploadComplete(self, filepath, public_url):
-    log.logger.info("Image %s uploaded as %s", filepath, public_url)
+    logger.info("Image %s uploaded as %s", filepath, public_url)
 
   @dbus.service.signal(dbus_interface="com.Gwibber.Uploader", signature="ss")
   def UploadFailed(self, filepath, error_message):
-    log.logger.info("Image %s failed to upload with message '%s'", filepath, error_message)
+    logger.info("Image %s failed to upload with message '%s'", filepath, error_message)
 
 class Translate(dbus.service.Object):
   __dbus_object_path__ = "/com/gwibber/Translate"

=== modified file 'gwibber/microblog/network.py'
--- gwibber/microblog/network.py	2011-11-01 13:24:26 +0000
+++ gwibber/microblog/network.py	2012-02-10 17:26:15 +0000
@@ -1,78 +1,53 @@
 #!/usr/bin/env python
 
-import urllib, pycurl, json, StringIO
-from util import log
-
-try:
-  import libproxy
-except:
-  libproxy = None
-
-# Completely disable libproxy support for now, it causes crashes on amd64
-libproxy = None
-
-class CurlDownloader:
-  def __init__(self, url, params=None, post=False, username=None, password=None, header=None, body=None):
-    self.curl = pycurl.Curl()
-
-    # store url for logging later
-    self.url = url
-
-    if header:
-      self.curl.setopt(pycurl.HTTPHEADER, header)
-
-    if body:
-      self.curl.setopt(pycurl.POST, 1)
-      self.curl.setopt(pycurl.POSTFIELDS, body)
-  
+import urllib, json
+import urllib2, base64
+import logging
+logger = logging.getLogger("Network")
+
+class UrlLib2Downloader:
+  def __init__(self, url, params=None, post=False, username=None,
+               password=None, header=None, body=None, proxy=None):
+
+    data = None
+
     if params:
       if post:
-        self.curl.setopt(pycurl.HTTPPOST, [(x, str(y)) for x,y in params.items()])
+        data = urllib.urlencode(params)
       else:
         url = "?".join((url, urllib.urlencode(params)))
-    
-    self.curl.setopt(pycurl.URL, str(url))
-    #log.logger.debug("URL: %s", str(url))
-    
+
+    self.url = url
+
+    if header:
+      req = urllib2.Request(url, data, headers=header)
+    else:
+      req = urllib2.Request(url, data)
+
     if username and password:
-      self.curl.setopt(pycurl.USERPWD, "%s:%s" % (str(username), str(password)))
-
-    self.curl.setopt(pycurl.FOLLOWLOCATION, 1)
-    self.curl.setopt(pycurl.MAXREDIRS, 5)
-    self.curl.setopt(pycurl.TIMEOUT, 150)
-    self.curl.setopt(pycurl.HTTP_VERSION, pycurl.CURL_HTTP_VERSION_1_0)
-
-    self.content = StringIO.StringIO()
-    self.curl.setopt(pycurl.WRITEFUNCTION, self.content.write)
-    
-    if libproxy:
-      proxy_factory = libproxy.ProxyFactory()
-      log.logger.debug("libproxy: getting proxies")
-      proxylist = proxy_factory.getProxies(str(url))
-
-      if proxylist:
-        proxy = proxylist[0]
-        if (proxy.find("@") != -1):
-            self.curl.setopt(pycurl.PROXYAUTH, ["CURLAUTH_ANY"])
-        if (proxy.find("direct://") != 0):
-            log.logger.debug("using proxy %s", proxy)
-            self.curl.setopt(pycurl.PROXY, proxy)
+      base64string = base64.encodestring('%s:%s' % (username, password)).replace('\n', '')
+      req.add_header("Authorization", "Basic %s" % base64string)
+    if proxy and len(proxy) > 1:  # If didn't get a list, we're screwed
+      req.set_proxy(proxy[1], proxy[0])
 
     try:
-      self.curl.perform()
-    except pycurl.error, e:
-      log.logger.error("Network failure for %s - error: %d - %s", self.url.split("?")[0], e[0], e[1])
+      self.res = urllib2.urlopen(req)
+    except urllib2.HTTPError, e:
+      logger.error("Network failure for %s - error code: %s", e.geturl().split("?")[0], e.getcode())
+      self.res = "Network error: {0}".format(e.getcode())
 
   def get_json(self):
     try:
       return json.loads(self.get_string())
     except ValueError as e:
-      log.logger.debug("Failed to parse the response for %s, error was: %s", self.url.split("?")[0], str(e))
+      logger.debug("Failed to parse the response for %s, error was: %s", self.url.split("?")[0], str(e))
       return []
 
   def get_string(self):
-    return self.content.getvalue()
-
-Download = CurlDownloader
-
-
+    try:
+      return self.res.read()
+    except AttributeError:
+      return self.res
+
+
+Download = UrlLib2Downloader

=== modified file 'gwibber/microblog/plugins/buzz/__init__.py'
--- gwibber/microblog/plugins/buzz/__init__.py	2011-04-14 18:39:56 +0000
+++ gwibber/microblog/plugins/buzz/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,8 +1,11 @@
 from gwibber.microblog import network, util
-from gwibber.microblog.util import resources
 import json
 from oauth import oauth
 
+import logging
+logger = logging.getLogger("Buzz")
+logger.debug("Initializing.")
+
 PROTOCOL_INFO = {
   "name": "Buzz",
   "version": "1.0",
@@ -134,5 +137,3 @@
     path = "activities/%s/@self/%s/@comments" % (target["sender"]["id"], target["mid"])
     self._get(path, post=True, single=True, body=text)
     return []
-
-

=== modified file 'gwibber/microblog/plugins/digg/__init__.py'
--- gwibber/microblog/plugins/digg/__init__.py	2010-11-19 23:50:20 +0000
+++ gwibber/microblog/plugins/digg/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,6 +1,8 @@
 from gwibber.microblog import network, util
-from gwibber.microblog.util import resources
-from gettext import lgettext as _
+
+import logging
+logger = logging.getLogger("Digg")
+logger.debug("Initializing.")
 
 PROTOCOL_INFO = {
   "name": "Digg",

=== modified file 'gwibber/microblog/plugins/facebook/__init__.py'
--- gwibber/microblog/plugins/facebook/__init__.py	2011-08-22 16:11:15 +0000
+++ gwibber/microblog/plugins/facebook/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from gwibber.microblog import network, util
-from gwibber.microblog.util import log, resources
+from gwibber.microblog.util import resources
 import hashlib, mx.DateTime, time
 from os.path import join, getmtime, exists
 from gettext import lgettext as _
@@ -13,7 +13,9 @@
 except:
   pass
 
-log.logger.name = "Facebook"
+import logging
+logger = logging.getLogger("Facebook")
+logger.debug("Initializing.")
 
 PROTOCOL_INFO = {
   "name": "Facebook",
@@ -61,7 +63,7 @@
   def _check_error(self, data):
     if isinstance(data, dict):
       if data.has_key("error"):
-        log.logger.info("Facebook error %s - %s", data["error"]["type"], data["error"]["message"])
+        logger.info("Facebook error %s - %s", data["error"]["type"], data["error"]["message"])
         return True
       else: 
         return False
@@ -70,7 +72,7 @@
   def _get(self, operation, post=False, single=False, **args):
     if not self.user_id or "access_token" not in self.account:
       logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Authentication failed"), "Auth needs updating")
-      log.logger.error("%s", logstr)
+      logger.error("%s", logstr)
       return [{"error": {"type": "auth", "account": self.account, "message": _("Authentication failed, please re-authorize")}}]
 
     args.update({
@@ -86,15 +88,15 @@
     if isinstance(data, dict) and data.get("error_msg", 0):
       if "permission" in data["error_msg"]:
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Authentication failed"), data["error_msg"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["error_msg"]}}]
       elif data["error_code"] == 102:
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Session invalid"), data["error_msg"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["error_msg"]}}]
       else:
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Unknown failure"), data["error_msg"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "unknown", "account": self.account, "message": data["error_msg"]}}]
 
     return data
@@ -111,7 +113,7 @@
   
   def _message(self, data):
     if type(data) != dict:
-      log.logger.error("Cannot parse message data: %s", str(data))
+      logger.error("Cannot parse message data: %s", str(data))
       return {}
 
     m = {}
@@ -211,41 +213,41 @@
 
     data = self._get("me/home")
     
-    log.logger.debug("<STATS> facebook:receive account:%s since:%s size:%s",
+    logger.debug("<STATS> facebook:receive account:%s since:%s size:%s",
         self.account["id"], mx.DateTime.DateTimeFromTicks(since), len(str(data)))
     
     if not self._check_error(data):
       try:
         return [self._message(post) for post in data["data"]]
       except TypeError:
-        log.logger.error("<facebook:receive> failed to parse message data")
+        logger.error("<facebook:receive> failed to parse message data")
         return data
     else: return 
 
   def delete(self, message):
     result = self._get("stream.remove", post_id=message["mid"])
     if not result:
-      log.logger.error("<facebook:delete> failed")
+      logger.error("<facebook:delete> failed")
       return
     return []
 
   def like(self, message):
     result = self._get(message["mid"] + "/likes", post=True)
     if not result:
-      log.logger.error("<facebook:like> failed")
+      logger.error("<facebook:like> failed")
       return
     return []
 
   def send(self, message):
     result = self._get("me/feed", message=message, status_includes_verb=True, post=True)
     if not result:
-      log.logger.error("<facebook:send> failed")
+      logger.error("<facebook:send> failed")
       return
     return []
 
   def send_thread(self, message, target):
     result = self._get(target["mid"] + "/comments", message=message, post=True)
     if not result:
-      log.logger.error("<facebook:send_thread> failed")
+      logger.error("<facebook:send_thread> failed")
       return
     return []

=== modified file 'gwibber/microblog/plugins/flickr/__init__.py'
--- gwibber/microblog/plugins/flickr/__init__.py	2011-03-09 19:49:53 +0000
+++ gwibber/microblog/plugins/flickr/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,5 +1,9 @@
 from gwibber.microblog import network, util
-from gwibber.microblog.util import log, resources
+from gwibber.microblog.util import resources
+
+import logging
+logger = logging.getLogger("Flickr")
+logger.debug("Initializing.")
 
 import re, mx.DateTime
 from gettext import lgettext as _
@@ -99,5 +103,5 @@
       extras="date_upload,owner_name,icon_server")
     else: 
       logstr = """%s: %s""" % (PROTOCOL_INFO["name"], _("Failed to find account"))
-      log.logger.error("%s", logstr)
+      logger.error("%s", logstr)
       return [{"error": {"type": "auth", "account": self.account, "message": _("Failed to find account")}}]

=== modified file 'gwibber/microblog/plugins/foursquare/__init__.py'
--- gwibber/microblog/plugins/foursquare/__init__.py	2011-09-21 20:02:43 +0000
+++ gwibber/microblog/plugins/foursquare/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,8 +1,11 @@
 from gwibber.microblog import network, util
-from gwibber.microblog.util import log, resources
+from gwibber.microblog.util import resources
 import urllib, urllib2, json, htmllib, re
 from gettext import lgettext as _
-log.logger.name = "Foursquare"
+
+import logging
+logger = logging.getLogger("FourSquare")
+logger.debug("Initializing.")
 
 PROTOCOL_INFO = {
   "name": "Foursquare",
@@ -124,19 +127,22 @@
     if isinstance(data, dict) and "recent" in data:
       return True
     else:
-      log.logger.error("Foursquare error %s", data)
+      logger.error("Foursquare error %s", data)
       return False
 
   def _get(self, path, parse="message", post=False, single=False, **args):
     url = "/".join((URL_PREFIX, path))
     
     url = url + "?oauth_token=" + self.token
+    #
+    # TODO: Proxy support. Where's Downloader?
+    #
     data = json.load(urllib2.urlopen(url))["response"]
 
     if isinstance(data, dict) and data.get("errors", 0):
       if "authenticate" in data["errors"][0]["message"]:
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Authentication failed"), error["message"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["errors"][0]["message"]}}]
       else:
         for error in data["errors"]:
@@ -145,11 +151,11 @@
     elif isinstance(data, dict) and data.get("error", 0):
       if "Incorrect signature" in data["error"]:
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Request failed"), data["error"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["error"]}}]
     elif isinstance(data, str):
       logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Request failed"), data)
-      log.logger.error("%s", logstr)
+      logger.error("%s", logstr)
       return [{"error": {"type": "request", "account": self.account, "message": data}}]
     if not self._check_error(data):
       return []

=== modified file 'gwibber/microblog/plugins/friendfeed/__init__.py'
--- gwibber/microblog/plugins/friendfeed/__init__.py	2010-11-19 23:50:20 +0000
+++ gwibber/microblog/plugins/friendfeed/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,6 +1,9 @@
 from gwibber.microblog import network, util
-from gwibber.microblog.util import log, resources
-log.logger.name = "FriendFeed"
+from gwibber.microblog.util import resources
+
+import logging
+logger = logging.getLogger("FriendFeed")
+logger.debug("Initializing.")
 
 
 PROTOCOL_INFO = {

=== modified file 'gwibber/microblog/plugins/identica/__init__.py'
--- gwibber/microblog/plugins/identica/__init__.py	2011-11-01 12:38:36 +0000
+++ gwibber/microblog/plugins/identica/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,10 +1,11 @@
-import re
 from gwibber.microblog import network, util
-import gnomekeyring
 from oauth import oauth
-from gwibber.microblog.util import log, resources
+from gwibber.microblog.util import resources
 from gettext import lgettext as _
-log.logger.name = "Identi.ca"
+
+import logging
+logger = logging.getLogger("Identica")
+logger.debug("Initializing.")
 
 PROTOCOL_INFO = {
   "name": "Identi.ca",
@@ -51,6 +52,11 @@
   ],
 }
 
+#
+# TODO: There is self.url_prefix and no global URL_PREFIX?
+#
+URL_PREFIX = "https://identi.ca"
+
 class Client:
   def __init__(self, acct):
     self.url_prefix = "https://identi.ca"
@@ -93,7 +99,7 @@
         m["images"] = images
         m["type"] = "photo"
     except:
-      log.logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
+      logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
 
     return m
 
@@ -117,7 +123,7 @@
 
   def _message(self, data):
     if type(data) != dict:
-      log.logger.error("Cannot parse message data: %s", str(data))
+      logger.error("Cannot parse message data: %s", str(data))
       return {}
 
     n = {}
@@ -208,7 +214,7 @@
 
   def _get(self, path, parse="message", post=False, single=False, **args):
     if not self.account.has_key("access_token") and not self.account.has_key("secret_token"):
-      log.logger.error("%s unexpected result - %s", PROTOCOL_INFO["name"], _("Account needs to be re-authorized"))
+      logger.error("%s unexpected result - %s", PROTOCOL_INFO["name"], _("Account needs to be re-authorized"))
       return [{"error": {"type": "auth", "account": self.account, "message": _("Account needs to be re-authorized")}}]
 
     self.sigmethod = oauth.OAuthSignatureMethod_HMAC_SHA1()
@@ -229,19 +235,19 @@
     resources.dump(self.account["service"], self.account["id"], data)
 
     if isinstance(data, dict) and data.get("error", 0):
-      log.logger.error("%s failure - %s", PROTOCOL_INFO["name"], data["error"])
+      logger.error("%s failure - %s", PROTOCOL_INFO["name"], data["error"])
       if "authenticate" in data["error"]:
         return [{"error": {"type": "auth", "account": self.account, "message": data["error"]}}]
       else:
         return [{"error": {"type": "unknown", "account": self.account, "message": data["error"]}}]
     elif isinstance(data, str):
-      log.logger.error("%s unexpected result - %s", PROTOCOL_INFO["name"], data)
+      logger.error("%s unexpected result - %s", PROTOCOL_INFO["name"], data)
       return [{"error": {"type": "unknown", "account": self.account, "message": data}}]
 
     if parse == "follow" or parse == "unfollow":
       if isinstance(data, dict) and data.get("error", 0):
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("%s failed" % parse), data["error"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["error"]}}]
       else:
         return [["friendships", {"type": parse, "account": self.account["id"], "service": self.account["service"],"user_id": data["id"], "nick": data["screen_name"]}]]
@@ -260,7 +266,7 @@
     data = data.get_json()
 
     if type(data) != dict:
-      log.logger.error("Cannot parse search data: %s", str(data))
+      logger.error("Cannot parse search data: %s", str(data))
       return []
 
     return [self._result(m) for m in data["results"]]

=== modified file 'gwibber/microblog/plugins/pingfm/__init__.py'
--- gwibber/microblog/plugins/pingfm/__init__.py	2010-10-18 20:24:12 +0000
+++ gwibber/microblog/plugins/pingfm/__init__.py	2012-02-10 17:26:15 +0000
@@ -8,6 +8,10 @@
 
 from gwibber.microblog import network, util
 
+import logging
+logger = logging.getLogger("Ping.FM")
+logger.debug("Initializing.")
+
 PROTOCOL_INFO = {
   "name": "Ping.fm",
   "version": 0.1,

=== modified file 'gwibber/microblog/plugins/qaiku/__init__.py'
--- gwibber/microblog/plugins/qaiku/__init__.py	2010-11-19 23:50:20 +0000
+++ gwibber/microblog/plugins/qaiku/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,7 +1,9 @@
 from gwibber.microblog import network, util
 from gwibber.microblog.util import resources
-from gettext import lgettext as _
 
+import logging
+logger = logging.getLogger("Qaiku")
+logger.debug("Initializing.")
 PROTOCOL_INFO = {
   "name": "Qaiku",
   "version": "1.0",

=== modified file 'gwibber/microblog/plugins/statusnet/__init__.py'
--- gwibber/microblog/plugins/statusnet/__init__.py	2012-02-02 22:35:38 +0000
+++ gwibber/microblog/plugins/statusnet/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,10 +1,12 @@
 import re
 from gwibber.microblog import network, util
-import gnomekeyring
 from oauth import oauth
-from gwibber.microblog.util import log, resources
+from gwibber.microblog.util import resources
 from gettext import lgettext as _
-log.logger.name = "StatusNet"
+
+import logging
+logger = logging.getLogger("StatusNet")
+logger.debug("Initializing.")
 
 PROTOCOL_INFO = {
   "name": "StatusNet",
@@ -97,7 +99,7 @@
         m["images"] = images
         m["type"] = "photo"
     except:
-      log.logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
+      logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
 
     return m
 
@@ -121,7 +123,7 @@
 
   def _message(self, data):
     if type(data) != dict:
-      log.logger.error("Cannot parse message data: %s", str(data))
+      logger.error("Cannot parse message data: %s", str(data))
       return {}
 
     n = {}
@@ -211,7 +213,7 @@
 
   def _get(self, path, parse="message", post=False, single=False, **args):
     if not self.account.has_key("access_token") and not self.account.has_key("secret_token"):
-      log.logger.error("%s unexpected result - %s", PROTOCOL_INFO["name"], _("Account needs to be re-authorized"))
+      logger.error("%s unexpected result - %s", PROTOCOL_INFO["name"], _("Account needs to be re-authorized"))
       return [{"error": {"type": "auth", "account": self.account, "message": _("Account needs to be re-authorized")}}]
 
     url = "/".join((self.account["url_prefix"], "api", path))
@@ -233,19 +235,19 @@
     resources.dump(self.account["service"], self.account["id"], data)
 
     if isinstance(data, dict) and data.get("error", 0):
-      log.logger.error("%s failure - %s", PROTOCOL_INFO["name"], data["error"])
+      logger.error("%s failure - %s", PROTOCOL_INFO["name"], data["error"])
       if "authenticate" in data["error"]:
         return [{"error": {"type": "auth", "account": self.account, "message": data["error"]}}]
       else:
         return [{"error": {"type": "unknown", "account": self.account, "message": data["error"]}}]
     elif isinstance(data, str):
-      log.logger.error("%s unexpected result - %s", PROTOCOL_INFO["name"], data)
+      logger.error("%s unexpected result - %s", PROTOCOL_INFO["name"], data)
       return [{"error": {"type": "unknown", "account": self.account, "message": data}}]
 
     if parse == "follow" or parse == "unfollow":
       if isinstance(data, dict) and data.get("error", 0):
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("%s failed" % parse), data["error"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["error"]}}]
       else:
         return [["friendships", {"type": parse, "account": self.account["id"], "service": self.account["service"],"user_id": data["id"], "nick": data["screen_name"]}]]
@@ -264,7 +266,7 @@
     data = data.get_json()
 
     if type(data) != dict:
-      log.logger.error("Cannot parse search data: %s", str(data))
+      logger.error("Cannot parse search data: %s", str(data))
       return []
 
     return [self._result(m) for m in data["results"]]

=== modified file 'gwibber/microblog/plugins/twitter/__init__.py'
--- gwibber/microblog/plugins/twitter/__init__.py	2011-11-01 12:38:36 +0000
+++ gwibber/microblog/plugins/twitter/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,10 +1,11 @@
 from gwibber.microblog import network, util
-import re
-import gnomekeyring
 from oauth import oauth
-from gwibber.microblog.util import log, resources
+from gwibber.microblog.util import resources
 from gettext import lgettext as _
-log.logger.name = "Twitter"
+
+import logging
+logger = logging.getLogger("Twitter")
+logger.debug("Initializing.")
 
 PROTOCOL_INFO = {
   "name": "Twitter",
@@ -57,7 +58,7 @@
 URL_PREFIX = "https://twitter.com"
 API_PREFIX = "https://api.twitter.com/1"
 
-class Client:
+class Client ():
   def __init__(self, acct):
     self.service = util.getbus("Service")
     if acct.has_key("secret_token") and acct.has_key("password"): acct.pop("password")
@@ -71,7 +72,7 @@
     self.token = oauth.OAuthToken(acct["access_token"], acct["secret_token"])
 
   def _common(self, data):
-    m = {};
+    m = {}
     try:
 
       m["mid"] = str(data["id"])
@@ -97,7 +98,7 @@
         m["images"] = images
         m["type"] = "photo"
     except: 
-      log.logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
+      logger.error("%s failure - %s", PROTOCOL_INFO["name"], data)
       return {}
  
     return m
@@ -122,7 +123,7 @@
     
   def _message(self, data):
     if type(data) != dict:
-      log.logger.error("Cannot parse message data: %s", str(data))
+      logger.error("Cannot parse message data: %s", str(data))
       return {}
 
     n = {}
@@ -247,18 +248,18 @@
     request = oauth.OAuthRequest.from_consumer_and_token(self.consumer, self.token,
         http_method=post and "POST" or "GET", http_url=url, parameters=util.compact(args))
     request.sign_request(self.sigmethod, self.consumer, self.token)
-    
+
     if post:
-      data = network.Download(request.to_url(), util.compact(args), post).get_json()
+      headers = request.to_header()
+      data = network.Download(url, util.compact(args), post, header=headers).get_json()
     else:
       data = network.Download(request.to_url(), None, post).get_json()
-
     resources.dump(self.account["service"], self.account["id"], data)
 
     if isinstance(data, dict) and data.get("errors", 0):
       if "authenticate" in data["errors"][0]["message"]:
-        logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Authentication failed"), error["message"])
-        log.logger.error("%s", logstr)
+        logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Authentication failed"), data["errors"][0]["message"])
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["errors"][0]["message"]}}]
       else:
         for error in data["errors"]:
@@ -267,17 +268,17 @@
     elif isinstance(data, dict) and data.get("error", 0):
       if "Incorrect signature" in data["error"]:
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Request failed"), data["error"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["error"]}}]
     elif isinstance(data, str):
       logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("Request failed"), data)
-      log.logger.error("%s", logstr)
+      logger.error("%s", logstr)
       return [{"error": {"type": "request", "account": self.account, "message": data}}]
 
     if parse == "follow" or parse == "unfollow":
       if isinstance(data, dict) and data.get("error", 0):
         logstr = """%s: %s - %s""" % (PROTOCOL_INFO["name"], _("%s failed" % parse), data["error"])
-        log.logger.error("%s", logstr)
+        logger.error("%s", logstr)
         return [{"error": {"type": "auth", "account": self.account, "message": data["error"]}}]
       else:
         return [["friendships", {"type": parse, "account": self.account["id"], "service": self.account["service"],"user_id": data["id"], "nick": data["screen_name"]}]]
@@ -297,7 +298,7 @@
     data = data.get_json()["results"]
 
     if type(data) != list:
-      log.logger.error("Cannot parse search data: %s", str(data))
+      logger.error("Cannot parse search data: %s", str(data))
       return []
 
     return [self._result(m) for m in data]

=== modified file 'gwibber/microblog/storage.py'
--- gwibber/microblog/storage.py	2011-10-23 04:11:05 +0000
+++ gwibber/microblog/storage.py	2012-02-10 17:26:15 +0000
@@ -3,11 +3,13 @@
 import json, sqlite3, uuid
 import gtk, gobject, dbus, dbus.service
 import util, util.keyring, atexit
-from util import log
 from dbus.mainloop.glib import DBusGMainLoop
 
 DBusGMainLoop(set_as_default=True)
 
+import logging
+logger = logging.getLogger("Storage")
+
 class MessageManager(dbus.service.Object):
   __dbus_object_path__ = "/com/gwibber/Messages"
 
@@ -38,7 +40,7 @@
     if not self.db.execute("PRAGMA table_info(messages)").fetchall():
       self.setup_table()
 
-    log.logger.debug("Creating indexes")
+    logger.debug("Creating indexes")
     self.db.execute("create index IF NOT EXISTS idx2 on messages (stream, time, transient)")
 
   def setup_table(self):
@@ -49,20 +51,20 @@
       self.db.execute("create index IF NOT EXISTS idx2 on messages (stream, time, transient)")
 
   def maintenance(self):
-    log.logger.info("Cleaning up database...")
+    logger.info("Cleaning up database...")
     accounts = self.db.execute("SELECT distinct(account) FROM messages").fetchall()
     for acct in accounts:
       try:
         if not self.db.execute("SELECT count(id) FROM accounts WHERE id = '%s'" % acct[0]).fetchone()[0]:
-          log.logger.info("DB Maintenance: Found data for an unknown account %s, removing", acct[0])
+          logger.info("DB Maintenance: Found data for an unknown account %s, removing", acct[0])
           self.db.execute("DELETE FROM messages WHERE account = '%s'" % acct[0])
       except:
         pass
       try:
         count = self.db.execute("SELECT count(data) FROM messages WHERE operation = 'receive' AND stream = 'messages' AND account = '%s'" % acct[0]).fetchone()[0]
-        log.logger.info("Found %d records in the messages stream for account %s", count, acct[0])
+        logger.info("Found %d records in the messages stream for account %s", count, acct[0])
         if count > 2000:
-          log.logger.info("Purging old data for %s", acct[0])
+          logger.info("Purging old data for %s", acct[0])
           self.db.execute("DELETE FROM messages WHERE account = ? AND operation = 'receive' AND stream = 'messages' AND time IN (SELECT CAST (time AS int) FROM (SELECT time FROM messages WHERE account = ? AND operation = 'receive' AND stream = 'messages' AND time != 0 ORDER BY time ASC LIMIT (SELECT COUNT(time) FROM messages WHERE operation = 'receive' AND stream = 'messages' AND account = ? AND time != 0) - 2000) ORDER BY time ASC)", (acct[0],acct[0],acct[0]))
       except:
         pass
@@ -103,15 +105,15 @@
 
   @dbus.service.signal("com.Gwibber.Searches", signature="s")
   def Updated(self, data):
-    log.logger.debug("Search Changed: %s", data)
+    logger.debug("Search Changed: %s", data)
 
   @dbus.service.signal("com.Gwibber.Searches", signature="s")
   def Deleted(self, data):
-    log.logger.debug("Search Deleted: %s", data)
+    logger.debug("Search Deleted: %s", data)
 
   @dbus.service.signal("com.Gwibber.Searches", signature="s")
   def Created(self, data):
-    log.logger.debug("Search Created: %s", data)
+    logger.debug("Search Created: %s", data)
   
   @dbus.service.method("com.Gwibber.Searches", in_signature="s", out_signature="s")
   def Get(self, id):
@@ -169,15 +171,15 @@
 
   @dbus.service.signal("com.Gwibber.Streams", signature="s")
   def Updated(self, data):
-    log.logger.debug("Stream Changed: %s", data)
+    logger.debug("Stream Changed: %s", data)
 
   @dbus.service.signal("com.Gwibber.Streams", signature="s")
   def Deleted(self, data):
-    log.logger.debug("Stream Deleted: %s", data)
+    logger.debug("Stream Deleted: %s", data)
 
   @dbus.service.signal("com.Gwibber.Streams", signature="s")
   def Created(self, data):
-    log.logger.debug("Stream Created: %s", data)
+    logger.debug("Stream Created: %s", data)
   
   @dbus.service.method("com.Gwibber.Streams", in_signature="s", out_signature="s")
   def Get(self, id):
@@ -284,7 +286,7 @@
       self.update_password_cache(acct)
 
   def unlock_password_cache(self):
-    log.logger.debug("Unlocking password cache!")
+    logger.debug("Unlocking password cache!")
     for id in self.passwords:
       util.keyring.munlock(self.passwords[id])
 
@@ -296,15 +298,15 @@
 
   @dbus.service.signal("com.Gwibber.Accounts", signature="s")
   def Updated(self, data):
-    log.logger.info("Account Changed: %s", data)
+    logger.info("Account Changed: %s", data)
 
   @dbus.service.signal("com.Gwibber.Accounts", signature="s")
   def Deleted(self, data):
-    log.logger.debug("Account Deleted: %s", data)
+    logger.debug("Account Deleted: %s", data)
 
   @dbus.service.signal("com.Gwibber.Accounts", signature="s")
   def Created(self, data):
-    log.logger.debug("Account Created: %s", data)
+    logger.debug("Account Created: %s", data)
   
   @dbus.service.method("com.Gwibber.Accounts", in_signature="s", out_signature="s")
   def Get(self, id):

=== modified file 'gwibber/microblog/util/__init__.py'
--- gwibber/microblog/util/__init__.py	2011-09-19 22:23:09 +0000
+++ gwibber/microblog/util/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,10 +1,11 @@
-
 import os, locale, re, mx.DateTime, cgi
-import log, resources
+import resources
 import dbus
 from const import *
 from htmlentitydefs import name2codepoint
 
+import logging
+logger = logging.getLogger("Microblog Util")
 
 # Try to import * from custom, install custom.py to include packaging 
 # customizations like distro API keys, etc
@@ -179,7 +180,7 @@
       pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(icon, iconsize, iconsize)
       notification.set_icon_from_pixbuf(pixbuf)
     except glib.GError as e:
-      log.logger.error("Avatar failure - %s - %s", icon, e.message)
+      logger.error("Avatar failure - %s - %s", icon, e.message)
       resources.del_avatar(icon)
 
     if timeout:
@@ -191,7 +192,7 @@
     try:
       notification.show ()
     except:
-      log.logger.error("Notification failed")
+      logger.error("Notification failed")
     return
 
   can_notify = True

=== modified file 'gwibber/microblog/util/couchmigrate.py'
--- gwibber/microblog/util/couchmigrate.py	2010-12-10 05:12:11 +0000
+++ gwibber/microblog/util/couchmigrate.py	2012-02-10 17:26:15 +0000
@@ -7,9 +7,12 @@
   CouchDatabase = None
   
 from const import SQLITE_DB_FILENAME
-import sqlite3, uuid, json, log
+import sqlite3, uuid, json
 import resources
 
+import logging
+logger = logging.getLogger("Couch Migrate")
+
 COUCH_DB_ACCOUNTS = "gwibber_accounts"
 
 # Dynamically build a list of available service plugins
@@ -30,12 +33,12 @@
         accounts = CouchDatabase(COUCH_DB_ACCOUNTS, create=False)
         records = accounts.get_records()
       except NoSuchDatabase:
-        log.logger.info("Nothing to migrate from desktopcouch")
+        logger.info("Nothing to migrate from desktopcouch")
         return
 
       migrate = {}
 
-      log.logger.info("Looking for accounts to migrate from desktopcouch to sqlite")
+      logger.info("Looking for accounts to migrate from desktopcouch to sqlite")
 
       for record in records:
         id = str(record["value"]["protocol"] + "-" + record["value"]["username"])
@@ -52,7 +55,7 @@
           for param in SERVICES[record["value"]["protocol"]]["config"]: 
             key = param.replace('private:','')
             new_account[key] = record["value"][key]
-          log.logger.info("Found account %s - %s that needs to be migrated", new_account["service"], new_account["username"])
+          logger.info("Found account %s - %s that needs to be migrated", new_account["service"], new_account["username"])
           self.Create(json.dumps(new_account))
 
   def Create(self, account):

=== modified file 'gwibber/microblog/util/exceptions.py'
--- gwibber/microblog/util/exceptions.py	2010-10-06 23:33:22 +0000
+++ gwibber/microblog/util/exceptions.py	2012-02-10 17:26:15 +0000
@@ -1,7 +1,9 @@
-import log
 import os, subprocess
 import xdg, time
 
+import logging
+logger = logging.getLogger("Exceptions")
+
 import gettext
 from gettext import lgettext as _
 if hasattr(gettext, 'bind_textdomain_codeset'):
@@ -23,15 +25,15 @@
     """
     def __init__(self, kind="UNKNOWN", service="UNKNOWN", username="UNKNOWN", message="UNKNOWN"):
         if kind == "keyring" or kind == "auth":
-            log.logger.error("Failed to find credentials in the keyring")
+            logger.error("Failed to find credentials in the keyring")
             accounts_error = os.path.join(xdg.BaseDirectory.xdg_cache_home, "gwibber", ".accounts_error")
             if os.path.exists(accounts_error) and os.path.getmtime(accounts_error) > time.time()-600:
-                log.logger.info("gwibber-accounts was raised less than 600 seconds")
+                logger.info("gwibber-accounts was raised less than 600 seconds")
                 return
             else:
                 open(accounts_error, 'w').close() 
         else:
-            log.logger.error("%s failure: %s:%s - %s", kind, service, username, message)
+            logger.error("%s failure: %s:%s - %s", kind, service, username, message)
 
         display_message = _("There was an %(kind)s failure from %(service)s for account %(account)s, error was %(error)s") % {
           "kind": kind, 

=== modified file 'gwibber/microblog/util/keyring.py'
--- gwibber/microblog/util/keyring.py	2010-10-22 16:59:03 +0000
+++ gwibber/microblog/util/keyring.py	2012-02-10 17:26:15 +0000
@@ -8,11 +8,10 @@
   value = ""
   try:
     value = gnomekeyring.find_items_sync(
-        gnomekeyring.ITEM_GENERIC_SECRET,
-        {"id": str(id)})[0].secret
+      gnomekeyring.ITEM_GENERIC_SECRET,
+      {"id": str(id)})[0].secret
     mlock(value)
   except gnomekeyring.NoMatchError:
-    print id
     raise exceptions.GwibberServiceError("keyring")
 
   return value

=== modified file 'gwibber/microblog/util/log.py'
--- gwibber/microblog/util/log.py	2010-10-19 03:09:16 +0000
+++ gwibber/microblog/util/log.py	2012-02-10 17:26:15 +0000
@@ -6,14 +6,28 @@
 import xdg.BaseDirectory
 
 cache_dir = realpath(join(xdg.BaseDirectory.xdg_cache_home, "gwibber"))
+
 if not isdir(cache_dir):
   makedirs(cache_dir)
 
 LOG_FILENAME = join(cache_dir, "gwibber.log")
-loghandler = logging.handlers.RotatingFileHandler(
-       LOG_FILENAME, maxBytes=20971520, backupCount=5)
-logger = logging.getLogger('Gwibber')
-logformatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-loghandler.setFormatter(logformatter)
-logger.setLevel(logging.INFO)
-logger.addHandler(loghandler)
+
+def setup_logging(console = False, debuglog = False):
+  log =  logging.getLogger()
+  if debuglog:
+    log.setLevel(logging.DEBUG)
+  else:
+    log.setLevel(logging.INFO)
+
+  if console:
+    console_handler = logging.StreamHandler()
+    console_formatter = logging.Formatter('%(name)-12s %(threadName)-12s: %(levelname)-8s %(message)s')
+    console_handler.setFormatter(console_formatter)
+    log.addHandler(console_handler)
+
+  text_handler = logging.handlers.RotatingFileHandler(LOG_FILENAME, maxBytes=20971520, backupCount=5)
+  text_formatter = logging.Formatter("%(asctime)s - %(name)-12s %(threadName)-14s:  %(levelname)-8s - %(message)s")
+  text_handler.setFormatter(text_formatter)
+  log.addHandler(text_handler)
+
+  log.info("Logger initialized")

=== modified file 'gwibber/microblog/util/resources.py'
--- gwibber/microblog/util/resources.py	2011-11-04 12:40:19 +0000
+++ gwibber/microblog/util/resources.py	2012-02-10 17:26:15 +0000
@@ -5,16 +5,16 @@
 """
 
 import os, sys
-from os.path import join, isdir, realpath, exists
 from os import makedirs, remove
-from os import environ
 import Image
-import log
 import mx.DateTime
 from gwibber.microblog import network
 from const import *
 import inspect
 
+import logging
+logger = logging.getLogger("Resources")
+
 # Try to import * from custom, install custom.py to include packaging 
 # customizations like distro API keys, etc
 try:
@@ -22,8 +22,6 @@
 except:
   pass
 
-log.logger.name = "Gwibber Dispatcher Resources"
-
 PROGRAM_NAME = "gwibber"
 UI_DIR_NAME = "ui"
 THEME_DIR_NAME = os.path.join(UI_DIR_NAME, "themes")
@@ -90,7 +88,7 @@
   avatar_cache_image = join(avatar_cache_dir, url.replace("/",""))
 
   if not exists(avatar_cache_image) or len(open(avatar_cache_image, "r").read()) < 1:
-    log.logger.debug("Downloading avatar %s", url)
+    logger.debug("Downloading avatar %s", url)
     f = file(avatar_cache_image, "w")
     data = network.Download(url)
     f.write(data.get_string())
@@ -106,7 +104,7 @@
     try:
       remove(avatar)
     except:
-      log.logger.error("Failed to remove avatar from cache: %s", avatar)
+      logger.error("Failed to remove avatar from cache: %s", avatar)
 
 def img_resize(img_path, size):
   try:
@@ -118,7 +116,7 @@
       image.resize((size, size), Image.ANTIALIAS).save(img_path, format="jpeg")
   except Exception, e:
     from traceback import format_exc
-    log.logger.error("Image resizing failed:\n%s", format_exc())
+    logger.error("Image resizing failed:\n%s", format_exc())
 
 def get_desktop_file():
   p = os.path.join(LAUNCH_DIR, "gwibber.desktop")
@@ -206,7 +204,7 @@
     dump_cache_file = join(dump_cache_dir, (aid + "." + str(mx.DateTime.now()) + "." + operation))
 
     if not exists(dump_cache_file) or len(open(dump_cache_file, "r").read()) < 1:
-      log.logger.debug("Dumping test data %s - %s - %s", service, aid, operation)
+      logger.debug("Dumping test data %s - %s - %s", service, aid, operation)
       f = file(dump_cache_file, "w")
       f.write(str(data))
       f.close()

=== modified file 'po/Makefile.in.in'
--- po/Makefile.in.in	2011-12-06 19:58:21 +0000
+++ po/Makefile.in.in	2012-02-10 17:26:15 +0000
@@ -49,8 +49,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
@@ -73,15 +73,20 @@
 .SUFFIXES:
 .SUFFIXES: .po .pox .gmo .mo .msg .cat
 
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
 	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:

=== modified file 'tests/plugins/test/__init__.py'
--- tests/plugins/test/__init__.py	2012-01-10 18:20:28 +0000
+++ tests/plugins/test/__init__.py	2012-02-10 17:26:15 +0000
@@ -1,7 +1,10 @@
 from gwibber.microblog import util
-from gwibber.microblog.util import log
 import json
 
+import logging
+logger = logging.getLogger("Plugin Test")
+logger.debug("Initializing.")
+
 import re, mx.DateTime
 from gettext import lgettext as _
 
@@ -66,5 +69,5 @@
     return getattr(self, opname)(**args)
 
   def receive(self, count=util.COUNT, since=None):
-    log.logger.debug ("HERE");
+    logger.debug ("HERE");
     return self._get("statuses/friends_timeline.json", count=count, since_id=since, source="Gwibber")