[gnome-settings-daemon] all: build cleanly with GCC 4.6

[Cosimo Cecchi <cosimoc src gnome org>]

commit fbff5d038af7c9da3d9e2f2ccfa3b228760a9646
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Feb 7 12:16:53 2011 -0500

    all: build cleanly with GCC 4.6

 gnome-settings-daemon/gnome-settings-manager.c     |   33 ++++---------------
 gnome-settings-daemon/main.c                       |    4 --
 .../media-keys/cut-n-paste/gvc-mixer-event-role.c  |   19 -----------
 .../media-keys/cut-n-paste/gvc-mixer-sink-input.c  |   33 --------------------
 plugins/media-keys/cut-n-paste/gvc-mixer-sink.c    |   31 ------------------
 .../cut-n-paste/gvc-mixer-source-output.c          |   16 ---------
 plugins/media-keys/cut-n-paste/gvc-mixer-source.c  |   31 ------------------
 7 files changed, 7 insertions(+), 160 deletions(-)
---
diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
index 784752b..c528ef1 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 bd7ac0a..306d9da 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");
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c b/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c
index fb5831f..2a2e787 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c
@@ -57,13 +57,10 @@ update_settings (GvcMixerEventRole *role,
                  gpointer          *op)
 {
         pa_operation              *o;
-        guint                      index;
         const GvcChannelMap       *map;
         pa_context                *context;
         pa_ext_stream_restore_info info;
 
-        index = gvc_mixer_stream_get_index (GVC_MIXER_STREAM (role));
-
         map = gvc_mixer_stream_get_channel_map (GVC_MIXER_STREAM(role));
 
         info.volume = *gvc_channel_map_get_cvolume(map);
@@ -157,28 +154,12 @@ gvc_mixer_event_role_get_property (GObject     *object,
         }
 }
 
-static GObject *
-gvc_mixer_event_role_constructor (GType                  type,
-                                  guint                  n_construct_properties,
-                                  GObjectConstructParam *construct_params)
-{
-        GObject       *object;
-        GvcMixerEventRole *self;
-
-        object = G_OBJECT_CLASS (gvc_mixer_event_role_parent_class)->constructor (type, n_construct_properties, construct_params);
-
-        self = GVC_MIXER_EVENT_ROLE (object);
-
-        return object;
-}
-
 static void
 gvc_mixer_event_role_class_init (GvcMixerEventRoleClass *klass)
 {
         GObjectClass        *object_class = G_OBJECT_CLASS (klass);
         GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass);
 
-        object_class->constructor = gvc_mixer_event_role_constructor;
         object_class->finalize = gvc_mixer_event_role_finalize;
         object_class->set_property = gvc_mixer_event_role_set_property;
         object_class->get_property = gvc_mixer_event_role_get_property;
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-sink-input.c b/plugins/media-keys/cut-n-paste/gvc-mixer-sink-input.c
index cc4b507..be918c0 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-sink-input.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-sink-input.c
@@ -41,7 +41,6 @@ struct GvcMixerSinkInputPrivate
 static void     gvc_mixer_sink_input_class_init (GvcMixerSinkInputClass *klass);
 static void     gvc_mixer_sink_input_init       (GvcMixerSinkInput      *mixer_sink_input);
 static void     gvc_mixer_sink_input_finalize   (GObject                *object);
-static void     gvc_mixer_sink_input_dispose    (GObject                *object);
 
 G_DEFINE_TYPE (GvcMixerSinkInput, gvc_mixer_sink_input, GVC_TYPE_MIXER_STREAM)
 
@@ -53,12 +52,10 @@ gvc_mixer_sink_input_push_volume (GvcMixerStream *stream, gpointer *op)
         const GvcChannelMap *map;
         pa_context          *context;
         const pa_cvolume    *cv;
-        guint                num_channels;
 
         index = gvc_mixer_stream_get_index (stream);
 
         map = gvc_mixer_stream_get_channel_map (stream);
-        num_channels = gvc_channel_map_get_num_channels (map);
 
         cv = gvc_channel_map_get_cvolume(map);
 
