all: build cleanly with GCC 4.6

2 files changed, 7 insertions, 30 deletions

diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
index 784752b6..c528ef1a 100644
--- a/gnome-settings-daemon/gnome-settings-manager.c
+++ b/gnome-settings-daemon/gnome-settings-manager.c
@@ -376,7 +376,6 @@ on_bus_gotten (GObject             *source_object,
                GnomeSettingsManager *manager)
 {
         GDBusConnection *connection;
-        guint registration_id;
         GError *error = NULL;
 
         connection = g_bus_get_finish (res, &error);
@@ -387,13 +386,13 @@ on_bus_gotten (GObject             *source_object,
         }
         manager->priv->connection = connection;
 
-        registration_id = g_dbus_connection_register_object (connection,
-                                                             GSD_MANAGER_DBUS_PATH,
-                                                             manager->priv->introspection_data->interfaces[0],
-                                                             &interface_vtable,
-                                                             manager,
-                                                             NULL,
-                                                             NULL);
+        g_dbus_connection_register_object (connection,
+                                           GSD_MANAGER_DBUS_PATH,
+                                           manager->priv->introspection_data->interfaces[0],
+                                           &interface_vtable,
+                                           manager,
+                                           NULL,
+                                           NULL);
 }
 
 static void
@@ -459,23 +458,6 @@ gnome_settings_manager_stop (GnomeSettingsManager *manager)
         manager->priv->settings = NULL;
 }
 
-static GObject *
-gnome_settings_manager_constructor (GType                  type,
-                                    guint                  n_construct_properties,
-                                    GObjectConstructParam *construct_properties)
-{
-        GnomeSettingsManager      *manager;
-        GnomeSettingsManagerClass *klass;
-
-        klass = GNOME_SETTINGS_MANAGER_CLASS (g_type_class_peek (GNOME_TYPE_SETTINGS_MANAGER));
-
-        manager = GNOME_SETTINGS_MANAGER (G_OBJECT_CLASS (gnome_settings_manager_parent_class)->constructor (type,
-                                                                                                         n_construct_properties,
-                                                                                                         construct_properties));
-
-        return G_OBJECT (manager);
-}
-
 static void
 gnome_settings_manager_dispose (GObject *object)
 {
@@ -493,7 +475,6 @@ gnome_settings_manager_class_init (GnomeSettingsManagerClass *klass)
 {
         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->constructor = gnome_settings_manager_constructor;
         object_class->dispose = gnome_settings_manager_dispose;
         object_class->finalize = gnome_settings_manager_finalize;
 
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index bd7ac0a4..306d9da6 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -198,10 +198,6 @@ on_term_signal_pipe_closed (GIOChannel *source,
                             GIOCondition condition,
                             gpointer data)
 {
-        GnomeSettingsManager *manager;
-
-        manager = GNOME_SETTINGS_MANAGER (data);
-
         term_signal_pipe_fds[0] = -1;
 
         g_debug ("Received SIGTERM - shutting down");