[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.77,1.78
From: |
Colin Leroy <address@hidden> |
Subject: |
[Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.77,1.78 |
Date: |
Thu, 20 Mar 2003 04:10:15 -0500 |
Update of /cvsroot/ayttm/ayttm/modules/msn2
In directory subversions:/tmp/cvs-serv17267/modules/msn2
Modified Files:
msn.C
Log Message:
fix cancel of incoming file transfers
Index: msn.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/msn.C,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- msn.C 20 Mar 2003 00:18:08 -0000 1.77
+++ msn.C 20 Mar 2003 09:10:12 -0000 1.78
@@ -536,6 +536,15 @@
}
}
+void eb_msn_filetrans_cancel(int tag)
+{
+ transfer_window *w = eb_find_window_by_tag(tag);
+ if (w) {
+ eb_debug(DBG_MSN,"cancelling FTP transfer with %s\n",
w->inv->other_user);
+ msn_filetrans_cancel(w->inv);
+ }
+}
+
static int checkconn(msnconn *conn) {
int status = 1;
eb_local_account * ela = NULL;
@@ -987,7 +996,9 @@
invitation_ftp * inv=(invitation_ftp *)inv_vd;
int tag = progress_window_new(filename, inv->filesize);
transfer_window * t_win = new transfer_window;
-
+
+ progress_window_set_close_cb(tag, eb_msn_filetrans_cancel);
+
eb_debug(DBG_MSN, "Accepting now\n");
t_win->inv = inv;
t_win->window_tag = tag;
@@ -1784,15 +1795,6 @@
eb_debug(DBG_MSN, "Got switchboard connection\n");
}
-void eb_msn_filesend_cancel(int tag)
-{
- transfer_window *w = eb_find_window_by_tag(tag);
- if (w) {
- eb_debug(DBG_MSN,"cancelling FTP transfer with %s\n",
w->inv->other_user);
- msn_filetrans_cancel(w->inv);
- }
-}
-
void ext_user_joined(msnconn * conn, char * username, char * friendlyname, int
is_initial)
{
eb_chat_room * ecr;
@@ -1855,7 +1857,7 @@
int tag = progress_window_new(filename, inv->filesize);
#endif
transfer_window * t_win = new transfer_window;
- progress_window_set_close_cb(tag, eb_msn_filesend_cancel);
+ progress_window_set_close_cb(tag, eb_msn_filetrans_cancel);
t_win->inv = inv;
t_win->window_tag = tag;
msn_add_to_llist(transfer_windows, t_win);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Ayttm-commits] CVS: ayttm/modules/msn2 msn.C,1.77,1.78,
Colin Leroy <address@hidden> <=
- Prev by Date:
[Ayttm-commits] CVS: ayttm/modules/msn2/libmsn2 msn_core.C,1.36,1.37
- Next by Date:
[Ayttm-commits] CVS: ayttm ChangeLog,1.354,1.355 configure.in,1.349,1.350
- Previous by thread:
[Ayttm-commits] CVS: ayttm/modules/msn2/libmsn2 msn_core.C,1.36,1.37
- Next by thread:
[Ayttm-commits] CVS: ayttm ChangeLog,1.354,1.355 configure.in,1.349,1.350
- Index(es):