diff options
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-account-manager.c | 7 | ||||
| -rw-r--r-- | libempathy/empathy-account-manager.h | 2 | ||||
| -rw-r--r-- | libempathy/empathy-contact-manager.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-contact-factory.c | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c index b56a67d98..aa45c3209 100644 --- a/libempathy/empathy-account-manager.c +++ b/libempathy/empathy-account-manager.c @@ -96,7 +96,10 @@ account_data_new_default (MissionControl *mc, actual_c = mission_control_get_connection_status (mc, account, &err); if (err != NULL) - actual_c = TP_CONNECTION_STATUS_DISCONNECTED; + { + actual_c = TP_CONNECTION_STATUS_DISCONNECTED; + g_error_free (err); + } return account_data_new (actual_p, actual_c, mc_account_is_enabled (account)); } @@ -538,7 +541,7 @@ empathy_account_manager_class_init (EmpathyAccountManagerClass *klass) /* public methods */ EmpathyAccountManager * -empathy_account_manager_new (void) +empathy_account_manager_dup_singleton (void) { return g_object_new (EMPATHY_TYPE_ACCOUNT_MANAGER, NULL); } diff --git a/libempathy/empathy-account-manager.h b/libempathy/empathy-account-manager.h index a6ebd5f73..58d977fc5 100644 --- a/libempathy/empathy-account-manager.h +++ b/libempathy/empathy-account-manager.h @@ -51,7 +51,7 @@ GType empathy_account_manager_get_type (void); /* public methods */ -EmpathyAccountManager * empathy_account_manager_new (void); +EmpathyAccountManager * empathy_account_manager_dup_singleton (void); int empathy_account_manager_get_connected_accounts (EmpathyAccountManager *manager); int empathy_account_manager_get_connecting_accounts diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index 2e50a53bd..213c625a3 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -217,7 +217,7 @@ empathy_contact_manager_init (EmpathyContactManager *manager) empathy_account_equal, (GDestroyNotify) g_object_unref, (GDestroyNotify) g_object_unref); - priv->account_manager = empathy_account_manager_new (); + priv->account_manager = empathy_account_manager_dup_singleton (); priv->contact_monitor = empathy_contact_monitor_new_for_proxy (EMPATHY_CONTACT_LIST (manager)); g_signal_connect (priv->account_manager, diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 56c2e4bf4..29345e0a3 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -739,7 +739,7 @@ empathy_dispatcher_init (EmpathyDispatcher *dispatcher) dispatcher->priv = priv; priv->mc = empathy_mission_control_new (); - priv->account_manager = empathy_account_manager_new (); + priv->account_manager = empathy_account_manager_dup_singleton (); g_signal_connect (priv->account_manager, "account-connection-changed", diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c index ffb3c8896..f7a6638f9 100644 --- a/libempathy/empathy-tp-contact-factory.c +++ b/libempathy/empathy-tp-contact-factory.c @@ -1522,7 +1522,7 @@ empathy_tp_contact_factory_init (EmpathyTpContactFactory *tp_factory) EMPATHY_TYPE_TP_CONTACT_FACTORY, EmpathyTpContactFactoryPriv); tp_factory->priv = priv; - priv->account_manager = empathy_account_manager_new (); + priv->account_manager = empathy_account_manager_dup_singleton (); g_signal_connect (priv->account_manager, "account-connection-changed", G_CALLBACK (tp_contact_factory_account_connection_cb), |