From 51214c2a504b97f3e498ffd2e23a5f3e864ba95c Mon Sep 17 00:00:00 2001 From: Halton Huo Date: Tue, 3 Nov 2009 15:08:29 +0800 Subject: Drop is-dynamic related part since we use display-type instead. --- daemon/ck-connector.c | 1 - daemon/gdm-display.c | 36 ------------------------------------ daemon/gdm-display.h | 3 --- daemon/gdm-display.xml | 5 +---- daemon/gdm-dynamic-display.c | 1 - daemon/gdm-factory-slave.c | 6 +----- daemon/gdm-greeter-session.c | 4 +--- daemon/gdm-greeter-session.h | 3 +-- daemon/gdm-simple-slave.c | 6 +----- daemon/gdm-slave.c | 40 ---------------------------------------- daemon/gdm-static-display.c | 1 - daemon/gdm-welcome-session.c | 28 ++-------------------------- 12 files changed, 7 insertions(+), 127 deletions(-) diff --git a/daemon/ck-connector.c b/daemon/ck-connector.c index 8f6a4079..8609ccbb 100644 --- a/daemon/ck-connector.c +++ b/daemon/ck-connector.c @@ -83,7 +83,6 @@ static struct { { "session-type", DBUS_TYPE_STRING }, { "display-type", DBUS_TYPE_STRING }, { "is-local", DBUS_TYPE_BOOLEAN }, - { "is-dynamic", DBUS_TYPE_BOOLEAN }, { "unix-user", DBUS_TYPE_INT32 }, }; diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c index da60e5f8..e04753d1 100644 --- a/daemon/gdm-display.c +++ b/daemon/gdm-display.c @@ -69,7 +69,6 @@ struct GdmDisplayPrivate GdmDisplayAccessFile *access_file; gboolean is_local; - gboolean is_dynamic; gboolean use_auth; gboolean block_console_session_requests; guint finish_idle_id; @@ -93,7 +92,6 @@ enum { PROP_X11_COOKIE, PROP_X11_AUTHORITY_FILE, PROP_IS_LOCAL, - PROP_IS_DYNAMIC, PROP_USE_AUTH, PROP_SLAVE_COMMAND, PROP_BLOCK_CONSOLE_SESSION_REQUESTS, @@ -826,20 +824,6 @@ gdm_display_is_local (GdmDisplay *display, return TRUE; } -gboolean -gdm_display_is_dynamic (GdmDisplay *display, - gboolean *dynamic, - GError **error) -{ - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - - if (dynamic != NULL) { - *dynamic = display->priv->is_dynamic; - } - - return TRUE; -} - gboolean gdm_display_use_auth (GdmDisplay *display, gboolean *use_auth, @@ -942,13 +926,6 @@ _gdm_display_set_is_local (GdmDisplay *display, display->priv->is_local = is_local; } -static void -_gdm_display_set_is_dynamic (GdmDisplay *display, - gboolean is_dynamic) -{ - display->priv->is_dynamic = is_dynamic; -} - static void _gdm_display_set_use_auth (GdmDisplay *display, gboolean use_auth) @@ -1015,9 +992,6 @@ gdm_display_set_property (GObject *object, case PROP_IS_LOCAL: _gdm_display_set_is_local (self, g_value_get_boolean (value)); break; - case PROP_IS_DYNAMIC: - _gdm_display_set_is_dynamic (self, g_value_get_boolean (value)); - break; case PROP_USE_AUTH: _gdm_display_set_use_auth (self, g_value_get_boolean (value)); break; @@ -1081,9 +1055,6 @@ gdm_display_get_property (GObject *object, case PROP_IS_LOCAL: g_value_set_boolean (value, self->priv->is_local); break; - case PROP_IS_DYNAMIC: - g_value_set_boolean (value, self->priv->is_dynamic); - break; case PROP_USE_AUTH: g_value_set_boolean (value, self->priv->use_auth); break; @@ -1280,13 +1251,6 @@ gdm_display_class_init (GdmDisplayClass *klass) NULL, TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_IS_DYNAMIC, - g_param_spec_boolean ("is-dynamic", - NULL, - NULL, - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, PROP_USE_AUTH, g_param_spec_boolean ("use-auth", diff --git a/daemon/gdm-display.h b/daemon/gdm-display.h index 492aa5fb..b50549bf 100644 --- a/daemon/gdm-display.h +++ b/daemon/gdm-display.h @@ -126,9 +126,6 @@ gboolean gdm_display_get_session_id (GdmDisplay *disp gboolean gdm_display_is_local (GdmDisplay *display, gboolean *local, GError **error); -gboolean gdm_display_is_dynamic (GdmDisplay *display, - gboolean *dynamic, - GError **error); gboolean gdm_display_use_auth (GdmDisplay *display, gboolean *use_auth, GError **error); diff --git a/daemon/gdm-display.xml b/daemon/gdm-display.xml index 945939a1..c4d0b352 100644 --- a/daemon/gdm-display.xml +++ b/daemon/gdm-display.xml @@ -38,11 +38,8 @@ - - - - + diff --git a/daemon/gdm-dynamic-display.c b/daemon/gdm-dynamic-display.c index f9439f2f..c0beced0 100644 --- a/daemon/gdm-dynamic-display.c +++ b/daemon/gdm-dynamic-display.c @@ -196,7 +196,6 @@ gdm_dynamic_display_new (int display_number) object = g_object_new (GDM_TYPE_DYNAMIC_DISPLAY, "x11-display-number", display_number, "x11-display-name", x11_display, - "is-dynamic", TRUE, NULL); g_free (x11_display); diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c index 5cbcd742..5fe77531 100644 --- a/daemon/gdm-factory-slave.c +++ b/daemon/gdm-factory-slave.c @@ -458,7 +458,6 @@ static void run_greeter (GdmFactorySlave *slave) { gboolean display_is_local; - gboolean display_is_dynamic; char *display_id; char *display_name; char *seat_id; @@ -471,7 +470,6 @@ run_greeter (GdmFactorySlave *slave) g_debug ("GdmFactorySlave: Running greeter"); display_is_local = FALSE; - display_is_dynamic = FALSE; display_id = NULL; display_name = NULL; seat_id = NULL; @@ -482,7 +480,6 @@ run_greeter (GdmFactorySlave *slave) g_object_get (slave, "display-is-local", &display_is_local, - "display-is-dynamic", &display_is_dynamic, "display-id", &display_id, "display-name", &display_name, "seat-id", &seat_id, @@ -547,8 +544,7 @@ run_greeter (GdmFactorySlave *slave) session_id, display_device, display_hostname, - display_is_local, - display_is_dynamic); + display_is_local); g_signal_connect (slave->priv->greeter, "started", G_CALLBACK (on_greeter_session_start), diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c index 073994b1..95a0e6f9 100644 --- a/daemon/gdm-greeter-session.c +++ b/daemon/gdm-greeter-session.c @@ -144,8 +144,7 @@ gdm_greeter_session_new (const char *display_name, const char *session_id, const char *display_device, const char *display_hostname, - gboolean display_is_local, - gboolean display_is_dynamic) + gboolean display_is_local) { GObject *object; @@ -161,7 +160,6 @@ gdm_greeter_session_new (const char *display_name, "x11-display-device", display_device, "x11-display-hostname", display_hostname, "x11-display-is-local", display_is_local, - "x11-display-is-dynamic", display_is_dynamic, NULL); return GDM_GREETER_SESSION (object); diff --git a/daemon/gdm-greeter-session.h b/daemon/gdm-greeter-session.h index aa111884..c3c35061 100644 --- a/daemon/gdm-greeter-session.h +++ b/daemon/gdm-greeter-session.h @@ -54,8 +54,7 @@ GdmGreeterSession * gdm_greeter_session_new (const char const char *session_id, const char *display_device, const char *display_hostname, - gboolean display_is_local, - gboolean display_is_dynamic); + gboolean display_is_local); G_END_DECLS diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 15850a96..610483c3 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -886,7 +886,6 @@ static void start_greeter (GdmSimpleSlave *slave) { gboolean display_is_local; - gboolean display_is_dynamic; char *display_id; char *display_name; char *seat_id; @@ -900,7 +899,6 @@ start_greeter (GdmSimpleSlave *slave) g_debug ("GdmSimpleSlave: Running greeter"); display_is_local = FALSE; - display_is_dynamic = FALSE; display_id = NULL; display_name = NULL; seat_id = NULL; @@ -912,7 +910,6 @@ start_greeter (GdmSimpleSlave *slave) g_object_get (slave, "display-id", &display_id, "display-is-local", &display_is_local, - "display-is-dynamic", &display_is_dynamic, "display-name", &display_name, "display-seat-id", &seat_id, "display-session-id", &session_id, @@ -1001,8 +998,7 @@ start_greeter (GdmSimpleSlave *slave) session_id, display_device, display_hostname, - display_is_local, - display_is_dynamic); + display_is_local); g_signal_connect (slave->priv->greeter, "started", G_CALLBACK (on_greeter_session_start), diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c index 47b1419a..b0f7e576 100644 --- a/daemon/gdm-slave.c +++ b/daemon/gdm-slave.c @@ -83,7 +83,6 @@ struct GdmSlavePrivate int display_number; char *display_hostname; gboolean display_is_local; - gboolean display_is_dynamic; gboolean display_is_parented; char *display_seat_id; char *display_session_id; @@ -105,7 +104,6 @@ enum { PROP_DISPLAY_NUMBER, PROP_DISPLAY_HOSTNAME, PROP_DISPLAY_IS_LOCAL, - PROP_DISPLAY_IS_DYNAMIC, PROP_DISPLAY_SEAT_ID, PROP_DISPLAY_SESSION_ID, PROP_DISPLAY_X11_AUTHORITY_FILE @@ -552,24 +550,6 @@ gdm_slave_real_start (GdmSlave *slave) return FALSE; } - error = NULL; - res = dbus_g_proxy_call (slave->priv->display_proxy, - "IsDynamic", - &error, - G_TYPE_INVALID, - G_TYPE_BOOLEAN, &slave->priv->display_is_dynamic, - G_TYPE_INVALID); - if (! res) { - if (error != NULL) { - g_warning ("Failed to get value: %s", error->message); - g_error_free (error); - } else { - g_warning ("Failed to get value"); - } - - return FALSE; - } - error = NULL; res = dbus_g_proxy_call (slave->priv->display_proxy, "GetX11DisplayName", @@ -1375,13 +1355,6 @@ _gdm_slave_set_display_is_local (GdmSlave *slave, slave->priv->display_is_local = is; } -static void -_gdm_slave_set_display_is_dynamic (GdmSlave *slave, - gboolean is) -{ - slave->priv->display_is_dynamic = is; -} - static void gdm_slave_set_property (GObject *object, guint prop_id, @@ -1420,9 +1393,6 @@ gdm_slave_set_property (GObject *object, case PROP_DISPLAY_IS_LOCAL: _gdm_slave_set_display_is_local (self, g_value_get_boolean (value)); break; - case PROP_DISPLAY_IS_DYNAMIC: - _gdm_slave_set_display_is_dynamic (self, g_value_get_boolean (value)); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1467,9 +1437,6 @@ gdm_slave_get_property (GObject *object, case PROP_DISPLAY_IS_LOCAL: g_value_set_boolean (value, self->priv->display_is_local); break; - case PROP_DISPLAY_IS_DYNAMIC: - g_value_set_boolean (value, self->priv->display_is_dynamic); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -1608,13 +1575,6 @@ gdm_slave_class_init (GdmSlaveClass *klass) "display is local", TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_object_class_install_property (object_class, - PROP_DISPLAY_IS_DYNAMIC, - g_param_spec_boolean ("display-is-dynamic", - "display is dynamic", - "display is dynamic", - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); signals [STOPPED] = g_signal_new ("stopped", diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c index 9e5874a2..a747ee36 100644 --- a/daemon/gdm-static-display.c +++ b/daemon/gdm-static-display.c @@ -224,7 +224,6 @@ gdm_static_display_new (int display_number) object = g_object_new (GDM_TYPE_STATIC_DISPLAY, "x11-display-number", display_number, "x11-display-name", x11_display, - "is-dynamic", FALSE, NULL); g_free (x11_display); diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c index f8f52166..3a309119 100644 --- a/daemon/gdm-welcome-session.c +++ b/daemon/gdm-welcome-session.c @@ -71,7 +71,6 @@ struct GdmWelcomeSessionPrivate char *x11_display_hostname; char *x11_authority_file; gboolean x11_display_is_local; - gboolean x11_display_is_dynamic; guint child_watch_id; @@ -94,7 +93,6 @@ enum { PROP_X11_DISPLAY_HOSTNAME, PROP_X11_AUTHORITY_FILE, PROP_X11_DISPLAY_IS_LOCAL, - PROP_X11_DISPLAY_IS_DYNAMIC, PROP_USER_NAME, PROP_GROUP_NAME, PROP_SERVER_ADDRESS, @@ -188,13 +186,12 @@ open_welcome_session (GdmWelcomeSession *welcome_session) session_id = ""; } - g_debug ("GdmWelcomeSession: Opening ConsoleKit session for user:%d x11-display:'%s' x11-display-device:'%s' remote-host-name:'%s' is-local:%d is-dynamic:%d", + g_debug ("GdmWelcomeSession: Opening ConsoleKit session for user:%d x11-display:'%s' x11-display-device:'%s' remote-host-name:'%s' is-local:%d", pwent->pw_uid, welcome_session->priv->x11_display_name, x11_display_device, hostname, - welcome_session->priv->x11_display_is_local, - welcome_session->priv->x11_display_is_dynamic); + welcome_session->priv->x11_display_is_local); dbus_error_init (&error); res = ck_connector_open_session_with_parameters (welcome_session->priv->ckc, @@ -207,7 +204,6 @@ open_welcome_session (GdmWelcomeSession *welcome_session) "x11-display-device", &x11_display_device, "remote-host-name", &hostname, "is-local", &welcome_session->priv->x11_display_is_local, - "is-dynamic", &welcome_session->priv->x11_display_is_dynamic, NULL); if (! res) { if (dbus_error_is_set (&error)) { @@ -942,13 +938,6 @@ _gdm_welcome_session_set_x11_display_is_local (GdmWelcomeSession *welcome_sessio welcome_session->priv->x11_display_is_local = is_local; } -static void -_gdm_welcome_session_set_x11_display_is_dynamic (GdmWelcomeSession *welcome_session, - gboolean is_dynamic) -{ - welcome_session->priv->x11_display_is_dynamic = is_dynamic; -} - static void _gdm_welcome_session_set_x11_authority_file (GdmWelcomeSession *welcome_session, const char *file) @@ -1041,9 +1030,6 @@ gdm_welcome_session_set_property (GObject *object, case PROP_X11_DISPLAY_IS_LOCAL: _gdm_welcome_session_set_x11_display_is_local (self, g_value_get_boolean (value)); break; - case PROP_X11_DISPLAY_IS_DYNAMIC: - _gdm_welcome_session_set_x11_display_is_dynamic (self, g_value_get_boolean (value)); - break; case PROP_X11_AUTHORITY_FILE: _gdm_welcome_session_set_x11_authority_file (self, g_value_get_string (value)); break; @@ -1106,9 +1092,6 @@ gdm_welcome_session_get_property (GObject *object, case PROP_X11_DISPLAY_IS_LOCAL: g_value_set_boolean (value, self->priv->x11_display_is_local); break; - case PROP_X11_DISPLAY_IS_DYNAMIC: - g_value_set_boolean (value, self->priv->x11_display_is_dynamic); - break; case PROP_X11_AUTHORITY_FILE: g_value_set_string (value, self->priv->x11_authority_file); break; @@ -1210,13 +1193,6 @@ gdm_welcome_session_class_init (GdmWelcomeSessionClass *klass) "is local", FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_object_class_install_property (object_class, - PROP_X11_DISPLAY_IS_DYNAMIC, - g_param_spec_boolean ("x11-display-is-dynamic", - "is dynamic", - "is dynamic", - FALSE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (object_class, PROP_X11_AUTHORITY_FILE, g_param_spec_string ("x11-authority-file", -- cgit v1.2.1