Author: alexl
Date: Mon Feb 4 15:51:13 2008
New Revision: 13694
URL: http://svn.gnome.org/viewvc/nautilus?rev=13694&view=rev
Log:
2008-02-04 Alexander Larsson <[EMAIL PROTECTED]>
* libnautilus-private/nautilus-autorun.c:
Don't autorun non-local mounts.
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 Feb 4 15:51:13 2008
@@ -1223,8 +1223,9 @@
}
/* only open the folder once.. */
- if (open_folder)
+ if (open_folder) {
autorun_open_folder_for_mount (data);
+ }
g_object_unref (data->mount);
g_free (data);
@@ -1236,10 +1237,9 @@
AutorunData *data;
if (!should_autorun_mount (mount) ||
- eel_preferences_get_boolean
(NAUTILUS_PREFERENCES_MEDIA_AUTORUN_NEVER))
+ eel_preferences_get_boolean
(NAUTILUS_PREFERENCES_MEDIA_AUTORUN_NEVER)) {
return;
-
- /* TODO: only do this for local mounts */
+ }
/* Sniff the newly added mount to generate x-content/ types;
* we do this asynchronously (in another thread) since it
@@ -1359,7 +1359,12 @@
break;
}
}
-
+
+ if (!g_file_is_native (root)) {
+ /* only do autorun on local files */
+ /* TODO: Maybe we should do this on some gvfs mounts? like
gphoto: ? */
+ ignore_autorun = TRUE;
+ }
g_object_unref (root);
return !ignore_autorun;
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
