[gdm-list] Cleanups for gdm



Here's a patch that indicates some cleanups that might or might not be
of use.

Cheers
Kjartan

Index: gui/user-switch-applet/gdm-user-menu-item.c
===================================================================
--- gui/user-switch-applet/gdm-user-menu-item.c	(revisjon 5794)
+++ gui/user-switch-applet/gdm-user-menu-item.c	(arbeidskopi)
@@ -59,7 +59,7 @@
         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
Index: gui/user-switch-applet/applet.c
===================================================================
--- gui/user-switch-applet/applet.c	(revisjon 5794)
+++ gui/user-switch-applet/applet.c	(arbeidskopi)
@@ -97,7 +97,7 @@
                              PANEL_TYPE_APPLET,
                              "gdm-user-switch-applet", "0",
                              (PanelAppletFactoryCallback)applet_fill_cb,
-                             NULL);
+                             NULL)
 
 static void
 about_me_cb (BonoboUIComponent *ui_container,
@@ -409,14 +409,14 @@
         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 +438,10 @@
                 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 +466,10 @@
                 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 +1068,7 @@
 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 +1328,7 @@
                                 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 {
@@ -1822,6 +1820,8 @@
                 gtk_widget_show (GTK_WIDGET (applet));
         }
 
+	g_object_unref (program);
+
         return TRUE;
 }
 
Index: gui/simple-greeter/gdm-option-widget.c
===================================================================
--- gui/simple-greeter/gdm-option-widget.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-option-widget.c	(arbeidskopi)
@@ -170,13 +170,8 @@
 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,10 +363,7 @@
                                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,
                                                                                                          construct_properties));
Index: gui/simple-greeter/gdm-session-manager.c
===================================================================
--- gui/simple-greeter/gdm-session-manager.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-session-manager.c	(arbeidskopi)
@@ -392,10 +392,6 @@
                                   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 @@
                                   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,10 +418,7 @@
                                  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,
                                                                                                                      construct_properties));
@@ -440,10 +429,6 @@
 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);
 }
 
Index: gui/simple-greeter/gdm-session-client.c
===================================================================
--- gui/simple-greeter/gdm-session-client.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-session-client.c	(arbeidskopi)
@@ -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,10 +403,7 @@
                                 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,
                                                                                                     construct_properties));
@@ -419,10 +418,6 @@
 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);
 }
 
Index: gui/simple-greeter/gdm-language-chooser-widget.c
===================================================================
--- gui/simple-greeter/gdm-language-chooser-widget.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-language-chooser-widget.c	(arbeidskopi)
@@ -96,10 +96,6 @@
 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);
 }
 
Index: gui/simple-greeter/gdm-recent-option-widget.c
===================================================================
--- gui/simple-greeter/gdm-recent-option-widget.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-recent-option-widget.c	(arbeidskopi)
@@ -237,10 +237,6 @@
 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);
 }
 
Index: gui/simple-greeter/gdm-a11y-preferences-dialog.c
===================================================================
--- gui/simple-greeter/gdm-a11y-preferences-dialog.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-a11y-preferences-dialog.c	(arbeidskopi)
@@ -83,10 +83,6 @@
                                           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 @@
                                           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,10 +109,7 @@
                                          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,
                                                                                                                            construct_properties));
@@ -131,10 +120,6 @@
 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);
 }
 
Index: gui/simple-greeter/gdm-greeter-login-window.c
===================================================================
--- gui/simple-greeter/gdm-greeter-login-window.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-greeter-login-window.c	(arbeidskopi)
@@ -61,7 +61,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
@@ -1143,10 +1143,7 @@
                                       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,
                                                                                                                       construct_properties));
Index: gui/simple-greeter/gdm-greeter-client.c
===================================================================
--- gui/simple-greeter/gdm-greeter-client.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-greeter-client.c	(arbeidskopi)
@@ -625,10 +625,6 @@
                                  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 @@
                                  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,10 +651,7 @@
                                  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,
                                                                                                             construct_properties));
@@ -673,10 +662,6 @@
 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);
