diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-02-19 15:45:50 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-02-19 15:45:50 +0000 |
| commit | 4bddb1ab301fff18b7d1f975f99020350152d795 (patch) | |
| tree | f6cc59107c464a3ebc19cd5fb51b50515f81de75 | |
| parent | 6434eb5a71bf64d535f9496eaa45771ec52e9cbf (diff) | |
| download | gdm-4bddb1ab301fff18b7d1f975f99020350152d795.tar.gz | |
Fix a bunch of compiler warnings and remove unused code. Patch from:
2008-02-19 William Jon McCann <jmccann@redhat.com>
* common/gdm-settings-client.c:
(gdm_settings_client_get_locale_string),
(gdm_settings_client_init):
* common/gdm-settings-desktop-backend.c: (save_settings):
* common/gdm-settings-direct.c: (gdm_settings_direct_init):
* common/test-log.c: (test_log):
* common/test-settings-client.c: (test_settings_client):
* daemon/gdm-chooser-server.c: (gdm_chooser_server_constructor):
* daemon/gdm-chooser-session.c: (gdm_chooser_session_set_property),
(gdm_chooser_session_get_property),
(gdm_chooser_session_constructor):
* daemon/gdm-display-access-file.c:
* daemon/gdm-display.c: (_create_access_file_for_user),
(gdm_display_constructor):
* daemon/gdm-factory-slave.c: (gdm_factory_slave_start),
(gdm_factory_slave_stop), (gdm_factory_slave_set_property),
(gdm_factory_slave_get_property), (gdm_factory_slave_constructor):
* daemon/gdm-greeter-server.c: (gdm_greeter_server_constructor):
* daemon/gdm-greeter-session.c: (gdm_greeter_session_set_property),
(gdm_greeter_session_get_property):
* daemon/gdm-local-display-factory.c:
(gdm_local_display_factory_set_property),
(gdm_local_display_factory_get_property),
(gdm_local_display_factory_constructor):
* daemon/gdm-manager.c: (gdm_manager_constructor):
* daemon/gdm-product-display.c: (gdm_product_display_constructor):
* daemon/gdm-product-slave.c: (gdm_product_slave_start),
(gdm_product_slave_stop), (gdm_product_slave_set_property),
(gdm_product_slave_get_property), (gdm_product_slave_constructor):
* daemon/gdm-server.c: (gdm_server_constructor):
* daemon/gdm-session-auditor.c:
* daemon/gdm-session-direct.c: (gdm_session_direct_open):
* daemon/gdm-session-linux-auditor.c:
* daemon/gdm-session-relay.c: (gdm_session_relay_set_property),
(gdm_session_relay_get_property), (gdm_session_relay_constructor):
* daemon/gdm-session-settings.c:
* daemon/gdm-session-worker-job.c:
(gdm_session_worker_job_constructor):
* daemon/gdm-session-worker.c: (gdm_session_worker_constructor):
* daemon/gdm-simple-slave.c: (gdm_simple_slave_start),
(gdm_simple_slave_stop), (gdm_simple_slave_set_property),
(gdm_simple_slave_get_property), (gdm_simple_slave_constructor):
* daemon/gdm-slave.c: (gdm_slave_run_script),
(_get_primary_user_session_id), (gdm_slave_constructor):
* daemon/gdm-static-display.c: (gdm_static_display_set_property),
(gdm_static_display_get_property):
* daemon/gdm-static-factory-display.c:
(gdm_static_factory_display_set_property),
(gdm_static_factory_display_get_property),
(gdm_static_factory_display_constructor):
* daemon/gdm-transient-display.c:
(gdm_transient_display_set_property),
(gdm_transient_display_get_property):
* daemon/gdm-welcome-session.c: (parse_dbus_launch_output),
(gdm_welcome_session_constructor):
* daemon/gdm-xdmcp-chooser-slave.c:
(gdm_xdmcp_chooser_slave_start), (gdm_xdmcp_chooser_slave_stop),
(gdm_xdmcp_chooser_slave_set_property),
(gdm_xdmcp_chooser_slave_get_property),
(gdm_xdmcp_chooser_slave_constructor):
* daemon/gdm-xdmcp-display-factory.c: (do_bind),
(indirect_client_create), (gdm_xdmcp_handle_forward_query):
* daemon/test-session.c: (main):
* gui/simple-chooser/gdm-chooser-client.c:
(gdm_chooser_client_set_property),
(gdm_chooser_client_get_property),
(gdm_chooser_client_constructor), (gdm_chooser_client_dispose):
* gui/simple-chooser/gdm-chooser-session.c:
(gdm_chooser_session_set_property),
(gdm_chooser_session_get_property),
(gdm_chooser_session_constructor), (gdm_chooser_session_dispose):
* gui/simple-chooser/gdm-host-chooser-dialog.c:
(gdm_host_chooser_dialog_set_property),
(gdm_host_chooser_dialog_get_property),
(gdm_host_chooser_dialog_constructor),
(gdm_host_chooser_dialog_dispose):
* gui/simple-chooser/gdm-host-chooser-widget.c:
(gdm_host_chooser_widget_set_property),
(gdm_host_chooser_widget_get_property),
(gdm_host_chooser_widget_constructor):
* gui/simple-greeter/gdm-a11y-preferences-dialog.c:
(gdm_a11y_preferences_dialog_set_property),
(gdm_a11y_preferences_dialog_get_property),
(gdm_a11y_preferences_dialog_constructor),
(gdm_a11y_preferences_dialog_dispose):
* gui/simple-greeter/gdm-chooser-widget.c:
(shrink_edge_toward_active_row), (gdm_chooser_widget_constructor):
* gui/simple-greeter/gdm-greeter-client.c:
(gdm_greeter_client_set_property),
(gdm_greeter_client_get_property),
(gdm_greeter_client_constructor), (gdm_greeter_client_dispose):
* gui/simple-greeter/gdm-greeter-login-window.c:
(gdm_greeter_login_window_constructor):
* gui/simple-greeter/gdm-greeter-panel.c:
(gdm_greeter_panel_set_property), (gdm_greeter_panel_get_property),
(gdm_greeter_panel_constructor), (gdm_greeter_panel_dispose):
* gui/simple-greeter/gdm-greeter-session.c:
(gdm_greeter_session_set_property),
(gdm_greeter_session_get_property),
(gdm_greeter_session_constructor), (gdm_greeter_session_dispose):
* gui/simple-greeter/gdm-language-chooser-widget.c:
(gdm_language_chooser_widget_dispose):
* gui/simple-greeter/gdm-option-widget.c: (activate_from_item_id),
(gdm_option_widget_constructor):
* gui/simple-greeter/gdm-recent-option-widget.c:
(gdm_recent_option_widget_dispose):
* gui/simple-greeter/gdm-remote-login-window.c:
(gdm_remote_login_window_set_property),
(gdm_remote_login_window_get_property),
(gdm_remote_login_window_constructor):
* gui/simple-greeter/gdm-session-client.c:
(gdm_session_client_constructor), (gdm_session_client_dispose):
* gui/simple-greeter/gdm-session-manager.c:
(gdm_session_manager_set_property),
(gdm_session_manager_get_property),
(gdm_session_manager_constructor), (gdm_session_manager_dispose):
* gui/simple-greeter/gdm-user-chooser-dialog.c:
(gdm_user_chooser_dialog_set_property),
(gdm_user_chooser_dialog_get_property),
(gdm_user_chooser_dialog_constructor),
(gdm_user_chooser_dialog_dispose):
* gui/simple-greeter/gdm-user-chooser-widget.c:
(gdm_user_chooser_widget_set_property),
(gdm_user_chooser_widget_get_property),
(gdm_user_chooser_widget_constructor):
* gui/simple-greeter/gdm-user-manager.c:
(_get_primary_user_session_id), (_get_login_window_session_id):
* gui/simple-greeter/gdm-user.c:
* gui/simple-greeter/libnotificationarea/na-tray-manager.c:
(na_tray_manager_handle_begin_message):
* gui/simple-greeter/libnotificationarea/na-tray.c:
* gui/user-switch-applet/applet.c: (prefs_cb),
(switch_to_user_session), (display_key_changed), (applet_fill_cb):
* gui/user-switch-applet/gdm-user-menu-item.c:
* tests/s-common-address.c: (START_TEST):
* utils/gdmflexiserver.c: (get_login_window_session_id):
Fix a bunch of compiler warnings and remove unused code.
Patch from: Kjartan Maraas <kmaraas@broadpark.no>
svn path=/trunk/; revision=5800
60 files changed, 230 insertions, 471 deletions
@@ -1,3 +1,144 @@ +2008-02-19 William Jon McCann <jmccann@redhat.com> + + * common/gdm-settings-client.c: + (gdm_settings_client_get_locale_string), + (gdm_settings_client_init): + * common/gdm-settings-desktop-backend.c: (save_settings): + * common/gdm-settings-direct.c: (gdm_settings_direct_init): + * common/test-log.c: (test_log): + * common/test-settings-client.c: (test_settings_client): + * daemon/gdm-chooser-server.c: (gdm_chooser_server_constructor): + * daemon/gdm-chooser-session.c: (gdm_chooser_session_set_property), + (gdm_chooser_session_get_property), + (gdm_chooser_session_constructor): + * daemon/gdm-display-access-file.c: + * daemon/gdm-display.c: (_create_access_file_for_user), + (gdm_display_constructor): + * daemon/gdm-factory-slave.c: (gdm_factory_slave_start), + (gdm_factory_slave_stop), (gdm_factory_slave_set_property), + (gdm_factory_slave_get_property), (gdm_factory_slave_constructor): + * daemon/gdm-greeter-server.c: (gdm_greeter_server_constructor): + * daemon/gdm-greeter-session.c: (gdm_greeter_session_set_property), + (gdm_greeter_session_get_property): + * daemon/gdm-local-display-factory.c: + (gdm_local_display_factory_set_property), + (gdm_local_display_factory_get_property), + (gdm_local_display_factory_constructor): + * daemon/gdm-manager.c: (gdm_manager_constructor): + * daemon/gdm-product-display.c: (gdm_product_display_constructor): + * daemon/gdm-product-slave.c: (gdm_product_slave_start), + (gdm_product_slave_stop), (gdm_product_slave_set_property), + (gdm_product_slave_get_property), (gdm_product_slave_constructor): + * daemon/gdm-server.c: (gdm_server_constructor): + * daemon/gdm-session-auditor.c: + * daemon/gdm-session-direct.c: (gdm_session_direct_open): + * daemon/gdm-session-linux-auditor.c: + * daemon/gdm-session-relay.c: (gdm_session_relay_set_property), + (gdm_session_relay_get_property), (gdm_session_relay_constructor): + * daemon/gdm-session-settings.c: + * daemon/gdm-session-worker-job.c: + (gdm_session_worker_job_constructor): + * daemon/gdm-session-worker.c: (gdm_session_worker_constructor): + * daemon/gdm-simple-slave.c: (gdm_simple_slave_start), + (gdm_simple_slave_stop), (gdm_simple_slave_set_property), + (gdm_simple_slave_get_property), (gdm_simple_slave_constructor): + * daemon/gdm-slave.c: (gdm_slave_run_script), + (_get_primary_user_session_id), (gdm_slave_constructor): + * daemon/gdm-static-display.c: (gdm_static_display_set_property), + (gdm_static_display_get_property): + * daemon/gdm-static-factory-display.c: + (gdm_static_factory_display_set_property), + (gdm_static_factory_display_get_property), + (gdm_static_factory_display_constructor): + * daemon/gdm-transient-display.c: + (gdm_transient_display_set_property), + (gdm_transient_display_get_property): + * daemon/gdm-welcome-session.c: (parse_dbus_launch_output), + (gdm_welcome_session_constructor): + * daemon/gdm-xdmcp-chooser-slave.c: + (gdm_xdmcp_chooser_slave_start), (gdm_xdmcp_chooser_slave_stop), + (gdm_xdmcp_chooser_slave_set_property), + (gdm_xdmcp_chooser_slave_get_property), + (gdm_xdmcp_chooser_slave_constructor): + * daemon/gdm-xdmcp-display-factory.c: (do_bind), + (indirect_client_create), (gdm_xdmcp_handle_forward_query): + * daemon/test-session.c: (main): + * gui/simple-chooser/gdm-chooser-client.c: + (gdm_chooser_client_set_property), + (gdm_chooser_client_get_property), + (gdm_chooser_client_constructor), (gdm_chooser_client_dispose): + * gui/simple-chooser/gdm-chooser-session.c: + (gdm_chooser_session_set_property), + (gdm_chooser_session_get_property), + (gdm_chooser_session_constructor), (gdm_chooser_session_dispose): + * gui/simple-chooser/gdm-host-chooser-dialog.c: + (gdm_host_chooser_dialog_set_property), + (gdm_host_chooser_dialog_get_property), + (gdm_host_chooser_dialog_constructor), + (gdm_host_chooser_dialog_dispose): + * gui/simple-chooser/gdm-host-chooser-widget.c: + (gdm_host_chooser_widget_set_property), + (gdm_host_chooser_widget_get_property), + (gdm_host_chooser_widget_constructor): + * gui/simple-greeter/gdm-a11y-preferences-dialog.c: + (gdm_a11y_preferences_dialog_set_property), + (gdm_a11y_preferences_dialog_get_property), + (gdm_a11y_preferences_dialog_constructor), + (gdm_a11y_preferences_dialog_dispose): + * gui/simple-greeter/gdm-chooser-widget.c: + (shrink_edge_toward_active_row), (gdm_chooser_widget_constructor): + * gui/simple-greeter/gdm-greeter-client.c: + (gdm_greeter_client_set_property), + (gdm_greeter_client_get_property), + (gdm_greeter_client_constructor), (gdm_greeter_client_dispose): + * gui/simple-greeter/gdm-greeter-login-window.c: + (gdm_greeter_login_window_constructor): + * gui/simple-greeter/gdm-greeter-panel.c: + (gdm_greeter_panel_set_property), (gdm_greeter_panel_get_property), + (gdm_greeter_panel_constructor), (gdm_greeter_panel_dispose): + * gui/simple-greeter/gdm-greeter-session.c: + (gdm_greeter_session_set_property), + (gdm_greeter_session_get_property), + (gdm_greeter_session_constructor), (gdm_greeter_session_dispose): + * gui/simple-greeter/gdm-language-chooser-widget.c: + (gdm_language_chooser_widget_dispose): + * gui/simple-greeter/gdm-option-widget.c: (activate_from_item_id), + (gdm_option_widget_constructor): + * gui/simple-greeter/gdm-recent-option-widget.c: + (gdm_recent_option_widget_dispose): + * gui/simple-greeter/gdm-remote-login-window.c: + (gdm_remote_login_window_set_property), + (gdm_remote_login_window_get_property), + (gdm_remote_login_window_constructor): + * gui/simple-greeter/gdm-session-client.c: + (gdm_session_client_constructor), (gdm_session_client_dispose): + * gui/simple-greeter/gdm-session-manager.c: + (gdm_session_manager_set_property), + (gdm_session_manager_get_property), + (gdm_session_manager_constructor), (gdm_session_manager_dispose): + * gui/simple-greeter/gdm-user-chooser-dialog.c: + (gdm_user_chooser_dialog_set_property), + (gdm_user_chooser_dialog_get_property), + (gdm_user_chooser_dialog_constructor), + (gdm_user_chooser_dialog_dispose): + * gui/simple-greeter/gdm-user-chooser-widget.c: + (gdm_user_chooser_widget_set_property), + (gdm_user_chooser_widget_get_property), + (gdm_user_chooser_widget_constructor): + * gui/simple-greeter/gdm-user-manager.c: + (_get_primary_user_session_id), (_get_login_window_session_id): + * gui/simple-greeter/gdm-user.c: + * gui/simple-greeter/libnotificationarea/na-tray-manager.c: + (na_tray_manager_handle_begin_message): + * gui/simple-greeter/libnotificationarea/na-tray.c: + * gui/user-switch-applet/applet.c: (prefs_cb), + (switch_to_user_session), (display_key_changed), (applet_fill_cb): + * gui/user-switch-applet/gdm-user-menu-item.c: + * tests/s-common-address.c: (START_TEST): + * utils/gdmflexiserver.c: (get_login_window_session_id): + Fix a bunch of compiler warnings and remove unused code. + Patch from: Kjartan Maraas <kmaraas@broadpark.no> + 2008-02-18 William Jon McCann <jmccann@redhat.com> * common/gdm-address.c: diff --git a/common/gdm-settings-client.c b/common/gdm-settings-client.c index 099304d1..aa9eac53 100644 --- a/common/gdm-settings-client.c +++ b/common/gdm-settings-client.c @@ -45,8 +45,6 @@ #define SETTINGS_DBUS_PATH "/org/gnome/DisplayManager/Settings" #define SETTINGS_DBUS_INTERFACE "org.gnome.DisplayManager.Settings" -static char *schemas_file = NULL; -static char *schemas_root = NULL; static GHashTable *notifiers = NULL; static GHashTable *schemas = NULL; static DBusGProxy *settings_proxy = NULL; @@ -250,7 +248,6 @@ gdm_settings_client_get_locale_string (const char *key, { char *candidate_key; char *translated_value; - GError *error; char **languages; gboolean free_languages = FALSE; int i; @@ -260,7 +257,6 @@ gdm_settings_client_get_locale_string (const char *key, candidate_key = NULL; translated_value = NULL; - error = NULL; if (locale != NULL) { languages = g_new (char *, 2); @@ -529,9 +525,6 @@ gdm_settings_client_init (const char *file, schemas = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)gdm_settings_entry_free); g_slist_foreach (list, (GFunc)hashify_list, NULL); - schemas_file = g_strdup (file); - schemas_root = g_strdup (root); - dbus_g_proxy_add_signal (settings_proxy, "ValueChanged", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); dbus_g_proxy_connect_signal (settings_proxy, "ValueChanged", diff --git a/common/gdm-settings-desktop-backend.c b/common/gdm-settings-desktop-backend.c index b068c248..2d8c0b4e 100644 --- a/common/gdm-settings-desktop-backend.c +++ b/common/gdm-settings-desktop-backend.c @@ -173,7 +173,6 @@ static void save_settings (GdmSettingsDesktopBackend *backend) { GError *local_error; - gboolean res; char *contents; gsize length; @@ -192,10 +191,10 @@ save_settings (GdmSettingsDesktopBackend *backend) } local_error = NULL; - res = g_file_set_contents (backend->priv->filename, - contents, - length, - &local_error); + g_file_set_contents (backend->priv->filename, + contents, + length, + &local_error); if (local_error != NULL) { g_warning ("Unable to save settings: %s", local_error->message); g_error_free (local_error); diff --git a/common/gdm-settings-direct.c b/common/gdm-settings-direct.c index 176049e4..ebe80c40 100644 --- a/common/gdm-settings-direct.c +++ b/common/gdm-settings-direct.c @@ -38,8 +38,6 @@ #include "gdm-settings-utils.h" #include "gdm-settings-direct.h" -static char *schemas_file; -static char *schemas_root; static GHashTable *schemas; static GdmSettings *settings_object; @@ -226,9 +224,6 @@ gdm_settings_direct_init (GdmSettings *settings, schemas = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)gdm_settings_entry_free); g_slist_foreach (list, (GFunc)hashify_list, NULL); - schemas_file = g_strdup (file); - schemas_root = g_strdup (root); - settings_object = settings; return TRUE; diff --git a/common/test-log.c b/common/test-log.c index 6bde7604..dca3e9d7 100644 --- a/common/test-log.c +++ b/common/test-log.c @@ -46,8 +46,8 @@ test_log (void) g_message ("Test message"); g_warning ("Test warning"); - g_error ("Test error"); g_critical ("Test critical"); + g_error ("Test error"); } int diff --git a/common/test-settings-client.c b/common/test-settings-client.c index 379d9c5c..cd07d8fd 100644 --- a/common/test-settings-client.c +++ b/common/test-settings-client.c @@ -51,7 +51,6 @@ test_settings_client (gpointer data) char *strval; gboolean boolval; gboolean res; - guint notify_id; strval = NULL; res = gdm_settings_client_get_string (GDM_KEY_WILLING, &strval); @@ -62,7 +61,7 @@ test_settings_client (gpointer data) g_debug ("Got res=%d %s=%s", res, GDM_KEY_XDMCP, boolval ? "true" : "false"); g_debug ("Adding notify for all keys"); - notify_id = gdm_settings_client_notify_add ("/", notify_cb, NULL, NULL); + gdm_settings_client_notify_add ("/", notify_cb, NULL, NULL); g_debug ("Setting boolean key %s to %s", GDM_KEY_XDMCP, !boolval ? "true" : "false"); gdm_settings_client_set_boolean (GDM_KEY_XDMCP, !boolval); 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; } diff --git a/gui/simple-chooser/gdm-chooser-client.c b/gui/simple-chooser/gdm-chooser-client.c index 268fddf2..33ac53bb 100644 --- a/gui/simple-chooser/gdm-chooser-client.c +++ b/gui/simple-chooser/gdm-chooser-client.c @@ -302,10 +302,6 @@ gdm_chooser_client_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmChooserClient *self; - - self = GDM_CHOOSER_CLIENT (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -319,10 +315,6 @@ gdm_chooser_client_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmChooserClient *self; - - self = GDM_CHOOSER_CLIENT (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -336,9 +328,6 @@ gdm_chooser_client_constructor (GType type, GObjectConstructParam *construct_properties) { GdmChooserClient *chooser_client; - GdmChooserClientClass *klass; - - klass = GDM_CHOOSER_CLIENT_CLASS (g_type_class_peek (GDM_TYPE_CHOOSER_CLIENT)); chooser_client = GDM_CHOOSER_CLIENT (G_OBJECT_CLASS (gdm_chooser_client_parent_class)->constructor (type, n_construct_properties, @@ -350,10 +339,6 @@ gdm_chooser_client_constructor (GType type, static void gdm_chooser_client_dispose (GObject *object) { - GdmChooserClient *chooser_client; - - chooser_client = GDM_CHOOSER_CLIENT (object); - g_debug ("GdmChooserClient: Disposing chooser_client"); G_OBJECT_CLASS (gdm_chooser_client_parent_class)->dispose (object); diff --git a/gui/simple-chooser/gdm-chooser-session.c b/gui/simple-chooser/gdm-chooser-session.c index 47f35790..c8f2e688 100644 --- a/gui/simple-chooser/gdm-chooser-session.c +++ b/gui/simple-chooser/gdm-chooser-session.c @@ -208,10 +208,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); @@ -225,10 +221,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); @@ -242,9 +234,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, @@ -256,10 +245,6 @@ gdm_chooser_session_constructor (GType type, static void gdm_chooser_session_dispose (GObject *object) { - GdmChooserSession *chooser_session; - - chooser_session = GDM_CHOOSER_SESSION (object); - g_debug ("GdmChooserSession: Disposing chooser_session"); G_OBJECT_CLASS (gdm_chooser_session_parent_class)->dispose (object); diff --git a/gui/simple-chooser/gdm-host-chooser-dialog.c b/gui/simple-chooser/gdm-host-chooser-dialog.c index 9ac29299..89dab092 100644 --- a/gui/simple-chooser/gdm-host-chooser-dialog.c +++ b/gui/simple-chooser/gdm-host-chooser-dialog.c @@ -67,10 +67,6 @@ gdm_host_chooser_dialog_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmHostChooserDialog *self; - - self = GDM_HOST_CHOOSER_DIALOG (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -84,10 +80,6 @@ gdm_host_chooser_dialog_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmHostChooserDialog *self; - - self = GDM_HOST_CHOOSER_DIALOG (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -101,9 +93,6 @@ gdm_host_chooser_dialog_constructor (GType type, GObjectConstructParam *construct_properties) { GdmHostChooserDialog *host_chooser_dialog; - GdmHostChooserDialogClass *klass; - - klass = GDM_HOST_CHOOSER_DIALOG_CLASS (g_type_class_peek (GDM_TYPE_HOST_CHOOSER_DIALOG)); host_chooser_dialog = GDM_HOST_CHOOSER_DIALOG (G_OBJECT_CLASS (gdm_host_chooser_dialog_parent_class)->constructor (type, n_construct_properties, @@ -115,10 +104,6 @@ gdm_host_chooser_dialog_constructor (GType type, static void gdm_host_chooser_dialog_dispose (GObject *object) { - GdmHostChooserDialog *host_chooser_dialog; - - host_chooser_dialog = GDM_HOST_CHOOSER_DIALOG (object); - g_debug ("Disposing host_chooser_dialog"); G_OBJECT_CLASS (gdm_host_chooser_dialog_parent_class)->dispose (object); diff --git a/gui/simple-chooser/gdm-host-chooser-widget.c b/gui/simple-chooser/gdm-host-chooser-widget.c index e5bc01dd..9ae3d4fc 100644 --- a/gui/simple-chooser/gdm-host-chooser-widget.c +++ b/gui/simple-chooser/gdm-host-chooser-widget.c @@ -631,10 +631,6 @@ gdm_host_chooser_widget_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmHostChooserWidget *self; - - self = GDM_HOST_CHOOSER_WIDGET (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -648,10 +644,6 @@ gdm_host_chooser_widget_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmHostChooserWidget *self; - - self = GDM_HOST_CHOOSER_WIDGET (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -665,9 +657,6 @@ gdm_host_chooser_widget_constructor (GType type, GObjectConstructParam *construct_properties) { GdmHostChooserWidget *host_chooser_widget; - GdmHostChooserWidgetClass *klass; - - klass = GDM_HOST_CHOOSER_WIDGET_CLASS (g_type_class_peek (GDM_TYPE_HOST_CHOOSER_WIDGET)); host_chooser_widget = GDM_HOST_CHOOSER_WIDGET (G_OBJECT_CLASS (gdm_host_chooser_widget_parent_class)->constructor (type, n_construct_properties, diff --git a/gui/simple-greeter/gdm-a11y-preferences-dialog.c b/gui/simple-greeter/gdm-a11y-preferences-dialog.c index a6b78dd5..0ec3549b 100644 --- a/gui/simple-greeter/gdm-a11y-preferences-dialog.c +++ b/gui/simple-greeter/gdm-a11y-preferences-dialog.c @@ -83,10 +83,6 @@ gdm_a11y_preferences_dialog_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmA11yPreferencesDialog *self; - - self = GDM_A11Y_PREFERENCES_DIALOG (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -100,10 +96,6 @@ gdm_a11y_preferences_dialog_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmA11yPreferencesDialog *self; - - self = GDM_A11Y_PREFERENCES_DIALOG (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -117,9 +109,6 @@ gdm_a11y_preferences_dialog_constructor (GType type, GObjectConstructParam *construct_properties) { GdmA11yPreferencesDialog *a11y_preferences_dialog; - GdmA11yPreferencesDialogClass *klass; - - klass = GDM_A11Y_PREFERENCES_DIALOG_CLASS (g_type_class_peek (GDM_TYPE_A11Y_PREFERENCES_DIALOG)); a11y_preferences_dialog = GDM_A11Y_PREFERENCES_DIALOG (G_OBJECT_CLASS (gdm_a11y_preferences_dialog_parent_class)->constructor (type, n_construct_properties, @@ -131,10 +120,6 @@ gdm_a11y_preferences_dialog_constructor (GType type, static void gdm_a11y_preferences_dialog_dispose (GObject *object) { - GdmA11yPreferencesDialog *a11y_preferences_dialog; - - a11y_preferences_dialog = GDM_A11Y_PREFERENCES_DIALOG (object); - G_OBJECT_CLASS (gdm_a11y_preferences_dialog_parent_class)->dispose (object); } diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c index 4f8c6881..7a399e29 100644 --- a/gui/simple-greeter/gdm-chooser-widget.c +++ b/gui/simple-greeter/gdm-chooser-widget.c @@ -364,15 +364,12 @@ static gboolean shrink_edge_toward_active_row (GdmChooserWidget *widget, GtkTreeRowReference **edge_row) { - GtkTreeModel *model; GtkTreePath *active_path; GtkTreePath *edge_path; GtkTreeIter edge_iter; gboolean edge_is_hidden; int relative_position; - model = GTK_TREE_MODEL (widget->priv->list_store); - active_path = gtk_tree_row_reference_get_path (widget->priv->active_row); translate_base_path_to_sorted_path (widget, &active_path); @@ -919,9 +916,6 @@ gdm_chooser_widget_constructor (GType type, GObjectConstructParam *construct_properties) { GdmChooserWidget *chooser_widget; - GdmChooserWidgetClass *klass; - - klass = GDM_CHOOSER_WIDGET_CLASS (g_type_class_peek (GDM_TYPE_CHOOSER_WIDGET)); chooser_widget = GDM_CHOOSER_WIDGET (G_OBJECT_CLASS (gdm_chooser_widget_parent_class)->constructor (type, n_construct_properties, diff --git a/gui/simple-greeter/gdm-greeter-client.c b/gui/simple-greeter/gdm-greeter-client.c index b20e6e5f..4794b83f 100644 --- a/gui/simple-greeter/gdm-greeter-client.c +++ b/gui/simple-greeter/gdm-greeter-client.c @@ -625,10 +625,6 @@ gdm_greeter_client_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmGreeterClient *self; - - self = GDM_GREETER_CLIENT (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -642,10 +638,6 @@ gdm_greeter_client_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmGreeterClient *self; - - self = GDM_GREETER_CLIENT (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -659,9 +651,6 @@ gdm_greeter_client_constructor (GType type, GObjectConstructParam *construct_properties) { GdmGreeterClient *greeter_client; - GdmGreeterClientClass *klass; - - klass = GDM_GREETER_CLIENT_CLASS (g_type_class_peek (GDM_TYPE_GREETER_CLIENT)); greeter_client = GDM_GREETER_CLIENT (G_OBJECT_CLASS (gdm_greeter_client_parent_class)->constructor (type, n_construct_properties, @@ -673,10 +662,6 @@ gdm_greeter_client_constructor (GType type, static void gdm_greeter_client_dispose (GObject *object) { - GdmGreeterClient *greeter_client; - - greeter_client = GDM_GREETER_CLIENT (object); - g_debug ("GdmGreeterClient: Disposing greeter_client"); G_OBJECT_CLASS (gdm_greeter_client_parent_class)->dispose (object); diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index 0b090931..237f7b22 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -62,7 +62,7 @@ #include "gdm-greeter-login-window.h" #include "gdm-user-chooser-widget.h" -#if HAVE_PAM +#ifdef HAVE_PAM #include <security/pam_appl.h> #define PW_ENTRY_SIZE PAM_MAX_RESP_SIZE #else @@ -1170,9 +1170,6 @@ gdm_greeter_login_window_constructor (GType type, GObjectConstructParam *construct_properties) { GdmGreeterLoginWindow *login_window; - GdmGreeterLoginWindowClass *klass; - - klass = GDM_GREETER_LOGIN_WINDOW_CLASS (g_type_class_peek (GDM_TYPE_GREETER_LOGIN_WINDOW)); login_window = GDM_GREETER_LOGIN_WINDOW (G_OBJECT_CLASS (gdm_greeter_login_window_parent_class)->constructor (type, n_construct_properties, diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c index 00dfd282..e6f633a5 100644 --- a/gui/simple-greeter/gdm-greeter-panel.c +++ b/gui/simple-greeter/gdm-greeter-panel.c @@ -78,10 +78,6 @@ gdm_greeter_panel_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmGreeterPanel *self; - - self = GDM_GREETER_PANEL (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -95,10 +91,6 @@ gdm_greeter_panel_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmGreeterPanel *self; - - self = GDM_GREETER_PANEL (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -112,9 +104,6 @@ gdm_greeter_panel_constructor (GType type, GObjectConstructParam *construct_properties) { GdmGreeterPanel *greeter_panel; - GdmGreeterPanelClass *klass; - - klass = GDM_GREETER_PANEL_CLASS (g_type_class_peek (GDM_TYPE_GREETER_PANEL)); greeter_panel = GDM_GREETER_PANEL (G_OBJECT_CLASS (gdm_greeter_panel_parent_class)->constructor (type, n_construct_properties, @@ -126,10 +115,6 @@ gdm_greeter_panel_constructor (GType type, static void gdm_greeter_panel_dispose (GObject *object) { - GdmGreeterPanel *greeter_panel; - - greeter_panel = GDM_GREETER_PANEL (object); - g_debug ("Disposing greeter_panel"); G_OBJECT_CLASS (gdm_greeter_panel_parent_class)->dispose (object); diff --git a/gui/simple-greeter/gdm-greeter-session.c b/gui/simple-greeter/gdm-greeter-session.c index 6c4cb701..63ebc191 100644 --- a/gui/simple-greeter/gdm-greeter-session.c +++ b/gui/simple-greeter/gdm-greeter-session.c @@ -563,10 +563,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); @@ -580,10 +576,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); @@ -597,9 +589,6 @@ gdm_greeter_session_constructor (GType type, 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, @@ -611,10 +600,6 @@ gdm_greeter_session_constructor (GType type, static void gdm_greeter_session_dispose (GObject *object) { - GdmGreeterSession *greeter_session; - - greeter_session = GDM_GREETER_SESSION (object); - g_debug ("GdmGreeterSession: Disposing greeter_session"); G_OBJECT_CLASS (gdm_greeter_session_parent_class)->dispose (object); diff --git a/gui/simple-greeter/gdm-language-chooser-widget.c b/gui/simple-greeter/gdm-language-chooser-widget.c index 9dd811f2..0c9bfbec 100644 --- a/gui/simple-greeter/gdm-language-chooser-widget.c +++ b/gui/simple-greeter/gdm-language-chooser-widget.c @@ -96,10 +96,6 @@ gdm_language_chooser_widget_set_current_language_name (GdmLanguageChooserWidget static void gdm_language_chooser_widget_dispose (GObject *object) { - GdmLanguageChooserWidget *widget; - - widget = GDM_LANGUAGE_CHOOSER_WIDGET (object); - G_OBJECT_CLASS (gdm_language_chooser_widget_parent_class)->dispose (object); } diff --git a/gui/simple-greeter/gdm-option-widget.c b/gui/simple-greeter/gdm-option-widget.c index 4f95bdaf..fd24d65c 100644 --- a/gui/simple-greeter/gdm-option-widget.c +++ b/gui/simple-greeter/gdm-option-widget.c @@ -170,13 +170,8 @@ static void activate_from_item_id (GdmOptionWidget *widget, const char *item_id) { - GtkTreeModel *model; - GtkTreePath *path; GtkTreeIter iter; - model = GTK_TREE_MODEL (widget->priv->list_store); - path = NULL; - if (!find_item (widget, item_id, &iter)) { g_critical ("Tried to activate non-existing item from option widget"); return; @@ -368,9 +363,6 @@ gdm_option_widget_constructor (GType type, GObjectConstructParam *construct_properties) { GdmOptionWidget *option_widget; - GdmOptionWidgetClass *klass; - - klass = GDM_OPTION_WIDGET_CLASS (g_type_class_peek (GDM_TYPE_OPTION_WIDGET)); option_widget = GDM_OPTION_WIDGET (G_OBJECT_CLASS (gdm_option_widget_parent_class)->constructor (type, n_construct_properties, diff --git a/gui/simple-greeter/gdm-recent-option-widget.c b/gui/simple-greeter/gdm-recent-option-widget.c index ba5a7c14..76fa76bd 100644 --- a/gui/simple-greeter/gdm-recent-option-widget.c +++ b/gui/simple-greeter/gdm-recent-option-widget.c @@ -237,10 +237,6 @@ gdm_recent_option_widget_set_gconf_key (GdmRecentOptionWidget *widget, static void gdm_recent_option_widget_dispose (GObject *object) { - GdmRecentOptionWidget *widget; - - widget = GDM_RECENT_OPTION_WIDGET (object); - G_OBJECT_CLASS (gdm_recent_option_widget_parent_class)->dispose (object); } diff --git a/gui/simple-greeter/gdm-remote-login-window.c b/gui/simple-greeter/gdm-remote-login-window.c index 28e9fab7..3ff252d1 100644 --- a/gui/simple-greeter/gdm-remote-login-window.c +++ b/gui/simple-greeter/gdm-remote-login-window.c @@ -117,10 +117,6 @@ gdm_remote_login_window_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmRemoteLoginWindow *self; - - self = GDM_REMOTE_LOGIN_WINDOW (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -134,10 +130,6 @@ gdm_remote_login_window_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmRemoteLoginWindow *self; - - self = GDM_REMOTE_LOGIN_WINDOW (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -151,9 +143,6 @@ gdm_remote_login_window_constructor (GType type, GObjectConstructParam *construct_properties) { GdmRemoteLoginWindow *login_window; - GdmRemoteLoginWindowClass *klass; - - klass = GDM_REMOTE_LOGIN_WINDOW_CLASS (g_type_class_peek (GDM_TYPE_REMOTE_LOGIN_WINDOW)); login_window = GDM_REMOTE_LOGIN_WINDOW (G_OBJECT_CLASS (gdm_remote_login_window_parent_class)->constructor (type, n_construct_properties, diff --git a/gui/simple-greeter/gdm-session-client.c b/gui/simple-greeter/gdm-session-client.c index 14a916fa..1b75ffac 100644 --- a/gui/simple-greeter/gdm-session-client.c +++ b/gui/simple-greeter/gdm-session-client.c @@ -25,6 +25,8 @@ #include <unistd.h> #include <string.h> #include <signal.h> +#include <sys/types.h> +#include <sys/wait.h> #include <glib.h> #include <glib/gi18n.h> @@ -401,9 +403,6 @@ gdm_session_client_constructor (GType type, GObjectConstructParam *construct_properties) { GdmSessionClient *client; - GdmSessionClientClass *klass; - - klass = GDM_SESSION_CLIENT_CLASS (g_type_class_peek (GDM_TYPE_SESSION_CLIENT)); client = GDM_SESSION_CLIENT (G_OBJECT_CLASS (gdm_session_client_parent_class)->constructor (type, n_construct_properties, @@ -419,10 +418,6 @@ gdm_session_client_constructor (GType type, static void gdm_session_client_dispose (GObject *object) { - GdmSessionClient *session_client; - - session_client = GDM_SESSION_CLIENT (object); - G_OBJECT_CLASS (gdm_session_client_parent_class)->dispose (object); } diff --git a/gui/simple-greeter/gdm-session-manager.c b/gui/simple-greeter/gdm-session-manager.c index 153838c6..80fbb4c3 100644 --- a/gui/simple-greeter/gdm-session-manager.c +++ b/gui/simple-greeter/gdm-session-manager.c @@ -392,10 +392,6 @@ gdm_session_manager_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmSessionManager *self; - - self = GDM_SESSION_MANAGER (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -409,10 +405,6 @@ gdm_session_manager_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmSessionManager *self; - - self = GDM_SESSION_MANAGER (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -426,9 +418,6 @@ gdm_session_manager_constructor (GType type, GObjectConstructParam *construct_properties) { GdmSessionManager *session_manager; - GdmSessionManagerClass *klass; - - klass = GDM_SESSION_MANAGER_CLASS (g_type_class_peek (GDM_TYPE_SESSION_MANAGER)); session_manager = GDM_SESSION_MANAGER (G_OBJECT_CLASS (gdm_session_manager_parent_class)->constructor (type, n_construct_properties, @@ -440,10 +429,6 @@ gdm_session_manager_constructor (GType type, static void gdm_session_manager_dispose (GObject *object) { - GdmSessionManager *session_manager; - - session_manager = GDM_SESSION_MANAGER (object); - G_OBJECT_CLASS (gdm_session_manager_parent_class)->dispose (object); } diff --git a/gui/simple-greeter/gdm-user-chooser-dialog.c b/gui/simple-greeter/gdm-user-chooser-dialog.c index 48481777..48d90ca9 100644 --- a/gui/simple-greeter/gdm-user-chooser-dialog.c +++ b/gui/simple-greeter/gdm-user-chooser-dialog.c @@ -68,10 +68,6 @@ gdm_user_chooser_dialog_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmUserChooserDialog *self; - - self = GDM_USER_CHOOSER_DIALOG (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -85,10 +81,6 @@ gdm_user_chooser_dialog_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmUserChooserDialog *self; - - self = GDM_USER_CHOOSER_DIALOG (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -102,9 +94,6 @@ gdm_user_chooser_dialog_constructor (GType type, GObjectConstructParam *construct_properties) { GdmUserChooserDialog *user_chooser_dialog; - GdmUserChooserDialogClass *klass; - - klass = GDM_USER_CHOOSER_DIALOG_CLASS (g_type_class_peek (GDM_TYPE_USER_CHOOSER_DIALOG)); user_chooser_dialog = GDM_USER_CHOOSER_DIALOG (G_OBJECT_CLASS (gdm_user_chooser_dialog_parent_class)->constructor (type, n_construct_properties, @@ -116,10 +105,6 @@ gdm_user_chooser_dialog_constructor (GType type, static void gdm_user_chooser_dialog_dispose (GObject *object) { - GdmUserChooserDialog *user_chooser_dialog; - - user_chooser_dialog = GDM_USER_CHOOSER_DIALOG (object); - G_OBJECT_CLASS (gdm_user_chooser_dialog_parent_class)->dispose (object); } diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c index 322a3c30..c9c31591 100644 --- a/gui/simple-greeter/gdm-user-chooser-widget.c +++ b/gui/simple-greeter/gdm-user-chooser-widget.c @@ -124,10 +124,6 @@ gdm_user_chooser_widget_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GdmUserChooserWidget *self; - - self = GDM_USER_CHOOSER_WIDGET (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -141,10 +137,6 @@ gdm_user_chooser_widget_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GdmUserChooserWidget *self; - - self = GDM_USER_CHOOSER_WIDGET (object); - switch (prop_id) { default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -158,9 +150,6 @@ gdm_user_chooser_widget_constructor (GType type, GObjectConstructParam *construct_properties) { GdmUserChooserWidget *user_chooser_widget; - GdmUserChooserWidgetClass *klass; - - klass = GDM_USER_CHOOSER_WIDGET_CLASS (g_type_class_peek (GDM_TYPE_USER_CHOOSER_WIDGET)); user_chooser_widget = GDM_USER_CHOOSER_WIDGET (G_OBJECT_CLASS (gdm_user_chooser_widget_parent_class)->constructor (type, n_construct_properties, diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c index fbd22928..766dfeeb 100644 --- a/gui/simple-greeter/gdm-user-manager.c +++ b/gui/simple-greeter/gdm-user-manager.c @@ -146,7 +146,6 @@ _get_primary_user_session_id (GdmUserManager *manager, GdmUser *user) { gboolean res; - gboolean ret; gboolean can_activate_sessions; GError *error; GList *sessions; @@ -158,7 +157,6 @@ _get_primary_user_session_id (GdmUserManager *manager, return NULL; } - ret = FALSE; primary_ssid = NULL; sessions = NULL; @@ -306,7 +304,6 @@ static char * _get_login_window_session_id (GdmUserManager *manager) { gboolean res; - gboolean ret; gboolean can_activate_sessions; GError *error; GPtrArray *sessions; @@ -318,7 +315,6 @@ _get_login_window_session_id (GdmUserManager *manager) return NULL; } - ret = FALSE; primary_ssid = NULL; sessions = NULL; diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c index adb67332..59a003c4 100644 --- a/gui/simple-greeter/gdm-user.c +++ b/gui/simple-greeter/gdm-user.c @@ -86,7 +86,7 @@ static void gdm_user_finalize (GObject *object); static guint signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GdmUser, gdm_user, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdmUser, gdm_user, G_TYPE_OBJECT) static int session_compare (const char *a, diff --git a/gui/simple-greeter/libnotificationarea/na-tray-manager.c b/gui/simple-greeter/libnotificationarea/na-tray-manager.c index 59fdca36..9c36e692 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray-manager.c +++ b/gui/simple-greeter/libnotificationarea/na-tray-manager.c @@ -447,13 +447,13 @@ na_tray_manager_handle_begin_message (NaTrayManager *manager, /* Check if the same message is already in the queue and remove it if so */ for (p = manager->messages; p; p = p->next) { - PendingMessage *msg = p->data; + PendingMessage *message = p->data; - if (xevent->window == msg->window && - xevent->data.l[4] == msg->id) + if (xevent->window == message->window && + xevent->data.l[4] == message->id) { /* Hmm, we found it, now remove it */ - pending_message_free (msg); + pending_message_free (message); manager->messages = g_list_remove_link (manager->messages, p); g_list_free_1 (p); break; diff --git a/gui/simple-greeter/libnotificationarea/na-tray.c b/gui/simple-greeter/libnotificationarea/na-tray.c index 9bfc19f2..71927177 100644 --- a/gui/simple-greeter/libnotificationarea/na-tray.c +++ b/gui/simple-greeter/libnotificationarea/na-tray.c @@ -83,7 +83,7 @@ static TraysScreen *trays_screens = NULL; static void icon_tip_show_next (IconTip *icontip); -G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN); +G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN) static NaTray * get_tray (TraysScreen *trays_screen) diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c index 0201574a..06814fe8 100644 --- a/gui/user-switch-applet/applet.c +++ b/gui/user-switch-applet/applet.c @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>. + * Copyright (C) 2008 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -97,7 +98,7 @@ PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_GdmUserSwitchApplet_Factory", PANEL_TYPE_APPLET, "gdm-user-switch-applet", "0", (PanelAppletFactoryCallback)applet_fill_cb, - NULL); + NULL) static void about_me_cb (BonoboUIComponent *ui_container, @@ -409,14 +410,14 @@ prefs_cb (BonoboUIComponent *ui_container, label_setup_done = FALSE; key = panel_applet_gconf_get_full_key (adata->applet, DISPLAY_KEY); if (has_lockdown || !gconf_client_key_is_writable (adata->client, key, NULL)) { - GtkWidget *label; + GtkWidget *warning_label; gtk_widget_set_sensitive (username_radio, FALSE); gtk_widget_set_sensitive (text_radio, FALSE); gtk_widget_set_sensitive (icon_radio, FALSE); - label = glade_xml_get_widget (xml, "warning_label"); - make_label_small_italic (GTK_LABEL (label)); + warning_label = glade_xml_get_widget (xml, "warning_label"); + make_label_small_italic (GTK_LABEL (warning_label)); label_setup_done = TRUE; gtk_widget_show (warning_box); @@ -438,10 +439,10 @@ prefs_cb (BonoboUIComponent *ui_container, gtk_widget_set_sensitive (check, FALSE); if (!label_setup_done) { - GtkWidget *label; + GtkWidget *warning_label; - label = glade_xml_get_widget (xml, "warning_label"); - make_label_small_italic (GTK_LABEL (label)); + warning_label = glade_xml_get_widget (xml, "warning_label"); + make_label_small_italic (GTK_LABEL (warning_label)); label_setup_done = TRUE; gtk_widget_show (warning_box); @@ -466,10 +467,10 @@ prefs_cb (BonoboUIComponent *ui_container, gtk_widget_set_sensitive (check, FALSE); if (!label_setup_done) { - GtkWidget *label; + GtkWidget *warning_label; - label = glade_xml_get_widget (xml, "warning_label"); - make_label_small_italic (GTK_LABEL (label)); + warning_label = glade_xml_get_widget (xml, "warning_label"); + make_label_small_italic (GTK_LABEL (warning_label)); label_setup_done = TRUE; gtk_widget_show (warning_box); @@ -1068,9 +1069,7 @@ static void switch_to_user_session (GdmAppletData *adata, GdmUser *user) { - gboolean res; - - res = gdm_user_manager_activate_user_session (adata->manager, user); + gdm_user_manager_activate_user_session (adata->manager, user); } static void @@ -1330,7 +1329,7 @@ display_key_changed (GdmAppletData *adata, gtk_image_new_from_icon_name ("stock_people", GTK_ICON_SIZE_MENU); gtk_box_pack_start (GTK_BOX (parent), adata->imglabel, - TRUE, TRUE, 0); + TRUE, TRUE, item_border); gtk_widget_show (adata->imglabel); } } else { @@ -1511,36 +1510,35 @@ applet_fill_cb (PanelApplet *applet, return FALSE; /* Global GdmManager */ - if (!first_time) - { - gint argc = 1; - char *argv[2] = { "gdm-user-switch-applet", NULL}; - - first_time = TRUE; - - program = gnome_program_init ("gdm-user-switch-applet", - VERSION, - LIBGNOME_MODULE, - argc, argv, - GNOME_PROGRAM_STANDARD_PROPERTIES, - NULL); - - /* Do this here so it's only done once. */ - gtk_rc_parse_string ("style \"gdm-user-switch-menubar-style\"\n" - "{\n" - "GtkMenuBar::shadow-type = none\n" - "GtkMenuBar::internal-padding = 0\n" - "}\n" - "style \"gdm-user-switch-applet-style\"\n" - "{\n" - "GtkWidget::focus-line-width = 0\n" - "GtkWidget::focus-padding = 0\n" - "}\n" - "widget \"*.gdm-user-switch-menubar\" style \"gdm-user-switch-menubar-style\"\n" - "widget \"*.gdm-user-switch-applet\" style \"gdm-user-switch-applet-style\"\n"); - gtk_window_set_default_icon_name ("stock_people"); - g_set_application_name (_("User Switch Applet")); - } + if (!first_time) { + int argc = 1; + char *argv[2] = { "gdm-user-switch-applet", NULL}; + + first_time = TRUE; + + program = gnome_program_init ("gdm-user-switch-applet", + VERSION, + LIBGNOME_MODULE, + argc, argv, + GNOME_PROGRAM_STANDARD_PROPERTIES, + NULL); + + /* Do this here so it's only done once. */ + gtk_rc_parse_string ("style \"gdm-user-switch-menubar-style\"\n" + "{\n" + "GtkMenuBar::shadow-type = none\n" + "GtkMenuBar::internal-padding = 0\n" + "}\n" + "style \"gdm-user-switch-applet-style\"\n" + "{\n" + "GtkWidget::focus-line-width = 0\n" + "GtkWidget::focus-padding = 0\n" + "}\n" + "widget \"*.gdm-user-switch-menubar\" style \"gdm-user-switch-menubar-style\"\n" + "widget \"*.gdm-user-switch-applet\" style \"gdm-user-switch-applet-style\"\n"); + gtk_window_set_default_icon_name ("stock_people"); + g_set_application_name (_("User Switch Applet")); + } adata = g_new0 (GdmAppletData, 1); adata->applet = applet; @@ -1822,6 +1820,8 @@ applet_fill_cb (PanelApplet *applet, gtk_widget_show (GTK_WIDGET (applet)); } + g_object_unref (program); + return TRUE; } diff --git a/gui/user-switch-applet/gdm-user-menu-item.c b/gui/user-switch-applet/gdm-user-menu-item.c index aab4360c..79de2fa1 100644 --- a/gui/user-switch-applet/gdm-user-menu-item.c +++ b/gui/user-switch-applet/gdm-user-menu-item.c @@ -59,7 +59,7 @@ struct _GdmUserMenuItemClass GtkImageMenuItemClass parent_class; }; -G_DEFINE_TYPE (GdmUserMenuItem, gdm_user_menu_item, GTK_TYPE_IMAGE_MENU_ITEM); +G_DEFINE_TYPE (GdmUserMenuItem, gdm_user_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) static void diff --git a/tests/s-common-address.c b/tests/s-common-address.c index 353bb73d..f6c4bff2 100644 --- a/tests/s-common-address.c +++ b/tests/s-common-address.c @@ -81,8 +81,7 @@ teardown (void) */ START_TEST (test_gdm_address_get_type) { - GType g; - g = gdm_address_get_type (); + gdm_address_get_type (); /* it did not crash! :) */ } diff --git a/utils/gdmflexiserver.c b/utils/gdmflexiserver.c index 8c193515..e1666f8d 100644 --- a/utils/gdmflexiserver.c +++ b/utils/gdmflexiserver.c @@ -552,13 +552,11 @@ static char * get_login_window_session_id (DBusConnection *connection, const char *seat_id) { - gboolean ret; gboolean can_activate_sessions; char **sessions; char *session_id; int i; - ret = FALSE; session_id = NULL; sessions = NULL; |