empathy r2122 - in trunk: libempathy libempathy-gtk src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan  9 10:06:36 2009
New Revision: 2122
URL: http://svn.gnome.org/viewvc/empathy?rev=2122&view=rev

Log:
Set the right weak pointer.

Modified:
   trunk/libempathy-gtk/empathy-smiley-manager.c
   trunk/libempathy/empathy-contact-factory.c
   trunk/libempathy/empathy-idle.c
   trunk/libempathy/empathy-log-manager.c
   trunk/src/empathy-event-manager.c
   trunk/src/empathy-ft-manager.c

Modified: trunk/libempathy-gtk/empathy-smiley-manager.c
==============================================================================
--- trunk/libempathy-gtk/empathy-smiley-manager.c	(original)
+++ trunk/libempathy-gtk/empathy-smiley-manager.c	Fri Jan  9 10:06:36 2009
@@ -129,9 +129,9 @@
 	} else {
 		retval = G_OBJECT_CLASS (empathy_smiley_manager_parent_class)->constructor
 			(type, n_props, props);
-		g_object_add_weak_pointer (retval, (gpointer *) &retval);
 
 		manager_singleton = EMPATHY_SMILEY_MANAGER (retval);
+		g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
 	}
 
 	return retval;

Modified: trunk/libempathy/empathy-contact-factory.c
==============================================================================
--- trunk/libempathy/empathy-contact-factory.c	(original)
+++ trunk/libempathy/empathy-contact-factory.c	Fri Jan  9 10:06:36 2009
@@ -147,9 +147,9 @@
 	} else {
 		retval = G_OBJECT_CLASS (empathy_contact_factory_parent_class)->constructor
 			(type, n_props, props);
-		g_object_add_weak_pointer (retval, (gpointer *) &retval);
 
 		factory_singleton = EMPATHY_CONTACT_FACTORY (retval);
+		g_object_add_weak_pointer (retval, (gpointer *) &factory_singleton);
 	}
 
 	return retval;

Modified: trunk/libempathy/empathy-idle.c
==============================================================================
--- trunk/libempathy/empathy-idle.c	(original)
+++ trunk/libempathy/empathy-idle.c	Fri Jan  9 10:06:36 2009
@@ -285,9 +285,9 @@
 	} else {
 		retval = G_OBJECT_CLASS (empathy_idle_parent_class)->constructor
 			(type, n_props, props);
-		g_object_add_weak_pointer (retval, (gpointer *) &retval);
 
 		idle_singleton = EMPATHY_IDLE (retval);
+		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	Fri Jan  9 10:06:36 2009
@@ -115,9 +115,9 @@
 	} else {
 		retval = G_OBJECT_CLASS (empathy_log_manager_parent_class)->constructor
 			(type, n_props, props);
-		g_object_add_weak_pointer (retval, (gpointer *) &retval);
 
 		manager_singleton = EMPATHY_LOG_MANAGER (retval);
+		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	Fri Jan  9 10:06:36 2009
@@ -401,9 +401,9 @@
 	} else {
 		retval = G_OBJECT_CLASS (empathy_event_manager_parent_class)->constructor
 			(type, n_props, props);
-		g_object_add_weak_pointer (retval, (gpointer *) &retval);
 
 		manager_singleton = EMPATHY_EVENT_MANAGER (retval);
+		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	Fri Jan  9 10:06:36 2009
@@ -785,9 +785,9 @@
     {
       retval = G_OBJECT_CLASS (empathy_ft_manager_parent_class)->constructor
           (type, n_props, props);
-      g_object_add_weak_pointer (retval, (gpointer *) &retval);
 
       manager_singleton = EMPATHY_FT_MANAGER (retval);
+      g_object_add_weak_pointer (retval, (gpointer *) &manager_singleton);
     }
 
   return retval;