[gnome-games/sudoku-tube] Some small things

[Zhang Sen <zhangsen src gnome org>]

commit 77d921d97fe17290f4dd34eda546fcad74631841
Author: Zhang Sen <zh jesse gmail com>
Date:   Wed Aug 12 16:32:30 2009 +0800

    Some small things
    
    Trying to conform to the diagram at http://live.gnome.org/ZhangSen/GSoC2009

 gnome-sudoku/src/lib/main.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index eee7875..5e64678 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -183,7 +183,7 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
 
         Like show highlight, update hints, start timer, etc."""
         self._main_grid_vew.connect_to_notes_model(self._notes_model)
-        self._main_model.connect('puzzle-finished', self.you_win_callback)
+        self._main_model.connect('puzzle-finished', self._puzzle_finished_cb)
         self._calc_difficulty()
         self.setup_toggles()
         self.update_statusbar()
@@ -387,7 +387,7 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
 
         return sublabel
 
-    def you_win_callback(self, sudoku_model):
+    def _puzzle_finished_cb(self, sudoku_model):
         if hasattr(self, 'dancer'):
             return
         self.won = True
@@ -403,6 +403,7 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
         else:
             if self._negotiate_result():
                 label = "You WIN"
+                self._stop_network_game()
             else:
                 return
 
@@ -411,10 +412,11 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
 
     def _negotiate_result(self):
         def reply_handler(*args):
-            print 'acknowledge reply', args
+            logger.debug('signal peer: %s' % args)
         def error_handler(error):
-            print 'acknowledge error:', error
+            logger.error('signal peer: %s' % error)
 
+        i_win = None
         if self._is_initiator:
             i_win = True
             logger.debug('signal receiver that they fail')
@@ -423,7 +425,7 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
                     error_handler=error_handler)
         else:
             assert self._peer is not None
-            if not self._peer.has_won():
+            if not self._peer.has_won(): # FIXME should use async all
                 i_win = True
                 logger.debug('signal initiator that they fail')
                 self._peer.acknowledge_win(
@@ -433,6 +435,8 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
         return i_win
 
     def fail_network_game(self):
+        """We fail the game
+        """
         dialog = gtk.Dialog("You fail",
                 self.w,
                 gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
@@ -440,7 +444,6 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
         label = gtk.Label("you fail")
         label.show()
         dialog.vbox.pack_start(label)
-        dialog.connect("response", self._stop_network_game)
         dialog.run()
         dialog.destroy()