@@ -107,29 +104,12 @@ gvc_mixer_sink_input_change_is_muted (GvcMixerStream *stream,
         return TRUE;
 }
 
-static GObject *
-gvc_mixer_sink_input_constructor (GType                  type,
-                                  guint                  n_construct_properties,
-                                  GObjectConstructParam *construct_params)
-{
-        GObject       *object;
-        GvcMixerSinkInput *self;
-
-        object = G_OBJECT_CLASS (gvc_mixer_sink_input_parent_class)->constructor (type, n_construct_properties, construct_params);
-
-        self = GVC_MIXER_SINK_INPUT (object);
-
-        return object;
-}
-
 static void
 gvc_mixer_sink_input_class_init (GvcMixerSinkInputClass *klass)
 {
         GObjectClass        *object_class = G_OBJECT_CLASS (klass);
         GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass);
 
-        object_class->constructor = gvc_mixer_sink_input_constructor;
-        object_class->dispose = gvc_mixer_sink_input_dispose;
         object_class->finalize = gvc_mixer_sink_input_finalize;
 
         stream_class->push_volume = gvc_mixer_sink_input_push_volume;
@@ -145,19 +125,6 @@ gvc_mixer_sink_input_init (GvcMixerSinkInput *sink_input)
 }
 
 static void
-gvc_mixer_sink_input_dispose (GObject *object)
-{
-        GvcMixerSinkInput *mixer_sink_input;
-
-        g_return_if_fail (object != NULL);
-        g_return_if_fail (GVC_IS_MIXER_SINK_INPUT (object));
-
-        mixer_sink_input = GVC_MIXER_SINK_INPUT (object);
-
-        G_OBJECT_CLASS (gvc_mixer_sink_input_parent_class)->dispose (object);
-}
-
-static void
 gvc_mixer_sink_input_finalize (GObject *object)
 {
         GvcMixerSinkInput *mixer_sink_input;
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-sink.c b/plugins/media-keys/cut-n-paste/gvc-mixer-sink.c
index 1a14440..c6512cd 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-sink.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-sink.c
@@ -41,7 +41,6 @@ struct GvcMixerSinkPrivate
 static void     gvc_mixer_sink_class_init (GvcMixerSinkClass *klass);
 static void     gvc_mixer_sink_init       (GvcMixerSink      *mixer_sink);
 static void     gvc_mixer_sink_finalize   (GObject           *object);
-static void     gvc_mixer_sink_dispose    (GObject           *object);
 
 G_DEFINE_TYPE (GvcMixerSink, gvc_mixer_sink, GVC_TYPE_MIXER_STREAM)
 
@@ -137,29 +136,12 @@ gvc_mixer_sink_change_port (GvcMixerStream *stream,
 #endif /* PA_MICRO > 15 */
 }
 
-static GObject *
-gvc_mixer_sink_constructor (GType                  type,
-                            guint                  n_construct_properties,
-                            GObjectConstructParam *construct_params)
-{
-        GObject      *object;
-        GvcMixerSink *self;
-
-        object = G_OBJECT_CLASS (gvc_mixer_sink_parent_class)->constructor (type, n_construct_properties, construct_params);
-
-        self = GVC_MIXER_SINK (object);
-
-        return object;
-}
-
 static void
 gvc_mixer_sink_class_init (GvcMixerSinkClass *klass)
 {
         GObjectClass        *object_class = G_OBJECT_CLASS (klass);
         GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass);
 
-        object_class->constructor = gvc_mixer_sink_constructor;
-        object_class->dispose = gvc_mixer_sink_dispose;
         object_class->finalize = gvc_mixer_sink_finalize;
 
         stream_class->push_volume = gvc_mixer_sink_push_volume;
@@ -176,19 +158,6 @@ gvc_mixer_sink_init (GvcMixerSink *sink)
 }
 
 static void