Index: gui/simple-greeter/gdm-user-chooser-dialog.c
===================================================================
--- gui/simple-greeter/gdm-user-chooser-dialog.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-user-chooser-dialog.c	(arbeidskopi)
@@ -68,10 +68,6 @@
                                       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 @@
                                       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,10 +94,7 @@
                                      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,
                                                                                                                            construct_properties));
@@ -116,10 +105,6 @@
 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);
 }
 
Index: gui/simple-greeter/gdm-greeter-panel.c
===================================================================
--- gui/simple-greeter/gdm-greeter-panel.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-greeter-panel.c	(arbeidskopi)
@@ -78,10 +78,6 @@
                                 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 @@
                                 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,10 +104,7 @@
                                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,
                                                                                                          construct_properties));
@@ -126,10 +115,6 @@
 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);
Index: gui/simple-greeter/gdm-user-chooser-widget.c
===================================================================
--- gui/simple-greeter/gdm-user-chooser-widget.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-user-chooser-widget.c	(arbeidskopi)
@@ -124,10 +124,6 @@
                                       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 @@
                                       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,10 +150,7 @@
                                      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,
                                                                                                                            construct_properties));
Index: gui/simple-greeter/gdm-remote-login-window.c
===================================================================
--- gui/simple-greeter/gdm-remote-login-window.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-remote-login-window.c	(arbeidskopi)
@@ -117,10 +117,6 @@
                                       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 @@
                                       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,10 +143,7 @@
                                      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,
                                                                                                                       construct_properties));
Index: gui/simple-greeter/gdm-greeter-session.c
===================================================================
--- gui/simple-greeter/gdm-greeter-session.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-greeter-session.c	(arbeidskopi)
@@ -563,10 +563,6 @@
                                   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 @@
                                   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,10 +589,7 @@
                                  GObjectConstructParam *construct_properties)
 {
         GdmGreeterSession      *greeter_session;
-        GdmGreeterSessionClass *klass;
 
-        klass = GDM_GREETER_SESSION_CLASS (g_type_class_peek (GDM_TYPE_GREETER_SESSION));
-
         greeter_session = GDM_GREETER_SESSION (G_OBJECT_CLASS (gdm_greeter_session_parent_class)->constructor (type,
                                                                                                                n_construct_properties,
                                                                                                                construct_properties));
@@ -611,10 +600,6 @@
 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);
Index: gui/simple-greeter/gdm-user.c
===================================================================
--- gui/simple-greeter/gdm-user.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-user.c	(arbeidskopi)
@@ -86,7 +86,7 @@
 
 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,
