nautilus r15074 - in trunk: . libnautilus-private

[cosimoc svn gnome org]

Author: cosimoc
Date: Mon Mar  9 13:08:26 2009
New Revision: 15074
URL: http://svn.gnome.org/viewvc/nautilus?rev=15074&view=rev

Log:
2009-03-09  Cosimo Cecchi  <cosimoc gnome org>

	* libnautilus-private/nautilus-autorun.c:
	(nautilus_allow_autorun_for_volume_finish):
	inhibit autorun for 10 seconds instead of 5 seconds at login,
	as that may be too short for slower machines (#520691).


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	Mon Mar  9 13:08:26 2009
@@ -1196,15 +1196,17 @@
 	g_object_set_data (G_OBJECT (volume), "nautilus-allow-autorun", GINT_TO_POINTER (1));
 }
 
+#define INHIBIT_AUTORUN_SECONDS 10
+
 void
 nautilus_allow_autorun_for_volume_finish (GVolume *volume)
 {
 	if (g_object_get_data (G_OBJECT (volume), "nautilus-allow-autorun") != NULL) {
-		g_timeout_add_full (0,
-				    5000,
-				    remove_allow_volume,
-				    g_object_ref (volume),
-				    g_object_unref);
+		g_timeout_add_seconds_full (0,
+					    INHIBIT_AUTORUN_SECONDS,
+					    remove_allow_volume,
+					    g_object_ref (volume),
+					    g_object_unref);
 	}
 }