Run pygi-convert.sh for automatic conversion from GTK+ 2 to GTK+ 3

Run pygi-convert.sh for automatic conversion from GTK+ 2 to GTK+ 3 and
pygobject+gobject-introspection. This is only on a best-effort basis;
the code will be in a broken state after this patch and need to be
fixed manually.

The purpose of committing the intermediate, non-working output is to make it
reproducible. It's impractical to manually review the changes.

The exact version used was 2d8f48f4ff56bb75985136452b50b75895258608 from the
main pygobject repository [1].

[1] git://git.gnome.org/pygobject

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel Quiñones <manuq@laptop.org>

1 files changed, 51 insertions, 51 deletions

diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 7bf0960..83d0d9c 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -19,10 +19,10 @@ import os
 import logging
 from gettext import gettext as _
 
-import gobject
-import pango
-import gconf
-import gtk
+from gi.repository import GObject
+from gi.repository import Pango
+from gi.repository import GConf
+from gi.repository import Gtk
 
 from sugar import util
 from sugar.graphics import style
@@ -36,23 +36,23 @@ from jarabe.view.palettes import ActivityPalette
 from jarabe.journal import misc
 
 
-class ActivitiesTreeView(gtk.TreeView):
+class ActivitiesTreeView(Gtk.TreeView):
     __gtype_name__ = 'SugarActivitiesTreeView'
 
     __gsignals__ = {
-        'erase-activated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+        'erase-activated': (GObject.SignalFlags.RUN_FIRST, None,
                             ([str])),
     }
 
     def __init__(self):
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
 
         self._query = ''
 
-        self.modify_base(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color())
+        self.modify_base(Gtk.StateType.NORMAL, style.COLOR_WHITE.get_gdk_color())
         self.set_headers_visible(False)
         selection = self.get_selection()
-        selection.set_mode(gtk.SELECTION_NONE)
+        selection.set_mode(Gtk.SelectionMode.NONE)
 
         model = ListModel()
         model.set_visible_func(self.__model_visible_cb)
@@ -61,8 +61,8 @@ class ActivitiesTreeView(gtk.TreeView):
         cell_favorite = CellRendererFavorite(self)
         cell_favorite.connect('clicked', self.__favorite_clicked_cb)
 
-        column = gtk.TreeViewColumn()
-        column.pack_start(cell_favorite)
+        column = Gtk.TreeViewColumn()
+        column.pack_start(cell_favorite, True)
         column.set_cell_data_func(cell_favorite, self.__favorite_set_data_cb)
         self.append_column(column)
 
@@ -70,48 +70,48 @@ class ActivitiesTreeView(gtk.TreeView):
         cell_icon.connect('erase-activated', self.__erase_activated_cb)
         cell_icon.connect('clicked', self.__icon_clicked_cb)
 
-        column = gtk.TreeViewColumn()
-        column.pack_start(cell_icon)
+        column = Gtk.TreeViewColumn()
+        column.pack_start(cell_icon, True)
         column.add_attribute(cell_icon, 'file-name', ListModel.COLUMN_ICON)
         self.append_column(column)
 
-        cell_text = gtk.CellRendererText()
-        cell_text.props.ellipsize = pango.ELLIPSIZE_MIDDLE
+        cell_text = Gtk.CellRendererText()
+        cell_text.props.ellipsize = Pango.EllipsizeMode.MIDDLE
         cell_text.props.ellipsize_set = True
 
-        column = gtk.TreeViewColumn()
-        column.props.sizing = gtk.TREE_VIEW_COLUMN_GROW_ONLY
+        column = Gtk.TreeViewColumn()
+        column.props.sizing = Gtk.TreeViewColumnSizing.GROW_ONLY
         column.props.expand = True
         column.set_sort_column_id(ListModel.COLUMN_TITLE)
-        column.pack_start(cell_text)
+        column.pack_start(cell_text, True)
         column.add_attribute(cell_text, 'markup', ListModel.COLUMN_TITLE)
         self.append_column(column)
 
-        cell_text = gtk.CellRendererText()
+        cell_text = Gtk.CellRendererText()
         cell_text.props.xalign = 1
 
-        column = gtk.TreeViewColumn()
+        column = Gtk.TreeViewColumn()
         column.set_alignment(1)
-        column.props.sizing = gtk.TREE_VIEW_COLUMN_GROW_ONLY
+        column.props.sizing = Gtk.TreeViewColumnSizing.GROW_ONLY
         column.props.resizable = True
         column.props.reorderable = True
         column.props.expand = True
         column.set_sort_column_id(ListModel.COLUMN_VERSION)
