meld r1218 - trunk

[kaiw svn gnome org]

Author: kaiw
Date: Wed Mar  4 21:47:27 2009
New Revision: 1218
URL: http://svn.gnome.org/viewvc/meld?rev=1218&view=rev

Log:
Don't rely on the default argument for UIManager.insert_action_group()

The existing code relies on the default value of the pos argument, but the
default was added after pygtk 2.12. For compatibility with earlier versions of
pygtk, add the pos argument here.

Patch contributed by Andrew Beyer.


Modified:
   trunk/dirdiff.py
   trunk/melddoc.py

Modified: trunk/dirdiff.py
==============================================================================
--- trunk/dirdiff.py	(original)
+++ trunk/dirdiff.py	Wed Mar  4 21:47:27 2009
@@ -267,7 +267,7 @@
 
     def on_container_switch_in_event(self, ui):
         melddoc.MeldDoc.on_container_switch_in_event(self, ui)
-        ui.insert_action_group(self.filter_actiongroup)
+        ui.insert_action_group(self.filter_actiongroup, -1)
         self.custom_merge_id = ui.new_merge_id()
         for x in self.filter_ui:
             ui.add_ui(self.custom_merge_id, *x)

Modified: trunk/melddoc.py
==============================================================================
--- trunk/melddoc.py	(original)
+++ trunk/melddoc.py	Wed Mar  4 21:47:27 2009
@@ -116,7 +116,7 @@
         """Called when the container app switches to this tab.
         """
         self.ui_merge_id = uimanager.add_ui_from_file(self.ui_file)
-        uimanager.insert_action_group(self.actiongroup)
+        uimanager.insert_action_group(self.actiongroup, -1)
         self.popup_menu = uimanager.get_widget("/Popup")
         uimanager.ensure_update()