summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Reck <mathias.reck@teamviewer.com>2016-11-10 16:15:53 +0100
committerRay Strode <rstrode@redhat.com>2016-11-10 13:59:38 -0500
commita0f63b36b4a64581df1a769723e130c645314678 (patch)
tree9bf3f7e86086c59e265f842301a002a2968e43ce
parent4eb6575fdbd0e0dda9b209f6b4731edf990fde98 (diff)
downloadgdm-a0f63b36b4a64581df1a769723e130c645314678.tar.gz
daemon: update X11DisplayName on register display
When a display registered, the sessions 'display-name' was already updated. The displays 'x11-display-name' however was not, so I've just added that. Of course that also meant that the 'x11-display-name' could no longer be constructor only. https://bugzilla.gnome.org/show_bug.cgi?id=752341
-rw-r--r--daemon/gdm-display.c2
-rw-r--r--daemon/gdm-manager.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index ab84ba4d..a7db6f13 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -1187,7 +1187,7 @@ gdm_display_class_init (GdmDisplayClass *klass)
"x11-display-name",
"x11-display-name",
NULL,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class,
PROP_SEAT_ID,
g_param_spec_string ("seat-id",
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 8338c639..0cb3af30 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -781,8 +781,10 @@ gdm_manager_handle_register_display (GdmDBusManager *manager,
if (session != NULL) {
GPid pid;
- if (x11_display_name != NULL)
+ if (x11_display_name != NULL) {
g_object_set (G_OBJECT (session), "display-name", x11_display_name, NULL);
+ g_object_set (G_OBJECT (display), "x11-display-name", x11_display_name, NULL);
+ }
/* FIXME: this should happen in gdm-session.c when the session is opened
*/