aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy/empathy-utils.c6
-rw-r--r--libempathy/empathy-utils.h3
-rw-r--r--src/empathy.c4
3 files changed, 3 insertions, 10 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index e1c7244fd..c0cba4d73 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -881,9 +881,3 @@ empathy_send_file (EmpathyContact *contact,
return file;
}
-void
-empathy_init (void)
-{
- emp_cli_init ();
-}
-
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index fe2acfee5..2d4734feb 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -133,9 +133,6 @@ EmpathyFile * empathy_send_file (EmpathyContact *contact,
EmpathyFile *empathy_send_file (EmpathyContact *contact,
GFile *file);
-/* General */
-void empathy_init (void);
-
G_END_DECLS
#endif /* __EMPATHY_UTILS_H__ */
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 ();