Set the right weak pointer.

svn path=/trunk/; revision=2122

diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 3f6ea25c338b12d9dcf5db891cf285c4dca9fdce..451fc693761b8664f207e55819b622540cef9695 100644 (file)
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -129,9 +129,9 @@ smiley_manager_constructor (GType type,
        } 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;

diff --git a/libempathy/empathy-contact-factory.c b/libempathy/empathy-contact-factory.c
index f7f701bea823c7db3de0c4b9b3b6eb45cf475295..412fd8669590c23a451934c0bf9e04ae5e2b66c0 100644 (file)
--- a/libempathy/empathy-contact-factory.c
+++ b/libempathy/empathy-contact-factory.c
@@ -147,9 +147,9 @@ contact_factory_constructor (GType type,
        } 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;

diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 2751f7cfafc0d5729392febc8ced689bd589a68c..faa43c3fe899adf98f46d6d03670247c118b5cc5 100644 (file)
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -285,9 +285,9 @@ idle_constructor (GType type,
        } 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;

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index f3d17c2480c58c98e962ef05b6e29a0fa75a4383..39dd4f3a25d0e9430a2250713a00936fc00c6c99 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -115,9 +115,9 @@ log_manager_constructor (GType type,
        } 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;

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 398d8d9ffe53e220a67a0e08bc8ac512ff64b801..23f80f7e8514adbea070dc6712ad7d12a800d900 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -401,9 +401,9 @@ event_manager_constructor (GType type,
        } 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;

diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 8cbfd8502703b730db2e95130584e82bcec6b870..ee580b385e723e305c9f5abda2d6e92e37fbab40 100644 (file)
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -785,9 +785,9 @@ empathy_ft_manager_constructor (GType type,
     {
       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;