All: Chain up to constructor of derived class

The pygi-convert.sh script does replace the chaining to the
constructor of the derived class and chains up to the GObject
constructor, those introduced missing imports and a few more
issues with arguments passing.

In general it is clearer to chain up to the constructor of
the derived class so while fixing the issues introduced by the
script we did switch to that behavior in all of the shell.

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

29 files changed, 46 insertions, 48 deletions

diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index 77730db..b075638 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -40,7 +40,7 @@ class ControlPanel(Gtk.Window):
     __gtype_name__ = 'SugarControlPanel'
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
 
         self._max_columns = int(0.285 * (float(Gdk.Screen.width()) /
             style.GRID_CELL_SIZE - 3))
@@ -395,7 +395,7 @@ class _SectionIcon(Gtk.EventBox):
         self._xo_color = None
         self._title = 'No Title'
 
-        GObject.GObject.__init__(self, **kwargs)
+        Gtk.EventBox.__init__(self, **kwargs)
 
         self._vbox = Gtk.VBox()
         self._icon = Icon(icon_name=self._icon_name,
diff --git a/src/jarabe/controlpanel/inlinealert.py b/src/jarabe/controlpanel/inlinealert.py
index 4eda804..d768724 100644
--- a/src/jarabe/controlpanel/inlinealert.py
+++ b/src/jarabe/controlpanel/inlinealert.py
@@ -56,7 +56,7 @@ class InlineAlert(Gtk.HBox):
         self._msg_label.modify_fg(Gtk.StateType.NORMAL,
                                   style.COLOR_SELECTION_GREY.get_gdk_color())
 
-        GObject.GObject.__init__(self, **kwargs)
+        Gtk.HBox.__init__(self, **kwargs)
 
         self.set_spacing(style.DEFAULT_SPACING)
         self.modify_bg(Gtk.StateType.NORMAL,
diff --git a/src/jarabe/controlpanel/sectionview.py b/src/jarabe/controlpanel/sectionview.py
index 0e37e18..cbf4768 100644
--- a/src/jarabe/controlpanel/sectionview.py
+++ b/src/jarabe/controlpanel/sectionview.py
@@ -33,7 +33,7 @@ class SectionView(Gtk.VBox):
     _APPLY_TIMEOUT = 1000
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.VBox.__init__(self)
         self._is_valid = True
         self.auto_close = False
         self.needs_restart = False
diff --git a/src/jarabe/controlpanel/toolbar.py b/src/jarabe/controlpanel/toolbar.py
index 6cb27a0..2094d3b 100644
--- a/src/jarabe/controlpanel/toolbar.py
+++ b/src/jarabe/controlpanel/toolbar.py
@@ -41,7 +41,7 @@ class MainToolbar(Gtk.Toolbar):
     }
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Toolbar.__init__(self)
 
         self._add_separator()
 
@@ -101,7 +101,7 @@ class SectionToolbar(Gtk.Toolbar):
     }
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Toolbar.__init__(self)
 
         self._add_separator()
 
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py
index 6afb916..5caa855 100644
--- a/src/jarabe/desktop/activitieslist.py
+++ b/src/jarabe/desktop/activitieslist.py
@@ -46,7 +46,7 @@ class ActivitiesTreeView(Gtk.TreeView):
     }
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.TreeView.__init__(self)
 
         self._query = ''
 
@@ -170,7 +170,7 @@ class ListModel(Gtk.TreeModelSort):
     def __init__(self):
         self._model = Gtk.ListStore(str, bool, str, str, str, str, int, str)
         self._model_filter = self._model.filter_new()
-        GObject.GObject.__init__(self, self._model_filter)
+        Gtk.TreeModelSort.__init__(self, self._model_filter)
 
         GObject.idle_add(self.__connect_to_bundle_registry_cb)
 
@@ -302,7 +302,7 @@ class ActivitiesList(Gtk.VBox):
     def __init__(self):
         logging.debug('STARTUP: Loading the activities list')
 
