[gnome-games/gnome-3-0] sudoku: more gi porting

[Thomas Hindoe Paaboel Andersen <thomashpa src gnome org>]

commit 9f38c4fd5ae979b6c6e9aa7be2cdd4fba6d32c99
Author: Thomas Hindoe Paaboel Andersen <phomes gmail com>
Date:   Tue Apr 5 22:48:16 2011 +0200

    sudoku: more gi porting

 gnome-sudoku/src/lib/dialog_swallower.py |    6 +++---
 gnome-sudoku/src/lib/main.py             |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/dialog_swallower.py b/gnome-sudoku/src/lib/dialog_swallower.py
index 28d0d3c..4a8ef7a 100644
--- a/gnome-sudoku/src/lib/dialog_swallower.py
+++ b/gnome-sudoku/src/lib/dialog_swallower.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from gi.repository import Gtk
+from gi.repository import Gtk,GObject
 
 # Convenience library for a new kind of UI -- for e.g. this game, we
 # don't really want to have dialogs. Nonetheless, it's convenient to
@@ -18,7 +18,7 @@ class SwappableArea (Gtk.Notebook):
         GObject.GObject.__init__(self)
         self.set_show_tabs(False)
         self.set_show_border(False)
-        self.main_page = self.append_page(main_area)
+        self.main_page = self.append_page(main_area, None)
 
     def swallow_window (self, d):
         child = d.get_child()
@@ -27,7 +27,7 @@ class SwappableArea (Gtk.Notebook):
 
     def swallow_widget (self, w):
         w.unparent()
-        return self.append_page(w)
+        return self.append_page(w, None)
 
     def response_cb (self, w, response, data=None):
         Gtk.main_quit()
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index 3f6daa3..8d9c0ed 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -321,14 +321,14 @@ class UI (gconf_wrapper.GConfWrapper):
         self.main_area = Gtk.HBox()
         self.swallower = dialog_swallower.SwappableArea(self.main_area)
         self.swallower.show()
-        self.vb.pack_start(self.swallower, True, padding = 12)
-        self.main_area.pack_start(self.gsd, padding = 6)
+        self.vb.pack_start(self.swallower, True, True, 12)
+        self.main_area.pack_start(self.gsd, True, True, 6)
         self.main_actions.set_visible(True)
         self.game_box = Gtk.VBox()
         self.main_area.show()
         self.vb.show()
         self.game_box.show()
-        self.main_area.pack_start(self.game_box, False, padding = 12)
+        self.main_area.pack_start(self.game_box, False, False, 12)
         self.w.add(self.vb)
 
     def setup_toggles (self):
@@ -736,7 +736,7 @@ class TrackerBox (Gtk.VBox):
         self.tinfo.ui = self
         self.vb = self.builder.get_object('vbox1')
         self.vb.unparent()
-        self.pack_start(self.vb, expand = True, fill = True)
+        self.pack_start(self.vb, True, True, 0)
         self.setup_actions()
         self.setup_tree()
         self.show_all()