From edd498d9247b17303686df0b222e07ebcbad66dc Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 16 Feb 2015 11:47:33 -0500 Subject: display: don't make d-bus object path require display number Going forward we aren't always going to know the display number ahead of time, so don't use it for encoding the display id. --- daemon/gdm-display.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c index b206e88a..7bd75239 100644 --- a/daemon/gdm-display.c +++ b/daemon/gdm-display.c @@ -1268,21 +1268,15 @@ gdm_display_constructor (GType type, GObjectConstructParam *construct_properties) { GdmDisplay *self; - char *canonical_display_name; gboolean res; self = GDM_DISPLAY (G_OBJECT_CLASS (gdm_display_parent_class)->constructor (type, n_construct_properties, construct_properties)); - canonical_display_name = g_strdelimit (g_strdup (self->priv->x11_display_name), - ":" G_STR_DELIMITERS, '_'); - g_free (self->priv->id); - self->priv->id = g_strdup_printf ("/org/gnome/DisplayManager/Displays/%s", - canonical_display_name); - - g_free (canonical_display_name); + self->priv->id = g_strdup_printf ("/org/gnome/DisplayManager/Displays/%lu", + (gulong) self); res = register_display (self); if (! res) { -- cgit v1.2.1