Changeset 3fbce97 for protocols/bee_user.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• protocols/bee_user.c (modified) (3 diffs)

protocols/bee_user.c

@@ -247 +247 @@
 }
 
-void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, uint32_t flags, time_t sent_at)
+void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, guint32 flags, time_t sent_at)
 {
         bee_t *bee = ic->bee;
@@ -265 +265 @@
 
         if (bee->ui->user_msg && bu) {
-                bee->ui->user_msg(bee, bu, msg, sent_at);
+                bee->ui->user_msg(bee, bu, msg, flags, sent_at);
         } else {
                 imcb_log(ic, "Message from unknown handle %s:\n%s", handle, msg);
@@ -297 +297 @@
 }
 
-void imcb_buddy_typing(struct im_connection *ic, const char *handle, uint32_t flags)
+void imcb_buddy_typing(struct im_connection *ic, const char *handle, guint32 flags)
 {
         bee_user_t *bu;