Fix a bunch of compiler warnings. Add Werror for now to warning flags.

2007-10-15  William Jon McCann  <mccann@jhu.edu>

	* common/gdm-md5.c: (gdm_md5_final):
	* common/gdm-settings-backend.c:
	* common/gdm-signal-handler.c: (gdm_signal_handler_init):
	* common/test-settings-client.c: (test_settings_client):
	* configure.ac:
	* daemon/gdm-factory-slave.c:
	* daemon/gdm-greeter-session.c: (gdm_greeter_session_spawn):
	* daemon/gdm-local-display-factory.c:
	* daemon/gdm-manager.c:
	* daemon/gdm-product-slave.c:
	* daemon/gdm-session-relay.c: (session_handle_child_message):
	* daemon/gdm-session.c: (handle_connection):
	* daemon/gdm-simple-slave.c:
	* daemon/gdm-xdmcp-display-factory.c:
	* daemon/main.c: (main):
	* daemon/session-worker-main.c: (main):
	* gui/simple-chooser/gdm-host-chooser-dialog.c: (on_response):
	* gui/simple-chooser/gdm-host-chooser-widget.c:
	* gui/simple-greeter/gdm-language-chooser-widget.c:
	(languages_parse_start_tag), (territories_parse_start_tag):
	* gui/simple-greeter/gdm-simple-greeter.c:
	* gui/simple-greeter/gdm-user-chooser-widget.c:
	(gdm_user_chooser_widget_init):
	* gui/simple-greeter/greeter-main.c: (activate_power_manager):
	* gui/simple-greeter/test-user-manager.c: (main):
	Fix a bunch of compiler warnings.  Add Werror for now to
	warning flags.


svn path=/trunk/; revision=5371

24 files changed, 73 insertions, 243 deletions

diff --git a/ChangeLog b/ChangeLog
index 7574a2a1..7e477889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,35 @@
 2007-10-15  William Jon McCann  <mccann@jhu.edu>
 
+	* common/gdm-md5.c: (gdm_md5_final):
+	* common/gdm-settings-backend.c:
+	* common/gdm-signal-handler.c: (gdm_signal_handler_init):
+	* common/test-settings-client.c: (test_settings_client):
+	* configure.ac:
+	* daemon/gdm-factory-slave.c:
+	* daemon/gdm-greeter-session.c: (gdm_greeter_session_spawn):
+	* daemon/gdm-local-display-factory.c:
+	* daemon/gdm-manager.c:
+	* daemon/gdm-product-slave.c:
+	* daemon/gdm-session-relay.c: (session_handle_child_message):
+	* daemon/gdm-session.c: (handle_connection):
+	* daemon/gdm-simple-slave.c:
+	* daemon/gdm-xdmcp-display-factory.c:
+	* daemon/main.c: (main):
+	* daemon/session-worker-main.c: (main):
+	* gui/simple-chooser/gdm-host-chooser-dialog.c: (on_response):
+	* gui/simple-chooser/gdm-host-chooser-widget.c:
+	* gui/simple-greeter/gdm-language-chooser-widget.c:
+	(languages_parse_start_tag), (territories_parse_start_tag):
+	* gui/simple-greeter/gdm-simple-greeter.c:
+	* gui/simple-greeter/gdm-user-chooser-widget.c:
+	(gdm_user_chooser_widget_init):
+	* gui/simple-greeter/greeter-main.c: (activate_power_manager):
+	* gui/simple-greeter/test-user-manager.c: (main):
+	Fix a bunch of compiler warnings.  Add Werror for now to
+	warning flags.
+
+2007-10-15  William Jon McCann  <mccann@jhu.edu>
+
 	* daemon/Makefile.am:
 	* daemon/fstype.c:
 	Remove unused file.
