--- netbook-launcher-1.6.21.orig/src/launcher-sidebar.c
+++ netbook-launcher-1.6.21/src/launcher-sidebar.c
@@ -825,6 +825,8 @@
   GMount *mount;
   ClutterActor *shortcut;
   gchar *icon_name = NULL;
+  gboolean nautilus_prefs_media_autorun_never;
+  GConfClient *client = gconf_client_get_default ();
 
   g_return_if_fail (LAUNCHER_IS_SIDEBAR (sidebar));
   priv = sidebar->priv;
@@ -862,10 +864,16 @@
 
   ensure_layout (sidebar);
 
+  nautilus_prefs_media_autorun_never = gconf_client_get_bool (client,
+      "/apps/nautilus/preferences/media_autorun_never",
+      NULL);
+
+
   /* Try and automount IF nautilus and gnome-volume-manager
      are not already running */
   if (!G_IS_MOUNT (mount) && !priv->first_run && 
-      !is_running ("gnome-volume-manager") && !is_running ("nautilus"))
+      !is_running ("gnome-volume-manager") && !is_running ("nautilus")
+      && !nautilus_prefs_media_autorun_never)
   {
     g_object_set_data (G_OBJECT (shortcut), "automount", 
                        GINT_TO_POINTER (TRUE ? 1:0));