empathy r2095 - trunk/libempathy
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r2095 - trunk/libempathy
- Date: Tue, 6 Jan 2009 16:49:43 +0000 (UTC)
Author: xclaesse
Date: Tue Jan 6 16:49:43 2009
New Revision: 2095
URL: http://svn.gnome.org/viewvc/empathy?rev=2095&view=rev
Log:
disconnect_monitor_signals function is quite useless.
Modified:
trunk/libempathy/empathy-account-manager.c
Modified: trunk/libempathy/empathy-account-manager.c
==============================================================================
--- trunk/libempathy/empathy-account-manager.c (original)
+++ trunk/libempathy/empathy-account-manager.c Tue Jan 6 16:49:43 2009
@@ -412,22 +412,6 @@
}
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 @@
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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]