aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2010-03-30 21:48:31 +0800
committerJonny Lamb <jonnylamb@gnome.org>2010-03-30 21:48:31 +0800
commit5d6902cc05f95832e06afd88b6d581be68c1a79f (patch)
tree07b3c98b86de4b24e82fb52990f24716e9b0411a /src/empathy.c
parent62a0fee5ae1749f38e476ba67c0e1f2804ad5ee7 (diff)
parentd8dd568c2c1fed4cb328c2a9afc148186fda12aa (diff)
downloadgsoc2013-empathy-5d6902cc05f95832e06afd88b6d581be68c1a79f.tar
gsoc2013-empathy-5d6902cc05f95832e06afd88b6d581be68c1a79f.tar.gz
gsoc2013-empathy-5d6902cc05f95832e06afd88b6d581be68c1a79f.tar.bz2
gsoc2013-empathy-5d6902cc05f95832e06afd88b6d581be68c1a79f.tar.lz
gsoc2013-empathy-5d6902cc05f95832e06afd88b6d581be68c1a79f.tar.xz
gsoc2013-empathy-5d6902cc05f95832e06afd88b6d581be68c1a79f.tar.zst
gsoc2013-empathy-5d6902cc05f95832e06afd88b6d581be68c1a79f.zip
Merge branch 'undo-close-tab'
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/empathy.c b/src/empathy.c
index b92f58d26..637778d47 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -72,6 +72,7 @@
#include "empathy-import-mc4-accounts.h"
#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
+#include "empathy-chat-manager.h"
#include "empathy-status-icon.h"
#include "empathy-call-window.h"
#include "empathy-chat-window.h"
@@ -581,6 +582,7 @@ main (int argc, char *argv[])
GtkWidget *window;
EmpathyIdle *idle;
EmpathyConnectivity *connectivity;
+ EmpathyChatManager *chat_manager;
GError *error = NULL;
UniqueApp *unique_app;
gboolean chatroom_manager_ready;
@@ -686,6 +688,9 @@ main (int argc, char *argv[])
window = empathy_main_window_show ();
icon = empathy_status_icon_new (GTK_WINDOW (window), start_hidden);
+ /* Chat manager */
+ chat_manager = empathy_chat_manager_dup_singleton ();
+
g_signal_connect (unique_app, "message-received",
G_CALLBACK (unique_app_message_cb), window);
@@ -735,6 +740,7 @@ main (int argc, char *argv[])
g_object_unref (debug_sender);
#endif
+ g_object_unref (chat_manager);
g_object_unref (idle);
g_object_unref (connectivity);
g_object_unref (icon);