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

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index e1c7244fd0dd2bf9ce6ff6a39bb15f2efb028410..c0cba4d7331aa3fe5b289a4a681441a7dcff5264 100644 (file)
--- 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 fe2acfee56524cf865a5d9e1c69145cc68df1524..2d4734febca697cd02bb2a0cb486215350dde6aa 100644 (file)
--- 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 9bc98ff1196b148de771b87b304db95c87e42cdb..0f8cce4044410935047149e8dbfc276f5595afed 100644 (file)
--- 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 ();