Gtk, GObject and import gi modifications

14 files changed, 127 insertions, 126 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)
diff --git a/gui/canvaslistbox.py b/gui/canvaslistbox.py
index e53f7a6..9eaa9a0 100644
--- a/gui/canvaslistbox.py
+++ b/gui/canvaslistbox.py
@@ -17,8 +17,8 @@
 # If you find this activity useful or end up using parts of it in one of your
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
-
-import gtk
+import gi
+from gi.repository import Gtk
 import hippo
 
 from sugar.graphics import style
@@ -38,20 +38,20 @@ class CanvasListBox(hippo.CanvasWidget):
     self._entries_div.props.padding=10
     self._entries_div.props.orientation=hippo.ORIENTATION_VERTICAL    
 
-    # Munge it all up into something we can stick into a gtk.ScrolledWindow
+    # Munge it all up into something we can stick into a Gtk.ScrolledWindow
     canvas = hippo.Canvas() 
     canvas.set_root(self._entries_div)
     canvas.show()
     
-    hbox = gtk.HBox()
-    hbox.set_flags(gtk.HAS_FOCUS | gtk.CAN_FOCUS)
+    hbox = Gtk.HBox()
+    hbox.set_flags(Gtk.HAS_FOCUS | Gtk.CAN_FOCUS)
     hbox.pack_start(canvas)
     hbox.show()
 
-    scroller = gtk.ScrolledWindow()
-    scroller.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
-    viewport = gtk.Viewport()
-    viewport.set_shadow_type(gtk.SHADOW_NONE) 
+    scroller = Gtk.ScrolledWindow()
+    scroller.set_policy(Gtk.POLICY_NEVER, Gtk.POLICY_AUTOMATIC)
+    viewport = Gtk.Viewport()
+    viewport.set_shadow_type(Gtk.SHADOW_NONE) 
     viewport.add(hbox)
     viewport.show()
     scroller.add(viewport)
diff --git a/gui/frame.py b/gui/frame.py
index 49a5a8e..365797a 100644
--- a/gui/frame.py
+++ b/gui/frame.py
@@ -17,9 +17,9 @@
 # If you find this activity useful or end up using parts of it in one of your
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
-
-import gobject
-import gtk
+import gi
+from gi.repository import GObject
+from gi.repository import Gtk
 import hippo
 import logging
 
@@ -87,7 +87,7 @@ class Frame(hippo.Canvas):
       orientation=hippo.ORIENTATION_HORIZONTAL)
     
     # logo
-    logo = gtk.Image()
+    logo = Gtk.Image()
     logo.set_from_file(Globals.logo)
     ret.append(hippo.CanvasWidget(widget=logo))
     
@@ -103,7 +103,7 @@ class Frame(hippo.Canvas):
                                       padding_right=30,
                                       yalign=hippo.ALIGNMENT_CENTER,
                                       orientation=hippo.ORIENTATION_VERTICAL)
-    button = gtk.Button(_('Lesson Plans'))
+    button = Gtk.Button(_('Lesson Plans'))
     button.set_size_request(200, -1)
     button.active = False
     button.connect('clicked', self.__do_clicked_lessonplans)
@@ -121,11 +121,11 @@ class Frame(hippo.Canvas):
       padding_bottom=0,
       spacing=8,
       orientation=hippo.ORIENTATION_HORIZONTAL)
-    button = gtk.Button(_('Read Jokebooks'))
+    button = Gtk.Button(_('Read Jokebooks'))
     button.connect('clicked', self.__do_clicked_read)
     self.__button_read = hippo.CanvasWidget(widget=theme.theme_widget(button))
     ret.append(self.__button_read)
-    button = gtk.Button(_('Make Jokebook'))
+    button = Gtk.Button(_('Make Jokebook'))
     button.connect('clicked', self.__do_clicked_make)
     self.__button_make = hippo.CanvasWidget(widget=theme.theme_widget(button))
     ret.append(self.__button_make)
diff --git a/gui/lessonplanwidget.py b/gui/lessonplanwidget.py
index 98c90ce..2b97a18 100644
--- a/gui/lessonplanwidget.py
+++ b/gui/lessonplanwidget.py
@@ -17,17 +17,17 @@
 # If you find this activity useful or end up using parts of it in one of your
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
-
+import gi
 import os
 import locale
