empathy r2440 - in trunk: libempathy libempathy-gtk src

[xclaesse svn gnome org]

Author: xclaesse
Date: Wed Feb 11 19:43:49 2009
New Revision: 2440
URL: http://svn.gnome.org/viewvc/empathy?rev=2440&view=rev

Log:
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>

Modified:
   trunk/libempathy-gtk/empathy-smiley-manager.c
   trunk/libempathy/empathy-account-manager.c
   trunk/libempathy/empathy-call-factory.c
   trunk/libempathy/empathy-chatroom-manager.c
   trunk/libempathy/empathy-contact-factory.c
   trunk/libempathy/empathy-contact-manager.c
   trunk/libempathy/empathy-dispatcher.c
   trunk/libempathy/empathy-idle.c
   trunk/libempathy/empathy-log-manager.c
   trunk/src/empathy-event-manager.c
   trunk/src/empathy-ft-manager.c
   trunk/src/ephy-spinner.c

Modified: trunk/libempathy-gtk/empathy-smiley-manager.c
==============================================================================
--- trunk/libempathy-gtk/empathy-smiley-manager.c	(original)
+++ trunk/libempathy-gtk/empathy-smiley-manager.c	Wed Feb 11 19:43:49 2009
@@ -131,7 +131,7 @@
 			(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;

Modified: trunk/libempathy/empathy-account-manager.c
==============================================================================
--- trunk/libempathy/empathy-account-manager.c	(original)
+++ trunk/libempathy/empathy-account-manager.c	Wed Feb 11 19:43:49 2009
@@ -474,8 +474,8 @@
                                                                                    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);

Modified: trunk/libempathy/empathy-call-factory.c
==============================================================================
--- trunk/libempathy/empathy-call-factory.c	(original)
+++ trunk/libempathy/empathy-call-factory.c	Wed Feb 11 19:43:49 2009
@@ -63,7 +63,7 @@
 
   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;
 }

Modified: trunk/libempathy/empathy-chatroom-manager.c
==============================================================================
--- trunk/libempathy/empathy-chatroom-manager.c	(original)
+++ trunk/libempathy/empathy-chatroom-manager.c	Wed Feb 11 19:43:49 2009
@@ -139,7 +139,7 @@
   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)
     {

Modified: trunk/libempathy/empathy-contact-factory.c
==============================================================================
--- trunk/libempathy/empathy-contact-factory.c	(original)
+++ trunk/libempathy/empathy-contact-factory.c	Wed Feb 11 19:43:49 2009
@@ -149,7 +149,7 @@
 			(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;

Modified: trunk/libempathy/empathy-contact-manager.c
==============================================================================
--- trunk/libempathy/empathy-contact-manager.c	(original)
+++ trunk/libempathy/empathy-contact-manager.c	Wed Feb 11 19:43:49 2009
@@ -212,7 +212,7 @@
 			(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;

Modified: trunk/libempathy/empathy-dispatcher.c
==============================================================================
--- trunk/libempathy/empathy-dispatcher.c	(original)
+++ trunk/libempathy/empathy-dispatcher.c	Wed Feb 11 19:43:49 2009
@@ -896,7 +896,7 @@
           (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
     {

Modified: trunk/libempathy/empathy-idle.c
==============================================================================
--- trunk/libempathy/empathy-idle.c	(original)
+++ trunk/libempathy/empathy-idle.c	Wed Feb 11 19:43:49 2009
@@ -296,7 +296,7 @@
 			(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;

Modified: trunk/libempathy/empathy-log-manager.c
==============================================================================
--- trunk/libempathy/empathy-log-manager.c	(original)
+++ trunk/libempathy/empathy-log-manager.c	Wed Feb 11 19:43:49 2009
@@ -117,7 +117,7 @@
 			(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;

Modified: trunk/src/empathy-event-manager.c
==============================================================================
--- trunk/src/empathy-event-manager.c	(original)
+++ trunk/src/empathy-event-manager.c	Wed Feb 11 19:43:49 2009
@@ -826,7 +826,7 @@
 			(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;

Modified: trunk/src/empathy-ft-manager.c
==============================================================================
--- trunk/src/empathy-ft-manager.c	(original)
+++ trunk/src/empathy-ft-manager.c	Wed Feb 11 19:43:49 2009
@@ -791,7 +791,7 @@
           (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;

Modified: trunk/src/ephy-spinner.c
==============================================================================
--- trunk/src/ephy-spinner.c	(original)
+++ trunk/src/ephy-spinner.c	Wed Feb 11 19:43:49 2009
@@ -489,7 +489,7 @@
 		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;
 	}