Index: gui/simple-greeter/libnotificationarea/na-tray-manager.c
===================================================================
--- gui/simple-greeter/libnotificationarea/na-tray-manager.c	(revisjon 5794)
+++ gui/simple-greeter/libnotificationarea/na-tray-manager.c	(arbeidskopi)
@@ -447,13 +447,13 @@
   /* 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;
Index: gui/simple-greeter/libnotificationarea/na-tray.c
===================================================================
--- gui/simple-greeter/libnotificationarea/na-tray.c	(revisjon 5794)
+++ gui/simple-greeter/libnotificationarea/na-tray.c	(arbeidskopi)
@@ -83,7 +83,7 @@
 
 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)
Index: gui/simple-greeter/gdm-chooser-widget.c
===================================================================
--- gui/simple-greeter/gdm-chooser-widget.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-chooser-widget.c	(arbeidskopi)
@@ -364,15 +364,12 @@
 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,10 +916,7 @@
                                 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,
                                                                                                             construct_properties));
Index: gui/simple-greeter/gdm-user-manager.c
===================================================================
--- gui/simple-greeter/gdm-user-manager.c	(revisjon 5794)
+++ gui/simple-greeter/gdm-user-manager.c	(arbeidskopi)
@@ -146,7 +146,6 @@
                               GdmUser        *user)
 {
         gboolean    res;
-        gboolean    ret;
         gboolean    can_activate_sessions;
         GError     *error;
         GList      *sessions;
@@ -158,7 +157,6 @@
                 return NULL;
         }
 
-        ret = FALSE;
         primary_ssid = NULL;
         sessions = NULL;
 
@@ -306,7 +304,6 @@
 _get_login_window_session_id (GdmUserManager *manager)
 {
         gboolean    res;
-        gboolean    ret;
         gboolean    can_activate_sessions;
         GError     *error;
         GPtrArray  *sessions;
@@ -318,7 +315,6 @@
                 return NULL;
         }
 
-        ret = FALSE;
         primary_ssid = NULL;
         sessions = NULL;
 
Index: gui/simple-chooser/gdm-host-chooser-dialog.c
===================================================================
--- gui/simple-chooser/gdm-host-chooser-dialog.c	(revisjon 5794)
+++ gui/simple-chooser/gdm-host-chooser-dialog.c	(arbeidskopi)
@@ -67,10 +67,6 @@
                                       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 @@
                                       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,10 +93,7 @@
                                      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,
                                                                                                                            construct_properties));
@@ -115,10 +104,6 @@
 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);
Index: gui/simple-chooser/gdm-host-chooser-widget.c
===================================================================
--- gui/simple-chooser/gdm-host-chooser-widget.c	(revisjon 5794)
+++ gui/simple-chooser/gdm-host-chooser-widget.c	(arbeidskopi)
@@ -631,10 +631,6 @@
                                       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 @@
                                       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,10 +657,7 @@
                                      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,
                                                                                                                            construct_properties));
Index: gui/simple-chooser/gdm-chooser-client.c
===================================================================
--- gui/simple-chooser/gdm-chooser-client.c	(revisjon 5794)
+++ gui/simple-chooser/gdm-chooser-client.c	(arbeidskopi)
@@ -302,10 +302,6 @@
                                  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 @@
                                  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,10 +328,7 @@
                                  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,
                                                                                                             construct_properties));
@@ -350,10 +339,6 @@
 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);
Index: gui/simple-chooser/gdm-chooser-session.c
===================================================================
--- gui/simple-chooser/gdm-chooser-session.c	(revisjon 5794)
+++ gui/simple-chooser/gdm-chooser-session.c	(arbeidskopi)
@@ -208,10 +208,6 @@
                                   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 @@
                                   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,10 +234,7 @@
                                  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,
                                                                                                                construct_properties));
@@ -256,10 +245,6 @@
 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);
Index: common/gdm-settings-desktop-backend.c
===================================================================
--- common/gdm-settings-desktop-backend.c	(revisjon 5794)
+++ common/gdm-settings-desktop-backend.c	(arbeidskopi)
@@ -173,7 +173,6 @@
 save_settings (GdmSettingsDesktopBackend *backend)
 {
         GError   *local_error;
-        gboolean  res;
         char     *contents;
         gsize     length;
 
@@ -192,7 +191,7 @@
         }
 
         local_error = NULL;
-        res = g_file_set_contents (backend->priv->filename,
+        g_file_set_contents (backend->priv->filename,
                                    contents,
                                    length,
                                    &local_error);
Index: common/gdm-settings-direct.c
===================================================================
--- common/gdm-settings-direct.c	(revisjon 5794)
+++ common/gdm-settings-direct.c	(arbeidskopi)
@@ -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 @@
         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;
Index: common/test-settings-client.c
===================================================================
--- common/test-settings-client.c	(revisjon 5794)
+++ common/test-settings-client.c	(arbeidskopi)
@@ -51,7 +51,6 @@
         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 @@
         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);
Index: common/test-log.c
===================================================================
--- common/test-log.c	(revisjon 5794)
+++ common/test-log.c	(arbeidskopi)
@@ -46,8 +46,8 @@
 
         g_message ("Test message");
         g_warning ("Test warning");
+        g_critical ("Test critical");
         g_error ("Test error");
-        g_critical ("Test critical");
 }
 
 int
Index: common/gdm-settings-client.c
===================================================================
--- common/gdm-settings-client.c	(revisjon 5794)
+++ common/gdm-settings-client.c	(arbeidskopi)
@@ -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 @@
 {
         char    *candidate_key;
         char    *translated_value;
-        GError  *error;
         char   **languages;
         gboolean free_languages = FALSE;
         int      i;
@@ -260,7 +257,6 @@
 
         candidate_key = NULL;
         translated_value = NULL;
-        error = NULL;
 
         if (locale != NULL) {
                 languages = g_new (char *, 2);
@@ -529,9 +525,6 @@
         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",
Index: utils/gdmflexiserver.c
===================================================================
--- utils/gdmflexiserver.c	(revisjon 5794)
+++ utils/gdmflexiserver.c	(arbeidskopi)
@@ -552,13 +552,11 @@
 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;
 
Index: tests/s-common-address.c
===================================================================
--- tests/s-common-address.c	(revisjon 5794)
+++ tests/s-common-address.c	(arbeidskopi)
@@ -81,8 +81,7 @@
  */
 START_TEST (test_gdm_address_get_type)
 {
-        GType g;
-        g = gdm_address_get_type ();
+        gdm_address_get_type ();
         /* it did not crash! :) */
 
 }
