soc.2010.detachablepurple: 6cbad347: Fixed a misuse of purple_object_type_ins...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 6cbad3471a0b425ebbe61c8f8d916af10bcf983a
Parent:   b06c099979a900710e7343b664d91230d1871db8
Author:   gillux at soc.pidgin.im
Date:     08/11/10 18:46:29
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/6cbad3471a0b425ebbe61c8f8d916af10bcf983a

Changelog: 

Fixed a misuse of purple_object_type_install_dbus_infos() in remote mode.

Changes against parent b06c099979a900710e7343b664d91230d1871db8

  patched  libpurple/dbus/callback.c

-------------- next part --------------
============================================================
--- libpurple/dbus/callback.c	5ba4f3b872163f768b1cd0eb2215d70e38b42418
+++ libpurple/dbus/callback.c	4b1203681fb0be662149a70de96e4b55071f0681
@@ -153,12 +153,12 @@ purple_dbus_callback_class_init(PurpleDB
 	gobject_class->finalize     = purple_dbus_callback_finalize;
 	klass->instance = NULL;
 
-	/* dbus_glib_DBUS_purple_callback_object_info is defined in
-	 * dbus-callback-server.h, which is autogenerated. */
-	purple_object_type_install_dbus_infos(PURPLE_TYPE_DBUS_CALLBACK,
-	                          &dbus_glib_DBUS_purple_callback_object_info);
+	if (purple_core_is_daemon_mode()) {
+		/* dbus_glib_DBUS_purple_callback_object_info is defined in
+		 * dbus-callback-server.h, which is autogenerated. */
+		purple_object_type_install_dbus_infos(PURPLE_TYPE_DBUS_CALLBACK,
+		                  &dbus_glib_DBUS_purple_callback_object_info);
 
-	if (purple_core_is_daemon_mode()) {
 		/* Register the signals */
 		signals[SIG_DBUS_RUN_CALLBACK] =
 			g_signal_new("run_callback",