summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-01-13 03:53:15 +0100
committerLennart Poettering <lennart@poettering.net>2012-02-07 18:59:34 +0100
commit1a5f9a0f7a65e796e044ff2f3f793e8268d31623 (patch)
tree71c83064ae5c47469fa08db9c5819aa3f77c83cb
parent3ed96cac0c49d0687fc273d11bad51772d8233ed (diff)
downloadgdm-1a5f9a0f7a65e796e044ff2f3f793e8268d31623.tar.gz
welcome-session: get rid of register-ck-session property since it is unused
Nothing was using register-ck-session and it has no effect, hence let's get rid of this dead code.
-rw-r--r--daemon/Makefile.am6
-rw-r--r--daemon/gdm-chooser-session.c1
-rw-r--r--daemon/gdm-greeter-session.c1
-rw-r--r--daemon/gdm-welcome-session.c25
4 files changed, 1 insertions, 32 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 65e82b84..a153c43f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -115,8 +115,6 @@ gdm_simple_slave_SOURCES = \
simple-slave-main.c \
gdm-greeter-server.c \
gdm-greeter-server.h \
- ck-connector.h \
- ck-connector.c \
gdm-welcome-session.c \
gdm-welcome-session.h \
gdm-greeter-session.c \
@@ -156,8 +154,6 @@ gdm_factory_slave_SOURCES = \
factory-slave-main.c \
gdm-greeter-server.c \
gdm-greeter-server.h \
- ck-connector.h \
- ck-connector.c \
gdm-welcome-session.c \
gdm-welcome-session.h \
gdm-greeter-session.c \
@@ -232,8 +228,6 @@ gdm_xdmcp_chooser_slave_SOURCES = \
xdmcp-chooser-slave-main.c \
gdm-chooser-server.c \
gdm-chooser-server.h \
- ck-connector.h \
- ck-connector.c \
gdm-session.c \
gdm-session.h \
gdm-session-direct.c \
diff --git a/daemon/gdm-chooser-session.c b/daemon/gdm-chooser-session.c
index da0f2ab0..6aa60a67 100644
--- a/daemon/gdm-chooser-session.c
+++ b/daemon/gdm-chooser-session.c
@@ -81,7 +81,6 @@ gdm_chooser_session_new (const char *display_name,
"server-dbus-path", GDM_CHOOSER_SERVER_DBUS_PATH,
"server-dbus-interface", GDM_CHOOSER_SERVER_DBUS_INTERFACE,
"server-env-var-name", "GDM_CHOOSER_DBUS_ADDRESS",
- "register-ck-session", FALSE,
"x11-display-name", display_name,
"x11-display-device", display_device,
"x11-display-hostname", display_hostname,
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
index 80320651..44259abb 100644
--- a/daemon/gdm-greeter-session.c
+++ b/daemon/gdm-greeter-session.c
@@ -82,7 +82,6 @@ gdm_greeter_session_new (const char *display_name,
"server-dbus-path", GDM_GREETER_SERVER_DBUS_PATH,
"server-dbus-interface", GDM_GREETER_SERVER_DBUS_INTERFACE,
"server-env-var-name", "GDM_GREETER_DBUS_ADDRESS",
- "register-ck-session", TRUE,
"x11-display-name", display_name,
"x11-display-seat-id", seat_id,
"x11-display-device", display_device,
diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
index 41144a87..8721fe72 100644
--- a/daemon/gdm-welcome-session.c
+++ b/daemon/gdm-welcome-session.c
@@ -42,7 +42,6 @@
#include <dbus/dbus-glib-lowlevel.h>
#include "gdm-common.h"
-#include "ck-connector.h"
#include "gdm-session.h"
#include "gdm-session-direct.h"
@@ -78,7 +77,6 @@ struct GdmWelcomeSessionPrivate
char *server_dbus_path;
char *server_dbus_interface;
char *server_env_var_name;
- gboolean register_ck_session;
char *server_address;
};
@@ -98,8 +96,7 @@ enum {
PROP_COMMAND,
PROP_SERVER_DBUS_PATH,
PROP_SERVER_DBUS_INTERFACE,
- PROP_SERVER_ENV_VAR_NAME,
- PROP_REGISTER_CK_SESSION,
+ PROP_SERVER_ENV_VAR_NAME
};
enum {
@@ -1040,13 +1037,6 @@ _gdm_welcome_session_set_server_env_var_name (GdmWelcomeSession *welcome_session
}
static void
-_gdm_welcome_session_set_register_ck_session (GdmWelcomeSession *welcome_session,
- gboolean val)
-{
- welcome_session->priv->register_ck_session = val;
-}
-
-static void
gdm_welcome_session_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -1093,9 +1083,6 @@ gdm_welcome_session_set_property (GObject *object,
case PROP_SERVER_DBUS_INTERFACE:
_gdm_welcome_session_set_server_dbus_interface (self, g_value_get_string (value));
break;
- case PROP_REGISTER_CK_SESSION:
- _gdm_welcome_session_set_register_ck_session (self, g_value_get_boolean (value));
- break;
case PROP_SERVER_ENV_VAR_NAME:
_gdm_welcome_session_set_server_env_var_name (self, g_value_get_string (value));
break;
@@ -1155,9 +1142,6 @@ gdm_welcome_session_get_property (GObject *object,
case PROP_SERVER_DBUS_INTERFACE:
g_value_set_string (value, self->priv->server_dbus_interface);
break;
- case PROP_REGISTER_CK_SESSION:
- g_value_set_boolean (value, self->priv->register_ck_session);
- break;
case PROP_SERVER_ENV_VAR_NAME:
g_value_set_string (value, self->priv->server_env_var_name);
break;
@@ -1279,13 +1263,6 @@ gdm_welcome_session_class_init (GdmWelcomeSessionClass *klass)
"command",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
- g_object_class_install_property (object_class,
- PROP_REGISTER_CK_SESSION,
- g_param_spec_boolean ("register-ck-session",
- NULL,
- NULL,
- FALSE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
signals [STARTED] =
g_signal_new ("started",
G_OBJECT_CLASS_TYPE (object_class),