Merge lp:~mterry/unity-greeter/no-gvfsd into lp:~robert-ancell/unity-greeter/trunk

[Michael Terry]

Prevents gvfsd from being started in greeter session.

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2011-08-08 10:21:25 +0000
+++ src/user-list.vala	2011-08-19 15:53:33 +0000
@@ -150,10 +150,9 @@
         setup_indicators ();
     }
 
-    async void setup_indicators ()
+    async void greeter_set_env (string key, string val)
     {
-        /* Set env var that will tell indicators to reduce functionality *.
-        GLib.Environment.set_variable ("INDICATOR_GREETER_MODE", "1", true);
+        GLib.Environment.set_variable (key, val, true);
 
         /* And also set it in the DBus activation environment so that any
          * indicator services pick it up. */
@@ -167,7 +166,7 @@
                                                          null);
 
             var builder = new GLib.VariantBuilder (GLib.VariantType.ARRAY);
-            builder.add ("{ss}", "INDICATOR_GREETER_MODE", "1");
+            builder.add ("{ss}", key, val);
 
             yield proxy.call ("UpdateActivationEnvironment",
                               new GLib.Variant ("(a{ss})", builder),
@@ -178,6 +177,12 @@
             warning ("Could not get set environment for indicators: %s", e.message);
             return;
         }
+    }
+
+    async void setup_indicators ()
+    {
+        greeter_set_env ("INDICATOR_GREETER_MODE", "1"); // reduced functionality
+        greeter_set_env ("GIO_USE_VFS", "local"); // no gvfsd
 
         load_indicator ("/usr/lib/indicators3/6/libsession.so");
         load_indicator ("/usr/lib/indicators3/6/libdatetime.so");