[gdm] manager: properly query display number when built without plymouth
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] manager: properly query display number when built without plymouth
- Date: Sat, 11 Apr 2015 11:13:17 +0000 (UTC)
commit 172534d4a803d7905c10a76dc7bd6652cebc5f81
Author: Ray Strode <rstrode redhat com>
Date: Tue Apr 7 10:57:36 2015 -0400
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
daemon/gdm-manager.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 0dfce86..fc357d3 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) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]