diff --git a/common/gdm-md5.c b/common/gdm-md5.c
index f25e9d10..37078814 100644
--- a/common/gdm-md5.c
+++ b/common/gdm-md5.c
@@ -445,7 +445,7 @@ gdm_md5_final (GdmMD5Context *context,
 
         md5_finish (context, digest);
 
-        if (!g_string_append_len (results, digest, 16))
+        if (!g_string_append_len (results, (char *)digest, 16))
                 return FALSE;
 
         /* some kind of security paranoia, though it seems pointless
diff --git a/common/gdm-settings-backend.c b/common/gdm-settings-backend.c
index f2e4da61..d90ca536 100644
--- a/common/gdm-settings-backend.c
+++ b/common/gdm-settings-backend.c
@@ -55,8 +55,6 @@ static void     gdm_settings_backend_class_init (GdmSettingsBackendClass *klass)
 static void     gdm_settings_backend_init       (GdmSettingsBackend      *settings_backend);
 static void     gdm_settings_backend_finalize   (GObject                 *object);
 
-static gpointer settings_backend_object = NULL;
-
 G_DEFINE_ABSTRACT_TYPE (GdmSettingsBackend, gdm_settings_backend, G_TYPE_OBJECT)
 
 GQuark
diff --git a/common/gdm-signal-handler.c b/common/gdm-signal-handler.c
index ec1aef55..151c986f 100644
--- a/common/gdm-signal-handler.c
+++ b/common/gdm-signal-handler.c
@@ -322,7 +322,10 @@ gdm_signal_handler_init (GdmSignalHandler *handler)
 
         handler->priv = GDM_SIGNAL_HANDLER_GET_PRIVATE (handler);
 
-        handler->priv->lookup = g_hash_table_new (NULL, NULL);
+        handler->priv->lookup = g_hash_table_new_full (NULL,
+                                                       NULL,
+                                                       NULL,
+                                                       (GDestroyNotify)signal_list_free);
 
         if (pipe (signal_pipes) == -1) {
                 g_error ("Could not create pipe() for signal handling");
diff --git a/common/test-settings-client.c b/common/test-settings-client.c
index e2a82717..da6f5bdd 100644
--- a/common/test-settings-client.c
+++ b/common/test-settings-client.c
@@ -50,7 +50,6 @@ test_settings_client (gpointer data)
 {
         char    *strval;
         gboolean boolval;
-        int      intval;
         gboolean res;
         guint    notify_id;
 
diff --git a/configure.ac b/configure.ac
index e2bc2e46..c3b6a9eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1179,7 +1179,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
         -Wall \
         -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
         -Wnested-externs -Wpointer-arith \
-        -Wcast-align -Wsign-compare \
+        -Wcast-align -Wsign-compare -Werror \
         $CFLAGS"
 
         for option in -Wno-strict-aliasing -Wno-sign-compare; do
diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
index 16656b07..fb26010b 100644
--- a/daemon/gdm-factory-slave.c
+++ b/daemon/gdm-factory-slave.c
@@ -33,6 +33,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <glib-object.h>
 
 #define DBUS_API_SUBJECT_TO_CHANGE
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
index 777ca118..55a1ba94 100644
--- a/daemon/gdm-greeter-session.c
+++ b/daemon/gdm-greeter-session.c
@@ -292,44 +292,6 @@ get_greeter_environment (GdmGreeterSession *greeter_session)
 }
 
 static void
-gdm_slave_whack_temp_auth_file (GdmGreeterSession *greeter_session)
-{
-#if 0
-        uid_t old;
-
-        old = geteuid ();
-        if (old != 0)
-                seteuid (0);
-        if (d->parent_temp_auth_file != NULL) {
-                VE_IGNORE_EINTR (g_unlink (d->parent_temp_auth_file));
-        }
-        g_free (d->parent_temp_auth_file);
-        d->parent_temp_auth_file = NULL;
-        if (old != 0)
-                seteuid (old);
-#endif
-}
-
-
-static void
-create_temp_auth_file (GdmGreeterSession *greeter_session)
-{
-#if 0
-        if (d->type == TYPE_FLEXI_XNEST &&
-            d->parent_auth_file != NULL) {
-                if (d->parent_temp_auth_file != NULL) {
-                        VE_IGNORE_EINTR (g_unlink (d->parent_temp_auth_file));
-                }
-                g_free (d->parent_temp_auth_file);
-                d->parent_temp_auth_file =
-                        copy_auth_file (d->server_uid,
-                                        gdm_daemon_config_get_gdmuid (),
-                                        d->parent_auth_file);
-        }
-#endif
-}
-
-static void
 greeter_session_child_watch (GPid        pid,
                      int         status,
                      GdmGreeterSession *greeter_session)
@@ -671,7 +633,6 @@ stop_dbus_daemon (GdmGreeterSession *greeter_session)
 static gboolean
 gdm_greeter_session_spawn (GdmGreeterSession *greeter_session)
 {
-        char           **argv;
         GError          *error;
         GPtrArray       *env;
         gboolean         ret;
@@ -684,7 +645,9 @@ gdm_greeter_session_spawn (GdmGreeterSession *greeter_session)
                 /* FIXME: */
         }
 