-        GObject.GObject.__init__(self)
+        Gtk.VBox.__init__(self)
 
         scrolled_window = Gtk.ScrolledWindow()
         scrolled_window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 2e0cfb9..b14e707 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -71,7 +71,7 @@ class FavoritesBox(Gtk.VBox):
     __gtype_name__ = 'SugarFavoritesBox'
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.VBox.__init__(self)
 
         self._view = FavoritesView(self)
         self.pack_start(self._view, True, True, 0)
diff --git a/src/jarabe/desktop/friendview.py b/src/jarabe/desktop/friendview.py
index d791ff5..77f4b6e 100644
--- a/src/jarabe/desktop/friendview.py
+++ b/src/jarabe/desktop/friendview.py
@@ -26,7 +26,7 @@ from jarabe.model import bundleregistry
 
 class FriendView(Gtk.VBox):
     def __init__(self, buddy, **kwargs):
-        GObject.GObject.__init__(self)
+        Gtk.VBox.__init__(self)
 
         # round icon sizes to an even number so that it can be accurately
         # centered in a larger bounding box also of even dimensions
diff --git a/src/jarabe/desktop/homebox.py b/src/jarabe/desktop/homebox.py
index 188ea63..875ecf6 100644
--- a/src/jarabe/desktop/homebox.py
+++ b/src/jarabe/desktop/homebox.py
@@ -38,7 +38,7 @@ class HomeBox(Gtk.VBox):
     def __init__(self, toolbar):
         logging.debug('STARTUP: Loading the home view')
 
-        GObject.GObject.__init__(self)
+        Gtk.VBox.__init__(self)
 
         self._favorites_box = favoritesview.FavoritesBox()
         self._list_view = ActivitiesList()
diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py
index 71de65d..2ac222f 100644
--- a/src/jarabe/desktop/homewindow.py
+++ b/src/jarabe/desktop/homewindow.py
@@ -43,7 +43,7 @@ _instance = None
 class HomeWindow(Gtk.Window):
     def __init__(self):
         logging.debug('STARTUP: Loading the desktop window')
-        GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
 
         accel_group = Gtk.AccelGroup()
         self.set_data('sugar-accel-group', accel_group)
diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py
index 5434825..cb84b4a 100644
--- a/src/jarabe/desktop/keydialog.py
+++ b/src/jarabe/desktop/keydialog.py
@@ -74,7 +74,7 @@ class CanceledKeyRequestError(dbus.DBusException):
 
 class KeyDialog(Gtk.Dialog):
     def __init__(self, ssid, flags, wpa_flags, rsn_flags, dev_caps, response):
-        GObject.GObject.__init__(self, flags=Gtk.DialogFlags.MODAL)
+        Gtk.Dialog.__init__(self, flags=Gtk.DialogFlags.MODAL)
         self.set_title('Wireless Key Required')
 
         self._response = response
diff --git a/src/jarabe/desktop/snowflakelayout.py b/src/jarabe/desktop/snowflakelayout.py
index 53dd982..c10fefc 100644
--- a/src/jarabe/desktop/snowflakelayout.py
+++ b/src/jarabe/desktop/snowflakelayout.py
@@ -29,7 +29,7 @@ class SnowflakeLayout(Gtk.Container):
     __gtype_name__ = 'SugarSnowflakeLayout'
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Container.__init__(self)
         self.set_has_window(False)
         self._nflakes = 0
         self._children = {}
diff --git a/src/jarabe/desktop/viewcontainer.py b/src/jarabe/desktop/viewcontainer.py
index 135b8df..cc6e7f2 100644
--- a/src/jarabe/desktop/viewcontainer.py
+++ b/src/jarabe/desktop/viewcontainer.py
@@ -24,7 +24,7 @@ class ViewContainer(Gtk.Container):
     __gtype_name__ = 'SugarViewContainer'
 
     def __init__(self, layout, owner_icon, activity_icon=None, **kwargs):
