Changes in protocols/purple/ft.c [ea90275:98d46d5]

File:

• protocols/purple/ft.c (modified) (10 diffs)

protocols/purple/ft.c

@@ -42 +42 @@
         char *fn, *handle;
         gboolean ui_wants_data;
-        int timeout;
 };
 
@@ -65 +64 @@
         struct prpl_xfer_data *px = ft->data;
 
-        if (px->xfer) {
-                if (!purple_xfer_is_completed(px->xfer) && !purple_xfer_is_canceled(px->xfer)) {
-                        purple_xfer_cancel_local(px->xfer);
-                }
-                px->xfer->ui_data = NULL;
-                purple_xfer_unref(px->xfer);
-                px->xfer = NULL;
-        }
-}
-
-static void prpl_xfer_free(struct file_transfer *ft)
-{
-        struct prpl_xfer_data *px = ft->data;
-        struct purple_data *pd = px->ic->proto_data;
-
-        pd->filetransfers = g_slist_remove(pd->filetransfers, px);
-
-        if (px->xfer) {
-                px->xfer->ui_data = NULL;
-                purple_xfer_unref(px->xfer);
-        }
-
-        if (px->timeout) {
-                b_event_remove(px->timeout);
-        }
-
-        g_free(px->fn);
-        g_free(px->handle);
-        if (px->fd >= 0) {
-                close(px->fd);
-        }
-        g_free(px);
+        purple_xfer_request_denied(px->xfer);
 }
 
 static void prplcb_xfer_new(PurpleXfer *xfer)
 {
-        purple_xfer_ref(xfer);
-
         if (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE) {
                 struct prpl_xfer_data *px = g_new0(struct prpl_xfer_data, 1);
-                struct purple_data *pd;
 
                 xfer->ui_data = px;
@@ -113 +78 @@
                 px->ic = purple_ic_by_pa(xfer->account);
 
-                pd = px->ic->proto_data;
-                pd->filetransfers = g_slist_prepend(pd->filetransfers, px);
-
                 purple_xfer_set_local_filename(xfer, px->fn);
 
@@ -150 +112 @@
         px->ft->accept = prpl_xfer_accept;
         px->ft->canceled = prpl_xfer_canceled;
-        px->ft->free = prpl_xfer_free;
         px->ft->write_request = prpl_xfer_write_request;
 
@@ -203 +164 @@
 
 
+/* Generic (IM<>UI): */
 static void prplcb_xfer_destroy(PurpleXfer *xfer)
 {
         struct prpl_xfer_data *px = xfer->ui_data;
 
-        if (px) {
-                px->xfer = NULL;
-        }
+        g_free(px->fn);
+        g_free(px->handle);
+        if (px->fd >= 0) {
+                close(px->fd);
+        }
+        g_free(px);
 }
 
@@ -259 +224 @@
         struct prpl_xfer_data *px = xfer->ui_data;
 
-        if (px && px->ft) {
+        if (px->ft) {
                 imcb_file_canceled(px->ic, px->ft, "Canceled by remote end");
-        } else if (px) {
+        } else {
                 /* px->ft == NULL for sends, because of the two stages. :-/ */
                 imcb_error(px->ic, "File transfer cancelled by remote end");
@@ -275 +240 @@
 {
         struct prpl_xfer_data *px = g_new0(struct prpl_xfer_data, 1);
-        struct purple_data *pd;
         char *dir, *basename;
 
         ft->data = px;
         px->ft = ft;
-        px->ft->free = prpl_xfer_free;
 
         dir = g_strdup("/tmp/bitlbee-purple-ft.XXXXXX");
@@ -309 +272 @@
         px->handle = g_strdup(handle);
 
-        pd = px->ic->proto_data;
-        pd->filetransfers = g_slist_prepend(pd->filetransfers, px);
-
         imcb_log(ic,
                  "Due to libpurple limitations, the file has to be cached locally before proceeding with the actual file transfer. Please wait...");
 
-        px->timeout = b_timeout_add(0, purple_transfer_request_cb, ft);
+        b_timeout_add(0, purple_transfer_request_cb, ft);
 }
 
@@ -335 +295 @@
         struct prpl_xfer_data *px = ft->data;
 
-        px->timeout = 0;
-
         if (ft->write == NULL) {
                 ft->write = prpl_xfer_write;
@@ -364 +322 @@
                 px->ft = NULL;
         } else {
-                px->timeout = b_timeout_add(0, purple_transfer_request_cb, ft);
+                b_timeout_add(0, purple_transfer_request_cb, ft);
         }
 
         return TRUE;
-}
-
-void purple_transfer_cancel_all(struct im_connection *ic)
-{
-        struct purple_data *pd = ic->proto_data;
-
-        while (pd->filetransfers) {
-                struct prpl_xfer_data *px = pd->filetransfers->data;
-
-                if (px->ft) {
-                        imcb_file_canceled(ic, px->ft, "Logging out");
-                }
-
-                pd->filetransfers = g_slist_remove(pd->filetransfers, px);
-        }
 }