Changeset 3ddbd23c for protocols/jabber/s5bytestream.c

Timestamp:

2015-07-29T21:48:14Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

69b94c3

Parents:

10d089d (diff), 73dd021 (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 remote-tracking branch 'origin/develop' into parson

Conflicts:

lib/json.c - Yep, no longer exists in the branch so not important.

File:

• protocols/jabber/s5bytestream.c (modified) (1 diff)

protocols/jabber/s5bytestream.c

@@ -85 +85 @@
                 return jabber_bs_abort(bt, msg ": %s", strerror(errno)); }
 
-gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...);
+gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...) G_GNUC_PRINTF(2, 3);
 void jabber_bs_canceled(file_transfer_t *ft, char *reason);
 void jabber_bs_free_transfer(file_transfer_t *ft);