soc.2010.detachablepurple: 9b9bbe0a: Updated PurpleAccount and PurpleConstruc...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 9b9bbe0ae57a480103e675ad27752ef6e137592a
Parent:   b971801e6e8d1c6ace4c6f43826e32548b57a709
Author:   gillux at soc.pidgin.im
Date:     07/17/10 03:25:52
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/9b9bbe0ae57a480103e675ad27752ef6e137592a

Changelog: 

Updated PurpleAccount and PurpleConstructor giving the previous commit.

Changes against parent b971801e6e8d1c6ace4c6f43826e32548b57a709

  patched  libpurple/account.c
  patched  libpurple/dbus-constructor.c

-------------- next part --------------
============================================================
--- libpurple/account.c	aaeb655bdcc95594823a482e8de276e3c060fa14
+++ libpurple/account.c	a571fda69f5b9bbecfde7d5049f8c10faae4d4cc
@@ -758,7 +758,7 @@ static void purple_account_class_init(Pu
 	/* Add dbus stuff */
 	if (purple_core_is_daemon_mode())
 		/* Install method introspection data */
-		dbus_g_object_type_install_info(PURPLE_TYPE_ACCOUNT,
+		purple_object_type_install_dbus_infos(PURPLE_TYPE_ACCOUNT,
 									&dbus_glib_DBUS_purple_account_object_info);
 #endif
 	g_type_class_add_private(klass, sizeof(PurpleAccountPrivate));
============================================================
--- libpurple/dbus-constructor.c	4c480d602655bfc7def43b317957bd2b3335d2a9
+++ libpurple/dbus-constructor.c	b967df285f76dbd6f557a0fc49452357908a8f09
@@ -66,7 +66,7 @@ static void purple_constructor_class_ini
 	 * dbus_glib_DBUS_purple_constructor_object_info is defined in
 	 * dbus-constructor-server.h, which is autogenerated.
 	 */
-	dbus_g_object_type_install_info(PURPLE_TYPE_CONSTRUCTOR,
+	purple_object_type_install_dbus_infos(PURPLE_TYPE_CONSTRUCTOR,
 					&dbus_glib_DBUS_purple_constructor_object_info);
 }
 
@@ -133,11 +133,6 @@ pack_account_prop_cb(char *prop_name, Pu
 	g_ptr_array_add(props_pack, g_value_get_boxed(&prop));
 }
 
-/* We can't include dbus-account-server.h twice in libpurple or it produces an
- * error when linking. For here we use an extern definition instead.
- */
-extern const DBusGObjectInfo dbus_glib_DBUS_purple_account_object_info;
-
 /**
  * A callback used in DBUS_purple_constructor_get_all_accounts().
  * Packs the given acc account into a { dbus_path, protocol_id, account_struct }
@@ -218,8 +213,8 @@ DBUS_purple_constructor_get_all_accounts
 		if (!exported_props) {
 			/* Grab all the properties names */
 			interface = purple_object_get_dbus_obj_interface(PURPLE_OBJECT(acc));
-			exported_props = purple_dbus_get_gobj_props(interface,
-				&dbus_glib_DBUS_purple_account_object_info);
+			exported_props = purple_object_get_dbus_props(
+				PURPLE_TYPE_ACCOUNT, interface);
 
 		}
 		pack_accounts_cb(acc, *accounts, exported_props);