Index: daemon/gdm-local-display-factory.c
===================================================================
--- daemon/gdm-local-display-factory.c	(revisjon 5794)
+++ daemon/gdm-local-display-factory.c	(arbeidskopi)
@@ -438,10 +438,6 @@
                                         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 @@
                                         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 @@
                                        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));
Index: daemon/gdm-session-worker-job.c
===================================================================
--- daemon/gdm-session-worker-job.c	(revisjon 5794)
+++ daemon/gdm-session-worker-job.c	(arbeidskopi)
@@ -339,10 +339,7 @@
                                     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,
                                                                                        construct_properties));
Index: daemon/gdm-server.c
===================================================================
--- daemon/gdm-server.c	(revisjon 5794)
+++ daemon/gdm-server.c	(arbeidskopi)
@@ -831,10 +831,7 @@
                         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,
                                                                                     construct_properties));
Index: daemon/gdm-session-settings.c
===================================================================
--- daemon/gdm-session-settings.c	(revisjon 5794)
+++ daemon/gdm-session-settings.c	(arbeidskopi)
@@ -59,7 +59,7 @@
         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)
Index: daemon/gdm-session-linux-auditor.c
===================================================================
--- daemon/gdm-session-linux-auditor.c	(revisjon 5794)
+++ daemon/gdm-session-linux-auditor.c	(arbeidskopi)
@@ -42,7 +42,7 @@
 
 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,
Index: daemon/gdm-product-slave.c
===================================================================
--- daemon/gdm-product-slave.c	(revisjon 5794)
+++ daemon/gdm-product-slave.c	(arbeidskopi)
@@ -966,13 +966,12 @@
 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 @@
 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 @@
                                 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 @@
                                 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,10 +1073,7 @@
                                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,
                                                                                                          construct_properties));
Index: daemon/gdm-session-auditor.c
===================================================================
--- daemon/gdm-session-auditor.c	(revisjon 5794)
+++ daemon/gdm-session-auditor.c	(arbeidskopi)
@@ -61,7 +61,7 @@
         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)
Index: daemon/test-session.c
===================================================================
--- daemon/test-session.c	(revisjon 5794)
+++ daemon/test-session.c	(arbeidskopi)
@@ -235,10 +235,7 @@
 {
         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);
 
         g_type_init ();
@@ -345,6 +342,4 @@
                 g_object_unref (session);
                 g_message ("GdmSessionDirect object destroyed successfully");
         } while (1);
-
-        return exit_code;
 }
Index: daemon/gdm-slave.c
===================================================================
--- daemon/gdm-slave.c	(revisjon 5794)
+++ daemon/gdm-slave.c	(arbeidskopi)
@@ -253,7 +253,6 @@
         gint       status;
         GError    *error;
         GPtrArray *env;
-        gboolean   res;
         gboolean   ret;
 
         ret = FALSE;
@@ -323,16 +322,16 @@
 
         env = get_script_environment (slave, login);
 
