Merge lp:~lool/netbook-remix-launcher/lp-403556 into lp:netbook-remix-launcher

[Loïc Minier]

[Loïc Minier (lool)]

Proposed change is to honour the nautilus GConf preference for not doing any automounting. IMO the UNR upstream team might be wanting to double check what other mechanisms they want to copy from Nautilus or whether we should be using an entirely different key. In the latter case, ubiquity needs to be changed to also set the new key.

Will chat with njpatel about this tomorrow.

NB: Sorry didn't test or test-build these rebased changes due to lazyness in getting the bdeps to build tip.

[Neil J. Patel (njpatel)]

Looks good, definitely want to stick to nautilus's setting. I've merged and tested and it seems to work fine, the only difference was I added a g_object_unref (client) to the end of the function to free the GConfClient.

review: Approve

=== modified file 'src/nl-volumes-source.c'
--- src/nl-volumes-source.c	2009-08-04 10:09:59 +0000
+++ src/nl-volumes-source.c	2009-08-05 14:33:43 +0000
@@ -621,6 +621,8 @@
 {
   GMount       *mount;
   ClutterActor *tile;
+  GConfClient *client = gconf_client_get_default ();
+  gboolean nautilus_prefs_media_autorun_never;
 
   g_return_val_if_fail (G_IS_VOLUME (volume), FALSE);
 
@@ -632,10 +634,15 @@
     }
 
   mount = g_volume_get_mount (volume);
+
+  nautilus_prefs_media_autorun_never = gconf_client_get_bool (client,
+      "/apps/nautilus/preferences/media_autorun_never",
+      NULL);
   
   if (!G_IS_MOUNT (mount)
       && !is_running ("gnome-volume-manager")
-      && !is_running ("nautilus"))
+      && !is_running ("nautilus")
+      && !nautilus_prefs_media_autorun_never)
     {
       g_debug ("Automounting volume");
       on_volume_clicked (tile, volume);