summaryrefslogtreecommitdiff
path: root/caribou/settings/preferences_window.py
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gmail.com>2011-08-29 23:05:11 -0400
committerEitan Isaacson <eitan@monotonous.org>2011-08-31 09:19:27 -0700
commit1857bd953dc02ac781991f0b97b488b4f300b01f (patch)
tree49a4315bc8ef9b4c736e3f3e0410daa8cf39a335 /caribou/settings/preferences_window.py
parentf810f7bfa40fd53bbf2f47d628ad0f0279b24b72 (diff)
downloadcaribou-1857bd953dc02ac781991f0b97b488b4f300b01f.tar.gz
Use GLib, GObject from gi.repository instead of glib, gobject
Use GLib and GObject from gi.repository instead of glib and gobject modules for compatibility with pygobject-3.0. Otherwise, when running on a system with pygobject-2.0 and pygobject-3.0 installed, caribou-preferences fails with ImportError: could not import gobject (error was: ImportError('When using gi.repository you must not import static modules like "gobject". Please change all occurrences of "import gobject" to "from gi.repository import GObject".',)) https://bugzilla.gnome.org/show_bug.cgi?id=657666
Diffstat (limited to 'caribou/settings/preferences_window.py')
-rw-r--r--caribou/settings/preferences_window.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/caribou/settings/preferences_window.py b/caribou/settings/preferences_window.py
index 55f9fca..541ecb5 100644
--- a/caribou/settings/preferences_window.py
+++ b/caribou/settings/preferences_window.py
@@ -20,7 +20,7 @@
from caribou.settings.setting_types import *
-import gobject
+from gi.repository import GObject
from gi.repository import Gdk
from gi.repository import Gtk
@@ -230,7 +230,7 @@ class PreferencesDialog(Gtk.Dialog, AbstractPreferencesUI):
__gtype_name__ = "PreferencesDialog"
def __init__(self, settings_manager):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.add_button(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)
self.set_border_width(6)
self.set_title(settings_manager.groups.label)
@@ -243,7 +243,7 @@ class PreferencesWindow(Gtk.Window, AbstractPreferencesUI):
__gtype_name__ = "PreferencesWindow"
def __init__(self, settings_manager):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.set_border_width(6)
self.set_title(settings_manager.groups.label)