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

protocols/purple/ft.c

@@ -232 +232 @@
 }
 
-static void prplcb_xfer_dbg(PurpleXfer *xfer)
-{
-        fprintf(stderr, "prplcb_xfer_dbg 0x%p\n", xfer);
-}
-
 
 /* Sending files (UI->IM): */
@@ -337 +332 @@
 PurpleXferUiOps bee_xfer_uiops =
 {
-        prplcb_xfer_new,
-        prplcb_xfer_destroy,
-        NULL, /* prplcb_xfer_add, */
-        prplcb_xfer_progress,
-        prplcb_xfer_dbg,
-        prplcb_xfer_cancel_remote,
-        NULL,
-        NULL,
-        prplcb_xfer_dbg,
+        prplcb_xfer_new,           /* new_xfer */
+        prplcb_xfer_destroy,       /* destroy */
+        NULL,                      /* add_xfer */
+        prplcb_xfer_progress,      /* update_progress */
+        NULL,                      /* cancel_local */
+        prplcb_xfer_cancel_remote, /* cancel_remote */
+        NULL,                      /* ui_write */
+        NULL,                      /* ui_read */
+        NULL,                      /* data_not_sent */
 };