From: Philip Chimento <philip.chimento@gmail.com>
Date: Sat, 25 Aug 2012 22:52:09 +0000 (+0200)
Subject: Various PyGObject fixes
X-Git-Tag: v0.9~17
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=402276613364c89057260e6fdda315c78dcecba2;p=projects%2Fchimara%2Fchimara.git

Various PyGObject fixes
---

diff --git a/player/player.py b/player/player.py
index 8528f9e..8437458 100644
--- a/player/player.py
+++ b/player/player.py
@@ -53,7 +53,7 @@ class Player(GObject.GObject):
 
         uimanager = Gtk.UIManager()
         uimanager.add_ui_from_file('chimara.menus')
-        uimanager.insert_action_group(actiongroup, 0)
+        uimanager.insert_action_group(actiongroup)
         menubar = uimanager.get_widget('/menubar')
         toolbar = uimanager.get_widget('/toolbar')
         toolbar.no_show_all = True
@@ -66,8 +66,7 @@ class Player(GObject.GObject):
         accels = uimanager.get_accel_group()
         self.window.add_accel_group(accels)
 
-        self.glk = Chimara.IF()
-        self.glk.props.ignore_errors = True
+        self.glk = Chimara.IF(ignore_errors=True)
         css_file = _maybe(self.prefs_settings.get_value('css-file'))
         if css_file is None:
             css_file = 'style.css'
@@ -256,11 +255,11 @@ class Player(GObject.GObject):
             self.glk.graphics_file = blorbfile
 
     # Various signal handlers for GtkBuilder file
-    def gtk_widget_hide(self, *args):
-        return Gtk.Widget.hide(*args)
+    def gtk_widget_hide(self, widget, *args):
+        return Gtk.Widget.hide(widget)
 
-    def gtk_widget_hide_on_delete(self, *args):
-        return Gtk.Widget.hide_on_delete(*args)
+    def gtk_widget_hide_on_delete(self, widget, *args):
+        return Gtk.Widget.hide_on_delete(widget)
 
     def dummy_handler(self, *args):
         pass