Take out multiple selections and got to the expanded view on single click.

1 files changed, 7 insertions, 12 deletions

diff --git a/journalactivity.py b/journalactivity.py
index cc5cf2f..ee99c70 100755
--- a/journalactivity.py
+++ b/journalactivity.py
@@ -47,7 +47,6 @@ class JournalActivity(activity.Activity):
         self._main_view.show()
 
         self._list_view = ListView()
-        self._list_view.connect('notify::selected-entry', self._notify_selected_entry_cb)
         self._list_view.connect('entry-activated', self._entry_activated_cb)
         self._main_view.pack_start(self._list_view)
         self._list_view.show()
@@ -61,16 +60,10 @@ class JournalActivity(activity.Activity):
 
         self.iconify()
 
-    def _notify_selected_entry_cb(self, list_view, pspec):
-        if list_view.props.selected_entry:
-            self._toolbox.set_current_toolbar(1)
-            jobject = list_view.props.selected_entry.jobject
-            self._toolbox.entry_toolbar.set_jobject(jobject)
-        else:
-            self._toolbox.set_current_toolbar(0)
-            self._toolbox.entry_toolbar.set_jobject(None)
-
     def _entry_activated_cb(self, list_view, entry):
+        self._toolbox.set_current_toolbar(1)
+        self._toolbox.entry_toolbar.set_jobject(entry.jobject)
+
         detail_view = DetailView(entry.jobject)
         detail_view.connect('go-back-clicked', self._go_back_clicked_cb)
         self.set_canvas(detail_view)
@@ -78,7 +71,6 @@ class JournalActivity(activity.Activity):
     
     def _go_back_clicked_cb(self, detail_view):
         self._show_main_view()
-        self._toolbox.set_current_toolbar(0)
 
     def _notify_active_cb(self, widget, pspec):
         if self.props.active:
@@ -92,13 +84,16 @@ class JournalActivity(activity.Activity):
     def _show_main_view(self):
         self.set_canvas(self._main_view)
         self._main_view.show()
+        self._toolbox.set_current_toolbar(0)
+        self._toolbox.entry_toolbar.set_jobject(None)
 
     def _entry_erased_cb(self, toolbar):
         self._list_view.refresh()
         self._show_main_view()
-        self._toolbox.set_current_toolbar(0)
 
     def _volume_changed_cb(self, volume_toolbar, volume_id):
         logging.debug('Selected volume: %r.' % volume_id)
         self._toolbox.search_toolbar.set_volume_id(volume_id)
         self._toolbox.set_current_toolbar(0)
+        self._toolbox.entry_toolbar.set_jobject(None)
+