Changeset 3fbce97 for protocols/purple/ft-direct.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/purple/ft-direct.c (modified) (1 diff)

protocols/purple/ft-direct.c

@@ -193 +193 @@
 PurpleXferUiOps bee_xfer_uiops =
 {
-        prplcb_xfer_new,
-        prplcb_xfer_dbg,
-        prplcb_xfer_dbg,
-        prplcb_xfer_progress,
-        prplcb_xfer_dbg,
-        prplcb_xfer_dbg,
-        prplcb_xfer_write,
-        prplcb_xfer_read,
-        prplcb_xfer_dbg,
+        prplcb_xfer_new,           /* new_xfer */
+        prplcb_xfer_dbg,           /* destroy */
+        prplcb_xfer_dbg,           /* add_xfer */
+        prplcb_xfer_progress,      /* update_progress */
+        prplcb_xfer_dbg,           /* cancel_local */
+        prplcb_xfer_dbg,           /* cancel_remote */
+        prplcb_xfer_write,         /* ui_write */
+        prplcb_xfer_read,          /* ui_read */
+        prplcb_xfer_dbg,           /* data_not_sent */
 };