From 7a0bb1cbaa4f02aba6eb4711d88b17b8a62a06f3 Mon Sep 17 00:00:00 2001
From: enkore <public@enkore.de>
Date: Wed, 6 Mar 2013 22:32:07 +0100
Subject: [PATCH] Fix issue with gobject&gobject2

summary: just don't ever use gobject and gobject2 at the same time...
---
 i3pystatus/core/imputil.py     | 2 +-
 i3pystatus/mail/thunderbird.py | 6 +++---
 setup.py                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/i3pystatus/core/imputil.py b/i3pystatus/core/imputil.py
index 2572f07..b2e2d74 100644
--- a/i3pystatus/core/imputil.py
+++ b/i3pystatus/core/imputil.py
@@ -33,7 +33,7 @@ class ClassFinder:
         return classes[0]
 
     def get_module(self, module):
-        return import_module("i3pystatus.{module}".format(module=module))
+        return import_module("i3pystatus.{mod}".format(mod=module))
 
     def instanciate_class_from_module(self, module, *args, **kwargs):
         if isinstance(module, types.ModuleType):
diff --git a/i3pystatus/mail/thunderbird.py b/i3pystatus/mail/thunderbird.py
index 31f2555..f8d2cd1 100644
--- a/i3pystatus/mail/thunderbird.py
+++ b/i3pystatus/mail/thunderbird.py
@@ -12,8 +12,9 @@ import threading
 import time
 from functools import partial
 
-import dbus, gobject
+import dbus
 from dbus.mainloop.glib import DBusGMainLoop
+from gi.repository import GObject
 
 from i3pystatus.mail import Backend
 
@@ -24,7 +25,6 @@ class Thunderbird(Backend):
 
     Requires
     * python-dbus
-    * python-gobject2
     """
 
     _unread = set()
@@ -38,7 +38,7 @@ class Thunderbird(Backend):
         bus.add_signal_receiver(self.changed_msg,
                                 dbus_interface="org.mozilla.thunderbird.DBus",
                                 signal_name="ChangedMessageSignal")
-        loop = gobject.MainLoop()
+        loop = GObject.MainLoop()
         dbus.mainloop.glib.threads_init()
         self.context = loop.get_context()
 
diff --git a/setup.py b/setup.py
index d921461..c58598b 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup
 
 setup(name="i3pystatus",
-      version="3.1",
+      version="3.2",
       description="Like i3status, this generates status line for i3bar / i3wm",
       url="http://github.com/enkore/i3pystatus",
       license="MIT",