Changeset b1dc403 for protocols/purple/ft-direct.c

Timestamp:

2015-05-04T21:58:50Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5726a0d

Parents:

531eabd (diff), 5ca1416 (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:

Catch up with master.

File:

• protocols/purple/ft-direct.c (modified) (3 diffs)

protocols/purple/ft-direct.c

@@ -28 +28 @@
 
 #include "bitlbee.h"
+#include "bpurple.h"
 
 #include <stdarg.h>
@@ -207 +208 @@
 void purple_transfer_request(struct im_connection *ic, file_transfer_t *ft, char *handle)
 {
-        PurpleAccount *pa = ic->proto_data;
+        struct purple_data *pd = ic->proto_data;
         struct prpl_xfer_data *px;
 
@@ -213 +214 @@
            multi-threaded anyway. */
         next_ft = ft;
-        serv_send_file(purple_account_get_connection(pa), handle, ft->file_name);
+        serv_send_file(purple_account_get_connection(pd->account), handle,
+                       ft->file_name);
 
         ft->write = prpl_xfer_write;