Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/JokeMachineActivity.py
diff options
context:
space:
mode:
Diffstat (limited to 'JokeMachineActivity.py')
-rw-r--r--JokeMachineActivity.py25
1 files changed, 13 insertions, 12 deletions
diff --git a/JokeMachineActivity.py b/JokeMachineActivity.py
index a5f3894..4cbe6f6 100644
--- a/JokeMachineActivity.py
+++ b/JokeMachineActivity.py
@@ -19,12 +19,13 @@
#
# init gthreads before using abiword
-import gobject
-gobject.threads_init()
+import gi
+from gi.repository import GObject
+GObject.threads_init()
import os
import logging
-import gtk
+from gi.repository import Gtk
from gettext import gettext as _
import gettext
@@ -47,7 +48,7 @@ import telepathy
import telepathy.client
from dbus import Interface
from dbus.service import method, signal
-from dbus.gobject_service import ExportedGObject
+from dbus.GObject_service import ExportedGObject
from sugar.presence.tubeconn import TubeConnection # deprecated ?! Gone from build >542 ? Ke ?
from sugar.presence import presenceservice
@@ -87,13 +88,13 @@ class JokeMachineActivity(activity.Activity):
#locale.setlocale(locale.LC_ALL, 'af')
# customize theme
- gtkrc = os.path.join(Globals.pwd, 'resources/gtkrc')
- if os.path.exists(gtkrc):
- logging.debug("Loading resources from %s" % gtkrc)
- gtk.rc_add_default_file(gtkrc)
- settings = gtk.settings_get_default()
- #gtk.rc_reset_styles(settings)
- gtk.rc_reparse_all_for_settings(settings, True)
+ Gtkrc = os.path.join(Globals.pwd, 'resources/Gtkrc')
+ if os.path.exists(Gtkrc):
+ logging.debug("Loading resources from %s" % Gtkrc)
+ Gtk.rc_add_default_file(Gtkrc)
+ settings = Gtk.settings_get_default()
+ #Gtk.rc_reset_styles(settings)
+ Gtk.rc_reparse_all_for_settings(settings, True)
logging.debug("Loading resources DONE")
Globals.set_activity_instance(self)
@@ -106,7 +107,7 @@ class JokeMachineActivity(activity.Activity):
# main activity frame
self.__activity_frame = Frame()
- vbox = gtk.VBox()
+ vbox = Gtk.VBox()
vbox.pack_start(self.__activity_frame)
vbox.show()
self.set_canvas(vbox)