summaryrefslogtreecommitdiff
path: root/daemon/gdm-manager.c
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2015-04-07 10:57:36 -0400
committerRay Strode <rstrode@redhat.com>2015-04-11 07:13:00 -0400
commit172534d4a803d7905c10a76dc7bd6652cebc5f81 (patch)
tree77ba7e5d677d831836786cc34b1daa588f42cc62 /daemon/gdm-manager.c
parent8c101a45daa714259c279848d67dccbd796544f0 (diff)
downloadgdm-172534d4a803d7905c10a76dc7bd6652cebc5f81.tar.gz
manager: properly query display number when built without plymouth
The code to query the display number of the display object is erroneously tucked away in guards. This leads to the display device getting queried prematurely. https://bugzilla.gnome.org/show_bug.cgi?id=747351
Diffstat (limited to 'daemon/gdm-manager.c')
-rw-r--r--daemon/gdm-manager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 0dfce868..fc357d3b 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -1803,11 +1803,12 @@ on_display_status_changed (GdmDisplay *display,
g_object_get (display,
"is-local", &display_is_local,
- "x11-display-number", &display_number,
NULL);
quit_plymouth = display_is_local && manager->priv->plymouth_is_running;
#endif
+ g_object_get (display, "x11-display-number", &display_number, NULL);
+
status = gdm_display_get_status (display);
switch (status) {