-gvc_mixer_sink_dispose (GObject *object)
-{
-        GvcMixerSink *mixer_sink;
-
-        g_return_if_fail (object != NULL);
-        g_return_if_fail (GVC_IS_MIXER_SINK (object));
-
-        mixer_sink = GVC_MIXER_SINK (object);
-
-        G_OBJECT_CLASS (gvc_mixer_sink_parent_class)->dispose (object);
-}
-
-static void
 gvc_mixer_sink_finalize (GObject *object)
 {
         GvcMixerSink *mixer_sink;
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-source-output.c b/plugins/media-keys/cut-n-paste/gvc-mixer-source-output.c
index 034b21c..38b109f 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-source-output.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-source-output.c
@@ -60,28 +60,12 @@ gvc_mixer_source_output_change_is_muted (GvcMixerStream *stream,
         return TRUE;
 }
 
-static GObject *
-gvc_mixer_source_output_constructor (GType                  type,
-                                  guint                  n_construct_properties,
-                                  GObjectConstructParam *construct_params)
-{
-        GObject       *object;
-        GvcMixerSourceOutput *self;
-
-        object = G_OBJECT_CLASS (gvc_mixer_source_output_parent_class)->constructor (type, n_construct_properties, construct_params);
-
-        self = GVC_MIXER_SOURCE_OUTPUT (object);
-
-        return object;
-}
-
 static void
 gvc_mixer_source_output_class_init (GvcMixerSourceOutputClass *klass)
 {
         GObjectClass        *object_class = G_OBJECT_CLASS (klass);
         GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass);
 
-        object_class->constructor = gvc_mixer_source_output_constructor;
         object_class->finalize = gvc_mixer_source_output_finalize;
 
         stream_class->push_volume = gvc_mixer_source_output_push_volume;
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-source.c b/plugins/media-keys/cut-n-paste/gvc-mixer-source.c
index 8900481..1c5f185 100644
--- a/plugins/media-keys/cut-n-paste/gvc-mixer-source.c
+++ b/plugins/media-keys/cut-n-paste/gvc-mixer-source.c
@@ -41,7 +41,6 @@ struct GvcMixerSourcePrivate
 static void     gvc_mixer_source_class_init (GvcMixerSourceClass *klass);
 static void     gvc_mixer_source_init       (GvcMixerSource      *mixer_source);
 static void     gvc_mixer_source_finalize   (GObject            *object);
-static void     gvc_mixer_source_dispose    (GObject           *object);
 
 G_DEFINE_TYPE (GvcMixerSource, gvc_mixer_source, GVC_TYPE_MIXER_STREAM)
 
@@ -137,29 +136,12 @@ gvc_mixer_source_change_port (GvcMixerStream *stream,
 #endif /* PA_MICRO > 15 */
 }
 
-static GObject *
-gvc_mixer_source_constructor (GType                  type,
-                            guint                  n_construct_properties,
-                            GObjectConstructParam *construct_params)
-{
-        GObject        *object;
-        GvcMixerSource *self;
-
-        object = G_OBJECT_CLASS (gvc_mixer_source_parent_class)->constructor (type, n_construct_properties, construct_params);
-
-        self = GVC_MIXER_SOURCE (object);
-
-        return object;
-}
-
 static void
 gvc_mixer_source_class_init (GvcMixerSourceClass *klass)
 {
         GObjectClass        *object_class = G_OBJECT_CLASS (klass);
         GvcMixerStreamClass *stream_class = GVC_MIXER_STREAM_CLASS (klass);
 
-        object_class->constructor = gvc_mixer_source_constructor;
-        object_class->dispose = gvc_mixer_source_dispose;
         object_class->finalize = gvc_mixer_source_finalize;
 
         stream_class->push_volume = gvc_mixer_source_push_volume;
@@ -176,19 +158,6 @@ gvc_mixer_source_init (GvcMixerSource *source)
 }
 
 static void
-gvc_mixer_source_dispose (GObject *object)
-{
-        GvcMixerSource *mixer_source;
-
-        g_return_if_fail (object != NULL);
-        g_return_if_fail (GVC_IS_MIXER_SOURCE (object));
-
-        mixer_source = GVC_MIXER_SOURCE (object);
-
-        G_OBJECT_CLASS (gvc_mixer_source_parent_class)->dispose (object);
-}
-
-static void
 gvc_mixer_source_finalize (GObject *object)
 {
         GvcMixerSource *mixer_source;