Commit 066bd775 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Don't autorun non-local mounts.

2008-02-04  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-autorun.c:
	Don't autorun non-local mounts.


svn path=/trunk/; revision=13694
parent e428c99e
2008-02-04 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-autorun.c:
Don't autorun non-local mounts.
2008-02-04 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-dnd.c ()
......
......@@ -1223,8 +1223,9 @@ autorun_guessed_content_type_callback (GObject *source_object,
}
/* 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 @@ nautilus_autorun (GMount *mount, NautilusAutorunOpenWindow open_window_func, gpo
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 @@ should_autorun_mount (GMount *mount)
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment