[gnome-settings-daemon] media-keys: GCC 4.6 warning fixes

[Bastien Nocera <hadess src gnome org>]

commit 1cba40f10871040dd63ca779ae4a2483c826d62c
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Mar 2 18:15:28 2011 +0000

    media-keys: GCC 4.6 warning fixes
    
    https://bugzilla.gnome.org/show_bug.cgi?id=642803

 plugins/media-keys/gsd-media-keys-manager.c |   26 +++++++-------------------
 plugins/media-keys/test-media-keys.c        |    3 +--
 2 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 8868dd8..60fdd1a 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1627,10 +1627,6 @@ gsd_media_keys_manager_set_property (GObject        *object,
                                const GValue   *value,
                                GParamSpec     *pspec)
 {
-        GsdMediaKeysManager *self;
-
-        self = GSD_MEDIA_KEYS_MANAGER (object);
-
         switch (prop_id) {
         default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1644,10 +1640,6 @@ gsd_media_keys_manager_get_property (GObject        *object,
                                GValue         *value,
                                GParamSpec     *pspec)
 {
-        GsdMediaKeysManager *self;
-
-        self = GSD_MEDIA_KEYS_MANAGER (object);
-
         switch (prop_id) {
         default:
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1661,9 +1653,6 @@ gsd_media_keys_manager_constructor (GType                  type,
                               GObjectConstructParam *construct_properties)
 {
         GsdMediaKeysManager      *media_keys_manager;
-        GsdMediaKeysManagerClass *klass;
-
-        klass = GSD_MEDIA_KEYS_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_MEDIA_KEYS_MANAGER));
 
         media_keys_manager = GSD_MEDIA_KEYS_MANAGER (G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->constructor (type,
                                                                                                       n_construct_properties,
@@ -1726,7 +1715,6 @@ on_bus_gotten (GObject             *source_object,
                GsdMediaKeysManager *manager)
 {
         GDBusConnection *connection;
-        guint registration_id;
         GError *error = NULL;
 
         connection = g_bus_get_finish (res, &error);
@@ -1737,13 +1725,13 @@ on_bus_gotten (GObject             *source_object,
         }
         manager->priv->connection = connection;
 
-        registration_id = g_dbus_connection_register_object (connection,
-                                                             GSD_MEDIA_KEYS_DBUS_PATH,
-                                                             manager->priv->introspection_data->interfaces[0],
-                                                             &interface_vtable,
-                                                             manager,
-                                                             NULL,
-                                                             NULL);
+        g_dbus_connection_register_object (connection,
+                                           GSD_MEDIA_KEYS_DBUS_PATH,
+                                           manager->priv->introspection_data->interfaces[0],
+                                           &interface_vtable,
+                                           manager,
+                                           NULL,
+                                           NULL);
 
         g_dbus_proxy_new (manager->priv->connection,
                           G_DBUS_PROXY_FLAGS_NONE,
diff --git a/plugins/media-keys/test-media-keys.c b/plugins/media-keys/test-media-keys.c
index 6b9f650..1c5e536 100644
--- a/plugins/media-keys/test-media-keys.c
+++ b/plugins/media-keys/test-media-keys.c
@@ -36,7 +36,6 @@ main (int    argc,
       char **argv)
 {
         GError  *error;
-        gboolean res;
 
 #ifdef ENABLE_NLS
         bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
@@ -56,7 +55,7 @@ main (int    argc,
         manager = gsd_media_keys_manager_new ();
 
         error = NULL;
-        res = gsd_media_keys_manager_start (manager, &error);
+        gsd_media_keys_manager_start (manager, &error);
 
         gtk_main ();