aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2009-01-07 00:49:43 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-07 00:49:43 +0800
commita7e11de287241ff6aa5cf02cab3087b1fcdc5db2 (patch)
treebcf54e5f614560f3c44ad0850149ec6582dba892 /libempathy
parent0c25c082a6be7d9c49a202a42dd10e21f344879d (diff)
downloadgsoc2013-empathy-a7e11de287241ff6aa5cf02cab3087b1fcdc5db2.tar
gsoc2013-empathy-a7e11de287241ff6aa5cf02cab3087b1fcdc5db2.tar.gz
gsoc2013-empathy-a7e11de287241ff6aa5cf02cab3087b1fcdc5db2.tar.bz2
gsoc2013-empathy-a7e11de287241ff6aa5cf02cab3087b1fcdc5db2.tar.lz
gsoc2013-empathy-a7e11de287241ff6aa5cf02cab3087b1fcdc5db2.tar.xz
gsoc2013-empathy-a7e11de287241ff6aa5cf02cab3087b1fcdc5db2.tar.zst
gsoc2013-empathy-a7e11de287241ff6aa5cf02cab3087b1fcdc5db2.zip
disconnect_monitor_signals function is quite useless.
svn path=/trunk/; revision=2095
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-account-manager.c28
1 files changed, 10 insertions, 18 deletions
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index a4429b5ea..9160a7e1f 100644
--- a/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@ -412,22 +412,6 @@ empathy_account_manager_init (EmpathyAccountManager *manager)
}
static void
-disconnect_monitor_signals (McAccountMonitor *monitor,
- GObject *obj)
-{
- g_signal_handlers_disconnect_by_func (monitor,
- account_created_cb, obj);
- g_signal_handlers_disconnect_by_func (monitor,
- account_deleted_cb, obj);
- g_signal_handlers_disconnect_by_func (monitor,
- account_disabled_cb, obj);
- g_signal_handlers_disconnect_by_func (monitor,
- account_enabled_cb, obj);
- g_signal_handlers_disconnect_by_func (monitor,
- account_changed_cb, obj);
-}
-
-static void
do_finalize (GObject *obj)
{
EmpathyAccountManager *manager = EMPATHY_ACCOUNT_MANAGER (obj);
@@ -454,10 +438,18 @@ do_dispose (GObject *obj)
G_CALLBACK (account_status_changed_cb),
obj);
- disconnect_monitor_signals (priv->monitor, obj);
-
if (priv->monitor)
{
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_created_cb, obj);
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_deleted_cb, obj);
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_disabled_cb, obj);
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_enabled_cb, obj);
+ g_signal_handlers_disconnect_by_func (priv->monitor,
+ account_changed_cb, obj);
g_object_unref (priv->monitor);
priv->monitor = NULL;
}