Rename mesh model to neighborhood and make it independent

from the shell model.

4 files changed, 14 insertions, 9 deletions

diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index f48670b..12a1ef0 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -31,7 +31,7 @@ from sugar.graphics.menuitem import MenuItem
 from sugar import profile
 
 from jarabe.model import accesspointmodel
-from jarabe.model import shellmodel
+from jarabe.model import neighborhood
 from jarabe.model import network
 from jarabe.view.buddyicon import BuddyIcon
 from jarabe.view.pulsingicon import CanvasPulsingIcon
@@ -439,7 +439,7 @@ class MeshBox(gtk.VBox):
     def __init__(self):
         gobject.GObject.__init__(self)
 
-        self._model = shellmodel.get_instance().get_mesh()
+        self._model = neighborhood.get_model()
         self._buddies = {}
         self._activities = {}
         self._access_points = {}
diff --git a/src/jarabe/model/Makefile.am b/src/jarabe/model/Makefile.am
index 26224f1..d6833a5 100644
--- a/src/jarabe/model/Makefile.am
+++ b/src/jarabe/model/Makefile.am
@@ -8,7 +8,7 @@ sugar_PYTHON =			\
 	homemodel.py		\
 	invites.py		\
 	owner.py		\
-	meshmodel.py		\
+	neighborhood.py		\
         network.py              \
 	shellmodel.py		\
 	screen.py		\
diff --git a/src/jarabe/model/meshmodel.py b/src/jarabe/model/neighborhood.py
index 3977da4..42239bd 100644
--- a/src/jarabe/model/meshmodel.py
+++ b/src/jarabe/model/neighborhood.py
@@ -41,7 +41,7 @@ class ActivityModel:
     def get_bundle_id(self):
         return self.bundle.bundle_id
 
-class MeshModel(gobject.GObject):
+class Neighborhood(gobject.GObject):
     __gsignals__ = {
         'activity-added':       (gobject.SIGNAL_RUN_FIRST,
                                  gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
@@ -234,3 +234,13 @@ class MeshModel(gobject.GObject):
             activity_model = self._activities[act.props.id]
             self.emit('activity-removed', activity_model)
             del self._activities[act.props.id]
+
+_model = None
+
+def get_model():
+    global _model
+
+    if not _model:
+        _model = Neighborhood()
+
+    return _model
diff --git a/src/jarabe/model/shellmodel.py b/src/jarabe/model/shellmodel.py
index c5a84ff..4145f5f 100644
--- a/src/jarabe/model/shellmodel.py
+++ b/src/jarabe/model/shellmodel.py
@@ -19,7 +19,6 @@ import gobject
 
 from sugar.presence import presenceservice
 from jarabe.model.friends import Friends
-from jarabe.model.meshmodel import MeshModel
 from jarabe.model.homemodel import HomeModel
 from jarabe.model import owner
 
@@ -45,7 +44,6 @@ class ShellModel(gobject.GObject):
         self._pservice = presenceservice.get_instance()
 
         self._friends = Friends()
-        self._mesh = MeshModel()
         self._home = HomeModel()
 
         self._screen = wnck.screen_get_default()
@@ -66,9 +64,6 @@ class ShellModel(gobject.GObject):
         if pspec.name == 'zoom-level':
             return self.get_zoom_level()                
 
-    def get_mesh(self):
-        return self._mesh
-
     def get_friends(self):
         return self._friends