aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2009-01-09 18:06:36 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-09 18:06:36 +0800
commit7396241b0868b083cab53603135ecb0537c5a11d (patch)
treecc292cef3f406e44943c05ed0883a9b120c83c8f
parent5dadc0ac3a478376337e2d10dec4ade7d5b44998 (diff)
downloadgsoc2013-empathy-7396241b0868b083cab53603135ecb0537c5a11d.tar
gsoc2013-empathy-7396241b0868b083cab53603135ecb0537c5a11d.tar.gz
gsoc2013-empathy-7396241b0868b083cab53603135ecb0537c5a11d.tar.bz2
gsoc2013-empathy-7396241b0868b083cab53603135ecb0537c5a11d.tar.lz
gsoc2013-empathy-7396241b0868b083cab53603135ecb0537c5a11d.tar.xz
gsoc2013-empathy-7396241b0868b083cab53603135ecb0537c5a11d.tar.zst
gsoc2013-empathy-7396241b0868b083cab53603135ecb0537c5a11d.zip
Set the right weak pointer.
svn path=/trunk/; revision=2122
-rw-r--r--libempathy-gtk/empathy-smiley-manager.c2
-rw-r--r--libempathy/empathy-contact-factory.c2
-rw-r--r--libempathy/empathy-idle.c2
-rw-r--r--libempathy/empathy-log-manager.c2
-rw-r--r--src/empathy-event-manager.c2
-rw-r--r--src/empathy-ft-manager.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 3f6ea25c3..451fc6937 100644
--- 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 f7f701bea..412fd8669 100644
--- 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 2751f7cfa..faa43c3fe 100644
--- 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 f3d17c248..39dd4f3a2 100644
--- 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 398d8d9ff..23f80f7e8 100644
--- 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 8cbfd8502..ee580b385 100644
--- 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;