Merge lp:~philip.scott/wingpanel-indicator-session/init-whats-needed into lp:~wingpanel-devs/wingpanel-indicator-session/trunk

[Felipe Escoto]

Prevent unneeded interfaces from timing out

The reason it was taking too long to start up the Shutdown dialog in greeter it was because we were starting up the session interface even when we weren't in a session, thus it was timing out...

This branch should fix it as it now only starts up the needed interfaces

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-05-21 15:56:59 +0000
+++ src/Indicator.vala	2016-07-12 16:36:50 +0000
@@ -100,18 +100,20 @@
             suspend.set_sensitive (false);
         }
 
-        try {
-            lock_interface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver");
-        } catch (IOError e) {
-            stderr.printf ("%s\n", e.message);
-            lock_screen.set_sensitive (false);
-        }
+        if (server_type == Wingpanel.IndicatorManager.ServerType.SESSION) {
+            try {
+                lock_interface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver");
+            } catch (IOError e) {
+                stderr.printf ("%s\n", e.message);
+                lock_screen.set_sensitive (false);
+            }
 
-        try {
-            seat_interface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.DisplayManager", "/org/freedesktop/DisplayManager/Seat0");
-        } catch (IOError e) {
-            stderr.printf ("%s\n", e.message);
-            lock_screen.set_sensitive (false);
+            try {
+                seat_interface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.DisplayManager", "/org/freedesktop/DisplayManager/Seat0");
+            } catch (IOError e) {
+                stderr.printf ("%s\n", e.message);
+                lock_screen.set_sensitive (false);
+            }
         }
     }
 

=== modified file 'src/Widgets/EndSessionDialog.vala'
--- src/Widgets/EndSessionDialog.vala	2016-01-15 19:59:37 +0000
+++ src/Widgets/EndSessionDialog.vala	2016-07-12 16:36:50 +0000
@@ -39,8 +39,11 @@
 
     construct {
         try {
-            session_interface = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.SessionManager", "/org/gnome/SessionManager");
-            system_interface = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1");
+            if (dialog_type == Session.Widgets.EndSessionDialogType.LOGOUT) {
+                session_interface = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.SessionManager", "/org/gnome/SessionManager");
+            } else {
+                system_interface = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1");
+            }
         } catch (IOError e) {
             stderr.printf ("%s\n", e.message);
         }