-        GObject.GObject.__init__(self, **kwargs)
+        Gtk.Container.__init__(self, **kwargs)
         self.set_has_window(False)
 
         self._activity_icon = None
diff --git a/src/jarabe/desktop/viewtoolbar.py b/src/jarabe/desktop/viewtoolbar.py
index 07c44a9..340ab73 100644
--- a/src/jarabe/desktop/viewtoolbar.py
+++ b/src/jarabe/desktop/viewtoolbar.py
@@ -45,7 +45,7 @@ class ViewToolbar(Gtk.Toolbar):
     }
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Toolbar.__init__(self)
 
         self._query = None
         self._autosearch_timer = None
diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py
index ada015a..800f285 100644
--- a/src/jarabe/frame/framewindow.py
+++ b/src/jarabe/frame/framewindow.py
@@ -16,7 +16,6 @@
 
 from gi.repository import Gtk
 from gi.repository import Gdk
-from gi.repository import GObject
 
 from sugar3.graphics import style
 
@@ -30,7 +29,7 @@ class FrameContainer(Gtk.Bin):
     __gtype_name__ = 'SugarFrameContainer'
 
     def __init__(self, position):
-        GObject.GObject.__init__(self)
+        Gtk.Bin.__init__(self)
         self._position = position
 
         if self.is_vertical():
@@ -105,7 +104,7 @@ class FrameWindow(Gtk.Window):
     __gtype_name__ = 'SugarFrameWindow'
 
     def __init__(self, position):
-        GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
         self.hover = False
         self.size = style.GRID_CELL_SIZE + style.LINE_WIDTH
 
diff --git a/src/jarabe/frame/notification.py b/src/jarabe/frame/notification.py
index 57664aa..184a779 100644
--- a/src/jarabe/frame/notification.py
+++ b/src/jarabe/frame/notification.py
@@ -37,7 +37,7 @@ class NotificationIcon(Gtk.EventBox):
 
     def __init__(self, **kwargs):
         self._icon = PulsingIcon(pixel_size=style.STANDARD_ICON_SIZE)
-        GObject.GObject.__init__(self, **kwargs)
+        Gtk.EventBox.__init__(self, **kwargs)
         self.props.visible_window = False
 
         self._icon.props.pulse_color = \
@@ -89,7 +89,7 @@ class NotificationWindow(Gtk.Window):
 
     def __init__(self, **kwargs):
 
-        GObject.GObject.__init__(self, **kwargs)
+        Gtk.Window.__init__(self, **kwargs)
 
         self.set_decorated(False)
         self.set_resizable(False)
diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py
index 405870a..5efc772 100644
--- a/src/jarabe/frame/zoomtoolbar.py
+++ b/src/jarabe/frame/zoomtoolbar.py
@@ -36,7 +36,7 @@ class ZoomToolbar(Gtk.Toolbar):
                           ([]))
         }
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Toolbar.__init__(self)
 
         # we shouldn't be mirrored in RTL locales
         self.set_direction(Gtk.TextDirection.LTR)
diff --git a/src/jarabe/intro/colorpicker.py b/src/jarabe/intro/colorpicker.py
index 2d078f0..0ec8c00 100644
--- a/src/jarabe/intro/colorpicker.py
+++ b/src/jarabe/intro/colorpicker.py
@@ -24,7 +24,7 @@ from sugar3.graphics.xocolor import XoColor
 
 class ColorPicker(Gtk.EventBox):
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.EventBox.__init__(self)
         self._xo_color = None
 
         self._xo = Icon(pixel_size=style.XLARGE_ICON_SIZE,
diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
index a6d3b97..93445b5 100644
--- a/src/jarabe/intro/window.py
+++ b/src/jarabe/intro/window.py
@@ -78,7 +78,7 @@ class _Page(Gtk.VBox):
     }
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.VBox.__init__(self)
         self.valid = False
 
     def set_valid(self, valid):
@@ -160,7 +160,7 @@ class _IntroBox(Gtk.VBox):
     PAGE_LAST = PAGE_COLOR
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.VBox.__init__(self)
         self.set_border_width(style.zoom(30))
 
         self._page = self.PAGE_NAME