+#if 0
         create_temp_auth_file (greeter_session);
+#endif
 
         g_debug ("Running greeter_session process: %s", greeter_session->priv->command);
 
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 7f2e7b37..a7923d43 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -48,17 +48,9 @@ struct GdmLocalDisplayFactoryPrivate
 };
 
 enum {
-        DISPLAY_ADDED,
-        DISPLAY_REMOVED,
-        LAST_SIGNAL
-};
-
-enum {
         PROP_0,
 };
 
-static guint signals [LAST_SIGNAL] = { 0, };
-
 static void     gdm_local_display_factory_class_init    (GdmLocalDisplayFactoryClass *klass);
 static void     gdm_local_display_factory_init          (GdmLocalDisplayFactory      *factory);
 static void     gdm_local_display_factory_finalize      (GObject                     *object);
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index aa646adb..7e1dee4a 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -31,6 +31,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <glib-object.h>
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus-glib.h>
diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c
index 05be20f7..8edd673b 100644
--- a/daemon/gdm-product-slave.c
+++ b/daemon/gdm-product-slave.c
@@ -33,6 +33,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <glib-object.h>
 
 #define DBUS_API_SUBJECT_TO_CHANGE
diff --git a/daemon/gdm-session-relay.c b/daemon/gdm-session-relay.c
index 21c4cf2a..4d98e608 100644
--- a/daemon/gdm-session-relay.c
+++ b/daemon/gdm-session-relay.c
@@ -487,7 +487,7 @@ session_handle_child_message (DBusConnection *connection,
         } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SessionStarted")) {
                 return handle_session_started (session_relay, connection, message);
         } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SessionStopped")) {
