From f37b9c31f4e492d6612bf42d32173de3dba98d4a Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Mon, 15 Mar 2010 18:58:29 +0000
Subject: Revert copy to "Journal" palette item in journal details view #1831

---
(limited to 'src/jarabe')

diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index fe05657..61671bc 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -37,6 +37,7 @@ from sugar.graphics.xocolor import XoColor
 from sugar.graphics import iconentry
 from sugar.graphics import style
 from sugar import mime
+from sugar import profile
 
 from jarabe.model import bundleregistry
 from jarabe.journal import misc
@@ -396,8 +397,8 @@ class EntryToolbar(gtk.Toolbar):
     def _resume_menu_item_activate_cb(self, menu_item, service_name):
         misc.resume(self._metadata, service_name)
 
-    def _copy_menu_item_activate_cb(self, menu_item, mount):
-        model.copy(self._metadata, mount.get_root().get_path())
+    def _copy_menu_item_activate_cb(self, menu_item, mount_point):
+        model.copy(self._metadata, mount_point)
 
     def _refresh_copy_palette(self):
         palette = self._copy.get_palette()
@@ -406,6 +407,17 @@ class EntryToolbar(gtk.Toolbar):
             palette.menu.remove(menu_item)
             menu_item.destroy()
 
+        if self._metadata['mountpoint'] != '/':
+            journal_item = MenuItem(_('Journal'))
+            journal_item.set_image(Icon(
+                    icon_name='activity-journal',
+                    xo_color=profile.get_color(),
+                    icon_size=gtk.ICON_SIZE_MENU))
+            journal_item.connect('activate',
+                    self._copy_menu_item_activate_cb, '/')
+            journal_item.show()
+            palette.menu.append(journal_item)
+
         volume_monitor = gio.volume_monitor_get()
         for mount in volume_monitor.get_mounts():
             if self._metadata['mountpoint'] == mount.get_root().get_path():
@@ -418,7 +430,7 @@ class EntryToolbar(gtk.Toolbar):
 
             menu_item.connect('activate',
                               self._copy_menu_item_activate_cb,
-                              mount)
+                              mount.get_root().get_path())
             palette.menu.append(menu_item)
             menu_item.show()
 
--
cgit v0.9.1