nautilus r14266 - in trunk: . libnautilus-private

[cosimoc svn gnome org]

Author: cosimoc
Date: Sun Jun 15 18:42:26 2008
New Revision: 14266
URL: http://svn.gnome.org/viewvc/nautilus?rev=14266&view=rev

Log:
2008-06-15  Cosimo Cecchi  <cosimoc gnome org>

	reviewed by: David Zeuthen <david fubar dk>

	* libnautilus-private/nautilus-autorun.c:
	Always open folder if the corresponding action is selected
	in the autorun preferences.
	Patch by Matthias Clasen. (#528675).


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-autorun.c

Modified: trunk/libnautilus-private/nautilus-autorun.c
==============================================================================
--- trunk/libnautilus-private/nautilus-autorun.c	(original)
+++ trunk/libnautilus-private/nautilus-autorun.c	Sun Jun 15 18:42:26 2008
@@ -1200,15 +1200,6 @@
 	gpointer user_data;
 } AutorunData;
 
-
-static void
-autorun_open_folder_for_mount (AutorunData *data)
-{
-	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN) && 
-	    data->open_window_func != NULL)
-		data->open_window_func (data->mount, data->user_data);
-}
-
 static void
 autorun_guessed_content_type_callback (GObject *source_object,
 				       GAsyncResult *res,
@@ -1237,13 +1228,14 @@
 			}
 			g_strfreev (guessed_content_type);
 		} else {
-			open_folder = TRUE;
+			if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN))
+				open_folder = TRUE;
 		}
 	}
 
 	/* only open the folder once.. */
-	if (open_folder) {
-		autorun_open_folder_for_mount (data);
+	if (open_folder && data->open_window_func != NULL) {
+		data->open_window_func (data->mount, data->user_data);
 	}
 
 	g_object_unref (data->mount);