-        column.pack_start(cell_text)
+        column.pack_start(cell_text, True)
         column.add_attribute(cell_text, 'text', ListModel.COLUMN_VERSION_TEXT)
         self.append_column(column)
 
-        cell_text = gtk.CellRendererText()
+        cell_text = Gtk.CellRendererText()
         cell_text.props.xalign = 1
 
-        column = gtk.TreeViewColumn()
+        column = Gtk.TreeViewColumn()
         column.set_alignment(1)
-        column.props.sizing = gtk.TREE_VIEW_COLUMN_GROW_ONLY
+        column.props.sizing = Gtk.TreeViewColumnSizing.GROW_ONLY
         column.props.resizable = True
         column.props.reorderable = True
         column.props.expand = True
         column.set_sort_column_id(ListModel.COLUMN_DATE)
-        column.pack_start(cell_text)
+        column.pack_start(cell_text, True)
         column.add_attribute(cell_text, 'text', ListModel.COLUMN_DATE_TEXT)
         self.append_column(column)
 
@@ -124,7 +124,7 @@ class ActivitiesTreeView(gtk.TreeView):
     def __favorite_set_data_cb(self, column, cell, model, tree_iter):
         favorite = model[tree_iter][ListModel.COLUMN_FAVORITE]
         if favorite:
-            client = gconf.client_get_default()
+            client = GConf.Client.get_default()
             color = XoColor(client.get_string('/desktop/sugar/user/color'))
             cell.props.xo_color = color
         else:
@@ -154,7 +154,7 @@ class ActivitiesTreeView(gtk.TreeView):
         return title is not None and title.lower().find(self._query) > -1
 
 
-class ListModel(gtk.TreeModelSort):
+class ListModel(Gtk.TreeModelSort):
     __gtype_name__ = 'SugarListModel'
 
     COLUMN_BUNDLE_ID = 0
@@ -167,11 +167,11 @@ class ListModel(gtk.TreeModelSort):
     COLUMN_DATE_TEXT = 7
 
     def __init__(self):
-        self._model = gtk.ListStore(str, bool, str, str, str, str, int, str)
+        self._model = Gtk.ListStore(str, bool, str, str, str, str, int, str)
         self._model_filter = self._model.filter_new()
-        gtk.TreeModelSort.__init__(self, self._model_filter)
+        GObject.GObject.__init__(self, self._model_filter)
 
-        gobject.idle_add(self.__connect_to_bundle_registry_cb)
+        GObject.idle_add(self.__connect_to_bundle_registry_cb)
 
     def __connect_to_bundle_registry_cb(self):
         registry = bundleregistry.get_registry()
@@ -233,7 +233,7 @@ class ListModel(gtk.TreeModelSort):
                             util.timestamp_to_elapsed_string(timestamp)])
 
     def set_visible_func(self, func):
-        self._model_filter.set_visible_func(func)
+        return;self._model_filter.set_visible_func(func)
 
     def refilter(self):
         self._model_filter.refilter()
@@ -249,8 +249,8 @@ class CellRendererFavorite(CellRendererIcon):
         self.props.height = style.GRID_CELL_SIZE
         self.props.size = style.SMALL_ICON_SIZE
         self.props.icon_name = 'emblem-favorite'
-        self.props.mode = gtk.CELL_RENDERER_MODE_ACTIVATABLE
-        client = gconf.client_get_default()
+        self.props.mode = Gtk.CellRendererMode.ACTIVATABLE
+        client = GConf.Client.get_default()
         prelit_color = XoColor(client.get_string('/desktop/sugar/user/color'))
         self.props.prelit_stroke_color = prelit_color.get_stroke_color()
         self.props.prelit_fill_color = prelit_color.get_fill_color()
@@ -260,7 +260,7 @@ class CellRendererActivityIcon(CellRendererIcon):
     __gtype_name__ = 'SugarCellRendererActivityIcon'
 
     __gsignals__ = {
-        'erase-activated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+        'erase-activated': (GObject.SignalFlags.RUN_FIRST, None,
                             ([str])),
     }
 
@@ -272,9 +272,9 @@ class CellRendererActivityIcon(CellRendererIcon):
         self.props.size = style.STANDARD_ICON_SIZE
         self.props.stroke_color = style.COLOR_BUTTON_GREY.get_svg()
         self.props.fill_color = style.COLOR_TRANSPARENT.get_svg()