-                return handle_session_started (session_relay, connection, message);
+                return handle_session_stopped (session_relay, connection, message);
         } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "Opened")) {
                 return handle_opened (session_relay, connection, message);
         } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "Reset")) {
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 6fc935b2..59f0602a 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -1170,12 +1170,12 @@ handle_connection (DBusServer      *server,
                 dbus_connection_setup_with_g_main (new_connection, NULL);
 
                 g_debug ("worker connection is %p", new_connection);
-#if 0
+
                 dbus_connection_add_filter (new_connection,
                                             connection_filter_function,
                                             session,
                                             NULL);
-#endif
+
                 dbus_connection_set_exit_on_disconnect (new_connection, FALSE);
 
                 dbus_connection_set_unix_user_function (new_connection,
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 6b8892a2..addec696 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -33,6 +33,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <glib-object.h>
 
 #define DBUS_API_SUBJECT_TO_CHANGE
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
index 71ef728c..075039c5 100644
--- a/daemon/gdm-xdmcp-display-factory.c
+++ b/daemon/gdm-xdmcp-display-factory.c
@@ -44,6 +44,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <glib-object.h>
 
 #include <X11/Xlib.h>
@@ -873,6 +874,8 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDisplayFactory *factory,
 #define SIN(__s)   ((struct sockaddr_in *) __s)
 #define SIN6(__s)  ((struct sockaddr_in6 *) __s)
 
+#if 0
+/* FIXME: Add chooser support */
 static void
 set_port_for_request (GdmAddress *address,
                       ARRAY8     *port)
@@ -896,6 +899,7 @@ set_port_for_request (GdmAddress *address,
                 break;
         }
 }
+#endif
 
 static void
 set_address_for_request (GdmAddress *address,
diff --git a/daemon/main.c b/daemon/main.c
index 414a9dd3..bbc61e1e 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -57,9 +57,6 @@ static void bus_proxy_destroyed_cb (DBusGProxy *bus_proxy,
 
 extern char **environ;
 
-static char           **stored_argv   = NULL;
-static int              stored_argc   = 0;
-static GList           *stored_env    = NULL;
 static GdmManager      *manager       = NULL;
 static GdmSettings     *settings      = NULL;
 static uid_t            gdm_uid       = -1;
@@ -251,82 +248,6 @@ write_pid (void)
 }
 
 static void
-gdm_final_cleanup (void)
-{
-        g_object_unref (manager);
-}
-
-/*
- * -------------------------------------
- * BEGIN Copyright status/holder unknown
- * -------------------------------------
- */
-static void
-main_saveenv (void)
-{
-        int i;
-
-        g_list_foreach (stored_env, (GFunc)g_free, NULL);
-        g_list_free (stored_env);
-        stored_env = NULL;
-
-        for (i = 0; environ[i] != NULL; i++) {
-                char *env = environ[i];
-                stored_env = g_list_prepend (stored_env, g_strdup (env));
-        }
-}
-
-static void
-main_restoreenv (void)
-{
-        GList *li;
-
-#ifdef HAVE_CLEARENV
-        clearenv ();
-#else
-        if (environ != NULL) {
-                environ[0] = NULL;
-        }
-#endif
-
-        /* FIXME: leaks */
-
-        for (li = stored_env; li != NULL; li = li->next) {
-                putenv (g_strdup (li->data));
-        }
-}
-
-static void
-gdm_restart_now (void)
-{
-        gdm_info (_("GDM restarting ..."));
-        gdm_final_cleanup ();
-        main_restoreenv ();
-
-        do {
-                errno = 0;
-                execvp (stored_argv[0], stored_argv);
-        } while (errno == EINTR);
-
-        g_warning (_("Failed to restart self"));
-        _exit (1);
-}
-
-static void
-store_argv (int   argc,
-            char *argv[])
-{
-        int i;
-
-        stored_argv = g_new0 (char *, argc + 1);
-        for (i = 0; i < argc; i++) {
-                stored_argv[i] = g_strdup (argv[i]);
-        }
-        stored_argv[i] = NULL;
-        stored_argc = argc;
-}
-
-static void
 check_logdir (void)
 {
         struct stat     statbuf;
@@ -622,9 +543,6 @@ main (int    argc,
 
         g_type_init ();
 
-        store_argv (argc, argv);
-        main_saveenv ();
-
         context = g_option_context_new (_("GNOME Display Manager"));
         g_option_context_add_main_entries (context, entries, NULL);
 
diff --git a/daemon/session-worker-main.c b/daemon/session-worker-main.c
index 2a52e03c..b787afa1 100644
--- a/daemon/session-worker-main.c
+++ b/daemon/session-worker-main.c
@@ -172,7 +172,6 @@ main (int    argc,
 
         g_main_loop_unref (main_loop);
 
- out:
 
         g_debug ("Worker finished");
 
diff --git a/gui/simple-chooser/gdm-host-chooser-dialog.c b/gui/simple-chooser/gdm-host-chooser-dialog.c
index 69dbe1fd..9ac29299 100644
--- a/gui/simple-chooser/gdm-host-chooser-dialog.c
+++ b/gui/simple-chooser/gdm-host-chooser-dialog.c
@@ -144,7 +144,7 @@ on_response (GdmHostChooserDialog *dialog,
 {
         switch (response_id) {
         case GTK_RESPONSE_APPLY:
-                gdm_host_chooser_widget_refresh (dialog->priv->chooser_widget);
+                gdm_host_chooser_widget_refresh (GDM_HOST_CHOOSER_WIDGET (dialog->priv->chooser_widget));
                 g_signal_stop_emission_by_name (dialog, "response");
                 break;
         default:
diff --git a/gui/simple-chooser/gdm-host-chooser-widget.c b/gui/simple-chooser/gdm-host-chooser-widget.c
index 90a83e81..6e38406e 100644
--- a/gui/simple-chooser/gdm-host-chooser-widget.c
+++ b/gui/simple-chooser/gdm-host-chooser-widget.c
@@ -110,12 +110,14 @@ chooser_host_add (GdmHostChooserWidget *widget,
         widget->priv->chooser_hosts = g_slist_prepend (widget->priv->chooser_hosts, host);
 }
 
+#if 0
 static void
 chooser_host_remove (GdmHostChooserWidget *widget,
                      GdmChooserHost       *host)
 {
         widget->priv->chooser_hosts = g_slist_remove (widget->priv->chooser_hosts, host);
 }
+#endif
 
 static void
 chooser_host_free (GdmChooserHost *host)
diff --git a/gui/simple-greeter/gdm-language-chooser-widget.c b/gui/simple-greeter/gdm-language-chooser-widget.c
index 5921ec0d..54a4368a 100644
--- a/gui/simple-greeter/gdm-language-chooser-widget.c
+++ b/gui/simple-greeter/gdm-language-chooser-widget.c
@@ -397,25 +397,6 @@ on_language_selected (GtkTreeSelection     *selection,
         widget->priv->current_locale = locale;
 }
 
-static gboolean
-locale_exists (const char *loc)
-{
-        gboolean ret;
-        char    *old;
-
-        old = g_strdup (setlocale (LC_MESSAGES, NULL));
-        if (setlocale (LC_MESSAGES, loc) != NULL) {
-                ret = TRUE;
-        } else {
-                ret = FALSE;
-        }
-
-        setlocale (LC_MESSAGES, old);
-        g_free (old);
-
-        return ret;
-}
-
 static char *
 utf8_convert (const char *str,
               int         len)
@@ -771,17 +752,20 @@ get_translated_territory (GdmLanguageChooserWidget *widget,
 
 static void
 languages_parse_start_tag (GMarkupParseContext      *ctx,
-                            const char               *element_name,
-                            const char              **attr_names,
-                            const char              **attr_values,
-                            GdmLanguageChooserWidget *widget,
-                            GError                  **error)
+                           const char               *element_name,
+                           const char              **attr_names,
+                           const char              **attr_values,
+                           gpointer                  user_data,
+                           GError                  **error)
 {
+        GdmLanguageChooserWidget *widget;
         const char *ccode_longB;
         const char *ccode_longT;
         const char *ccode;
         const char *lang_name;
 
+        widget = GDM_LANGUAGE_CHOOSER_WIDGET (user_data);
+
         if (! g_str_equal (element_name, "iso_639_entry") || attr_names == NULL || attr_values == NULL) {
                 return;
         }
@@ -850,14 +834,17 @@ territories_parse_start_tag (GMarkupParseContext      *ctx,
                              const char               *element_name,
                              const char              **attr_names,
                              const char              **attr_values,
-                             GdmLanguageChooserWidget *widget,
+                             gpointer                  user_data,
                              GError                  **error)
 {
+        GdmLanguageChooserWidget *widget;
         const char *acode_2;
         const char *acode_3;
         const char *ncode;
         const char *territory_name;
 
+        widget = GDM_LANGUAGE_CHOOSER_WIDGET (user_data);
+
         if (! g_str_equal (element_name, "iso_3166_entry") || attr_names == NULL || attr_values == NULL) {
                 return;
         }
diff --git a/gui/simple-greeter/gdm-simple-greeter.c b/gui/simple-greeter/gdm-simple-greeter.c
index 8f8a52c9..a16ac72d 100644
--- a/gui/simple-greeter/gdm-simple-greeter.c
+++ b/gui/simple-greeter/gdm-simple-greeter.c
@@ -402,42 +402,6 @@ cancel_button_clicked (GtkButton        *button,
 }
 
 static void
-suspend_button_clicked (GtkButton        *button,
-                        GdmSimpleGreeter *greeter)
-{
-        GError          *error;
-        DBusGConnection *connection;
-        DBusGProxy      *proxy;
-
-        g_debug ("Suspend button clicked");
-
-        error = NULL;
-        connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-        if (error != NULL) {
-                g_warning ("Couldn't suspend: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-        proxy = dbus_g_proxy_new_for_name (connection,
-                                           GPM_DBUS_NAME,
-                                           GPM_DBUS_PATH,
-                                           GPM_DBUS_INTERFACE);
-        error = NULL;
-        dbus_g_proxy_call (proxy,
-                           "Suspend",
-                           &error,
-                           G_TYPE_INVALID,
-                           G_TYPE_INVALID);
-        if (error != NULL) {
-                g_warning ("Couldn't suspend: %s", error->message);
-                g_error_free (error);
-                return;
-        }
-
-        g_object_unref (proxy);
-}
-
-static void
 on_user_activated (GdmUserChooserWidget *user_chooser,
                    GdmSimpleGreeter     *greeter)
 {
diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
index 525edc18..be54abce 100644
--- a/gui/simple-greeter/gdm-user-chooser-widget.c
+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
@@ -380,6 +380,7 @@ populate_model (GdmUserChooserWidget *widget,
                               widget);
 }
 
+#if 0
 static gboolean
 separator_func (GtkTreeModel *model,
                 GtkTreeIter  *iter,
@@ -398,6 +399,7 @@ separator_func (GtkTreeModel *model,
 
         return FALSE;
 }
+#endif
 
 static int
 compare_user_names (char *name_a,
@@ -570,6 +572,13 @@ gdm_user_chooser_widget_init (GdmUserChooserWidget *widget)
                                               CHOOSER_LIST_CAPTION_COLUMN,
                                               GTK_SORT_ASCENDING);
 
+#if 0
+        gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (widget->priv->treeview),
+                                              separator_func,
+                                              GINT_TO_POINTER (CHOOSER_LIST_ID_COLUMN),
+                                              NULL);
+#endif
+
         collect_users (widget);
 
         populate_model (widget, model);
diff --git a/gui/simple-greeter/greeter-main.c b/gui/simple-greeter/greeter-main.c
index d0b2cf02..afc9be19 100644
--- a/gui/simple-greeter/greeter-main.c
+++ b/gui/simple-greeter/greeter-main.c
@@ -52,7 +52,6 @@
 static DBusGConnection  *connection     = NULL;
 static GdmGreeter       *greeter        = NULL;
 static DBusGProxy       *server_proxy   = NULL;
-static DBusGProxy       *gpm_proxy      = NULL;
 
 static void
 on_info (DBusGProxy *proxy,
@@ -322,45 +321,6 @@ proxy_destroyed (GObject *object,
         g_debug ("GREETER Proxy disconnected");
 }
 
-#if 0
-static void
-activate_power_manager (void)
-{
-        DBusGConnection *connection;
-        GError          *error;
-        gboolean         res;
-        guint            result;
-
-        g_debug ("Activating power management");
-
-        error = NULL;
-        connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-        if (error != NULL) {
-                g_warning ("%s", error->message);
-                g_error_free (error);
-        }
-
-        gpm_proxy = dbus_g_proxy_new_for_name (connection,
-                                               DBUS_SERVICE_DBUS,
-                                               DBUS_PATH_DBUS,
-                                               DBUS_INTERFACE_DBUS);
-        error = NULL;
-        res = dbus_g_proxy_call (gpm_proxy,
-                                 "StartServiceByName",
-                                 &error,
-                                 G_TYPE_STRING, GPM_DBUS_NAME,
-                                 G_TYPE_UINT, 0,
-                                 G_TYPE_INVALID,
-                                 G_TYPE_UINT, &result,
-                                 G_TYPE_INVALID);
-        if (! res) {
-                g_warning ("Could not start service: %s", error->message);
-                g_error_free (error);
-        } else {
-                g_debug ("Result %u", result);
-        }
-}
-#else
 static void
 activate_power_manager (void)
 {
@@ -376,7 +336,6 @@ activate_power_manager (void)
                 g_error_free (error);
         }
 }
-#endif
 
 int
 main (int argc, char *argv[])
diff --git a/gui/simple-greeter/test-user-manager.c b/gui/simple-greeter/test-user-manager.c
index 436dce18..ed549d73 100644
--- a/gui/simple-greeter/test-user-manager.c
+++ b/gui/simple-greeter/test-user-manager.c
@@ -55,7 +55,6 @@ on_user_removed (GdmUserManager *manager,
 int
 main (int argc, char *argv[])
 {
-        GtkWidget *dialog;
 
         bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");