Use dispath module in controler

4 files changed, 8 insertions, 18 deletions

diff --git a/src/jarabe/journal/controler.py b/src/jarabe/journal/controler.py
index 76a3737..4d83a47 100644
--- a/src/jarabe/journal/controler.py
+++ b/src/jarabe/journal/controler.py
@@ -14,18 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import gobject
+from sugar import dispatch
 
 
-class _Objects(gobject.GObject):
-
-    __gsignals__ = {
-            'detail-clicked': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-                              ([str])),
-            }
-
-    def __init__(self):
-        gobject.GObject.__init__(self)
-
-
-objects = _Objects()
+details = dispatch.Signal()
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py
index 587b57b..12ef384 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -158,11 +158,12 @@ class JournalActivity(Window):
         self._main_view = gtk.VBox()
 
         self._view = View()
-        controler.objects.connect('detail-clicked', self.__detail_clicked_cb)
         self._view.connect('clear-clicked', self.__clear_clicked_cb)
         self._main_view.pack_start(self._view)
         self._view.show()
 
+        controler.details.connect(self.__view_details_cb)
+
         self._volumes_toolbar = VolumesToolbar()
         self._volumes_toolbar.connect('volume-changed',
                                       self.__volume_changed_cb)
@@ -189,8 +190,8 @@ class JournalActivity(Window):
         if keyname == 'Escape':
             self.show_main_view()
 
-    def __detail_clicked_cb(self, controler, object_id):
-        self._show_secondary_view(object_id)
+    def __view_details_cb(self, sender, signal, uid):
+        self._show_secondary_view(uid)
 
     def __clear_clicked_cb(self, list_view):
         self._main_toolbox.search_toolbar.clear_query()
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 10cc47a..f78ed5b 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -130,7 +130,7 @@ class ObjectPalette(Palette):
         model.delete(self._metadata['uid'])
 
     def __detail_activate_cb(self, menu_item):
-        controler.objects.emit('detail-clicked', self._metadata['uid'])
+        controler.details.send(None, uid=self._metadata['uid'])
 
     def __friend_selected_cb(self, menu_item, buddy):
         logging.debug('__friend_selected_cb')
diff --git a/src/jarabe/journal/widgets.py b/src/jarabe/journal/widgets.py
index 6febd86..7ea8d5b 100644
--- a/src/jarabe/journal/widgets.py
+++ b/src/jarabe/journal/widgets.py
@@ -274,7 +274,7 @@ class DetailsIconCanvas(CanvasIcon):
 
     def __activated_cb(self, button):
         self._set_leave_color()
-        controler.objects.emit('detail-clicked', self.metadata['uid'])
+        controler.details.send(None, uid=self.metadata['uid'])
 
     def __motion_notify_event_cb(self, icon, event):
         if event.detail == hippo.MOTION_DETAIL_ENTER: