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

Proposed by Felipe Escoto
Status: Merged
Approved by: Danielle Foré
Approved revision: 85
Merged at revision: 85
Proposed branch: lp:~philip.scott/wingpanel-indicator-session/init-whats-needed
Merge into: lp:~wingpanel-devs/wingpanel-indicator-session/trunk
Diff against target: 53 lines (+18/-13)
2 files modified
src/Indicator.vala (+13/-11)
src/Widgets/EndSessionDialog.vala (+5/-2)
To merge this branch: bzr merge lp:~philip.scott/wingpanel-indicator-session/init-whats-needed
Reviewer Review Type Date Requested Status
WingPanel Devs Pending
Review via email: mp+299843@code.launchpad.net

Commit message

Prevent unneeded interfaces from timing out

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
100 suspend.set_sensitive (false);100 suspend.set_sensitive (false);
101 }101 }
102102
103 try {103 if (server_type == Wingpanel.IndicatorManager.ServerType.SESSION) {
104 lock_interface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver");104 try {
105 } catch (IOError e) {105 lock_interface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver");
106 stderr.printf ("%s\n", e.message);106 } catch (IOError e) {
107 lock_screen.set_sensitive (false);107 stderr.printf ("%s\n", e.message);
108 }108 lock_screen.set_sensitive (false);
109 }
109110
110 try {111 try {
111 seat_interface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.DisplayManager", "/org/freedesktop/DisplayManager/Seat0");112 seat_interface = Bus.get_proxy_sync (BusType.SESSION, "org.freedesktop.DisplayManager", "/org/freedesktop/DisplayManager/Seat0");
112 } catch (IOError e) {113 } catch (IOError e) {
113 stderr.printf ("%s\n", e.message);114 stderr.printf ("%s\n", e.message);
114 lock_screen.set_sensitive (false);115 lock_screen.set_sensitive (false);
116 }
115 }117 }
116 }118 }
117119
118120
=== 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 @@
3939
40 construct {40 construct {
41 try {41 try {
42 session_interface = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.SessionManager", "/org/gnome/SessionManager");42 if (dialog_type == Session.Widgets.EndSessionDialogType.LOGOUT) {
43 system_interface = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1");43 session_interface = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.SessionManager", "/org/gnome/SessionManager");
44 } else {
45 system_interface = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1");
46 }
44 } catch (IOError e) {47 } catch (IOError e) {
45 stderr.printf ("%s\n", e.message);48 stderr.printf ("%s\n", e.message);
46 }49 }

Subscribers

People subscribed via source and target branches

to all changes: