[empathy] main-window: stop instantiating the contact manager
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] main-window: stop instantiating the contact manager
- Date: Wed, 14 Dec 2011 12:30:14 +0000 (UTC)
commit 42286849ee43d2807f8d4faa5d747b144859e08a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Dec 12 13:06:14 2011 +0100
main-window: stop instantiating the contact manager
We don't use it any more.
https://bugzilla.gnome.org/show_bug.cgi?id=660547
src/empathy-main-window.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 20bd607..91dd6bd 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -39,7 +39,6 @@
#include <libempathy/empathy-chatroom-manager.h>
#include <libempathy/empathy-chatroom.h>
#include <libempathy/empathy-contact-list.h>
-#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-individual-manager.h>
#include <libempathy/empathy-gsettings.h>
@@ -106,7 +105,6 @@ G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW);
#define GET_PRIV(self) ((EmpathyMainWindowPriv *)((EmpathyMainWindow *) self)->priv)
struct _EmpathyMainWindowPriv {
- EmpathyContactList *contact_manager;
EmpathyIndividualStore *individual_store;
EmpathyIndividualView *individual_view;
TpAccountManager *account_manager;
@@ -1371,7 +1369,6 @@ empathy_main_window_finalize (GObject *window)
g_object_unref (priv->account_manager);
g_object_unref (priv->individual_store);
- g_object_unref (priv->contact_manager);
g_object_unref (priv->sound_mgr);
g_hash_table_unref (priv->errors);
g_hash_table_unref (priv->auths);
@@ -2459,8 +2456,6 @@ empathy_main_window_init (EmpathyMainWindow *window)
* so it's got a race condition between its signal handlers and its
* finalization. The class is planned to be removed, so we won't fix
* this before then. */
- priv->contact_manager = EMPATHY_CONTACT_LIST (
- empathy_contact_manager_dup_singleton ());
individual_manager = empathy_individual_manager_dup_singleton ();
priv->individual_store = EMPATHY_INDIVIDUAL_STORE (
empathy_individual_store_manager_new (individual_manager));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]