@@ -264,7 +264,7 @@ class IntroWindow(Gtk.Window):
     __gtype_name__ = 'SugarIntroWindow'
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
 
         self.props.decorated = False
         self.maximize()
diff --git a/src/jarabe/journal/detailview.py b/src/jarabe/journal/detailview.py
index 1c5fad0..31c2ef3 100644
--- a/src/jarabe/journal/detailview.py
+++ b/src/jarabe/journal/detailview.py
@@ -38,8 +38,7 @@ class DetailView(Gtk.VBox):
         self._metadata = None
         self._expanded_entry = None
 
-        GObject.GObject.__init__(self, **kwargs)
-        GObject.GObject.__init__(self)
+        Gtk.VBox.__init__(self)
 
         back_bar = BackBar()
         back_bar.connect('button-release-event',
@@ -82,7 +81,7 @@ class DetailView(Gtk.VBox):
 
 class BackBar(Gtk.EventBox):
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.EventBox.__init__(self)
         self.modify_bg(Gtk.StateType.NORMAL,
                        style.COLOR_PANEL_GREY.get_gdk_color())
         hbox = Gtk.HBox(spacing=style.DEFAULT_PADDING)
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index 12d3989..f3eb1a1 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -40,13 +40,13 @@ from jarabe.journal import model
 
 class Separator(Gtk.VBox):
     def __init__(self, orientation):
-        GObject.GObject.__init__(self,
+        Gtk.VBox.__init__(self,
                 background_color=style.COLOR_PANEL_GREY.get_gdk_color())
 
 
 class BuddyList(Gtk.Alignment):
     def __init__(self, buddies):
-        GObject.GObject.__init__(self, 0, 0, 0, 0)
+        Gtk.Alignment.__init__(self, 0, 0, 0, 0)
 
         hbox = Gtk.HBox()
         for buddy in buddies:
@@ -61,7 +61,7 @@ class BuddyList(Gtk.Alignment):
 
 class ExpandedEntry(Gtk.EventBox):
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.EventBox.__init__(self)
         self._vbox = Gtk.VBox()
         self.add(self._vbox)
 
diff --git a/src/jarabe/journal/keepicon.py b/src/jarabe/journal/keepicon.py
index 90d08f4..16e3a57 100644
--- a/src/jarabe/journal/keepicon.py
+++ b/src/jarabe/journal/keepicon.py
@@ -25,7 +25,7 @@ from sugar3.graphics.xocolor import XoColor
 
 class KeepIcon(Gtk.ToggleButton):
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.ToggleButton.__init__(self)
         self.set_relief(Gtk.ReliefStyle.NONE)
         self.set_focus_on_click(False)
 
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 8b1e4ef..f6498e5 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -44,7 +44,7 @@ class TreeView(Gtk.TreeView):
     __gtype_name__ = 'JournalTreeView'
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.TreeView.__init__(self)
         self.set_headers_visible(False)
         self.set_enable_search(False)
 
@@ -75,7 +75,7 @@ class BaseListView(Gtk.Bin):
         self._last_progress_bar_pulse = None
         self._scroll_position = 0.
 
-        GObject.GObject.__init__(self)
+        Gtk.Bin.__init__(self)
 
         self.connect('map', self.__map_cb)
         self.connect('unrealize', self.__unrealize_cb)
diff --git a/src/jarabe/journal/modalalert.py b/src/jarabe/journal/modalalert.py
index 541d9c0..36f076e 100644
--- a/src/jarabe/journal/modalalert.py
+++ b/src/jarabe/journal/modalalert.py
@@ -29,7 +29,7 @@ class ModalAlert(Gtk.Window):
     __gtype_name__ = 'SugarModalAlert'
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
 
         self.set_border_width(style.LINE_WIDTH)
         offset = style.GRID_CELL_SIZE
diff --git a/src/jarabe/journal/objectchooser.py b/src/jarabe/journal/objectchooser.py
index a18fd11..662a282 100644
--- a/src/jarabe/journal/objectchooser.py
+++ b/src/jarabe/journal/objectchooser.py
@@ -40,7 +40,7 @@ class ObjectChooser(Gtk.Window):
     }
 
     def __init__(self, parent=None, what_filter=''):
-        GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
         self.set_type_hint(Gdk.WindowTypeHint.DIALOG)
         self.set_decorated(False)
         self.set_position(Gtk.WindowPosition.CENTER_ALWAYS)
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 5ef880b..8b67294 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -201,7 +201,7 @@ class CopyMenu(Gtk.Menu):
     }
 
     def __init__(self, metadata):
