Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@sugarlabs.org>2009-03-24 15:00:58 (GMT)
committer Tomeu Vizoso <tomeu@sugarlabs.org>2009-03-24 15:04:03 (GMT)
commit5bb0459efa0dc71df7963e0ca208d7f456f118dc (patch)
treeb475fedf8096569ec171903cfa10bfc844112ca8
parentc32bf82a1051c13711d34b8c335e9cf9b4ad286e (diff)
Call *mount_finish when the callback is called #326
-rw-r--r--extensions/deviceicon/volume.py7
-rw-r--r--src/jarabe/view/palettes.py5
2 files changed, 7 insertions, 5 deletions
diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index c795328..96d0796 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -88,7 +88,7 @@ def _setup_volumes(tray):
for mount in volume_monitor.get_mounts():
_add_device(mount, tray)
- #volume_monitor.connect('volume-added', _volume_added_cb, tray)
+ volume_monitor.connect('volume-added', _volume_added_cb, tray)
volume_monitor.connect('mount-added', _mount_added_cb, tray)
volume_monitor.connect('mount-removed', _mount_removed_cb, tray)
@@ -102,8 +102,9 @@ def _mount(volume, tray):
#TODO: pass None as mount_operation, or better, SugarMountOperation
volume.mount(gtk.MountOperation(tray.get_toplevel()), _mount_cb)
-def _mount_cb(source, result):
- logging.debug('mount finished %r %r' % (source, result))
+def _mount_cb(volume, result):
+ logging.debug('_mount_cb %r %r' % (volume, result))
+ volume.mount_finish(result)
def _mount_added_cb(volume_monitor, mount, tray):
_add_device(mount, tray)
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index 6124577..49d4e77 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -295,8 +295,9 @@ class VolumePalette(Palette):
def __unmount_activate_cb(self, menu_item):
self._mount.unmount(self.__unmount_cb)
- def __unmount_cb(self, source, result):
- logging.debug('__unmount_cb %r %r' % (source, result))
+ def __unmount_cb(self, mount, result):
+ logging.debug('__unmount_cb %r %r' % (mount, result))
+ mount.unmount_finish(result)
def __popup_cb(self, palette):
mount_point = self._mount.get_root().get_path()