[next] telepathy-gabble: tp_message_peek() has been removed

[Guillaume Desmottes]

Module: telepathy-gabble
Branch: next
Commit: 15cbd7eae31c0eaea1694f06779922c3b3e61e09
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=15cbd7eae31c0eaea1694f06779922c3b3e61e09

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue Mar 18 12:57:25 2014 +0100

tp_message_peek() has been removed

---

 src/message-util.c |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/message-util.c b/src/message-util.c
index 6b80708..fe5b3ab 100644
--- a/src/message-util.c
+++ b/src/message-util.c
@@ -93,12 +93,12 @@ gabble_message_util_build_stanza (TpMessage *message,
                                   gchar **token,
                                   GError **error)
 {
-  const GHashTable *part;
+  GVariant *part;
   WockyStanza *stanza = NULL;
   WockyNode *node;
   guint type = TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL;
   gboolean result = TRUE;
-  const gchar *content_type, *text;
+  const gchar *content_type = NULL, *text = NULL;
   gchar *id = NULL;
   guint n_parts;
 
@@ -110,10 +110,10 @@ gabble_message_util_build_stanza (TpMessage *message,
     return NULL; \
   } G_STMT_END
 
-  part = tp_message_peek (message, 0);
+  part = tp_message_dup_part (message, 0);
 
-  if (tp_asv_lookup (part, "message-type") != NULL)
-    type = tp_asv_get_uint32 (part, "message-type", &result);
+  if (tp_vardict_has_key (part, "message-type"))
+    type = tp_vardict_get_uint32 (part, "message-type", &result);
 
   if (!result)
     RETURN_INVALID_ARGUMENT ("message-type must be a 32-bit unsigned integer");
@@ -127,9 +127,11 @@ gabble_message_util_build_stanza (TpMessage *message,
     RETURN_INVALID_ARGUMENT ("message must contain exactly 1 part, not %u",
         (n_parts - 1));
 
-  part = tp_message_peek (message, 1);
-  content_type = tp_asv_get_string (part, "content-type");
-  text = tp_asv_get_string (part, "content");
+  g_variant_unref (part);
+
+  part = tp_message_dup_part (message, 1);
+  g_variant_lookup (part, "content-type", "&s", &content_type);
+  g_variant_lookup (part, "content", "&s", &text);
 
   if (content_type == NULL || tp_strdiff (content_type, "text/plain"))
     RETURN_INVALID_ARGUMENT ("message must be text/plain");
@@ -184,6 +186,8 @@ gabble_message_util_build_stanza (TpMessage *message,
     g_free (id);
 
   gabble_connection_update_last_use (conn);
+
+  g_variant_unref (part);
   return stanza;
 }