aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-11-22 00:16:06 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:16:06 +0800
commit2aa329dcb7773bef4ee2b593147b48a83b7658f8 (patch)
tree82ca425c6ca1a53098cc9d32f048bd5cbdc0bf51 /src/empathy.c
parent03c63ba1f0dbdac7a30ac025e3c02ce40cff7cc5 (diff)
downloadgsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar
gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.gz
gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.bz2
gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.lz
gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.xz
gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.zst
gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.zip
Removed empathy_init in favour of calling emp_cli_init directly. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=1773
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 9bc98ff11..0f8cce404 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -45,6 +45,8 @@
#include <libempathy-gtk/empathy-conf.h>
+#include <extensions/extensions.h>
+
#include "empathy-accounts-dialog.h"
#include "empathy-main-window.h"
#include "empathy-status-icon.h"
@@ -449,7 +451,7 @@ main (int argc, char *argv[])
g_warning ("Cannot create the 'empathy' bacon connection.");
}
- empathy_init ();
+ emp_cli_init ();
/* Setting up MC */
mc = empathy_mission_control_new ();