[gdm/wip/slave-connection: 7/33] daemon: drop display-id arg to GdmSessionDirect

[Ray Strode <halfline src gnome org>]

commit fc8aa593926e803fd144f5b2b12f9401ff5c1b35
Author: Ray Strode <rstrode redhat com>
Date:   Mon Jul 9 21:17:25 2012 -0400

    daemon: drop display-id arg to GdmSessionDirect
    
    It's not used anywhere, and so there's no reason to pass it along.

 daemon/gdm-session-direct.c  |   14 --------------
 daemon/gdm-session-direct.h  |    3 +--
 daemon/gdm-simple-slave.c    |    3 +--
 daemon/gdm-welcome-session.c |    3 +--
 daemon/test-session.c        |    3 +--
 5 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index e95c5e0..69717f8 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -116,7 +116,6 @@ struct _GdmSessionDirectPrivate
 
 enum {
         PROP_0,
-        PROP_DISPLAY_ID,
         PROP_DISPLAY_NAME,
         PROP_DISPLAY_HOSTNAME,
         PROP_DISPLAY_IS_LOCAL,
@@ -2828,9 +2827,6 @@ gdm_session_direct_set_property (GObject      *object,
         self = GDM_SESSION_DIRECT (object);
 
         switch (prop_id) {
-        case PROP_DISPLAY_ID:
-                _gdm_session_direct_set_display_id (self, g_value_get_string (value));
-                break;
         case PROP_DISPLAY_NAME:
                 _gdm_session_direct_set_display_name (self, g_value_get_string (value));
                 break;
@@ -2869,9 +2865,6 @@ gdm_session_direct_get_property (GObject    *object,
         self = GDM_SESSION_DIRECT (object);
 
         switch (prop_id) {
-        case PROP_DISPLAY_ID:
-                g_value_set_string (value, self->priv->display_id);
-                break;
         case PROP_DISPLAY_NAME:
                 g_value_set_string (value, self->priv->display_name);
                 break;
@@ -3024,13 +3017,6 @@ gdm_session_direct_class_init (GdmSessionDirectClass *session_class)
         g_type_class_add_private (session_class, sizeof (GdmSessionDirectPrivate));
 
         g_object_class_install_property (object_class,
-                                         PROP_DISPLAY_ID,
-                                         g_param_spec_string ("display-id",
-                                                              "display id",
-                                                              "display id",
-                                                              NULL,
-                                                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-        g_object_class_install_property (object_class,
                                          PROP_DISPLAY_NAME,
                                          g_param_spec_string ("display-name",
                                                               "display name",
diff --git a/daemon/gdm-session-direct.h b/daemon/gdm-session-direct.h
index 254d668..edaafd2 100644
--- a/daemon/gdm-session-direct.h
+++ b/daemon/gdm-session-direct.h
@@ -48,8 +48,7 @@ typedef struct
 
 GType              gdm_session_direct_get_type                 (void);
 
-GdmSessionDirect * gdm_session_direct_new                      (const char *display_id,
-                                                                const char *display_name,
+GdmSessionDirect * gdm_session_direct_new                      (const char *display_name,
                                                                 const char *display_hostname,
                                                                 const char *display_device,
                                                                 const char *display_seat_id,
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index e218c66..846d943 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -772,8 +772,7 @@ create_new_session (GdmSimpleSlave *slave)
                 display_device = gdm_server_get_display_device (slave->priv->server);
         }
 
-        slave->priv->session = gdm_session_direct_new (display_id,
-                                                       display_name,
+        slave->priv->session = gdm_session_direct_new (display_name,
                                                        display_hostname,
                                                        display_device,
                                                        display_seat_id,
diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
index 3431edb..e35df82 100644
--- a/daemon/gdm-welcome-session.c
+++ b/daemon/gdm-welcome-session.c
@@ -830,8 +830,7 @@ gdm_welcome_session_start (GdmWelcomeSession *welcome_session)
                 return FALSE;
         }
 
-        welcome_session->priv->session = GDM_SESSION (gdm_session_direct_new (NULL,
-                                                                              welcome_session->priv->x11_display_name,
+        welcome_session->priv->session = GDM_SESSION (gdm_session_direct_new (welcome_session->priv->x11_display_name,
                                                                               welcome_session->priv->x11_display_hostname,
                                                                               welcome_session->priv->x11_display_device,
                                                                               welcome_session->priv->x11_display_seat_id,
diff --git a/daemon/test-session.c b/daemon/test-session.c
index f75d5ed..53a3e34 100644
--- a/daemon/test-session.c
+++ b/daemon/test-session.c
@@ -264,8 +264,7 @@ main (int   argc,
 
         do {
                 g_debug ("creating instance of GdmSessionDirect object...");
-                session = gdm_session_direct_new ("/org/gnome/DisplayManager/Display1",
-                                                  ":0",
+                session = gdm_session_direct_new (":0",
                                                   g_get_host_name (),
                                                   ttyname (STDIN_FILENO),
                                                   "",