[gdm] daemon: drop some fluff code
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] daemon: drop some fluff code
- Date: Wed, 15 Jun 2011 15:30:05 +0000 (UTC)
commit c271f7000afbb9998996ede6956f23d514590f5b
Author: Ray Strode <rstrode redhat com>
Date: Wed Jun 15 10:48:27 2011 -0400
daemon: drop some fluff code
There's a bit of needless boilerplate and dead code
just sort of sitting around in various places.
This commit cleans things up a bit.
daemon/gdm-chooser-server.c | 34 -----------------
daemon/gdm-chooser-session.c | 68 ----------------------------------
daemon/gdm-display.c | 10 +++---
daemon/gdm-factory-slave.c | 47 ------------------------
daemon/gdm-greeter-server.c | 15 --------
daemon/gdm-greeter-session.c | 70 ------------------------------------
daemon/gdm-local-display-factory.c | 1 -
daemon/gdm-product-slave.c | 47 ------------------------
daemon/gdm-server.c | 14 -------
daemon/gdm-session-relay.c | 64 --------------------------------
daemon/gdm-session-worker-job.c | 7 ----
daemon/gdm-session-worker.c | 4 --
daemon/gdm-simple-slave.c | 2 +-
daemon/gdm-slave-proxy.c | 6 +++-
daemon/gdm-static-display.c | 51 --------------------------
daemon/gdm-transient-display.c | 51 --------------------------
daemon/gdm-welcome-session.c | 16 --------
daemon/gdm-xdmcp-chooser-display.c | 4 --
daemon/gdm-xdmcp-chooser-slave.c | 49 +------------------------
daemon/gdm-xdmcp-display-factory.c | 44 ++++++++++++----------
20 files changed, 36 insertions(+), 568 deletions(-)
---
diff --git a/daemon/gdm-chooser-server.c b/daemon/gdm-chooser-server.c
index fc9fd3c..2bd664c 100644
--- a/daemon/gdm-chooser-server.c
+++ b/daemon/gdm-chooser-server.c
@@ -80,7 +80,6 @@ static guint signals [LAST_SIGNAL] = { 0, };
static void gdm_chooser_server_class_init (GdmChooserServerClass *klass);
static void gdm_chooser_server_init (GdmChooserServer *chooser_server);
-static void gdm_chooser_server_finalize (GObject *object);
G_DEFINE_TYPE (GdmChooserServer, gdm_chooser_server, G_TYPE_OBJECT)
@@ -515,20 +514,6 @@ gdm_chooser_server_get_property (GObject *object,
}
}
-static GObject *
-gdm_chooser_server_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmChooserServer *chooser_server;
-
- chooser_server = GDM_CHOOSER_SERVER (G_OBJECT_CLASS (gdm_chooser_server_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
-
- return G_OBJECT (chooser_server);
-}
-
static void
gdm_chooser_server_class_init (GdmChooserServerClass *klass)
{
@@ -536,8 +521,6 @@ gdm_chooser_server_class_init (GdmChooserServerClass *klass)
object_class->get_property = gdm_chooser_server_get_property;
object_class->set_property = gdm_chooser_server_set_property;
- object_class->constructor = gdm_chooser_server_constructor;
- object_class->finalize = gdm_chooser_server_finalize;
g_type_class_add_private (klass, sizeof (GdmChooserServerPrivate));
@@ -602,23 +585,6 @@ gdm_chooser_server_init (GdmChooserServer *chooser_server)
chooser_server->priv = GDM_CHOOSER_SERVER_GET_PRIVATE (chooser_server);
}
-static void
-gdm_chooser_server_finalize (GObject *object)
-{
- GdmChooserServer *chooser_server;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GDM_IS_CHOOSER_SERVER (object));
-
- chooser_server = GDM_CHOOSER_SERVER (object);
-
- g_return_if_fail (chooser_server->priv != NULL);
-
- gdm_chooser_server_stop (chooser_server);
-
- G_OBJECT_CLASS (gdm_chooser_server_parent_class)->finalize (object);
-}
-
GdmChooserServer *
gdm_chooser_server_new (const char *display_id)
{
diff --git a/daemon/gdm-chooser-session.c b/daemon/gdm-chooser-session.c
index 884d52c..da0f2ab 100644
--- a/daemon/gdm-chooser-session.c
+++ b/daemon/gdm-chooser-session.c
@@ -52,91 +52,23 @@ struct GdmChooserSessionPrivate
gpointer dummy;
};
-enum {
- PROP_0,
-};
-
static void gdm_chooser_session_class_init (GdmChooserSessionClass *klass);
static void gdm_chooser_session_init (GdmChooserSession *chooser_session);
-static void gdm_chooser_session_finalize (GObject *object);
G_DEFINE_TYPE (GdmChooserSession, gdm_chooser_session, GDM_TYPE_WELCOME_SESSION)
static void
-gdm_chooser_session_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gdm_chooser_session_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GObject *
-gdm_chooser_session_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmChooserSession *chooser_session;
-
- chooser_session = GDM_CHOOSER_SESSION (G_OBJECT_CLASS (gdm_chooser_session_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
-
- return G_OBJECT (chooser_session);
-}
-
-static void
gdm_chooser_session_class_init (GdmChooserSessionClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->get_property = gdm_chooser_session_get_property;
- object_class->set_property = gdm_chooser_session_set_property;
- object_class->constructor = gdm_chooser_session_constructor;
- object_class->finalize = gdm_chooser_session_finalize;
-
g_type_class_add_private (klass, sizeof (GdmChooserSessionPrivate));
}
static void
gdm_chooser_session_init (GdmChooserSession *chooser_session)
{
-
chooser_session->priv = GDM_CHOOSER_SESSION_GET_PRIVATE (chooser_session);
}
-static void
-gdm_chooser_session_finalize (GObject *object)
-{
- GdmChooserSession *chooser_session;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GDM_IS_CHOOSER_SESSION (object));
-
- chooser_session = GDM_CHOOSER_SESSION (object);
-
- g_return_if_fail (chooser_session->priv != NULL);
-
- G_OBJECT_CLASS (gdm_chooser_session_parent_class)->finalize (object);
-}
-
GdmChooserSession *
gdm_chooser_session_new (const char *display_name,
const char *display_device,
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 84b4925..f38ce1d 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -328,11 +328,11 @@ gdm_display_real_get_timed_login_details (GdmDisplay *display,
delay = 0;
res = gdm_settings_direct_get_boolean (GDM_KEY_AUTO_LOGIN_ENABLE, &enabled);
- if (enabled) {
+ if (res && enabled) {
res = gdm_settings_direct_get_string (GDM_KEY_AUTO_LOGIN_USER, &username);
}
- if (enabled && username != NULL && username[0] != '\0') {
+ if (enabled && res && username != NULL && username[0] != '\0') {
goto out;
}
@@ -341,12 +341,12 @@ gdm_display_real_get_timed_login_details (GdmDisplay *display,
enabled = FALSE;
res = gdm_settings_direct_get_boolean (GDM_KEY_TIMED_LOGIN_ENABLE, &enabled);
- if (! enabled) {
+ if (res && ! enabled) {
goto out;
}
res = gdm_settings_direct_get_string (GDM_KEY_TIMED_LOGIN_USER, &username);
- if (username == NULL || username[0] == '\0') {
+ if (res && (username == NULL || username[0] == '\0')) {
enabled = FALSE;
g_free (username);
username = NULL;
@@ -356,7 +356,7 @@ gdm_display_real_get_timed_login_details (GdmDisplay *display,
delay = 0;
res = gdm_settings_direct_get_int (GDM_KEY_TIMED_LOGIN_DELAY, &delay);
- if (delay <= 0) {
+ if (res && delay <= 0) {
/* we don't allow the timed login to have a zero delay */
delay = 10;
}
diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
index 9e435f9..c61f8f4 100644
--- a/daemon/gdm-factory-slave.c
+++ b/daemon/gdm-factory-slave.c
@@ -81,10 +81,6 @@ struct GdmFactorySlavePrivate
DBusGConnection *connection;
};
-enum {
- PROP_0,
-};
-
static void gdm_factory_slave_class_init (GdmFactorySlaveClass *klass);
static void gdm_factory_slave_init (GdmFactorySlave *factory_slave);
static void gdm_factory_slave_finalize (GObject *object);
@@ -869,54 +865,11 @@ gdm_factory_slave_stop (GdmSlave *slave)
}
static void
-gdm_factory_slave_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gdm_factory_slave_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GObject *
-gdm_factory_slave_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmFactorySlave *factory_slave;
-
- factory_slave = GDM_FACTORY_SLAVE (G_OBJECT_CLASS (gdm_factory_slave_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
-
- return G_OBJECT (factory_slave);
-}
-
-static void
gdm_factory_slave_class_init (GdmFactorySlaveClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdmSlaveClass *slave_class = GDM_SLAVE_CLASS (klass);
- object_class->get_property = gdm_factory_slave_get_property;
- object_class->set_property = gdm_factory_slave_set_property;
- object_class->constructor = gdm_factory_slave_constructor;
object_class->finalize = gdm_factory_slave_finalize;
slave_class->start = gdm_factory_slave_start;
diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
index 7f27f93..5dd3c8f 100644
--- a/daemon/gdm-greeter-server.c
+++ b/daemon/gdm-greeter-server.c
@@ -1175,20 +1175,6 @@ gdm_greeter_server_get_property (GObject *object,
}
}
-static GObject *
-gdm_greeter_server_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmGreeterServer *greeter_server;
-
- greeter_server = GDM_GREETER_SERVER (G_OBJECT_CLASS (gdm_greeter_server_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
-
- return G_OBJECT (greeter_server);
-}
-
static void
gdm_greeter_server_class_init (GdmGreeterServerClass *klass)
{
@@ -1196,7 +1182,6 @@ gdm_greeter_server_class_init (GdmGreeterServerClass *klass)
object_class->get_property = gdm_greeter_server_get_property;
object_class->set_property = gdm_greeter_server_set_property;
- object_class->constructor = gdm_greeter_server_constructor;
object_class->finalize = gdm_greeter_server_finalize;
g_type_class_add_private (klass, sizeof (GdmGreeterServerPrivate));
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
index a401508..39f1528 100644
--- a/daemon/gdm-greeter-session.c
+++ b/daemon/gdm-greeter-session.c
@@ -50,69 +50,14 @@ struct GdmGreeterSessionPrivate
gpointer dummy;
};
-enum {
- PROP_0,
-};
-
static void gdm_greeter_session_class_init (GdmGreeterSessionClass *klass);
static void gdm_greeter_session_init (GdmGreeterSession *greeter_session);
-static void gdm_greeter_session_finalize (GObject *object);
G_DEFINE_TYPE (GdmGreeterSession, gdm_greeter_session, GDM_TYPE_WELCOME_SESSION)
static void
-gdm_greeter_session_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gdm_greeter_session_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GObject *
-gdm_greeter_session_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmGreeterSession *greeter_session;
- GdmGreeterSessionClass *klass;
-
- klass = GDM_GREETER_SESSION_CLASS (g_type_class_peek (GDM_TYPE_GREETER_SESSION));
-
- greeter_session = GDM_GREETER_SESSION (G_OBJECT_CLASS (gdm_greeter_session_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
-
- return G_OBJECT (greeter_session);
-}
-
-static void
gdm_greeter_session_class_init (GdmGreeterSessionClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->get_property = gdm_greeter_session_get_property;
- object_class->set_property = gdm_greeter_session_set_property;
- object_class->constructor = gdm_greeter_session_constructor;
- object_class->finalize = gdm_greeter_session_finalize;
-
g_type_class_add_private (klass, sizeof (GdmGreeterSessionPrivate));
}
@@ -123,21 +68,6 @@ gdm_greeter_session_init (GdmGreeterSession *greeter_session)
greeter_session->priv = GDM_GREETER_SESSION_GET_PRIVATE (greeter_session);
}
-static void
-gdm_greeter_session_finalize (GObject *object)
-{
- GdmGreeterSession *greeter_session;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GDM_IS_GREETER_SESSION (object));
-
- greeter_session = GDM_GREETER_SESSION (object);
-
- g_return_if_fail (greeter_session->priv != NULL);
-
- G_OBJECT_CLASS (gdm_greeter_session_parent_class)->finalize (object);
-}
-
GdmGreeterSession *
gdm_greeter_session_new (const char *display_name,
const char *seat_id,
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 219e142..e42695e 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -193,7 +193,6 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact
{
gboolean ret;
GdmDisplay *display;
- guint32 num;
g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c
index af1c480..d56a74b 100644
--- a/daemon/gdm-product-slave.c
+++ b/daemon/gdm-product-slave.c
@@ -83,11 +83,6 @@ struct GdmProductSlavePrivate
char *start_session_service_name;
};
-enum {
- PROP_0,
- PROP_DISPLAY_ID,
-};
-
static void gdm_product_slave_class_init (GdmProductSlaveClass *klass);
static void gdm_product_slave_init (GdmProductSlave *product_slave);
static void gdm_product_slave_finalize (GObject *object);
@@ -1354,53 +1349,11 @@ gdm_product_slave_stop (GdmSlave *slave)
}
static void
-gdm_product_slave_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gdm_product_slave_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GObject *
-gdm_product_slave_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmProductSlave *product_slave;
-
- product_slave = GDM_PRODUCT_SLAVE (G_OBJECT_CLASS (gdm_product_slave_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
- return G_OBJECT (product_slave);
-}
-
-static void
gdm_product_slave_class_init (GdmProductSlaveClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdmSlaveClass *slave_class = GDM_SLAVE_CLASS (klass);
- object_class->get_property = gdm_product_slave_get_property;
- object_class->set_property = gdm_product_slave_set_property;
- object_class->constructor = gdm_product_slave_constructor;
object_class->finalize = gdm_product_slave_finalize;
slave_class->start = gdm_product_slave_start;
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 8dacdb5..a995a03 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -843,19 +843,6 @@ gdm_server_get_property (GObject *object,
}
}
-static GObject *
-gdm_server_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmServer *server;
-
- server = GDM_SERVER (G_OBJECT_CLASS (gdm_server_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
- return G_OBJECT (server);
-}
-
static void
gdm_server_class_init (GdmServerClass *klass)
{
@@ -863,7 +850,6 @@ gdm_server_class_init (GdmServerClass *klass)
object_class->get_property = gdm_server_get_property;
object_class->set_property = gdm_server_set_property;
- object_class->constructor = gdm_server_constructor;
object_class->finalize = gdm_server_finalize;
g_type_class_add_private (klass, sizeof (GdmServerPrivate));
diff --git a/daemon/gdm-session-relay.c b/daemon/gdm-session-relay.c
index f76fa6f..dc0c79f 100644
--- a/daemon/gdm-session-relay.c
+++ b/daemon/gdm-session-relay.c
@@ -72,7 +72,6 @@ static guint signals [LAST_SIGNAL] = { 0, };
static void gdm_session_relay_class_init (GdmSessionRelayClass *klass);
static void gdm_session_relay_init (GdmSessionRelay *session_relay);
-static void gdm_session_relay_finalize (GObject *object);
static void gdm_session_iface_init (GdmSessionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GdmSessionRelay,
@@ -1233,46 +1232,6 @@ gdm_session_relay_get_address (GdmSessionRelay *session_relay)
}
static void
-gdm_session_relay_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gdm_session_relay_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GObject *
-gdm_session_relay_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmSessionRelay *session_relay;
-
- session_relay = GDM_SESSION_RELAY (G_OBJECT_CLASS (gdm_session_relay_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
-
- return G_OBJECT (session_relay);
-}
-
-static void
gdm_session_iface_init (GdmSessionIface *iface)
{
@@ -1297,12 +1256,6 @@ static void
gdm_session_relay_class_init (GdmSessionRelayClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
- object_class->get_property = gdm_session_relay_get_property;
- object_class->set_property = gdm_session_relay_set_property;
- object_class->constructor = gdm_session_relay_constructor;
- object_class->finalize = gdm_session_relay_finalize;
-
g_type_class_add_private (klass, sizeof (GdmSessionRelayPrivate));
signals [CONNECTED] =
@@ -1334,23 +1287,6 @@ gdm_session_relay_init (GdmSessionRelay *session_relay)
session_relay->priv = GDM_SESSION_RELAY_GET_PRIVATE (session_relay);
}
-static void
-gdm_session_relay_finalize (GObject *object)
-{
- GdmSessionRelay *session_relay;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GDM_IS_SESSION_RELAY (object));
-
- session_relay = GDM_SESSION_RELAY (object);
-
- g_return_if_fail (session_relay->priv != NULL);
-
- gdm_session_relay_stop (session_relay);
-
- G_OBJECT_CLASS (gdm_session_relay_parent_class)->finalize (object);
-}
-
GdmSessionRelay *
gdm_session_relay_new (void)
{
diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
index 8b93663..a129353 100644
--- a/daemon/gdm-session-worker-job.c
+++ b/daemon/gdm-session-worker-job.c
@@ -261,8 +261,6 @@ gdm_session_worker_job_spawn (GdmSessionWorkerJob *session_worker_job,
(GChildWatchFunc)session_worker_job_child_watch,
session_worker_job);
- out:
-
return ret;
}
@@ -282,11 +280,6 @@ gdm_session_worker_job_start (GdmSessionWorkerJob *session_worker_job,
res = gdm_session_worker_job_spawn (session_worker_job, name);
- if (res) {
-
- }
-
-
return res;
}
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index ea12da3..1c44b17 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -1331,10 +1331,6 @@ _change_user (GdmSessionWorker *worker,
uid_t uid,
gid_t gid)
{
- gboolean ret;
-
- ret = FALSE;
-
#ifdef THE_MAN_PAGE_ISNT_LYING
/* pam_setcred wants to be called as the authenticated user
* but pam_open_session needs to be called as super-user.
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 55c0f19..305637f 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -1235,7 +1235,7 @@ start_greeter (GdmSimpleSlave *slave)
res = gdm_settings_direct_get_int (GDM_KEY_PING_INTERVAL,
&(slave->priv->ping_interval));
- if ( ! display_is_local && slave->priv->ping_interval > 0) {
+ if ( ! display_is_local && res && slave->priv->ping_interval > 0) {
alarm (slave->priv->ping_interval);
}
diff --git a/daemon/gdm-slave-proxy.c b/daemon/gdm-slave-proxy.c
index 48efbd1..68eddcb 100644
--- a/daemon/gdm-slave-proxy.c
+++ b/daemon/gdm-slave-proxy.c
@@ -233,7 +233,6 @@ spawn_slave (GdmSlaveProxy *slave)
static void
kill_slave (GdmSlaveProxy *slave)
{
- int exit_status;
int res;
if (slave->priv->pid <= 1) {
@@ -244,7 +243,12 @@ kill_slave (GdmSlaveProxy *slave)
if (res < 0) {
g_warning ("Unable to kill slave process");
} else {
+ int exit_status;
+
exit_status = gdm_wait_on_pid (slave->priv->pid);
+
+ g_debug ("GdmSlaveProxy: slave died with exit status %d", exit_status);
+
g_spawn_close_pid (slave->priv->pid);
slave->priv->pid = 0;
}
diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c
index 9605f5a..16953f9 100644
--- a/daemon/gdm-static-display.c
+++ b/daemon/gdm-static-display.c
@@ -48,13 +48,8 @@ struct GdmStaticDisplayPrivate
gboolean first_login;
};
-enum {
- PROP_0,
-};
-
static void gdm_static_display_class_init (GdmStaticDisplayClass *klass);
static void gdm_static_display_init (GdmStaticDisplay *static_display);
-static void gdm_static_display_finalize (GObject *object);
G_DEFINE_TYPE (GdmStaticDisplay, gdm_static_display, GDM_TYPE_DISPLAY)
@@ -129,32 +124,6 @@ gdm_static_display_unmanage (GdmDisplay *display)
}
static void
-gdm_static_display_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gdm_static_display_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
gdm_static_display_get_timed_login_details (GdmDisplay *display,
gboolean *enabledp,
char **usernamep,
@@ -174,13 +143,8 @@ gdm_static_display_get_timed_login_details (GdmDisplay *display,
static void
gdm_static_display_class_init (GdmStaticDisplayClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdmDisplayClass *display_class = GDM_DISPLAY_CLASS (klass);
- object_class->get_property = gdm_static_display_get_property;
- object_class->set_property = gdm_static_display_set_property;
- object_class->finalize = gdm_static_display_finalize;
-
display_class->create_authority = gdm_static_display_create_authority;
display_class->add_user_authorization = gdm_static_display_add_user_authorization;
display_class->remove_user_authorization = gdm_static_display_remove_user_authorization;
@@ -203,21 +167,6 @@ gdm_static_display_init (GdmStaticDisplay *static_display)
static_display->priv->first_login = TRUE;
}
-static void
-gdm_static_display_finalize (GObject *object)
-{
- GdmStaticDisplay *static_display;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GDM_IS_STATIC_DISPLAY (object));
-
- static_display = GDM_STATIC_DISPLAY (object);
-
- g_return_if_fail (static_display->priv != NULL);
-
- G_OBJECT_CLASS (gdm_static_display_parent_class)->finalize (object);
-}
-
GdmDisplay *
gdm_static_display_new (int display_number)
{
diff --git a/daemon/gdm-transient-display.c b/daemon/gdm-transient-display.c
index 01813f7..991429f 100644
--- a/daemon/gdm-transient-display.c
+++ b/daemon/gdm-transient-display.c
@@ -48,13 +48,8 @@ struct GdmTransientDisplayPrivate
gpointer dummy;
};
-enum {
- PROP_0,
-};
-
static void gdm_transient_display_class_init (GdmTransientDisplayClass *klass);
static void gdm_transient_display_init (GdmTransientDisplay *display);
-static void gdm_transient_display_finalize (GObject *object);
G_DEFINE_TYPE (GdmTransientDisplay, gdm_transient_display, GDM_TYPE_DISPLAY)
@@ -119,32 +114,6 @@ gdm_transient_display_unmanage (GdmDisplay *display)
}
static void
-gdm_transient_display_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gdm_transient_display_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
gdm_transient_display_get_timed_login_details (GdmDisplay *display,
gboolean *enabledp,
char **usernamep,
@@ -158,13 +127,8 @@ gdm_transient_display_get_timed_login_details (GdmDisplay *display,
static void
gdm_transient_display_class_init (GdmTransientDisplayClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdmDisplayClass *display_class = GDM_DISPLAY_CLASS (klass);
- object_class->get_property = gdm_transient_display_get_property;
- object_class->set_property = gdm_transient_display_set_property;
- object_class->finalize = gdm_transient_display_finalize;
-
display_class->create_authority = gdm_transient_display_create_authority;
display_class->add_user_authorization = gdm_transient_display_add_user_authorization;
display_class->remove_user_authorization = gdm_transient_display_remove_user_authorization;
@@ -185,21 +149,6 @@ gdm_transient_display_init (GdmTransientDisplay *display)
display->priv = GDM_TRANSIENT_DISPLAY_GET_PRIVATE (display);
}
-static void
-gdm_transient_display_finalize (GObject *object)
-{
- GdmTransientDisplay *display;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GDM_IS_TRANSIENT_DISPLAY (object));
-
- display = GDM_TRANSIENT_DISPLAY (object);
-
- g_return_if_fail (display->priv != NULL);
-
- G_OBJECT_CLASS (gdm_transient_display_parent_class)->finalize (object);
-}
-
GdmDisplay *
gdm_transient_display_new (int display_number)
{
diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
index 438a95a..bf373a6 100644
--- a/daemon/gdm-welcome-session.c
+++ b/daemon/gdm-welcome-session.c
@@ -358,7 +358,6 @@ get_welcome_environment (GdmWelcomeSession *welcome_session,
NULL
};
int i;
- char *windowpath;
load_lang_config_file (LANG_CONFIG_FILE,
(const char **) optional_environment);
@@ -1278,20 +1277,6 @@ gdm_welcome_session_get_property (GObject *object,
}
}
-static GObject *
-gdm_welcome_session_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmWelcomeSession *welcome_session;
-
- welcome_session = GDM_WELCOME_SESSION (G_OBJECT_CLASS (gdm_welcome_session_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
-
- return G_OBJECT (welcome_session);
-}
-
static void
gdm_welcome_session_class_init (GdmWelcomeSessionClass *klass)
{
@@ -1299,7 +1284,6 @@ gdm_welcome_session_class_init (GdmWelcomeSessionClass *klass)
object_class->get_property = gdm_welcome_session_get_property;
object_class->set_property = gdm_welcome_session_set_property;
- object_class->constructor = gdm_welcome_session_constructor;
object_class->finalize = gdm_welcome_session_finalize;
g_type_class_add_private (klass, sizeof (GdmWelcomeSessionPrivate));
diff --git a/daemon/gdm-xdmcp-chooser-display.c b/daemon/gdm-xdmcp-chooser-display.c
index 85bd3b7..69bf150 100644
--- a/daemon/gdm-xdmcp-chooser-display.c
+++ b/daemon/gdm-xdmcp-chooser-display.c
@@ -55,10 +55,6 @@ struct GdmXdmcpChooserDisplayPrivate
};
enum {
- PROP_0,
-};
-
-enum {
HOSTNAME_SELECTED,
LAST_SIGNAL
};
diff --git a/daemon/gdm-xdmcp-chooser-slave.c b/daemon/gdm-xdmcp-chooser-slave.c
index 3117ff9..23d9e4f 100644
--- a/daemon/gdm-xdmcp-chooser-slave.c
+++ b/daemon/gdm-xdmcp-chooser-slave.c
@@ -73,10 +73,6 @@ struct GdmXdmcpChooserSlavePrivate
};
enum {
- PROP_0,
-};
-
-enum {
HOSTNAME_SELECTED,
LAST_SIGNAL
};
@@ -193,7 +189,7 @@ run_chooser (GdmXdmcpChooserSlave *slave)
res = gdm_settings_direct_get_int (GDM_KEY_PING_INTERVAL,
&(slave->priv->ping_interval));
- if (slave->priv->ping_interval > 0) {
+ if (res && slave->priv->ping_interval > 0) {
alarm (slave->priv->ping_interval);
}
@@ -320,54 +316,11 @@ gdm_xdmcp_chooser_slave_stop (GdmSlave *slave)
}
static void
-gdm_xdmcp_chooser_slave_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gdm_xdmcp_chooser_slave_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static GObject *
-gdm_xdmcp_chooser_slave_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_properties)
-{
- GdmXdmcpChooserSlave *xdmcp_chooser_slave;
-
- xdmcp_chooser_slave = GDM_XDMCP_CHOOSER_SLAVE (G_OBJECT_CLASS (gdm_xdmcp_chooser_slave_parent_class)->constructor (type,
- n_construct_properties,
- construct_properties));
-
- return G_OBJECT (xdmcp_chooser_slave);
-}
-
-static void
gdm_xdmcp_chooser_slave_class_init (GdmXdmcpChooserSlaveClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdmSlaveClass *slave_class = GDM_SLAVE_CLASS (klass);
- object_class->get_property = gdm_xdmcp_chooser_slave_get_property;
- object_class->set_property = gdm_xdmcp_chooser_slave_set_property;
- object_class->constructor = gdm_xdmcp_chooser_slave_constructor;
object_class->finalize = gdm_xdmcp_chooser_slave_finalize;
slave_class->start = gdm_xdmcp_chooser_slave_start;
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
index f62fdfb..d5ac32b 100644
--- a/daemon/gdm-xdmcp-display-factory.c
+++ b/daemon/gdm-xdmcp-display-factory.c
@@ -2991,26 +2991,30 @@ gdm_xdmcp_display_factory_start (GdmDisplayFactory *base_factory)
g_return_val_if_fail (factory->priv->socket_fd == -1, FALSE);
/* read configuration */
- res = gdm_settings_direct_get_uint (GDM_KEY_UDP_PORT,
- &(factory->priv->port));
- res = gdm_settings_direct_get_boolean (GDM_KEY_MULTICAST,
- &(factory->priv->use_multicast));
- res = gdm_settings_direct_get_string (GDM_KEY_MULTICAST_ADDR,
- &(factory->priv->multicast_address));
- res = gdm_settings_direct_get_boolean (GDM_KEY_INDIRECT,
- &(factory->priv->honor_indirect));
- res = gdm_settings_direct_get_uint (GDM_KEY_DISPLAYS_PER_HOST,
- &(factory->priv->max_displays_per_host));
- res = gdm_settings_direct_get_uint (GDM_KEY_MAX_SESSIONS,
- &(factory->priv->max_displays));
- res = gdm_settings_direct_get_uint (GDM_KEY_MAX_PENDING,
- &(factory->priv->max_pending_displays));
- res = gdm_settings_direct_get_uint (GDM_KEY_MAX_WAIT,
- &(factory->priv->max_wait));
- res = gdm_settings_direct_get_uint (GDM_KEY_MAX_WAIT_INDIRECT,
- &(factory->priv->max_wait_indirect));
- res = gdm_settings_direct_get_string (GDM_KEY_WILLING,
- &(factory->priv->willing_script));
+ res = gdm_settings_direct_get_uint (GDM_KEY_UDP_PORT,
+ &(factory->priv->port));
+ res = res && gdm_settings_direct_get_boolean (GDM_KEY_MULTICAST,
+ &(factory->priv->use_multicast));
+ res = res && gdm_settings_direct_get_string (GDM_KEY_MULTICAST_ADDR,
+ &(factory->priv->multicast_address));
+ res = res && gdm_settings_direct_get_boolean (GDM_KEY_INDIRECT,
+ &(factory->priv->honor_indirect));
+ res = res && gdm_settings_direct_get_uint (GDM_KEY_DISPLAYS_PER_HOST,
+ &(factory->priv->max_displays_per_host));
+ res = res && gdm_settings_direct_get_uint (GDM_KEY_MAX_SESSIONS,
+ &(factory->priv->max_displays));
+ res = res && gdm_settings_direct_get_uint (GDM_KEY_MAX_PENDING,
+ &(factory->priv->max_pending_displays));
+ res = res && gdm_settings_direct_get_uint (GDM_KEY_MAX_WAIT,
+ &(factory->priv->max_wait));
+ res = res && gdm_settings_direct_get_uint (GDM_KEY_MAX_WAIT_INDIRECT,
+ &(factory->priv->max_wait_indirect));
+ res = res && gdm_settings_direct_get_string (GDM_KEY_WILLING,
+ &(factory->priv->willing_script));
+
+ if (! res) {
+ return res;
+ }
ret = open_port (factory);
if (! ret) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
