disconnect_monitor_signals function is quite useless.

svn path=/trunk/; revision=2095

diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index a4429b5eaaeca279a0923eb3a3b725a048a5239b..9160a7e1f0cce96b00f2cbe527bcf829d5f8c734 100644 (file)
--- a/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@ -411,22 +411,6 @@ empathy_account_manager_init (EmpathyAccountManager *manager)
   mc_accounts_list_free (mc_accounts);
 }
 
-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)
 {
@@ -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;
     }