[gnome-games/sudoku-tube] Trivial, rename some things

[Zhang Sen <zhangsen src gnome org>]

commit c0b796a643f8a5bd839b4e11c91d66db9a0d42fc
Author: Zhang Sen <zh jesse gmail com>
Date:   Tue Jul 28 09:10:20 2009 +0800

    Trivial, rename some things

 gnome-sudoku/src/lib/main.py       |   18 ++++++++++--------
 gnome-sudoku/src/lib/networking.py |   14 ++++++++++----
 2 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index fb8207d..579a6ab 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -53,7 +53,7 @@ class UI (gconf_wrapper.GConfWrapper):
                      'height': 675,
                      'auto_save_interval':60 # auto-save interval in seconds...
                      }
-    tube_service = 'org.gnome.Sudoku'
+    _tube_service = 'org.gnome.Sudoku'
     _remote_view_obj_path = "/ViewProxy"
 
     def __init__ (self):
@@ -67,7 +67,7 @@ class UI (gconf_wrapper.GConfWrapper):
         self._history_manager = None
         self.setup_gui()
 
-        self.tube_handler = tube_handler.TubeHandler(self.tube_service,
+        self.tube_handler = tube_handler.TubeHandler(self._tube_service,
                 callback=self._tube_received_cb)
 
         self.timer = timer.ActiveTimer(self.w)
@@ -392,9 +392,11 @@ class UI (gconf_wrapper.GConfWrapper):
 
     def _tube_received_cb(self, bus):
         remote_view_proxy = bus.get_object(object_path=self._remote_view_obj_path)
-        logger.info("got view from server")
-        local_view_proxy = networking.LocalViewProxy(remote_view_proxy)
-        local_view_proxy.connect_to_model(self._main_model)
+        logger.info("got a remote view which we can manipulate")
+        # we issue command on remote_view_handler, which will communicate with
+        # remote_view
+        view_handler = networking.RemoteViewHandler(remote_view_proxy)
+        view_handler.connect_to_model(self._main_model)
 
     def new_cb (self, *args):
         if self._close_current_game():
@@ -410,16 +412,16 @@ class UI (gconf_wrapper.GConfWrapper):
         if choice:
             logger.info("selected: %s\nconnection: %s\nhandle: %d" % (
                     choice[2].alias, choice[0].service_name, choice[1]))
-            tp_tube.offer_tube(choice[0], choice[1], self.tube_service,
+            tp_tube.offer_tube(choice[0], choice[1], self._tube_service,
                     self._tube_offered_cb)
         else:
             logger.info("None selected")
 
     def _tube_offered_cb(self, bus):
         """Called when the peer accepts our tube"""
-        proxy_of_self = networking.RemoteViewProxy(bus,
+        proxy_of_side_view = networking.SideViewProxy(bus,
                 self._remote_view_obj_path, self._side_grid_vew)
-        logger.info("created the mirror of myself")
+        logger.info("exported side-view on dbus")
         self._side_grid_vew.show()
 
     def _close_current_game (self):
diff --git a/gnome-sudoku/src/lib/networking.py b/gnome-sudoku/src/lib/networking.py
index c45ba4c..08354af 100644
--- a/gnome-sudoku/src/lib/networking.py
+++ b/gnome-sudoku/src/lib/networking.py
@@ -6,8 +6,9 @@ import dbus
 
 logger = logging.getLogger("main.network")
 
-class RemoteViewProxy(dbus.service.Object):
-    """Expose the game on dbus, so the others can listen to it"""
+class SideViewProxy(dbus.service.Object):
+    """A dbus object, which exports a sudoku game's side-view on dbus
+    """
 
     view_interface = "org.gnome.Sudoku.view"
 
@@ -33,9 +34,14 @@ class RemoteViewProxy(dbus.service.Object):
     def puzzle_finished_cb(self):
         print "the other user has finished"
 
-class LocalViewProxy:
+class RemoteViewHandler:
+
+    """A handler which has identical interface with SudokuView and will relay
+    commands to a remote SideViewProxy
+    """
 
     def __init__(self, remote_proxy):
+        """remote_proxy is a SideViewProxy"""
         self._remote_proxy = remote_proxy
 
     def update(self, changes):
@@ -55,6 +61,6 @@ class LocalViewProxy:
         model.add_observer(self)
         for x in range(9):
             for y in range(9):
-                val = model.grid._get_(x, y)
+                val = model.get_virgin_value(x, y)
                 if val:
                     self._remote_proxy.set_value(x,y, val)