-import gtk
+from gi.repository import Gtk
 import logging
 from gettext import gettext as _
 
 from abiword import Canvas as AbiCanvas
 
 
-class LessonPlanWidget(gtk.Notebook):
+class LessonPlanWidget(Gtk.Notebook):
   
   def __init__ (self, basepath):
     """Create a Notebook widget for displaying lesson plans in tabs.
@@ -68,6 +68,6 @@ class LessonPlanWidget(gtk.Notebook):
     canvas.view_online_layout()
     canvas.zoom_width()
     canvas.set_show_margin(False)
-    self.append_page(canvas, gtk.Label(name))
+    self.append_page(canvas, Gtk.Label(name))
     
     
diff --git a/gui/page.py b/gui/page.py
index 1d8d859..bc148df 100644
--- a/gui/page.py
+++ b/gui/page.py
@@ -17,9 +17,9 @@
 # If you find this activity useful or end up using parts of it in one of your
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
-
+import gi
 import os
-import gtk
+from gi.repository import Gtk
 import cairo # for getting png for CanvasImage
 import pango
 import hippo
@@ -51,7 +51,7 @@ from gui import theme
 from globals import Globals
 
 
-THUMB_SIZE = min(gtk.gdk.screen_width(), gtk.gdk.screen_height()) / 2
+THUMB_SIZE = min(Gtk.gdk.screen_width(), Gtk.gdk.screen_height()) / 2
 
 
 class Page(hippo.CanvasBox):
@@ -223,12 +223,12 @@ class Page(hippo.CanvasBox):
   # TODO: Implement editable and multiline
   # TODO: Lose multiline and change height variable to num_lines
   def __textview(self, text, width=300, height=-1, editable=True, multiline=False):
-    textview = gtk.TextView()
+    textview = Gtk.TextView()
     textview.get_buffer().set_text(text)
 
     # control props
-    textview.set_wrap_mode(gtk.WRAP_WORD)
-    textview.modify_base(gtk.STATE_NORMAL, theme.COLOR_TEXTBOX.get_gdk_color())
+    textview.set_wrap_mode(Gtk.WRAP_WORD)
+    textview.modify_base(Gtk.STATE_NORMAL, theme.COLOR_TEXTBOX.get_gdk_color())
     textview.set_editable(editable)
     textview.set_cursor_visible(editable)
     if height == -1:
@@ -238,10 +238,10 @@ class Page(hippo.CanvasBox):
       (w, h) = layout.get_pixel_size()
       height = h #+ theme.BORDER_WIDTH_CONTROL / 2 # fudge factor - on the XO-1 hardware all known solutions evaporate
     textview.set_size_request(width, height)
-    textview.set_border_window_size(gtk.TEXT_WINDOW_LEFT, 0)
-    textview.set_border_window_size(gtk.TEXT_WINDOW_RIGHT, 0)
-    textview.set_border_window_size(gtk.TEXT_WINDOW_TOP, 0)
-    textview.set_border_window_size(gtk.TEXT_WINDOW_BOTTOM, 0)
+    textview.set_border_window_size(Gtk.TEXT_WINDOW_LEFT, 0)
+    textview.set_border_window_size(Gtk.TEXT_WINDOW_RIGHT, 0)
+    textview.set_border_window_size(Gtk.TEXT_WINDOW_TOP, 0)
+    textview.set_border_window_size(Gtk.TEXT_WINDOW_BOTTOM, 0)
     textview.show()
     
     if editable: # because rounded corners are well... pretty
@@ -301,11 +301,11 @@ class Page(hippo.CanvasBox):
     # Courtesy of Write.activity - toolbar.py
     chooser = ObjectChooser(title=_('Choose image'), 
                             parent=Globals.JokeMachineActivity, #._parent,
-                            flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                            flags=Gtk.DIALOG_MODAL | Gtk.DIALOG_DESTROY_WITH_PARENT,
                             **filter)
     try:
       result = chooser.run()
-      if result == gtk.RESPONSE_ACCEPT:
+      if result == Gtk.RESPONSE_ACCEPT:
         logging.debug('ObjectChooser: %r' % chooser.get_selected_object())
         journal_object = chooser.get_selected_object()
         if hasattr(obj, 'image_blob') and journal_object and journal_object.file_path:
@@ -333,11 +333,11 @@ class Page(hippo.CanvasBox):
     logging.debug('choosing sound file') 
     chooser = ObjectChooser(title=_('Choose Sound'), 
                             parent=Globals.JokeMachineActivity, #._parent,
-                            flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                            flags=Gtk.DIALOG_MODAL | Gtk.DIALOG_DESTROY_WITH_PARENT,
                             **filter)
     try:
       result = chooser.run()
-      if result == gtk.RESPONSE_ACCEPT:
+      if result == Gtk.RESPONSE_ACCEPT:
         logging.debug('ObjectChooser: %r' % chooser.get_selected_object())
         journal_object = chooser.get_selected_object()
         if hasattr(obj, 'sound_blob') and journal_object and journal_object.file_path:
@@ -367,7 +367,7 @@ class Page(hippo.CanvasBox):
     player.play()
 
 def _load_image(file_name):
-    pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(file_name,
+    pixbuf = Gtk.gdk.pixbuf_new_from_file_at_size(file_name,
             THUMB_SIZE, THUMB_SIZE)
     if pixbuf is None:
         return None
diff --git a/gui/theme.py b/gui/theme.py
index 20537aa..4eefa4b 100644
--- a/gui/theme.py
+++ b/gui/theme.py
@@ -17,8 +17,8 @@
 # If you find this activity useful or end up using parts of it in one of your
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
-
-import gtk
+import gi
+from gi.repository import Gtk
 
 from sugar.graphics import style
 
@@ -47,32 +47,32 @@ COLOR_TEXT_FIELD_GREY = style.Color('#E5E5E5')
 
 
 COLOR_FG_BUTTONS = (
-  (gtk.STATE_NORMAL,      style.Color('#CCFF99')),
-  (gtk.STATE_ACTIVE,      style.Color('#CCFF99')),
-  (gtk.STATE_PRELIGHT,    style.Color('#CCFF99')),
-  (gtk.STATE_SELECTED,    style.Color('#CCFF99')),
-  (gtk.STATE_INSENSITIVE, style.Color('#CCFF99')),
+  (Gtk.STATE_NORMAL,      style.Color('#CCFF99')),
+  (Gtk.STATE_ACTIVE,      style.Color('#CCFF99')),
+  (Gtk.STATE_PRELIGHT,    style.Color('#CCFF99')),
+  (Gtk.STATE_SELECTED,    style.Color('#CCFF99')),
+  (Gtk.STATE_INSENSITIVE, style.Color('#CCFF99')),
 )
 COLOR_BG_BUTTONS = (
-  (gtk.STATE_NORMAL,      style.Color('#027F01')),
-  (gtk.STATE_ACTIVE,      style.Color('#014D01')),
-  (gtk.STATE_PRELIGHT,    style.Color('#016D01')),
-  (gtk.STATE_SELECTED,    style.Color('#027F01')),
-  (gtk.STATE_INSENSITIVE, style.Color('#027F01')),
+  (Gtk.STATE_NORMAL,      style.Color('#027F01')),
+  (Gtk.STATE_ACTIVE,      style.Color('#014D01')),
+  (Gtk.STATE_PRELIGHT,    style.Color('#016D01')),
+  (Gtk.STATE_SELECTED,    style.Color('#027F01')),
+  (Gtk.STATE_INSENSITIVE, style.Color('#027F01')),
 )
 COLOR_BG_RADIOBUTTONS = (
-  (gtk.STATE_NORMAL,      COLOR_LIGHT_GRAY),
-  (gtk.STATE_ACTIVE,      COLOR_LIGHT_GRAY),
-  (gtk.STATE_PRELIGHT,    COLOR_LIGHT_GRAY),
-  (gtk.STATE_SELECTED,    COLOR_LIGHT_GRAY),
-  (gtk.STATE_INSENSITIVE, COLOR_LIGHT_GRAY),
+  (Gtk.STATE_NORMAL,      COLOR_LIGHT_GRAY),
+  (Gtk.STATE_ACTIVE,      COLOR_LIGHT_GRAY),
+  (Gtk.STATE_PRELIGHT,    COLOR_LIGHT_GRAY),
+  (Gtk.STATE_SELECTED,    COLOR_LIGHT_GRAY),
+  (Gtk.STATE_INSENSITIVE, COLOR_LIGHT_GRAY),
 )
 COLOR_FG_RADIOBUTTONS = (
-  (gtk.STATE_NORMAL,      COLOR_DARK_GREEN),
-  (gtk.STATE_ACTIVE,      COLOR_DARK_GREEN),
-  (gtk.STATE_PRELIGHT,    COLOR_DARK_GREEN),
-  (gtk.STATE_SELECTED,    COLOR_DARK_GREEN),
-  (gtk.STATE_INSENSITIVE, COLOR_DARK_GREEN),
+  (Gtk.STATE_NORMAL,      COLOR_DARK_GREEN),
+  (Gtk.STATE_ACTIVE,      COLOR_DARK_GREEN),
+  (Gtk.STATE_PRELIGHT,    COLOR_DARK_GREEN),
+  (Gtk.STATE_SELECTED,    COLOR_DARK_GREEN),
+  (Gtk.STATE_INSENSITIVE, COLOR_DARK_GREEN),
 )
 
 
@@ -115,9 +115,9 @@ AUDIO_CHOOSE = 'resources/audio.png'
 
 # helpers ######################################################################
 
-# TODO - deprecate in favor of gtkrc
+# TODO - deprecate in favor of Gtkrc
 def theme_widget(widget, width=-1, height=-1, highlight=False):
-  """Apply colors to gtk Widgets
+  """Apply colors to Gtk Widgets
 
   widget         is the widget
   width, height  are optional width and height for resizing the widget
@@ -135,7 +135,7 @@ def theme_widget(widget, width=-1, height=-1, highlight=False):
 
   #for state, color in COLOR_BG_BUTTONS:
     #if highlight:
-      #widget.modify_bg(state, gtk.gdk.color_parse("#CCFF99"))
+      #widget.modify_bg(state, Gtk.gdk.color_parse("#CCFF99"))
     #else:
       #widget.modify_bg(state, color.get_gdk_color())
 
diff --git a/mesh/activitysession.py b/mesh/activitysession.py
index c3d0188..e1eb100 100644
--- a/mesh/activitysession.py
+++ b/mesh/activitysession.py
@@ -23,7 +23,7 @@ import logging
 
 
 from dbus.service import method, signal
-from dbus.gobject_service import ExportedGObject
+from dbus.GObject_service import ExportedGObject
 
 
 from globals import Globals
diff --git a/pages/choose.py b/pages/choose.py
index 33a637f..96120c5 100644
--- a/pages/choose.py
+++ b/pages/choose.py
@@ -17,9 +17,9 @@
 # If you find this activity useful or end up using parts of it in one of your
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
-
+import gi
 import os
-import gtk
+from gi.repository import Gtk
 import hippo
 import pango
 import logging
@@ -68,16 +68,16 @@ class Choose(Page):
     if jokebook.title is not None:
       message += '\'' + jokebook.title + '\' ' 
     message += _('jokebook ?')
-    confirm = gtk.MessageDialog(Globals.JokeMachineActivity, 
-                                gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-                                gtk.MESSAGE_QUESTION,
-                                gtk.BUTTONS_YES_NO,
+    confirm = Gtk.MessageDialog(Globals.JokeMachineActivity, 
+                                Gtk.DIALOG_MODAL | Gtk.DIALOG_DESTROY_WITH_PARENT,
+                                Gtk.MESSAGE_QUESTION,
+                                Gtk.BUTTONS_YES_NO,
                                 message)
     response = confirm.run()
     confirm.hide()
     confirm.destroy()
     del confirm
-    if response == gtk.RESPONSE_YES:
+    if response == Gtk.RESPONSE_YES:
       logging.debug('Deleting jokebook: %s' % jokebook.title)
       Globals.JokeMachineState.jokebooks.remove(jokebook)
       Globals.JokeMachineActivity.set_page(pages.choose.Choose)
@@ -104,11 +104,11 @@ class Choose(Page):
     
     # buttons
     if edit:
-      button = gtk.Button(_('Edit'))
+      button = Gtk.Button(_('Edit'))
       button.connect('clicked', self.__do_clicked_edit, jokebook)
       list_row.append(self.__make_column_div(100, hippo.CanvasWidget(widget=theme.theme_widget(button))))
       list_row.append(hippo.CanvasBox(box_width=theme.SPACER_HORIZONTAL)) # TODO spacer
-      button = gtk.Button(_('Delete'))
+      button = Gtk.Button(_('Delete'))
       button.connect('clicked', self.__do_clicked_delete, jokebook)
       list_row.append(self.__make_column_div(100, hippo.CanvasWidget(widget=theme.theme_widget(button))))
       list_row.append(hippo.CanvasBox(box_width=theme.SPACER_HORIZONTAL)) # TODO spacer    
diff --git a/pages/cover.py b/pages/cover.py
index 77a205e..f74e7f9 100644
--- a/pages/cover.py
+++ b/pages/cover.py
@@ -17,9 +17,9 @@
 # If you find this activity useful or end up using parts of it in one of your
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
-
+import gi
 import os
-import gtk
+from gi.repository import Gtk
 import hippo
 import pango
 import logging
@@ -50,7 +50,7 @@ class Cover(Page):
     self.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL))
     
     # open button 
-    button = gtk.Button(_('Open'))
+    button = Gtk.Button(_('Open'))
     button.connect('clicked', self.__do_clicked_open, jokebook)
     button.set_size_request(50, -1)
     self.append(hippo.CanvasWidget(widget=theme.theme_widget(button),
diff --git a/pages/edit.py b/pages/edit.py
index e269392..24bd781 100644
--- a/pages/edit.py
+++ b/pages/edit.py
@@ -18,9 +18,9 @@
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
 
-
+import gi
 import os
-import gtk
+from gi.repository import Gtk
 import hippo
 import pango
 import logging
@@ -116,7 +116,7 @@ class Edit(Page):
     self.append(self.__page_selector, hippo.PACK_EXPAND)
     self.__page_selector.page = EditInfo(jokebook, self)
     
-    button = gtk.Button(_('Preview'))
+    button = Gtk.Button(_('Preview'))
     button.connect('clicked', self.__do_clicked_preview, jokebook)    
     self.append(hippo.CanvasWidget(widget=theme.theme_widget(button), padding_top=theme.SPACER_VERTICAL))
 
@@ -170,7 +170,7 @@ class EditJokes(Page):
     jokes_div = CanvasListBox()
     jokes_div.props.border=0
     for joke in jokebook.jokes:
-      button = gtk.Button(' ' + _('Delete') + ' ')
+      button = Gtk.Button(' ' + _('Delete') + ' ')
       button.connect('clicked', self.__do_clicked_delete, jokebook, joke)
       list_row = self.make_listrow(JokeEditor(joke), hippo.PACK_EXPAND)
       list_row.append(hippo.CanvasWidget(widget=theme.theme_widget(button),
@@ -182,23 +182,23 @@ class EditJokes(Page):
     # new joke button
     buttons = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL,
                               xalign=hippo.ALIGNMENT_START)
-    button = gtk.Button(_('Add New Joke'))
+    button = Gtk.Button(_('Add New Joke'))
     button.connect('clicked', self.do_clicked_add_joke, jokebook)    
     buttons.append(hippo.CanvasWidget(widget=theme.theme_widget(button)))    
     jokes_div.append(buttons)
     
     
   def __do_clicked_delete(self, button, jokebook, joke):
-    confirm = gtk.MessageDialog(Globals.JokeMachineActivity, 
-                                gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-                                gtk.MESSAGE_QUESTION,
-                                gtk.BUTTONS_YES_NO,
+    confirm = Gtk.MessageDialog(Globals.JokeMachineActivity, 
+                                Gtk.DIALOG_MODAL | Gtk.DIALOG_DESTROY_WITH_PARENT,
+                                Gtk.MESSAGE_QUESTION,
+                                Gtk.BUTTONS_YES_NO,
                                 _('Are you sure you want to delete this joke ?'))
     response = confirm.run()
     confirm.hide()
     confirm.destroy()
     del confirm
-    if response == gtk.RESPONSE_YES:
+    if response == Gtk.RESPONSE_YES:
       logging.debug('Deleting joke: %s' % joke.id)
       jokebook.jokes.remove(joke)
       self.__parent.do_tab_clicked(EditJokes)
@@ -234,14 +234,14 @@ class EditReview(Page):
                                 spacing=10,
                                 padding=10)
       
-      button = gtk.Button(' ' + _('Reject') + ' ')
+      button = Gtk.Button(' ' + _('Reject') + ' ')
       button.connect('clicked', self.__do_clicked_reject, jokebook, joke)
       buttons.append(hippo.CanvasWidget(widget=theme.theme_widget(button),
                                         border_color=theme.COLOR_RED.get_int(),
                                         border=0,
                                         xalign=hippo.ALIGNMENT_CENTER))
 
-      button = gtk.Button(' ' + _('Accept') + ' ')
+      button = Gtk.Button(' ' + _('Accept') + ' ')
       button.connect('clicked', self.__do_clicked_accept, jokebook, joke)
       buttons.append(hippo.CanvasWidget(widget=theme.theme_widget(button),
                                         border_color=theme.COLOR_RED.get_int(),
@@ -259,14 +259,14 @@ class EditReview(Page):
                                   #box_width=100,
                                   #xalign=hippo.ALIGNMENT_START))
       ##button = None
-      #button = gtk.RadioButton()
-      #button = gtk.RadioButton(button, _('Approved'))
+      #button = Gtk.RadioButton()
+      #button = Gtk.RadioButton(button, _('Approved'))
       #button.set_size_request(200, -1)
       #status_box.append(hippo.CanvasWidget(widget = button))
-      #button = gtk.RadioButton(button, _('Rejected'))
+      #button = Gtk.RadioButton(button, _('Rejected'))
       #button.set_size_request(200, -1)
       #status_box.append(hippo.CanvasWidget(widget = button))
-      #button = gtk.RadioButton(button, _('Not Reviewed'))
+      #button = Gtk.RadioButton(button, _('Not Reviewed'))
       #button.set_size_request(200, -1)
       #button.set_active(True)
       #status_box.append(hippo.CanvasWidget(widget = button))
diff --git a/pages/joke.py b/pages/joke.py
index 9eb804e..269148e 100644
--- a/pages/joke.py
+++ b/pages/joke.py
@@ -18,9 +18,9 @@
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
 
-
+import gi
 import os
-import gtk
+from gi.repository import Gtk
 import hippo
 import pango
 from gettext import gettext as _
@@ -97,12 +97,12 @@ class Joke(Page):
     if len(jokebook.jokes) <= joke_id:
       self.append(self.make_bodytext(_('This Jokebook is empty')))
       if not Globals.JokeMachineActivity.is_initiator:
-        button = gtk.Button(_('Submit a Joke'))
+        button = Gtk.Button(_('Submit a Joke'))
         button.connect('clicked', self.__do_clicked_submit, jokebook, joke_id)        
         self.append(hippo.CanvasWidget(widget=theme.theme_widget(button), 
                                        padding_top=20))
       else:
-        button = gtk.Button(_('Add Jokes'))
+        button = Gtk.Button(_('Add Jokes'))
         button.connect('clicked', self.__do_clicked_add, jokebook, joke_id)        
         self.append(hippo.CanvasWidget(widget=theme.theme_widget(button), 
                                        padding_top=20))
@@ -121,7 +121,7 @@ class Joke(Page):
       orientation=hippo.ORIENTATION_HORIZONTAL)
 
     # the answer button
-    button = gtk.Button(_('Answer'))
+    button = Gtk.Button(_('Answer'))
     button.connect('clicked', self.__do_clicked_answer, jokebook, joke_id)        
     self.navigation_box.append(hippo.CanvasWidget(widget=theme.theme_widget(button), padding_top=20))
     self.joke_box.right.append(self.navigation_box)
@@ -151,13 +151,13 @@ class Joke(Page):
     
     # check if there are any more jokes left
     if len(jokebook.jokes) > joke_id + 1:
-      button = gtk.Button(_('Next'))
+      button = Gtk.Button(_('Next'))
       button.connect('clicked', self.__do_clicked_next, jokebook, joke_id + 1)        
       self.navigation_box.append(hippo.CanvasWidget(widget=theme.theme_widget(button), padding_right=10, padding_top=20))
     
     # only allow submitting a joke if activity is shared and you are the one joining
     if not Globals.JokeMachineActivity.is_initiator:
-      button = gtk.Button(_('Submit a Joke'))
+      button = Gtk.Button(_('Submit a Joke'))
       button.connect('clicked', self.__do_clicked_submit, jokebook, joke_id)        
       self.navigation_box.append(hippo.CanvasWidget(widget=theme.theme_widget(button), 
                                                     padding_top=20))
diff --git a/pages/preview.py b/pages/preview.py
index e0b07a3..e3e8508 100644
--- a/pages/preview.py
+++ b/pages/preview.py
@@ -18,9 +18,9 @@
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
 
-
+import gi
 import os
-import gtk
+from gi.repository import Gtk
 import hippo
 import pango
 import logging
@@ -64,7 +64,7 @@ class Preview(Page):
     
     self.append(hippo.CanvasBox(box_height=theme.SPACER_VERTICAL))
     
-    button = gtk.Button(_('Edit'))
+    button = Gtk.Button(_('Edit'))
     button.connect('clicked', self.__do_clicked_edit, jokebook)    
     self.append(hippo.CanvasWidget(widget=theme.theme_widget(button)))
 
diff --git a/pages/submit.py b/pages/submit.py
index aed4dbe..dfe7bd6 100644
--- a/pages/submit.py
+++ b/pages/submit.py
@@ -18,9 +18,9 @@
 # own creations we would love to hear from you at info@WorldWideWorkshop.org !
 #
 
-
+import gi
 import os
-import gtk
+from gi.repository import Gtk
 import hippo
 import pango
 import logging
@@ -102,10 +102,10 @@ class Submit(Page):
       padding_top=8,
       spacing=18,
       orientation=hippo.ORIENTATION_HORIZONTAL)
-    button = gtk.Button(_('Submit'))
+    button = Gtk.Button(_('Submit'))
     button.connect('clicked', self.__do_clicked_submit, jokebook, joke)    
     nav.append(hippo.CanvasWidget(widget=theme.theme_widget(button), padding_right=10, padding_top=20))
-    button = gtk.Button(_('Back'))
+    button = Gtk.Button(_('Back'))
     button.connect('clicked', self.__do_clicked_back, jokebook, last_joke)    
     nav.append(hippo.CanvasWidget(widget=theme.theme_widget(button), padding_top=20))
     jokebox.right.append(nav)
diff --git a/util/audioplayer.py b/util/audioplayer.py
index ce635cc..5b982ce 100644
--- a/util/audioplayer.py
+++ b/util/audioplayer.py
@@ -19,7 +19,7 @@
 #
 
 import os
-import gst
+import Gst
 import logging
 
 from globals import Globals
@@ -75,31 +75,31 @@ class AudioPlayer(object):
 
   def play(self):
     logging.debug('AudioPlayer - started playing sound')
-    self.pipeline.set_state(gst.STATE_PLAYING)
+    self.pipeline.set_state(Gst.STATE_PLAYING)
     logging.debug('AudioPlayer - finished playing sound')
 
 
 
   def __build_pipeline(self):
     # pipeline
-    pipeline = gst.Pipeline('pipeline')
+    pipeline = Gst.Pipeline('pipeline')
 
     # add source
-    source = gst.element_factory_make('filesrc', 'source')
+    source = Gst.element_factory_make('filesrc', 'source')
     pipeline.add(source)
 
     # add decoder
-    decoder = gst.element_factory_make('decodebin', 'decoder')
+    decoder = Gst.element_factory_make('decodebin', 'decoder')
     decoder.connect("new-decoded-pad", self.__new_decoded_pad) #, converter)
     pipeline.add(decoder)
     source.link(decoder)
 
     # add converter
-    converter = gst.element_factory_make("audioconvert", "converter")
+    converter = Gst.element_factory_make("audioconvert", "converter")
     pipeline.add(converter)
 
     # add output
-    sink = gst.element_factory_make('autoaudiosink', 'sink')
+    sink = Gst.element_factory_make('autoaudiosink', 'sink')
     pipeline.add(sink)
     converter.link(sink)
 
@@ -121,11 +121,11 @@ class AudioPlayer(object):
   def __on_audio_message(self, bus, message):
     t = message.type
     #logging.debug('message: %r' % t)
-    if t == gst.MESSAGE_EOS:
-      self.pipeline.set_state(gst.STATE_NULL)
+    if t == Gst.MESSAGE_EOS:
+      self.pipeline.set_state(Gst.STATE_NULL)
       logging.debug('AudioPlayer - EOS')
-    elif t == gst.MESSAGE_ERROR:
-      self.pipeline.set_state(gst.STATE_NULL)
+    elif t == Gst.MESSAGE_ERROR:
+      self.pipeline.set_state(Gst.STATE_NULL)
       err, debug = message.parse_error()
       logging.debug('AudioPlayer - Error: %r %r', err, debug)