-        self.props.mode = gtk.CELL_RENDERER_MODE_ACTIVATABLE
+        self.props.mode = Gtk.CellRendererMode.ACTIVATABLE
 
-        client = gconf.client_get_default()
+        client = GConf.Client.get_default()
         prelit_color = XoColor(client.get_string('/desktop/sugar/user/color'))
         self.props.prelit_stroke_color = prelit_color.get_stroke_color()
         self.props.prelit_fill_color = prelit_color.get_fill_color()
@@ -295,19 +295,19 @@ class CellRendererActivityIcon(CellRendererIcon):
         self.emit('erase-activated', bundle_id)
 
 
-class ActivitiesList(gtk.VBox):
+class ActivitiesList(Gtk.VBox):
     __gtype_name__ = 'SugarActivitiesList'
 
     def __init__(self):
         logging.debug('STARTUP: Loading the activities list')
 
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
 
-        scrolled_window = gtk.ScrolledWindow()
-        scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
-        scrolled_window.set_shadow_type(gtk.SHADOW_NONE)
+        scrolled_window = Gtk.ScrolledWindow()
+        scrolled_window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        scrolled_window.set_shadow_type(Gtk.ShadowType.NONE)
         scrolled_window.connect('key-press-event', self.__key_press_event_cb)
-        self.pack_start(scrolled_window)
+        self.pack_start(scrolled_window, True, True, 0)
         scrolled_window.show()
 
         self._tree_view = ActivitiesTreeView()
@@ -321,7 +321,7 @@ class ActivitiesList(gtk.VBox):
         self._tree_view.set_filter(query)
 
     def __key_press_event_cb(self, scrolled_window, event):
-        keyname = gtk.gdk.keyval_name(event.keyval)
+        keyname = Gdk.keyval_name(event.keyval)
 
         vadjustment = scrolled_window.props.vadjustment
         if keyname == 'Up':
@@ -360,10 +360,10 @@ class ActivitiesList(gtk.VBox):
                 % activity_info.get_name()
 
         cancel_icon = Icon(icon_name='dialog-cancel')
-        alert.add_button(gtk.RESPONSE_CANCEL, _('Keep'), cancel_icon)
+        alert.add_button(Gtk.ResponseType.CANCEL, _('Keep'), cancel_icon)
 
         erase_icon = Icon(icon_name='dialog-ok')
-        alert.add_button(gtk.RESPONSE_OK, _('Erase'), erase_icon)
+        alert.add_button(Gtk.ResponseType.OK, _('Erase'), erase_icon)
 
         alert.connect('response', self.__erase_confirmation_dialog_response_cb,
                 bundle_id)
@@ -373,7 +373,7 @@ class ActivitiesList(gtk.VBox):
     def __erase_confirmation_dialog_response_cb(self, alert, response_id,
                                                 bundle_id):
         self.remove_alert()
-        if response_id == gtk.RESPONSE_OK:
+        if response_id == Gtk.ResponseType.OK:
             registry = bundleregistry.get_registry()
             bundle = registry.get_bundle(bundle_id)
             registry.uninstall(bundle, delete_profile=True)
@@ -383,7 +383,7 @@ class ActivityListPalette(ActivityPalette):
     __gtype_name__ = 'SugarActivityListPalette'
 
     __gsignals__ = {
-        'erase-activated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+        'erase-activated': (GObject.SignalFlags.RUN_FIRST, None,
                             ([str])),
     }
 
@@ -399,7 +399,7 @@ class ActivityListPalette(ActivityPalette):
 
         self._favorite_item = MenuItem('')
         self._favorite_icon = Icon(icon_name='emblem-favorite',
-                icon_size=gtk.ICON_SIZE_MENU)
+                icon_size=Gtk.IconSize.MENU)
         self._favorite_item.set_image(self._favorite_icon)
         self._favorite_item.connect('activate',
                                     self.__change_favorite_activate_cb)
@@ -431,14 +431,14 @@ class ActivityListPalette(ActivityPalette):
         registry.disconnect(self._activity_changed_sid)
 
     def _update_favorite_item(self):
-        label = self._favorite_item.child
+        label = self._favorite_item.get_child()
         if self._favorite:
             label.set_text(_('Remove favorite'))
             xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(),
                                          style.COLOR_TRANSPARENT.get_svg()))
         else:
             label.set_text(_('Make favorite'))
-            client = gconf.client_get_default()
+            client = GConf.Client.get_default()
             xo_color = XoColor(client.get_string('/desktop/sugar/user/color'))
 
         self._favorite_icon.props.xo_color = xo_color