Fix issue with gobject&gobject2

summary: just don't ever use gobject and gobject2 at the same time...
This commit is contained in:
enkore 2013-03-06 22:32:07 +01:00
parent fa1f6c534c
commit 7a0bb1cbaa
3 changed files with 5 additions and 5 deletions

View File

@ -33,7 +33,7 @@ class ClassFinder:
return classes[0] return classes[0]
def get_module(self, module): 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): def instanciate_class_from_module(self, module, *args, **kwargs):
if isinstance(module, types.ModuleType): if isinstance(module, types.ModuleType):

View File

@ -12,8 +12,9 @@ import threading
import time import time
from functools import partial from functools import partial
import dbus, gobject import dbus
from dbus.mainloop.glib import DBusGMainLoop from dbus.mainloop.glib import DBusGMainLoop
from gi.repository import GObject
from i3pystatus.mail import Backend from i3pystatus.mail import Backend
@ -24,7 +25,6 @@ class Thunderbird(Backend):
Requires Requires
* python-dbus * python-dbus
* python-gobject2
""" """
_unread = set() _unread = set()
@ -38,7 +38,7 @@ class Thunderbird(Backend):
bus.add_signal_receiver(self.changed_msg, bus.add_signal_receiver(self.changed_msg,
dbus_interface="org.mozilla.thunderbird.DBus", dbus_interface="org.mozilla.thunderbird.DBus",
signal_name="ChangedMessageSignal") signal_name="ChangedMessageSignal")
loop = gobject.MainLoop() loop = GObject.MainLoop()
dbus.mainloop.glib.threads_init() dbus.mainloop.glib.threads_init()
self.context = loop.get_context() self.context = loop.get_context()

View File

@ -3,7 +3,7 @@
from setuptools import setup from setuptools import setup
setup(name="i3pystatus", setup(name="i3pystatus",
version="3.1", version="3.2",
description="Like i3status, this generates status line for i3bar / i3wm", description="Like i3status, this generates status line for i3bar / i3wm",
url="http://github.com/enkore/i3pystatus", url="http://github.com/enkore/i3pystatus",
license="MIT", license="MIT",