[gdm/wip/wayland-at-login-screen: 49/70] display: don't make d-bus object path require display number

[Ray Strode <halfline src gnome org>]

commit edd498d9247b17303686df0b222e07ebcbad66dc
Author: Ray Strode <rstrode redhat com>
Date:   Mon Feb 16 11:47:33 2015 -0500

    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 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index b206e88..7bd7523 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) {