From bd8015ada50279a9c475ecbe711233b92d92ef17 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Sun, 20 Sep 2009 11:19:19 +0000
Subject: Don't automount all the volumes at startup #1357

---
(limited to 'extensions')

diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index 4ccae7a..8955313 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -90,6 +90,12 @@ def _volume_added_cb(volume_monitor, volume, tray):
     _mount(volume, tray)
 
 def _mount(volume, tray):
+    # Follow Nautilus behaviour here
+    # since it has the same issue with removable device
+    # and it would be good to not invent our own workflow
+    if hasattr(volume, 'should_automount') and not volume.should_automount():
+        return
+
     #TODO: should be done by some other process, like gvfs-hal-volume-monitor
     #TODO: use volume.should_automount() when it gets into pygtk
     if volume.get_mount() is None and volume.can_mount():
--
cgit v0.9.1