[Telepathy-commits] [telepathy-glib/master] Messages: adapt to MessageSent growing a flags arg

[Will Thompson]

---
 examples/cm/echo-message-parts/chan.c |    2 +-
 telepathy-glib/message-mixin.c        |    3 ++-
 telepathy-glib/message-mixin.h        |    4 ++--
 tests/dbus/message-mixin.c            |    1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/examples/cm/echo-message-parts/chan.c b/examples/cm/echo-message-parts/chan.c
index 482cbca..c9fc54d 100644
--- a/examples/cm/echo-message-parts/chan.c
+++ b/examples/cm/echo-message-parts/chan.c
@@ -173,7 +173,7 @@ send_message (GObject *object,
 finally:
   /* "OK, we've sent the message" (after calling this, message must not be
    * dereferenced) */
-  tp_message_mixin_sent (object, message, "", NULL);
+  tp_message_mixin_sent (object, message, flags, "", NULL);
 
   if (received != NULL)
     {
diff --git a/telepathy-glib/message-mixin.c b/telepathy-glib/message-mixin.c
index 6f22b98..930c223 100644
--- a/telepathy-glib/message-mixin.c
+++ b/telepathy-glib/message-mixin.c
@@ -1689,6 +1689,7 @@ struct _TpMessageMixinOutgoingMessagePrivate {
 void
 tp_message_mixin_sent (GObject *object,
                        TpMessage *message,
+                       TpMessageSendingFlags flags,
                        const gchar *token,
                        const GError *error)
 {
@@ -1723,7 +1724,7 @@ tp_message_mixin_sent (GObject *object,
       /* emit Sent and MessageSent */
 
       tp_svc_channel_interface_messages_emit_message_sent (object,
-          message->parts, token);
+          message->parts, flags, token);
       string = parts_to_text (message->parts, NULL, &message_type, NULL, NULL);
       tp_svc_channel_type_text_emit_sent (object, now, message_type,
           string);
diff --git a/telepathy-glib/message-mixin.h b/telepathy-glib/message-mixin.h
index 20ba243..ff9a769 100644
--- a/telepathy-glib/message-mixin.h
+++ b/telepathy-glib/message-mixin.h
@@ -97,8 +97,8 @@ typedef void (*TpMessageMixinSendImpl) (GObject *object,
     TpMessage *message, TpMessageSendingFlags flags);
 
 void tp_message_mixin_sent (GObject *object,
-    TpMessage *message, const gchar *token,
-    const GError *error);
+    TpMessage *message, TpMessageSendingFlags flags,
+    const gchar *token, const GError *error);
 
 void tp_message_mixin_implement_sending (GObject *object,
     TpMessageMixinSendImpl send, guint n_types,
diff --git a/tests/dbus/message-mixin.c b/tests/dbus/message-mixin.c
index cd78014..2bdc596 100644
--- a/tests/dbus/message-mixin.c
+++ b/tests/dbus/message-mixin.c
@@ -155,6 +155,7 @@ on_message_received (TpChannel *chan,
 static void
 on_message_sent (TpChannel *chan,
                  const GPtrArray *parts,
+                 guint32 flags,
                  const gchar *token,
                  gpointer data,
                  GObject *object)
-- 
1.5.6.5