diff --git a/Mailnag/config_window.py b/Mailnag/config_window.py index db777b5..6a654e5 100644 --- a/Mailnag/config_window.py +++ b/Mailnag/config_window.py @@ -26,8 +26,7 @@ PACKAGE_NAME = "mailnag" __builtins__.USE_GTK3 = True # make keyring.py use GTK3 -import gobject -from gi.repository import GLib, GdkPixbuf, Gtk +from gi.repository import GLib, GdkPixbuf, Gtk, GObject import os import ConfigParser diff --git a/Mailnag/keyring.py b/Mailnag/keyring.py index c3efc5f..66c5ee4 100644 --- a/Mailnag/keyring.py +++ b/Mailnag/keyring.py @@ -22,10 +22,8 @@ # MA 02110-1301, USA. # -import gobject - if __builtins__["USE_GTK3"]: - from gi.repository import GLib, GdkPixbuf, Gtk + from gi.repository import GObject, GLib, GdkPixbuf, Gtk else: Gtk = __import__("gtk") GLib = __import__("glib") diff --git a/Mailnag/mailnag.py b/Mailnag/mailnag.py index 096481d..18b3c56 100644 --- a/Mailnag/mailnag.py +++ b/Mailnag/mailnag.py @@ -28,7 +28,6 @@ import urllib2 import ConfigParser import os import subprocess -import gobject PACKAGE_NAME = "mailnag" @@ -37,9 +36,10 @@ PACKAGE_NAME = "mailnag" __builtins__.USE_GTK3 = False # (also prevents keyring.py from using GTK3) if __builtins__.USE_GTK3: - from gi.repository import GLib, GdkPixbuf, Gtk, Notify + from gi.repository import GObject, GLib, GdkPixbuf, Gtk, Notify else: Gtk = __import__("gtk") + from gi.repository import GObject import pynotify import time @@ -696,7 +696,7 @@ def main(): if cfg.get('general', 'check_once') == '0': # wanna do more than one email check? check_interval = int(cfg.get('general', 'check_interval')) - gobject.timeout_add_seconds(60 * check_interval, mailchecker.timeout) + GObject.timeout_add_seconds(60 * check_interval, mailchecker.timeout) Gtk.main() # start Loop cleanup()