empathy r1737 - in trunk: libempathy src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:13:41 2008
New Revision: 1737
URL: http://svn.gnome.org/viewvc/empathy?rev=1737&view=rev

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

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy/empathy-tp-call.c
   trunk/libempathy/empathy-utils.c
   trunk/libempathy/empathy-utils.h
   trunk/src/empathy.c

Modified: trunk/libempathy/empathy-tp-call.c
==============================================================================
--- trunk/libempathy/empathy-tp-call.c	(original)
+++ trunk/libempathy/empathy-tp-call.c	Fri Nov 21 16:13:41 2008
@@ -589,8 +589,6 @@
 {
   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;

Modified: trunk/libempathy/empathy-utils.c
==============================================================================
--- trunk/libempathy/empathy-utils.c	(original)
+++ trunk/libempathy/empathy-utils.c	Fri Nov 21 16:13:41 2008
@@ -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 @@
 						weak_object);
 }
 
+void
+empathy_init (void)
+{
+	emp_cli_init ();
+}
+

Modified: trunk/libempathy/empathy-utils.h
==============================================================================
--- trunk/libempathy/empathy-utils.h	(original)
+++ trunk/libempathy/empathy-utils.h	Fri Nov 21 16:13:41 2008
@@ -122,6 +122,7 @@
 					 gpointer user_data,
 					 GDestroyNotify destroy,
 					 GObject *weak_object);
+void         empathy_init                           (void);
 
 G_END_DECLS
 

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Fri Nov 21 16:13:41 2008
@@ -449,6 +449,8 @@
 		g_warning ("Cannot create the 'empathy' bacon connection.");
 	}
 
+	empathy_init ();
+
 	/* Setting up MC */
 	mc = empathy_mission_control_new ();
 	g_signal_connect (mc, "ServiceEnded",