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

svn path=/trunk/; revision=665

1 files changed, 9 insertions, 3 deletions

diff --git a/extensions/extensions-cli.c b/extensions/extensions-cli.c
index 98a174478..c75633c33 100644
--- a/extensions/extensions-cli.c
+++ b/extensions/extensions-cli.c
@@ -12,8 +12,14 @@ static void _emp_ext_register_dbus_glib_marshallers (void);
 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;
+    }
 }