aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-19 22:20:06 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-25 16:24:37 +0800
commit3af8594e436d5c88e531fcd6f36a1d81b20b133e (patch)
tree1a884ec118d0a652c601bd4fbdb55325c7f0cda0
parent3c1151db28aa6d8726a763060070e0c8eb961e2d (diff)
downloadgsoc2013-empathy-3af8594e436d5c88e531fcd6f36a1d81b20b133e.tar
gsoc2013-empathy-3af8594e436d5c88e531fcd6f36a1d81b20b133e.tar.gz
gsoc2013-empathy-3af8594e436d5c88e531fcd6f36a1d81b20b133e.tar.bz2
gsoc2013-empathy-3af8594e436d5c88e531fcd6f36a1d81b20b133e.tar.lz
gsoc2013-empathy-3af8594e436d5c88e531fcd6f36a1d81b20b133e.tar.xz
gsoc2013-empathy-3af8594e436d5c88e531fcd6f36a1d81b20b133e.tar.zst
gsoc2013-empathy-3af8594e436d5c88e531fcd6f36a1d81b20b133e.zip
empathy.c: stop instantiating the chat manager
-rw-r--r--src/empathy.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/empathy.c b/src/empathy.c
index aa4610622..6e47af2de 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -63,7 +63,6 @@
#include "empathy-main-window.h"
#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
-#include "empathy-chat-manager.h"
#include "empathy-status-icon.h"
#include "empathy-ft-manager.h"
@@ -114,7 +113,6 @@ struct _EmpathyApp
EmpathyFTFactory *ft_factory;
EmpathyIdle *idle;
EmpathyConnectivity *connectivity;
- EmpathyChatManager *chat_manager;
GSettings *gsettings;
#ifdef HAVE_GEOCLUE
EmpathyLocationManager *location_manager;
@@ -143,7 +141,6 @@ empathy_app_dispose (GObject *object)
tp_clear_object (&self->debug_sender);
#endif
- tp_clear_object (&self->chat_manager);
tp_clear_object (&self->idle);
tp_clear_object (&self->connectivity);
tp_clear_object (&self->icon);
@@ -603,9 +600,6 @@ empathy_app_constructed (GObject *object)
self->icon = empathy_status_icon_new (GTK_WINDOW (self->window),
self->start_hidden);
- /* Chat manager */
- self->chat_manager = empathy_chat_manager_dup_singleton ();
-
/* Logging */
self->log_manager = tpl_log_manager_dup_singleton ();