Call emp_cli_init in empathy_init

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2153

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 2dbc9bd41fc341b11d45779a31dd366f55bbe1c9..87e593a85f0a96a82c994e232f92aea80bdd00c5 100644 (file)
--- 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 ed16640c188bc88f798cb278038d574d69b09d3e..1c275f11ef3d00ef1a24a87f4f5e8f9d6d09f915 100644 (file)
--- 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",