-        res = g_spawn_sync (NULL,
-                            argv,
-                            (char **)env->pdata,
-                            G_SPAWN_SEARCH_PATH,
-                            NULL,
-                            NULL,
-                            NULL,
-                            NULL,
-                            &status,
-                            &error);
+        g_spawn_sync (NULL,
+                      argv,
+                      (char **)env->pdata,
+                      G_SPAWN_SEARCH_PATH,
+                      NULL,
+                      NULL,
+                      NULL,
+                      NULL,
+                      &status,
+                      &error);
 
         g_ptr_array_foreach (env, (GFunc)g_free, NULL);
         g_ptr_array_free (env, TRUE);
@@ -836,7 +835,6 @@
                               const char *username)
 {
         gboolean    res;
-        gboolean    ret;
         gboolean    can_activate_sessions;
         GError     *error;
         DBusGProxy *manager_proxy;
@@ -851,7 +849,6 @@
                 return NULL;
         }
 
-        ret = FALSE;
         manager_proxy = NULL;
         primary_ssid = NULL;
         sessions = NULL;
@@ -1209,12 +1206,9 @@
                        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));
Index: daemon/gdm-display-access-file.c
===================================================================
--- daemon/gdm-display-access-file.c	(revisjon 5794)
+++ daemon/gdm-display-access-file.c	(arbeidskopi)
@@ -58,7 +58,7 @@
         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,
Index: daemon/gdm-product-display.c
===================================================================
--- daemon/gdm-product-display.c	(revisjon 5794)
+++ daemon/gdm-product-display.c	(arbeidskopi)
@@ -187,10 +187,7 @@
                                  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,
                                                                                                        construct_properties));
Index: daemon/gdm-static-factory-display.c
===================================================================
--- daemon/gdm-static-factory-display.c	(revisjon 5794)
+++ daemon/gdm-static-factory-display.c	(arbeidskopi)
@@ -124,10 +124,6 @@
                                          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 @@
                                          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,10 +150,7 @@
                                         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,
                                                                                                                      construct_properties));
Index: daemon/gdm-display.c
===================================================================
--- daemon/gdm-display.c	(revisjon 5794)
+++ daemon/gdm-display.c	(arbeidskopi)
@@ -142,7 +142,7 @@
         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 @@
                          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));
Index: daemon/gdm-chooser-server.c
===================================================================
--- daemon/gdm-chooser-server.c	(revisjon 5794)
+++ daemon/gdm-chooser-server.c	(arbeidskopi)
@@ -514,10 +514,7 @@
                                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,
                                                                                        construct_properties));
Index: daemon/gdm-manager.c
===================================================================
--- daemon/gdm-manager.c	(revisjon 5794)
+++ daemon/gdm-manager.c	(arbeidskopi)
@@ -320,10 +320,7 @@
                          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,
                                                                                        construct_properties));
Index: daemon/gdm-transient-display.c
===================================================================
--- daemon/gdm-transient-display.c	(revisjon 5794)
+++ daemon/gdm-transient-display.c	(arbeidskopi)
@@ -124,10 +124,6 @@
                                     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 @@
                                  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);
Index: daemon/gdm-welcome-session.c
===================================================================
--- daemon/gdm-welcome-session.c	(revisjon 5794)
+++ daemon/gdm-welcome-session.c	(arbeidskopi)
@@ -600,9 +600,9 @@
 
         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,10 +1030,7 @@
                                  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,
                                                                                                                construct_properties));
Index: daemon/gdm-factory-slave.c
===================================================================
--- daemon/gdm-factory-slave.c	(revisjon 5794)
+++ daemon/gdm-factory-slave.c	(arbeidskopi)
@@ -670,14 +670,13 @@
 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 @@
 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 @@
                                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 @@
                                 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,10 +832,7 @@
                                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,
                                                                                                          construct_properties));
Index: daemon/gdm-static-display.c
===================================================================
--- daemon/gdm-static-display.c	(revisjon 5794)
+++ daemon/gdm-static-display.c	(arbeidskopi)
@@ -125,10 +125,6 @@
                                  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 @@
                                  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);
