[telepathy-mission-control/master] McdConnection: turn ListChannels output into immutable properties correctly
Simon McVittie
simon.mcvittie at collabora.co.uk
Fri May 22 09:55:47 PDT 2009
This off-by-one error in parsing the GValueArray was previously masked by
the fact that there was time to re-download the Channel's immutable
properties before it was dispatched. Some refactoring in McdDispatcher
makes this fail.
---
src/mcd-connection.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index cbaad2d..f28056a 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -1339,11 +1339,11 @@ list_channels_cb (TpConnection *connection,
* we're on a fallback path so it's OK to be a bit slow */
channel_props = g_hash_table_new (g_str_hash, g_str_equal);
g_hash_table_insert (channel_props, TP_IFACE_CHANNEL ".ChannelType",
- va->values + 0);
- g_hash_table_insert (channel_props, TP_IFACE_CHANNEL ".TargetHandleType",
va->values + 1);
- g_hash_table_insert (channel_props, TP_IFACE_CHANNEL ".TargetHandle",
+ g_hash_table_insert (channel_props, TP_IFACE_CHANNEL ".TargetHandleType",
va->values + 2);
+ g_hash_table_insert (channel_props, TP_IFACE_CHANNEL ".TargetHandle",
+ va->values + 3);
mcd_connection_found_channel (self, object_path, channel_props);
g_hash_table_destroy (channel_props);
}
--
1.5.6.5
More information about the telepathy-commits
mailing list