From c1657a9a556c8b9d98fe7003e6bccba023670332 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Fri, 9 Jan 2009 16:13:32 +0000
Subject: Call emp_cli_init in empathy_init

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

svn path=/trunk/; revision=2153
---
 libempathy/empathy-utils.c | 5 +++++
 src/empathy.c              | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 2dbc9bd41..87e593a85 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -40,9 +40,12 @@
 #include "empathy-contact-factory.h"
 #include "empathy-contact-manager.h"
 
+#include <extensions/extensions.h>
+
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
+
 void
 empathy_init (void)
 {
@@ -64,6 +67,8 @@ empathy_init (void)
 	empathy_debug_set_flags (g_getenv ("EMPATHY_DEBUG"));
 	tp_debug_divert_messages (g_getenv ("EMPATHY_LOGFILE"));
 
+	emp_cli_init ();
+
 	initialized = TRUE;
 }
 
diff --git a/src/empathy.c b/src/empathy.c
index ed16640c1..1c275f11e 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -47,8 +47,6 @@
 #include <libempathy-gtk/empathy-conf.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include <extensions/extensions.h>
-
 #include "empathy-accounts-dialog.h"
 #include "empathy-main-window.h"
 #include "empathy-status-icon.h"
@@ -458,8 +456,6 @@ main (int argc, char *argv[])
 		g_warning ("Cannot create the 'empathy' bacon connection.");
 	}
 
-	emp_cli_init ();
-
 	/* Setting up MC */
 	mc = empathy_mission_control_new ();
 	g_signal_connect (mc, "ServiceEnded",
-- 
cgit v1.2.3