aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-01-10 00:13:32 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-10 00:13:32 +0800
commitc1657a9a556c8b9d98fe7003e6bccba023670332 (patch)
tree006932b484fdb23f5cbe2fa1236bf339efaa24b9
parent7fc8348976a2a8512e4657cfe839487331d5af88 (diff)
downloadgsoc2013-empathy-c1657a9a556c8b9d98fe7003e6bccba023670332.tar
gsoc2013-empathy-c1657a9a556c8b9d98fe7003e6bccba023670332.tar.gz
gsoc2013-empathy-c1657a9a556c8b9d98fe7003e6bccba023670332.tar.bz2
gsoc2013-empathy-c1657a9a556c8b9d98fe7003e6bccba023670332.tar.lz
gsoc2013-empathy-c1657a9a556c8b9d98fe7003e6bccba023670332.tar.xz
gsoc2013-empathy-c1657a9a556c8b9d98fe7003e6bccba023670332.tar.zst
gsoc2013-empathy-c1657a9a556c8b9d98fe7003e6bccba023670332.zip
Call emp_cli_init in empathy_init
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2153
-rw-r--r--libempathy/empathy-utils.c5
-rw-r--r--src/empathy.c4
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",