Added empathy_init function to call emp_cli_init in main. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1737

diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 6c90f49d890a967fba8feac6b387f5627df86c92..7703aeffb5c96718d44f6ddd16f4fd8c3abdefb2 100644 (file)
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -589,8 +589,6 @@ empathy_tp_call_class_init (EmpathyTpCallClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  emp_cli_init ();
-
   object_class->constructor = tp_call_constructor;
   object_class->finalize = tp_call_finalize;
   object_class->set_property = tp_call_set_property;

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index b5bdb9ff71f9bde377d3f1bdfb8cc28628c65674..934fc9e2c6a7cdaa1a396fef82940788669b6093 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -37,6 +37,8 @@
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/dbus.h>
 
+#include <extensions/extensions.h>
+
 #include "empathy-utils.h"
 #include "empathy-contact-factory.h"
 #include "empathy-contact-manager.h"
@@ -774,3 +776,9 @@ empathy_connection_request_channel (TpConnection *connection,
                                                weak_object);
 }
 
+void
+empathy_init (void)
+{
+       emp_cli_init ();
+}
+

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index a320c6246325c646bf1dd9ff335a92968b456915..afde4d3a7068b31d6a8f3f3018b17b858c9c97a2 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -122,6 +122,7 @@ void empathy_connection_request_channel (TpConnection *proxy,
                                         gpointer user_data,
                                         GDestroyNotify destroy,
                                         GObject *weak_object);
+void         empathy_init                           (void);
 
 G_END_DECLS
 

diff --git a/src/empathy.c b/src/empathy.c
index 15781d9292ccad62b81e6a301ebd9a873ff8bccd..9bc98ff1196b148de771b87b304db95c87e42cdb 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -449,6 +449,8 @@ main (int argc, char *argv[])
                g_warning ("Cannot create the 'empathy' bacon connection.");
        }
 
+       empathy_init ();
+
        /* Setting up MC */
        mc = empathy_mission_control_new ();
        g_signal_connect (mc, "ServiceEnded",