[meld] Fix deprecation warnings

[Kai Willadsen <kaiw src gnome org>]

commit 7f1fad2fe01e8d7c2d6a62b0b2719ee9db4ac236
Author: Dominique Leuenberger <dimstar opensuse org>
Date:   Sun Feb 23 00:55:17 2014 +0100

    Fix deprecation warnings
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724985

 meld/meldwindow.py       |   10 +++++-----
 meld/ui/notebooklabel.py |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 64ac077..ed712a3 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -134,13 +134,13 @@ class MeldWindow(gnomeglade.Component):
                 None, True),
         )
         ui_file = gnomeglade.ui_file("meldapp-ui.xml")
-        self.actiongroup = Gtk.ActionGroup('MainActions')
+        self.actiongroup = Gtk.ActionGroup(name='MainActions')
         self.actiongroup.set_translation_domain("meld")
         self.actiongroup.add_actions(actions)
         self.actiongroup.add_toggle_actions(toggleactions)
 
-        recent_action = Gtk.RecentAction("Recent",  _("Open Recent"),
-                                         _("Open recent files"), None)
+        recent_action = Gtk.RecentAction(name="Recent",  label=_("Open Recent"),
+                                         tooltip=_("Open recent files"), stock_id=None)
         recent_action.set_show_private(True)
         recent_action.set_filter(recent_comparisons.recent_filter)
         recent_action.set_sort_type(Gtk.RecentSortType.MRU)
@@ -494,7 +494,7 @@ class MeldWindow(gnomeglade.Component):
             self.ui.remove_action_group(self.tab_switch_actiongroup)
 
         self.tab_switch_merge_id = self.ui.new_merge_id()
-        self.tab_switch_actiongroup = Gtk.ActionGroup("TabSwitchActions")
+        self.tab_switch_actiongroup = Gtk.ActionGroup(name="TabSwitchActions")
         self.ui.insert_action_group(self.tab_switch_actiongroup)
         group = None
         current_page = self.notebook.get_current_page()
@@ -503,7 +503,7 @@ class MeldWindow(gnomeglade.Component):
             label = self.notebook.get_menu_label_text(page) or ""
             name = "SwitchTab%d" % i
             tooltip = _("Switch to this tab")
-            action = Gtk.RadioAction(name, label, tooltip, None, i)
+            action = Gtk.RadioAction(name=name, label=label, tooltip=tooltip, stock_id=None, value=i)
             action.join_group(group)
             group = action
             action.set_active(current_page == i)
diff --git a/meld/ui/notebooklabel.py b/meld/ui/notebooklabel.py
index adbc28a..4582771 100644
--- a/meld/ui/notebooklabel.py
+++ b/meld/ui/notebooklabel.py
@@ -38,7 +38,7 @@ class NotebookLabel(Gtk.HBox):
     tab_width_in_chars = 30
 
     def __init__(self, iconname, text, onclose):
-        Gtk.HBox.__init__(self, False, 4)
+        Gtk.HBox.__init__(self, homogeneous=False, spacing=4)
 
         label = Gtk.Label(label=text)
         # FIXME: ideally, we would use custom ellipsization that ellipsized the