/srv/mercurial-server/detachablepurple: dc4d2e881fe0: s/(const G...

Gilles Bedel gillux at cpw.pidgin.im
Fri Jun 15 22:01:50 EDT 2012


Changeset: dc4d2e881fe07092f5191db0c0b7da91662b220d
Author:	 Gilles Bedel <gillux at cpw.pidgin.im>
Date:	 2012-05-25 19:30 +0000
Branch:	 cpw.gillux.detachablepurple
URL: http://hg.pidgin.im/srv/mercurial-server/detachablepurple/rev/dc4d2e881fe0

Description:

s/(const GVariantType *)/G_VARIANT_TYPE/ Let's follow glib's way.

diffstat:

 libpurple/dbus/blist.c       |  8 ++++----
 libpurple/dbus/constructor.c |  2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (30 lines):

diff --git a/libpurple/dbus/blist.c b/libpurple/dbus/blist.c
--- a/libpurple/dbus/blist.c
+++ b/libpurple/dbus/blist.c
@@ -116,10 +116,10 @@
 	PurpleBlistNode *root = purple_blist_get_root();
 	const gchar *root_path = NULL;
 
-	g_variant_builder_init(&groups,   (const GVariantType *) "a(oa(sv))");
-	g_variant_builder_init(&contacts, (const GVariantType *) "a(oa(sv))");
-	g_variant_builder_init(&buddies,  (const GVariantType *) "a(oa(sv))");
-	g_variant_builder_init(&chats,    (const GVariantType *) "a(oa(sv))");
+	g_variant_builder_init(&groups,   G_VARIANT_TYPE("a(oa(sv))"));
+	g_variant_builder_init(&contacts, G_VARIANT_TYPE("a(oa(sv))"));
+	g_variant_builder_init(&buddies,  G_VARIANT_TYPE("a(oa(sv))"));
+	g_variant_builder_init(&chats,    G_VARIANT_TYPE("a(oa(sv))"));
 
 	pack_node(purple_blist_get_root(),
 	          &groups, &contacts, &buddies, &chats);
diff --git a/libpurple/dbus/constructor.c b/libpurple/dbus/constructor.c
--- a/libpurple/dbus/constructor.c
+++ b/libpurple/dbus/constructor.c
@@ -381,7 +381,7 @@
 	GList *all = purple_accounts_all();;
 
 	/* Pack every account into an array of accounts. */
-	g_variant_builder_init(&builder, (const GVariantType *) "a(oa(sv))");
+	g_variant_builder_init(&builder, G_VARIANT_TYPE("a(oa(sv))"));
 	while (all) {
 		PurpleAccount *account = all->data;
 		g_variant_builder_add_value



More information about the Commits mailing list