-        GObject.GObject.__init__(self)
+        Gtk.Menu.__init__(self)
 
         self._metadata = metadata
 
@@ -324,7 +324,7 @@ class FriendsMenu(Gtk.Menu):
     }
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Menu.__init__(self)
 
         if filetransfer.file_transfer_available():
             friends_model = friends.get_model()
@@ -357,7 +357,7 @@ class StartWithMenu(Gtk.Menu):
     __gtype_name__ = 'JournalStartWithMenu'
 
     def __init__(self, metadata):
-        GObject.GObject.__init__(self)
+        Gtk.Menu.__init__(self)
 
         self._metadata = metadata
 
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index f7e78ba..a592b21 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -171,7 +171,7 @@ class VolumesToolbar(Gtk.Toolbar):
     }
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.Toolbar.__init__(self)
         self._mount_added_hid = None
         self._mount_removed_hid = None
 
diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
index 56d98b6..930ba13 100644
--- a/src/jarabe/model/network.py
+++ b/src/jarabe/model/network.py
@@ -602,7 +602,7 @@ class AccessPoint(GObject.GObject):
     }
 
     def __init__(self, device, model):
-        self.__gobject_init__()
+        GObject.GObject.__init__(self)
         self.device = device
         self.model = model
 
diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
index b44c229..7f3e1ea 100644
--- a/src/jarabe/view/launcher.py
+++ b/src/jarabe/view/launcher.py
@@ -31,7 +31,7 @@ from jarabe.view.pulsingicon import PulsingIcon
 class LaunchWindow(Gtk.Window):
 
     def __init__(self, activity_id, icon_path, icon_color):
-        GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
 
         self.props.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN
         self.modify_bg(Gtk.StateType.NORMAL, style.COLOR_WHITE.get_gdk_color())
diff --git a/src/jarabe/view/viewsource.py b/src/jarabe/view/viewsource.py
index 2eead0d..651fdc0 100644
--- a/src/jarabe/view/viewsource.py
+++ b/src/jarabe/view/viewsource.py
@@ -113,7 +113,7 @@ class ViewSource(Gtk.Window):
 
     def __init__(self, window_xid, bundle_path, document_path,
                  sugar_toolkit_path, title):
-        GObject.GObject.__init__(self)
+        Gtk.Window.__init__(self)
 
         _logger.debug('ViewSource paths: %r %r %r', bundle_path,
                       document_path, sugar_toolkit_path)
@@ -342,7 +342,7 @@ class Toolbar(Gtk.Toolbar):
     }
 
     def __init__(self, title, bundle_path, document_path, sugar_toolkit_path):
-        GObject.GObject.__init__(self)
+        Gtk.Toolbar.__init__(self)
 
         document_button = None
         self.bundle_path = bundle_path
@@ -455,7 +455,7 @@ class FileViewer(Gtk.ScrolledWindow):
     }
 
     def __init__(self, path, initial_filename):
-        GObject.GObject.__init__(self)
+        Gtk.ScrolledWindow.__init__(self)
 
         self.props.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC
         self.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC
@@ -519,7 +519,7 @@ class SourceDisplay(Gtk.ScrolledWindow):
     __gtype_name__ = 'SugarSourceDisplay'
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        Gtk.ScrolledWindow.__init__(self)
 
         self.props.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC
         self.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC