Merge branch 'update-1' of git+ssh://dev.laptop.org/git/journal-activity into update-1

5 files changed, 29 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index 4a2cabb..d006d66 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+* #3092 Change the color of the preview box. (rwh)
+
+82
+
+* #2545 Correctly unmount the device from the DS when it is removed. (tomeu)
+* Implement ShowObject, #4909 (rwh)
+
 81
 
 * #5367 Cache icons extracted from bundles. (tomeu)
diff --git a/activity/activity.info b/activity/activity.info
index 1c17feb..d7fba8b 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Journal
-activity_version = 81
+activity_version = 82
 service_name = org.laptop.JournalActivity
 icon = activity-journal
 class = journalactivity.JournalActivity
diff --git a/expandedentry.py b/expandedentry.py
index 9085316..65b7808 100644
--- a/expandedentry.py
+++ b/expandedentry.py
@@ -205,7 +205,7 @@ class ExpandedEntry(hippo.CanvasBox):
         if has_preview:
             preview_box = hippo.CanvasImage(image=surface,
                                             border=style.LINE_WIDTH,
-                                            border_color=style.COLOR_BLACK.get_int(),
+                                            border_color=style.COLOR_BUTTON_GREY.get_int(),
                                             xalign=hippo.ALIGNMENT_CENTER,
                                             yalign=hippo.ALIGNMENT_CENTER,
                                             scale_width=width,
@@ -216,7 +216,7 @@ class ExpandedEntry(hippo.CanvasBox):
                                            xalign=hippo.ALIGNMENT_CENTER,
                                            yalign=hippo.ALIGNMENT_CENTER,
                                            border=style.LINE_WIDTH,
-                                           border_color=style.COLOR_BLACK.get_int(),
+                                           border_color=style.COLOR_BUTTON_GREY.get_int(),
                                            box_width=width,
                                            box_height=height)
         box.append(preview_box)
diff --git a/journalactivity.py b/journalactivity.py
index 3339573..6e9a8f5 100755
--- a/journalactivity.py
+++ b/journalactivity.py
@@ -74,6 +74,16 @@ class JournalActivityDBusService(dbus.service.Object):
         self._parent.set_search(search_dict)
         self._parent.search_grab_focus()
 
+    @dbus.service.method(J_DBUS_INTERFACE,
+        in_signature='s', out_signature='')
+    def ShowObject(self, object_id):
+        """Pop-up journal and show object with object_id"""
+
+        logging.debug('Trying to show object %s', object_id)
+
+        if self._parent.show_object(object_id):
+            self._parent.present()
+
     def _chooser_response_cb(self, chooser, response_id, chooser_id):
         logging.debug('JournalActivityDBusService._chooser_response_cb')
         if response_id == gtk.RESPONSE_ACCEPT:
@@ -208,6 +218,14 @@ class JournalActivity(activity.Activity):
         self.set_canvas(self._secondary_view)
         self._secondary_view.show()
 
+    def show_object(self, object_id):
+        jobject = datastore.get(object_id)
+        if jobject is None:
+            return False
+        else:
+            self._show_secondary_view(jobject)
+            return True
+
     def _entry_erased_cb(self, toolbar):
         self._show_main_view()
 
diff --git a/volumesmanager.py b/volumesmanager.py
index f0948ce..91efc81 100644
--- a/volumesmanager.py
+++ b/volumesmanager.py
@@ -182,10 +182,7 @@ class VolumesManager(gobject.GObject):
                     return
                 volume_id = self._mount_in_datastore(udi)
             else:
-                volume = self._get_volume_by_udi(udi)
-                if volume is not None:
-                    self._volumes.remove(volume)
-                    self.emit('volume-removed', volume)
+                self.unmount_from_datastore(udi)
             return
 
     def _mount_in_datastore(self, udi):