Merge lp:~mterry/unity-greeter/set-indicator-greeter-mode into lp:~robert-ancell/unity-greeter/trunk

[Michael Terry]

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2011-07-26 04:21:25 +0000
+++ src/user-list.vala	2011-08-03 17:45:54 +0000
@@ -147,6 +147,36 @@
 
         options_menu = new Gtk.Menu ();
 
+        setup_indicators ();
+    }
+
+    async void setup_indicators ()
+    {
+        // Set env var that will tell indicators to reduce functionality
+        GLib.Environment.set_variable("INDICATOR_GREETER_MODE", "1", true);
+
+        // And also set it in the DBus activation environment so that any
+        // indicator services pick it up.
+        try {
+          var proxy = new GLib.DBusProxy.for_bus_sync(GLib.BusType.SESSION,
+                                                      GLib.DBusProxyFlags.NONE, null, 
+                                                      "org.freedesktop.DBus",
+                                                      "/org/freedesktop/DBus",
+                                                      "org.freedesktop.DBus",
+                                                      null);
+
+          var builder = new GLib.VariantBuilder(GLib.VariantType.ARRAY);
+          builder.add("{ss}", "INDICATOR_GREETER_MODE", "1");
+
+          yield proxy.call("UpdateActivationEnvironment",
+                           new GLib.Variant("(a{ss})", builder),
+                           GLib.DBusCallFlags.NONE, -1, null);
+        }
+        catch (Error e) {
+          warning("Could not get set environment for indicators: %s", e.message);
+          return; // no indicators at all then
+        }
+
         load_indicator ("/usr/lib/indicators3/6/libsession.so");
         load_indicator ("/usr/lib/indicators3/6/libdatetime.so");
         load_indicator ("/usr/lib/indicators3/6/libsoundmenu.so");