nautilus r13714 - in trunk: . src

[alexl svn gnome org]

Author: alexl
Date: Fri Feb  8 16:13:37 2008
New Revision: 13714
URL: http://svn.gnome.org/viewvc/nautilus?rev=13714&view=rev

Log:
2008-02-08  Alexander Larsson  <alexl redhat com>

        * src/nautilus-application.c:
	Use the new g_volume_should_automount()




Modified:
   trunk/ChangeLog
   trunk/src/nautilus-application.c

Modified: trunk/src/nautilus-application.c
==============================================================================
--- trunk/src/nautilus-application.c	(original)
+++ trunk/src/nautilus-application.c	Fri Feb  8 16:13:37 2008
@@ -195,9 +195,8 @@
 		for (l = volumes; l != NULL; l = l->next) {
 			volume = l->data;
 			
-			/* TODO: only do this for local volumes */
-			
-			if (!g_volume_can_mount (volume)) {
+			if (!g_volume_should_automount (volume) ||
+			    !g_volume_can_mount (volume)) {
 				continue;
 			}
 			
@@ -1332,6 +1331,7 @@
 		       NautilusApplication *application)
 {
 	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT) &&
+	    g_volume_should_automount (volume) &&
 	    g_volume_can_mount (volume)) {
 		nautilus_file_operations_mount_volume (NULL, volume);
 	}