nautilus r13724 - in trunk: . libnautilus-private src

[alexl svn gnome org]

Author: alexl
Date: Mon Feb 11 11:15:26 2008
New Revision: 13724
URL: http://svn.gnome.org/viewvc/nautilus?rev=13724&view=rev

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

        * libnautilus-private/nautilus-file-operations.c:
        * libnautilus-private/nautilus-mime-actions.c:
        * libnautilus-private/nautilus-vfs-file.c:
        * src/nautilus-application.c:
        * src/nautilus-window-manage-views.c:
	Update for new gio mount flags argument



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-file-operations.c
   trunk/libnautilus-private/nautilus-mime-actions.c
   trunk/libnautilus-private/nautilus-vfs-file.c
   trunk/src/nautilus-application.c
   trunk/src/nautilus-window-manage-views.c

Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c	(original)
+++ trunk/libnautilus-private/nautilus-file-operations.c	Mon Feb 11 11:15:26 2008
@@ -2022,7 +2022,7 @@
 	
 	mount_op = eel_mount_operation_new (parent_window);
 	nautilus_inhibit_autorun_for_volume (volume);
-	g_volume_mount (volume, mount_op, NULL, volume_mount_cb, mount_op);
+	g_volume_mount (volume, 0, mount_op, NULL, volume_mount_cb, mount_op);
 }
 
 

Modified: trunk/libnautilus-private/nautilus-mime-actions.c
==============================================================================
--- trunk/libnautilus-private/nautilus-mime-actions.c	(original)
+++ trunk/libnautilus-private/nautilus-mime-actions.c	Mon Feb 11 11:15:26 2008
@@ -1300,7 +1300,7 @@
 		g_signal_connect (mount_op, "active_changed", (GCallback)activate_mount_op_active, parameters);
 		location = nautilus_file_get_location (file);
 		nautilus_inhibit_autorun_for_file (location);
-		g_file_mount_enclosing_volume (location, mount_op, parameters->cancellable,
+		g_file_mount_enclosing_volume (location, 0, mount_op, parameters->cancellable,
 					       activation_mount_not_mounted_callback, parameters);
 		g_object_unref (location);
 		g_object_unref (mount_op);

Modified: trunk/libnautilus-private/nautilus-vfs-file.c
==============================================================================
--- trunk/libnautilus-private/nautilus-vfs-file.c	(original)
+++ trunk/libnautilus-private/nautilus-vfs-file.c	Mon Feb 11 11:15:26 2008
@@ -278,6 +278,7 @@
 
 	location = nautilus_file_get_location (file);
 	g_file_mount_mountable (location,
+				0,
 				mount_op,
 				op->cancellable,
 				vfs_file_mount_callback,

Modified: trunk/src/nautilus-application.c
==============================================================================
--- trunk/src/nautilus-application.c	(original)
+++ trunk/src/nautilus-application.c	Mon Feb 11 11:15:26 2008
@@ -209,7 +209,7 @@
 			nautilus_inhibit_autorun_for_volume (volume);
 
 			/* pass NULL as GMountOperation to avoid user interaction */
-			g_volume_mount (volume, NULL, NULL, startup_volume_mount_cb, NULL);
+			g_volume_mount (volume, 0, NULL, NULL, startup_volume_mount_cb, NULL);
 		}
 		eel_g_object_list_free (volumes);
 	}

Modified: trunk/src/nautilus-window-manage-views.c
==============================================================================
--- trunk/src/nautilus-window-manage-views.c	(original)
+++ trunk/src/nautilus-window-manage-views.c	Mon Feb 11 11:15:26 2008
@@ -969,7 +969,7 @@
 		data->window = window;
 		window->details->mount_cancellable = data->cancellable;
 		nautilus_inhibit_autorun_for_file (location);
-		g_file_mount_enclosing_volume (location, mount_op, window->details->mount_cancellable,
+		g_file_mount_enclosing_volume (location, 0, mount_op, window->details->mount_cancellable,
 					       mount_not_mounted_callback, data);
 		g_object_unref (location);
 		g_object_unref (mount_op);