Index: daemon/gdm-session-worker.c
===================================================================
--- daemon/gdm-session-worker.c	(revisjon 5794)
+++ daemon/gdm-session-worker.c	(arbeidskopi)
@@ -2138,11 +2138,8 @@
                                 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));
Index: daemon/gdm-session-direct.c
===================================================================
--- daemon/gdm-session-direct.c	(revisjon 5794)
+++ daemon/gdm-session-direct.c	(arbeidskopi)
@@ -107,7 +107,7 @@
                          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 @@
 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
Index: daemon/gdm-session-relay.c
===================================================================
--- daemon/gdm-session-relay.c	(revisjon 5794)
+++ daemon/gdm-session-relay.c	(arbeidskopi)
@@ -1017,10 +1017,6 @@
                                 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 @@
                                 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,10 +1043,7 @@
                                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,
                                                                                                             construct_properties));
Index: daemon/gdm-greeter-server.c
===================================================================
--- daemon/gdm-greeter-server.c	(revisjon 5794)
+++ daemon/gdm-greeter-server.c	(arbeidskopi)
@@ -916,10 +916,7 @@
                                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,
                                                                                        construct_properties));
Index: daemon/gdm-simple-slave.c
===================================================================
--- daemon/gdm-simple-slave.c	(revisjon 5794)
+++ daemon/gdm-simple-slave.c	(arbeidskopi)
@@ -874,10 +874,8 @@
 static gboolean
 gdm_simple_slave_start (GdmSlave *slave)
 {
-        gboolean res;
+        GDM_SLAVE_CLASS (gdm_simple_slave_parent_class)->start (slave);
 
-        res = GDM_SLAVE_CLASS (gdm_simple_slave_parent_class)->start (slave);
-
         gdm_simple_slave_run (GDM_SIMPLE_SLAVE (slave));
 
         return TRUE;
@@ -886,11 +884,9 @@
 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 @@
                                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 @@
                                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,10 +941,7 @@
                               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,
                                                                                  construct_properties));
Index: daemon/gdm-greeter-session.c
===================================================================
--- daemon/gdm-greeter-session.c	(revisjon 5794)
+++ daemon/gdm-greeter-session.c	(arbeidskopi)
@@ -66,10 +66,6 @@
                                   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 @@
                                   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);
Index: daemon/gdm-xdmcp-display-factory.c
===================================================================
--- daemon/gdm-xdmcp-display-factory.c	(revisjon 5794)
+++ daemon/gdm-xdmcp-display-factory.c	(arbeidskopi)
@@ -439,7 +439,6 @@
         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,10 +1058,7 @@
                         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 @@
 
         /* 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;
         }
 
Index: daemon/gdm-chooser-session.c
===================================================================
--- daemon/gdm-chooser-session.c	(revisjon 5794)
+++ daemon/gdm-chooser-session.c	(arbeidskopi)
@@ -68,10 +68,6 @@
                                   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 @@
                                   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,10 +94,7 @@
                                  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,
                                                                                                                construct_properties));
Index: daemon/gdm-xdmcp-chooser-slave.c
===================================================================
--- daemon/gdm-xdmcp-chooser-slave.c	(revisjon 5794)
+++ daemon/gdm-xdmcp-chooser-slave.c	(arbeidskopi)
@@ -288,10 +288,8 @@
 static gboolean
 gdm_xdmcp_chooser_slave_start (GdmSlave *slave)
 {
-        gboolean res;
+        GDM_SLAVE_CLASS (gdm_xdmcp_chooser_slave_parent_class)->start (slave);
 
-        res = GDM_SLAVE_CLASS (gdm_xdmcp_chooser_slave_parent_class)->start (slave);
-
         gdm_xdmcp_chooser_slave_run (GDM_XDMCP_CHOOSER_SLAVE (slave));
 
         return TRUE;
@@ -300,11 +298,9 @@
 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 @@
                                       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 @@
                                       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,10 +343,7 @@
                                      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,
                                                                                                                            construct_properties));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]