empathy r2755 - branches/gnome-2-26/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Apr  3 12:44:34 2009
New Revision: 2755
URL: http://svn.gnome.org/viewvc/empathy?rev=2755&view=rev

Log:
Simplify how channel classes value is parsed. Fixes bug #577825

From: Xavier Claessens <xclaesse gmail com>

Modified:
   branches/gnome-2-26/libempathy/empathy-tp-contact-factory.c

Modified: branches/gnome-2-26/libempathy/empathy-tp-contact-factory.c
==============================================================================
--- branches/gnome-2-26/libempathy/empathy-tp-contact-factory.c	(original)
+++ branches/gnome-2-26/libempathy/empathy-tp-contact-factory.c	Fri Apr  3 12:44:34 2009
@@ -840,17 +840,13 @@
 
 	classes = g_value_get_boxed (value);
 	for (i = 0; i < classes->len; i++) {
-		GValue class = {0,};
-		GValue *chan_type, *handle_type;
+		GValueArray *class_struct;
 		GHashTable *fixed_prop;
+		GValue *chan_type, *handle_type;
 		GList *l;
 
-		g_value_init (&class, TP_STRUCT_TYPE_REQUESTABLE_CHANNEL_CLASS);
-		g_value_set_static_boxed (&class, g_ptr_array_index (classes, i));
-
-		dbus_g_type_struct_get (&class,
-					0, &fixed_prop,
-					G_MAXUINT);
+		class_struct = g_ptr_array_index (classes, i);
+		fixed_prop = g_value_get_boxed (g_value_array_get_nth (class_struct, 0));
 
 		chan_type = g_hash_table_lookup (fixed_prop,
 			TP_IFACE_CHANNEL ".ChannelType");