Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline

2 files changed, 9 insertions, 10 deletions

diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 3a5a909..7cf09d7 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -398,7 +398,7 @@ class BaseListView(gtk.HBox):
         metadata = self._last_clicked_entry.metadata
         if selection.target == 'text/uri-list':
             # Get hold of a reference so the temp file doesn't get deleted
-            self._temp_file_path = model.get_file(metadata)
+            self._temp_file_path = model.get_file(metadata['uid'])
             selection.set(selection.target, 8, self._temp_file_path)
         elif selection.target == 'journal-object-id':
             selection.set(selection.target, 8, metadata['uid'])
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index bb27ab7..32c8f68 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -27,6 +27,7 @@ from sugar.graphics.palette import Palette
 from sugar.graphics.xocolor import XoColor
 
 from jarabe.journal import model
+from jarabe.view.palettes import VolumePalette
 
 class VolumesToolbar(gtk.Toolbar):
     __gtype_name__ = 'VolumesToolbar'
@@ -77,11 +78,8 @@ class VolumesToolbar(gtk.Toolbar):
     def _add_button(self, mount):
         logging.debug('VolumeToolbar._add_button: %r' % mount.get_name())
 
-        palette = Palette(mount.get_name())
-
         button = VolumeButton(mount)
         button.props.group = self._volume_buttons[0]
-        button.set_palette(palette)
         button.connect('toggled', self._button_toggled_cb)
         position = self.get_item_index(self._volume_buttons[-1]) + 1
         self.insert(button, position)
@@ -89,12 +87,6 @@ class VolumesToolbar(gtk.Toolbar):
 
         self._volume_buttons.append(button)
 
-        if mount.can_unmount():
-            menu_item = gtk.MenuItem(_('Unmount'))
-            menu_item.connect('activate', self._unmount_activated_cb, mount)
-            palette.menu.append(menu_item)
-            menu_item.show()
-
         if len(self.get_children()) > 1:
             self.show()
 
@@ -149,6 +141,7 @@ class BaseButton(RadioToolButton):
 
 class VolumeButton(BaseButton):
     def __init__(self, mount):
+        self._mount = mount
         mount_point = mount.get_root().get_path()
         BaseButton.__init__(self, mount_point)
 
@@ -160,6 +153,12 @@ class VolumeButton(BaseButton):
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
         self.props.xo_color = color
 
+    def create_palette(self):
+        palette = VolumePalette(self._mount)
+        #palette.props.invoker = FrameWidgetInvoker(self)
+        #palette.set_group_id('frame')
+        return palette
+
 class JournalButton(BaseButton):
     def __init__(self):
         BaseButton.__init__(self, mount_point='/')