[nautilus/autorun-cleanup: 5/9] Don't autorun on nautilus_file_operations_mount_volume()

[Tomas Bzatek <tbzatek src gnome org>]

commit f239312b987eed856fc4b2e89c58acf34f125dd9
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Tue Nov 23 15:57:29 2010 +0100

    Don't autorun on nautilus_file_operations_mount_volume()

 libnautilus-private/nautilus-file-operations.c |   10 ++--------
 libnautilus-private/nautilus-file-operations.h |    4 +---
 src/nautilus-places-sidebar.c                  |    4 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 1ec07d6..e351fdf 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -61,7 +61,6 @@
 #include "nautilus-desktop-link-monitor.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-link.h"
-#include "nautilus-autorun.h"
 #include "nautilus-trash-monitor.h"
 #include "nautilus-file-utilities.h"
 #include "nautilus-file-conflict-dialog.h"
@@ -2298,7 +2297,6 @@ volume_mount_cb (GObject *source_object,
 	char *name;
 
 	error = NULL;
-	nautilus_allow_autorun_for_volume_finish (G_VOLUME (source_object));
 	if (!g_volume_mount_finish (G_VOLUME (source_object), res, &error)) {
 		if (error->code != G_IO_ERROR_FAILED_HANDLED) {
 			name = g_volume_get_name (G_VOLUME (source_object));
@@ -2334,17 +2332,15 @@ volume_mount_cb (GObject *source_object,
 
 void
 nautilus_file_operations_mount_volume (GtkWindow *parent_window,
-				       GVolume *volume,
-				       gboolean allow_autorun)
+				       GVolume *volume)
 {
 	nautilus_file_operations_mount_volume_full (parent_window, volume,
-						    allow_autorun, NULL, NULL);
+						    NULL, NULL);
 }
 
 void
 nautilus_file_operations_mount_volume_full (GtkWindow *parent_window,
 					    GVolume *volume,
-					    gboolean allow_autorun,
 					    NautilusMountCallback mount_callback,
 					    GObject *mount_callback_data_object)
 {
@@ -2366,8 +2362,6 @@ nautilus_file_operations_mount_volume_full (GtkWindow *parent_window,
 			   "mount-callback-data",
 			   mount_callback_data_object);
 
-	if (allow_autorun)
-		nautilus_allow_autorun_for_volume (volume);
 	g_volume_mount (volume, 0, mount_op, NULL, volume_mount_cb, mount_op);
 }
 
diff --git a/libnautilus-private/nautilus-file-operations.h b/libnautilus-private/nautilus-file-operations.h
index b851bce..c2ef34c 100644
--- a/libnautilus-private/nautilus-file-operations.h
+++ b/libnautilus-private/nautilus-file-operations.h
@@ -101,11 +101,9 @@ void nautilus_file_operations_unmount_mount_full (GtkWindow                 *par
 						  NautilusUnmountCallback    callback,
 						  gpointer                   callback_data);
 void nautilus_file_operations_mount_volume  (GtkWindow                      *parent_window,
-					     GVolume                        *volume,
-					     gboolean                        allow_autorun);
+					     GVolume                        *volume);
 void nautilus_file_operations_mount_volume_full (GtkWindow                      *parent_window,
 						 GVolume                        *volume,
-						 gboolean                        allow_autorun,
 						 NautilusMountCallback           mount_callback,
 						 GObject                        *mount_callback_data_object);
 
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index e5c9bae..52611bf 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -1856,7 +1856,7 @@ open_selected_bookmark (NautilusPlacesSidebar *sidebar,
 
 			sidebar->go_to_after_mount_flags = flags;
 
-			nautilus_file_operations_mount_volume_full (NULL, volume, FALSE,
+			nautilus_file_operations_mount_volume_full (NULL, volume,
 								    volume_mounted_cb,
 								    G_OBJECT (sidebar));
 		} else if (volume == NULL && drive != NULL &&
@@ -1991,7 +1991,7 @@ mount_shortcut_cb (GtkMenuItem           *item,
 			    -1);
 
 	if (volume != NULL) {
-		nautilus_file_operations_mount_volume (NULL, volume, FALSE);
+		nautilus_file_operations_mount_volume (NULL, volume);
 		g_object_unref (volume);
 	}
 }