diff options
Diffstat (limited to 'daemon')
28 files changed, 28 insertions, 191 deletions
diff --git a/daemon/gdm-chooser-server.c b/daemon/gdm-chooser-server.c index c53e7927..8d2576b8 100644 --- a/daemon/gdm-chooser-server.c +++ b/daemon/gdm-chooser-server.c @@ -514,9 +514,6 @@ gdm_chooser_server_constructor (GType type, GObjectConstructParam *construct_properties) { GdmChooserServer *chooser_server; - GdmChooserServerClass *klass; - - klass = GDM_CHOOSER_SERVER_CLASS (g_type_class_peek (GDM_TYPE_CHOOSER_SERVER)); chooser_server = GDM_CHOOSER_SERVER (G_OBJECT_CLASS (gdm_chooser_server_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-chooser-session.c b/daemon/gdm-chooser-session.c index 759096ae..884d52c4 100644 --- a/daemon/gdm-chooser-session.c +++ b/daemon/gdm-chooser-session.c @@ -68,10 +68,6 @@ gdm_chooser_session_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmChooserSession *self; - - self = GDM_CHOOSER_SESSION (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -85,10 +81,6 @@ gdm_chooser_session_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmChooserSession *self; - - self = GDM_CHOOSER_SESSION (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -102,9 +94,6 @@ gdm_chooser_session_constructor (GType type, GObjectConstructParam *construct_properties) { GdmChooserSession *chooser_session; - GdmChooserSessionClass *klass; - - klass = GDM_CHOOSER_SESSION_CLASS (g_type_class_peek (GDM_TYPE_CHOOSER_SESSION)); chooser_session = GDM_CHOOSER_SESSION (G_OBJECT_CLASS (gdm_chooser_session_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c index 08875682..8296907f 100644 --- a/daemon/gdm-display-access-file.c +++ b/daemon/gdm-display-access-file.c @@ -58,7 +58,7 @@ enum PROP_PATH }; -G_DEFINE_TYPE (GdmDisplayAccessFile, gdm_display_access_file, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdmDisplayAccessFile, gdm_display_access_file, G_TYPE_OBJECT) static void gdm_display_access_file_get_property (GObject *object, diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c index fbae90b9..39d464ec 100644 --- a/daemon/gdm-display.c +++ b/daemon/gdm-display.c @@ -142,7 +142,7 @@ _create_access_file_for_user (GdmDisplay *display, file_error = NULL; if (!gdm_display_access_file_open (access_file, &file_error)) { g_propagate_error (error, file_error); - return FALSE; + return NULL; } return access_file; @@ -778,11 +778,8 @@ gdm_display_constructor (GType type, GObjectConstructParam *construct_properties) { GdmDisplay *display; - GdmDisplayClass *klass; gboolean res; - klass = GDM_DISPLAY_CLASS (g_type_class_peek (GDM_TYPE_DISPLAY)); - display = GDM_DISPLAY (G_OBJECT_CLASS (gdm_display_parent_class)->constructor (type, n_construct_properties, construct_properties)); diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c index ba1df3ad..8791d5b7 100644 --- a/daemon/gdm-factory-slave.c +++ b/daemon/gdm-factory-slave.c @@ -670,14 +670,13 @@ gdm_factory_slave_run (GdmFactorySlave *slave) static gboolean gdm_factory_slave_start (GdmSlave *slave) { - gboolean res; gboolean ret; ret = FALSE; g_debug ("GdmFactorySlave: Starting factory slave"); - res = GDM_SLAVE_CLASS (gdm_factory_slave_parent_class)->start (slave); + GDM_SLAVE_CLASS (gdm_factory_slave_parent_class)->start (slave); GDM_FACTORY_SLAVE (slave)->priv->session = gdm_session_relay_new (); g_signal_connect (GDM_FACTORY_SLAVE (slave)->priv->session, @@ -766,11 +765,9 @@ gdm_factory_slave_start (GdmSlave *slave) static gboolean gdm_factory_slave_stop (GdmSlave *slave) { - gboolean res; - g_debug ("GdmFactorySlave: Stopping factory_slave"); - res = GDM_SLAVE_CLASS (gdm_factory_slave_parent_class)->stop (slave); + GDM_SLAVE_CLASS (gdm_factory_slave_parent_class)->stop (slave); if (GDM_FACTORY_SLAVE (slave)->priv->session != NULL) { gdm_session_relay_stop (GDM_FACTORY_SLAVE (slave)->priv->session); @@ -809,10 +806,6 @@ gdm_factory_slave_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmFactorySlave *self; - - self = GDM_FACTORY_SLAVE (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -826,10 +819,6 @@ gdm_factory_slave_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmFactorySlave *self; - - self = GDM_FACTORY_SLAVE (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -843,9 +832,6 @@ gdm_factory_slave_constructor (GType type, GObjectConstructParam *construct_properties) { GdmFactorySlave *factory_slave; - GdmFactorySlaveClass *klass; - - klass = GDM_FACTORY_SLAVE_CLASS (g_type_class_peek (GDM_TYPE_FACTORY_SLAVE)); factory_slave = GDM_FACTORY_SLAVE (G_OBJECT_CLASS (gdm_factory_slave_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c index 2fa8a8f2..e1f672c3 100644 --- a/daemon/gdm-greeter-server.c +++ b/daemon/gdm-greeter-server.c @@ -916,9 +916,6 @@ gdm_greeter_server_constructor (GType type, GObjectConstructParam *construct_properties) { GdmGreeterServer *greeter_server; - GdmGreeterServerClass *klass; - - klass = GDM_GREETER_SERVER_CLASS (g_type_class_peek (GDM_TYPE_GREETER_SERVER)); greeter_server = GDM_GREETER_SERVER (G_OBJECT_CLASS (gdm_greeter_server_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c index b6d555e8..8cb65ee1 100644 --- a/daemon/gdm-greeter-session.c +++ b/daemon/gdm-greeter-session.c @@ -66,10 +66,6 @@ gdm_greeter_session_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmGreeterSession *self; - - self = GDM_GREETER_SESSION (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -83,10 +79,6 @@ gdm_greeter_session_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmGreeterSession *self; - - self = GDM_GREETER_SESSION (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index d6930a66..4f80b748 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -438,10 +438,6 @@ gdm_local_display_factory_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmLocalDisplayFactory *self; - - self = GDM_LOCAL_DISPLAY_FACTORY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -455,10 +451,6 @@ gdm_local_display_factory_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmLocalDisplayFactory *self; - - self = GDM_LOCAL_DISPLAY_FACTORY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -515,11 +507,8 @@ gdm_local_display_factory_constructor (GType type, GObjectConstructParam *construct_properties) { GdmLocalDisplayFactory *factory; - GdmLocalDisplayFactoryClass *klass; gboolean res; - klass = GDM_LOCAL_DISPLAY_FACTORY_CLASS (g_type_class_peek (GDM_TYPE_LOCAL_DISPLAY_FACTORY)); - factory = GDM_LOCAL_DISPLAY_FACTORY (G_OBJECT_CLASS (gdm_local_display_factory_parent_class)->constructor (type, n_construct_properties, construct_properties)); diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index fa87800e..8b604686 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -320,9 +320,6 @@ gdm_manager_constructor (GType type, GObjectConstructParam *construct_properties) { GdmManager *manager; - GdmManagerClass *klass; - - klass = GDM_MANAGER_CLASS (g_type_class_peek (GDM_TYPE_MANAGER)); manager = GDM_MANAGER (G_OBJECT_CLASS (gdm_manager_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-product-display.c b/daemon/gdm-product-display.c index 3e8d860b..5dbc4d16 100644 --- a/daemon/gdm-product-display.c +++ b/daemon/gdm-product-display.c @@ -187,9 +187,6 @@ gdm_product_display_constructor (GType type, GObjectConstructParam *construct_properties) { GdmProductDisplay *display; - GdmProductDisplayClass *klass; - - klass = GDM_PRODUCT_DISPLAY_CLASS (g_type_class_peek (GDM_TYPE_PRODUCT_DISPLAY)); display = GDM_PRODUCT_DISPLAY (G_OBJECT_CLASS (gdm_product_display_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c index 9645abe2..f7991c2f 100644 --- a/daemon/gdm-product-slave.c +++ b/daemon/gdm-product-slave.c @@ -966,13 +966,12 @@ static gboolean gdm_product_slave_start (GdmSlave *slave) { gboolean ret; - gboolean res; GError *error; char *display_id; ret = FALSE; - res = GDM_SLAVE_CLASS (gdm_product_slave_parent_class)->start (slave); + GDM_SLAVE_CLASS (gdm_product_slave_parent_class)->start (slave); g_object_get (slave, "display-id", &display_id, @@ -1019,11 +1018,9 @@ gdm_product_slave_start (GdmSlave *slave) static gboolean gdm_product_slave_stop (GdmSlave *slave) { - gboolean res; - g_debug ("GdmProductSlave: Stopping product_slave"); - res = GDM_SLAVE_CLASS (gdm_product_slave_parent_class)->stop (slave); + GDM_SLAVE_CLASS (gdm_product_slave_parent_class)->stop (slave); if (GDM_PRODUCT_SLAVE (slave)->priv->session != NULL) { gdm_session_close (GDM_SESSION (GDM_PRODUCT_SLAVE (slave)->priv->session)); @@ -1050,10 +1047,6 @@ gdm_product_slave_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmProductSlave *self; - - self = GDM_PRODUCT_SLAVE (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1067,10 +1060,6 @@ gdm_product_slave_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmProductSlave *self; - - self = GDM_PRODUCT_SLAVE (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1084,9 +1073,6 @@ gdm_product_slave_constructor (GType type, GObjectConstructParam *construct_properties) { GdmProductSlave *product_slave; - GdmProductSlaveClass *klass; - - klass = GDM_PRODUCT_SLAVE_CLASS (g_type_class_peek (GDM_TYPE_PRODUCT_SLAVE)); product_slave = GDM_PRODUCT_SLAVE (G_OBJECT_CLASS (gdm_product_slave_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c index 0909e014..ff9a17d5 100644 --- a/daemon/gdm-server.c +++ b/daemon/gdm-server.c @@ -831,9 +831,6 @@ gdm_server_constructor (GType type, GObjectConstructParam *construct_properties) { GdmServer *server; - GdmServerClass *klass; - - klass = GDM_SERVER_CLASS (g_type_class_peek (GDM_TYPE_SERVER)); server = GDM_SERVER (G_OBJECT_CLASS (gdm_server_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-session-auditor.c b/daemon/gdm-session-auditor.c index c2e6d5c5..2e49e15f 100644 --- a/daemon/gdm-session-auditor.c +++ b/daemon/gdm-session-auditor.c @@ -61,7 +61,7 @@ enum { PROP_DISPLAY_DEVICE }; -G_DEFINE_TYPE (GdmSessionAuditor, gdm_session_auditor, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdmSessionAuditor, gdm_session_auditor, G_TYPE_OBJECT) static void gdm_session_auditor_class_init (GdmSessionAuditorClass *auditor_class) diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c index 7394f73e..2488668b 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -107,7 +107,7 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionDirect, gdm_session_direct, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (GDM_TYPE_SESSION, - gdm_session_iface_init)); + gdm_session_iface_init)) static gboolean send_dbus_message (DBusConnection *connection, @@ -1334,13 +1334,12 @@ static void gdm_session_direct_open (GdmSession *session) { GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); - gboolean res; g_return_if_fail (session != NULL); g_debug ("GdmSessionDirect: Opening session"); - res = start_worker (impl); + start_worker (impl); } static void diff --git a/daemon/gdm-session-linux-auditor.c b/daemon/gdm-session-linux-auditor.c index 0c0cf79a..d1210743 100644 --- a/daemon/gdm-session-linux-auditor.c +++ b/daemon/gdm-session-linux-auditor.c @@ -42,7 +42,7 @@ struct _GdmSessionLinuxAuditorPrivate static void gdm_session_linux_auditor_finalize (GObject *object); -G_DEFINE_TYPE (GdmSessionLinuxAuditor, gdm_session_linux_auditor, GDM_TYPE_SESSION_AUDITOR); +G_DEFINE_TYPE (GdmSessionLinuxAuditor, gdm_session_linux_auditor, GDM_TYPE_SESSION_AUDITOR) static void gdm_session_linux_auditor_report_login_attempt (GdmSessionAuditor *auditor, diff --git a/daemon/gdm-session-relay.c b/daemon/gdm-session-relay.c index cda094d8..bdce1603 100644 --- a/daemon/gdm-session-relay.c +++ b/daemon/gdm-session-relay.c @@ -1017,10 +1017,6 @@ gdm_session_relay_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmSessionRelay *self; - - self = GDM_SESSION_RELAY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1034,10 +1030,6 @@ gdm_session_relay_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmSessionRelay *self; - - self = GDM_SESSION_RELAY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1051,9 +1043,6 @@ gdm_session_relay_constructor (GType type, GObjectConstructParam *construct_properties) { GdmSessionRelay *session_relay; - GdmSessionRelayClass *klass; - - klass = GDM_SESSION_RELAY_CLASS (g_type_class_peek (GDM_TYPE_SESSION_RELAY)); session_relay = GDM_SESSION_RELAY (G_OBJECT_CLASS (gdm_session_relay_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-session-settings.c b/daemon/gdm-session-settings.c index 82a471c0..01ca5c46 100644 --- a/daemon/gdm-session-settings.c +++ b/daemon/gdm-session-settings.c @@ -59,7 +59,7 @@ enum { PROP_LANGUAGE_NAME, }; -G_DEFINE_TYPE (GdmSessionSettings, gdm_session_settings, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdmSessionSettings, gdm_session_settings, G_TYPE_OBJECT) static void gdm_session_settings_class_init (GdmSessionSettingsClass *settings_class) diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c index c3a0d63c..d3243608 100644 --- a/daemon/gdm-session-worker-job.c +++ b/daemon/gdm-session-worker-job.c @@ -339,9 +339,6 @@ gdm_session_worker_job_constructor (GType type, GObjectConstructParam *construct_properties) { GdmSessionWorkerJob *session_worker_job; - GdmSessionWorkerJobClass *klass; - - klass = GDM_SESSION_WORKER_JOB_CLASS (g_type_class_peek (GDM_TYPE_SESSION_WORKER_JOB)); session_worker_job = GDM_SESSION_WORKER_JOB (G_OBJECT_CLASS (gdm_session_worker_job_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index 4f2a50ef..67a81281 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -2138,11 +2138,8 @@ gdm_session_worker_constructor (GType type, GObjectConstructParam *construct_properties) { GdmSessionWorker *worker; - GdmSessionWorkerClass *klass; DBusError error; - klass = GDM_SESSION_WORKER_CLASS (g_type_class_peek (GDM_TYPE_SESSION_WORKER)); - worker = GDM_SESSION_WORKER (G_OBJECT_CLASS (gdm_session_worker_parent_class)->constructor (type, n_construct_properties, construct_properties)); diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 35bff1d0..bb85ad91 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -874,9 +874,7 @@ gdm_simple_slave_run (GdmSimpleSlave *slave) static gboolean gdm_simple_slave_start (GdmSlave *slave) { - gboolean res; - - res = GDM_SLAVE_CLASS (gdm_simple_slave_parent_class)->start (slave); + GDM_SLAVE_CLASS (gdm_simple_slave_parent_class)->start (slave); gdm_simple_slave_run (GDM_SIMPLE_SLAVE (slave)); @@ -886,11 +884,9 @@ gdm_simple_slave_start (GdmSlave *slave) static gboolean gdm_simple_slave_stop (GdmSlave *slave) { - gboolean res; - g_debug ("GdmSimpleSlave: Stopping simple_slave"); - res = GDM_SLAVE_CLASS (gdm_simple_slave_parent_class)->stop (slave); + GDM_SLAVE_CLASS (gdm_simple_slave_parent_class)->stop (slave); if (GDM_SIMPLE_SLAVE (slave)->priv->greeter != NULL) { gdm_welcome_session_stop (GDM_WELCOME_SESSION (GDM_SIMPLE_SLAVE (slave)->priv->greeter)); @@ -919,10 +915,6 @@ gdm_simple_slave_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmSimpleSlave *self; - - self = GDM_SIMPLE_SLAVE (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -936,10 +928,6 @@ gdm_simple_slave_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmSimpleSlave *self; - - self = GDM_SIMPLE_SLAVE (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -953,9 +941,6 @@ gdm_simple_slave_constructor (GType type, GObjectConstructParam *construct_properties) { GdmSimpleSlave *simple_slave; - GdmSimpleSlaveClass *klass; - - klass = GDM_SIMPLE_SLAVE_CLASS (g_type_class_peek (GDM_TYPE_SIMPLE_SLAVE)); simple_slave = GDM_SIMPLE_SLAVE (G_OBJECT_CLASS (gdm_simple_slave_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c index e810277a..3d27deb7 100644 --- a/daemon/gdm-slave.c +++ b/daemon/gdm-slave.c @@ -337,6 +337,11 @@ gdm_slave_run_script (GdmSlave *slave, g_ptr_array_foreach (env, (GFunc)g_free, NULL); g_ptr_array_free (env, TRUE); + if (! res) { + g_warning ("GdmSlave: Unable to run script: %s", error->message); + g_error_free (error); + } + gdm_slave_whack_temp_auth_file (slave); if (WIFEXITED (status)) { @@ -836,7 +841,6 @@ _get_primary_user_session_id (GdmSlave *slave, const char *username) { gboolean res; - gboolean ret; gboolean can_activate_sessions; GError *error; DBusGProxy *manager_proxy; @@ -851,7 +855,6 @@ _get_primary_user_session_id (GdmSlave *slave, return NULL; } - ret = FALSE; manager_proxy = NULL; primary_ssid = NULL; sessions = NULL; @@ -1209,12 +1212,9 @@ gdm_slave_constructor (GType type, GObjectConstructParam *construct_properties) { GdmSlave *slave; - GdmSlaveClass *klass; gboolean res; const char *id; - klass = GDM_SLAVE_CLASS (g_type_class_peek (GDM_TYPE_SLAVE)); - slave = GDM_SLAVE (G_OBJECT_CLASS (gdm_slave_parent_class)->constructor (type, n_construct_properties, construct_properties)); diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c index 7ecfc6fd..02f94c0e 100644 --- a/daemon/gdm-static-display.c +++ b/daemon/gdm-static-display.c @@ -125,10 +125,6 @@ gdm_static_display_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmStaticDisplay *self; - - self = GDM_STATIC_DISPLAY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -142,10 +138,6 @@ gdm_static_display_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmStaticDisplay *self; - - self = GDM_STATIC_DISPLAY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); diff --git a/daemon/gdm-static-factory-display.c b/daemon/gdm-static-factory-display.c index 07382dfe..128c3a18 100644 --- a/daemon/gdm-static-factory-display.c +++ b/daemon/gdm-static-factory-display.c @@ -124,10 +124,6 @@ gdm_static_factory_display_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmStaticFactoryDisplay *self; - - self = GDM_STATIC_FACTORY_DISPLAY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -141,10 +137,6 @@ gdm_static_factory_display_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmStaticFactoryDisplay *self; - - self = GDM_STATIC_FACTORY_DISPLAY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -158,9 +150,6 @@ gdm_static_factory_display_constructor (GType type, GObjectConstructParam *construct_properties) { GdmStaticFactoryDisplay *display; - GdmStaticFactoryDisplayClass *klass; - - klass = GDM_STATIC_FACTORY_DISPLAY_CLASS (g_type_class_peek (GDM_TYPE_STATIC_FACTORY_DISPLAY)); display = GDM_STATIC_FACTORY_DISPLAY (G_OBJECT_CLASS (gdm_static_factory_display_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-transient-display.c b/daemon/gdm-transient-display.c index a6a5f13a..ee0cefee 100644 --- a/daemon/gdm-transient-display.c +++ b/daemon/gdm-transient-display.c @@ -124,10 +124,6 @@ gdm_transient_display_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmTransientDisplay *self; - - self = GDM_TRANSIENT_DISPLAY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -141,10 +137,6 @@ gdm_transient_display_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmTransientDisplay *self; - - self = GDM_TRANSIENT_DISPLAY (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c index 7c45e15b..40ea716e 100644 --- a/daemon/gdm-welcome-session.c +++ b/daemon/gdm-welcome-session.c @@ -600,9 +600,9 @@ parse_dbus_launch_output (const char *output, if (pidp != NULL) { int pid; - gboolean res; - res = parse_value_as_integer (g_match_info_fetch (match_info, 2), &pid); - if (res) { + gboolean result; + result = parse_value_as_integer (g_match_info_fetch (match_info, 2), &pid); + if (result) { *pidp = pid; } else { *pidp = 0; @@ -1030,9 +1030,6 @@ gdm_welcome_session_constructor (GType type, GObjectConstructParam *construct_properties) { GdmWelcomeSession *welcome_session; - GdmWelcomeSessionClass *klass; - - klass = GDM_WELCOME_SESSION_CLASS (g_type_class_peek (GDM_TYPE_WELCOME_SESSION)); welcome_session = GDM_WELCOME_SESSION (G_OBJECT_CLASS (gdm_welcome_session_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-xdmcp-chooser-slave.c b/daemon/gdm-xdmcp-chooser-slave.c index b63c0b69..d8b6bd1e 100644 --- a/daemon/gdm-xdmcp-chooser-slave.c +++ b/daemon/gdm-xdmcp-chooser-slave.c @@ -288,9 +288,7 @@ gdm_xdmcp_chooser_slave_run (GdmXdmcpChooserSlave *slave) static gboolean gdm_xdmcp_chooser_slave_start (GdmSlave *slave) { - gboolean res; - - res = GDM_SLAVE_CLASS (gdm_xdmcp_chooser_slave_parent_class)->start (slave); + GDM_SLAVE_CLASS (gdm_xdmcp_chooser_slave_parent_class)->start (slave); gdm_xdmcp_chooser_slave_run (GDM_XDMCP_CHOOSER_SLAVE (slave)); @@ -300,11 +298,9 @@ gdm_xdmcp_chooser_slave_start (GdmSlave *slave) static gboolean gdm_xdmcp_chooser_slave_stop (GdmSlave *slave) { - gboolean res; - g_debug ("GdmXdmcpChooserSlave: Stopping xdmcp_chooser_slave"); - res = GDM_SLAVE_CLASS (gdm_xdmcp_chooser_slave_parent_class)->stop (slave); + GDM_SLAVE_CLASS (gdm_xdmcp_chooser_slave_parent_class)->stop (slave); if (GDM_XDMCP_CHOOSER_SLAVE (slave)->priv->chooser != NULL) { gdm_welcome_session_stop (GDM_WELCOME_SESSION (GDM_XDMCP_CHOOSER_SLAVE (slave)->priv->chooser)); @@ -321,10 +317,6 @@ gdm_xdmcp_chooser_slave_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmXdmcpChooserSlave *self; - - self = GDM_XDMCP_CHOOSER_SLAVE (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -338,10 +330,6 @@ gdm_xdmcp_chooser_slave_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmXdmcpChooserSlave *self; - - self = GDM_XDMCP_CHOOSER_SLAVE (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -355,9 +343,6 @@ gdm_xdmcp_chooser_slave_constructor (GType type, GObjectConstructParam *construct_properties) { GdmXdmcpChooserSlave *xdmcp_chooser_slave; - GdmXdmcpChooserSlaveClass *klass; - - klass = GDM_XDMCP_CHOOSER_SLAVE_CLASS (g_type_class_peek (GDM_TYPE_XDMCP_CHOOSER_SLAVE)); xdmcp_chooser_slave = GDM_XDMCP_CHOOSER_SLAVE (G_OBJECT_CLASS (gdm_xdmcp_chooser_slave_parent_class)->constructor (type, n_construct_properties, diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c index 33ce282a..bd6a4952 100644 --- a/daemon/gdm-xdmcp-display-factory.c +++ b/daemon/gdm-xdmcp-display-factory.c @@ -439,7 +439,6 @@ do_bind (guint port, ai_list = NULL; if ((gaierr = getaddrinfo (NULL, strport, &hints, &ai_list)) != 0) { g_error ("Unable to connect to socket: %s", gai_strerror (gaierr)); - return -1; } /* should only be one but.. */ @@ -1059,9 +1058,6 @@ indirect_client_create (GdmXdmcpDisplayFactory *factory, GdmAddress *dsp_address) { IndirectClient *ic; - int count; - - count = g_slist_length (factory->priv->indirect_clients); ic = g_new0 (IndirectClient, 1); ic->dsp_address = gdm_address_copy (dsp_address); @@ -1568,15 +1564,15 @@ gdm_xdmcp_handle_forward_query (GdmXdmcpDisplayFactory *factory, /* Check with tcp_wrappers if client is allowed to access */ if (! gdm_xdmcp_host_allow (address)) { - char *host; + char *host2; - host = NULL; - gdm_address_get_numeric_info (address, &host, NULL); + host2 = NULL; + gdm_address_get_numeric_info (address, &host2, NULL); g_warning ("%s: Got FORWARD_QUERY from banned host %s", "gdm_xdmcp_handle_forward query", - host); - g_free (host); + host2); + g_free (host2); return; } diff --git a/daemon/test-session.c b/daemon/test-session.c index 8545eecb..d9dff3ec 100644 --- a/daemon/test-session.c +++ b/daemon/test-session.c @@ -235,9 +235,6 @@ main (int argc, { GdmSessionDirect *session; char *username; - int exit_code; - - exit_code = 0; g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); @@ -345,6 +342,4 @@ main (int argc, g_object_unref (session); g_message ("GdmSessionDirect object destroyed successfully"); } while (1); - - return exit_code; } |