empathy r665 - in trunk: extensions libempathy src

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Feb 26 13:31:16 2008
New Revision: 665
URL: http://svn.gnome.org/viewvc/empathy?rev=665&view=rev

Log:
It's now safe to call emp_cli_init multiple times. Move that call to empathy_tp_call_class_init.


Modified:
   trunk/extensions/extensions-cli.c
   trunk/libempathy/empathy-tp-call.c
   trunk/src/empathy-call-chandler.c

Modified: trunk/extensions/extensions-cli.c
==============================================================================
--- trunk/extensions/extensions-cli.c	(original)
+++ trunk/extensions/extensions-cli.c	Tue Feb 26 13:31:16 2008
@@ -12,8 +12,14 @@
 void
 emp_cli_init (void)
 {
-  _emp_ext_register_dbus_glib_marshallers ();
+  static gboolean initilized = FALSE;
 
-  tp_proxy_or_subclass_hook_on_interface_add (TP_TYPE_PROXY,
-      emp_cli_misc_add_signals);
+  if (!initialized)
+    {
+      _emp_ext_register_dbus_glib_marshallers ();
+
+      tp_proxy_or_subclass_hook_on_interface_add (TP_TYPE_PROXY,
+          emp_cli_misc_add_signals);
+      initialized = TRUE;
+    }
 }

Modified: trunk/libempathy/empathy-tp-call.c
==============================================================================
--- trunk/libempathy/empathy-tp-call.c	(original)
+++ trunk/libempathy/empathy-tp-call.c	Tue Feb 26 13:31:16 2008
@@ -678,6 +678,8 @@
 {
   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/src/empathy-call-chandler.c
==============================================================================
--- trunk/src/empathy-call-chandler.c	(original)
+++ trunk/src/empathy-call-chandler.c	Tue Feb 26 13:31:16 2008
@@ -22,7 +22,6 @@
 
 #include <libmissioncontrol/mission-control.h>
 
-#include <extensions/extensions.h>
 #include <libempathy/empathy-tp-call.h>
 #include <libempathy/empathy-chandler.h>
 #include <libempathy/empathy-debug.h>
@@ -69,7 +68,6 @@
   EmpathyChandler *chandler;
 
   gtk_init (&argc, &argv);
-  emp_cli_init ();
 
   mc = empathy_mission_control_new ();