Fix type punned pointers warnings

Remove senseless (void **)

From: Olivier Crête <olivier.crete@collabora.co.uk>
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2440

diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index ca8a770b2bb2feea589f2a1de84ef73c466f6423..9f7dd73c84d011eafdc1356bba0dbb9f62cf48f8 100644 (file)
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -131,7 +131,7 @@ smiley_manager_constructor (GType type,
                        (type, n_props, props);
 
                manager_singleton = EMPATHY_SMILEY_MANAGER (retval);
-               g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
+               g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
        }
 
        return retval;

diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index 5c86e29b20a6ebe3f3c1686bc5b209d35d795aa7..ab372f32ee067a217a651c2e3c188f02dee9e764 100644 (file)
--- a/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@ -474,8 +474,8 @@ do_constructor (GType type,
                                                                                    n_construct_params,
                                                                                    construct_params);
       manager_singleton = EMPATHY_ACCOUNT_MANAGER (retval);
-      g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
-    } 
+      g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
+    }
   else
     {
       retval = g_object_ref (manager_singleton);

diff --git a/libempathy/empathy-call-factory.c b/libempathy/empathy-call-factory.c
index 08d35f0c2ebf1a7a893c2e42c18b696f333836cc..f412139be0a2347af4a5f63273887d06c7e1b555 100644 (file)
--- a/libempathy/empathy-call-factory.c
+++ b/libempathy/empathy-call-factory.c
@@ -63,7 +63,7 @@ empathy_call_factory_constructor (GType type, guint n_construct_params,
 
   call_factory = G_OBJECT_CLASS (empathy_call_factory_parent_class)->constructor
           (type, n_construct_params, construct_params);
-  g_object_add_weak_pointer (call_factory, (gpointer *)&call_factory);
+  g_object_add_weak_pointer (call_factory, (gpointer)&call_factory);
 
   return call_factory;
 }

diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index fdc6f3c0c95397d6e071b3497509ebbc017890ac..6765d9e48301b372b58ef80a80be794c389c0f76 100644 (file)
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -139,7 +139,7 @@ empathy_chatroom_manager_constructor (GType type,
   priv = GET_PRIV (self);
 
   chatroom_manager_singleton = self;
-  g_object_add_weak_pointer (obj, (gpointer *) &chatroom_manager_singleton);
+  g_object_add_weak_pointer (obj, (gpointer) &chatroom_manager_singleton);
 
   if (priv->file == NULL)
     {

diff --git a/libempathy/empathy-contact-factory.c b/libempathy/empathy-contact-factory.c
index 412fd8669590c23a451934c0bf9e04ae5e2b66c0..c3500577434f6e6ae42aca6c49d30db195b6c932 100644 (file)
--- a/libempathy/empathy-contact-factory.c
+++ b/libempathy/empathy-contact-factory.c
@@ -149,7 +149,7 @@ contact_factory_constructor (GType type,
                        (type, n_props, props);
 
                factory_singleton = EMPATHY_CONTACT_FACTORY (retval);
-               g_object_add_weak_pointer (retval, (gpointer *) &factory_singleton);
+               g_object_add_weak_pointer (retval, (gpointer) &factory_singleton);
        }
 
        return retval;

diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 335131a2f70803f67b28405c2a48401c86358b0e..409f41c449625afa215c33015fd9eda341f02216 100644 (file)
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -212,7 +212,7 @@ contact_manager_constructor (GType type,
                        (type, n_props, props);
 
                manager_singleton = EMPATHY_CONTACT_MANAGER (retval);
-               g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
+               g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
        }
 
        return retval;

diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 769b42120a83efe12886a12b0d75b08f82022b69..37701244743674c0661dd48d1dbd3eea24dec7ad 100644 (file)
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -896,7 +896,7 @@ dispatcher_constructor (GType type,
           (type, n_construct_params, construct_params);
 
       dispatcher = EMPATHY_DISPATCHER (retval);
-      g_object_add_weak_pointer (retval, (gpointer *) &dispatcher);
+      g_object_add_weak_pointer (retval, (gpointer) &dispatcher);
     }
   else
     {

diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 17813473869cbf306dfbc778260fd351cfdf8c84..eeb183892e64ddab5ec42931ff1431997d01a051 100644 (file)
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -296,7 +296,7 @@ idle_constructor (GType type,
                        (type, n_props, props);
 
                idle_singleton = EMPATHY_IDLE (retval);
-               g_object_add_weak_pointer (retval, (gpointer *) &idle_singleton);
+               g_object_add_weak_pointer (retval, (gpointer) &idle_singleton);
        }
 
        return retval;

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index 3d7acb3e09d7769024633b5edad0faef4f4f63b0..2dccbc9fdd6ad578166b159f85dfe3a7a4128944 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -117,7 +117,7 @@ log_manager_constructor (GType type,
                        (type, n_props, props);
 
                manager_singleton = EMPATHY_LOG_MANAGER (retval);
-               g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
+               g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
        }
 
        return retval;

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index ddab8769d3139f993d8efd007c6f52ad5fb36754..787c0e087d98e96ea14cae5f3993b603ce394a94 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -826,7 +826,7 @@ event_manager_constructor (GType type,
                        (type, n_props, props);
 
                manager_singleton = EMPATHY_EVENT_MANAGER (retval);
-               g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
+               g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
        }
 
        return retval;

diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 3036e5121050d3899645b795a4cc1ebef49531a4..e246ac9657dbe12c822672719d5cd01fc3fe4be3 100644 (file)
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -791,7 +791,7 @@ empathy_ft_manager_constructor (GType type,
           (type, n_props, props);
 
       manager_singleton = EMPATHY_FT_MANAGER (retval);
-      g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
+      g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
     }
 
   return retval;

diff --git a/src/ephy-spinner.c b/src/ephy-spinner.c
index b67b90f7669cfc8263179ea7bd8b214cc7aa2850..43b9bc9909c710ea05997548e2d643d303466186 100644 (file)
--- a/src/ephy-spinner.c
+++ b/src/ephy-spinner.c
@@ -489,7 +489,7 @@ ephy_spinner_cache_ref (void)
                spinner_cache = g_object_new (EPHY_TYPE_SPINNER_CACHE, NULL);
                cache_ptr = &spinner_cache;
                g_object_add_weak_pointer (G_OBJECT (spinner_cache),
-                                          (gpointer *) cache_ptr);
+                                          (gpointer) cache_ptr);
 
                return spinner_cache;
        }