comparison src/ft.c @ 9771:9812dde4323e

[gaim-migrate @ 10639] Some good file transfer tweaks from Dave West committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 18 Aug 2004 04:13:35 +0000
parents be96293982d2
children 5f7c81eeebd2
comparison
equal deleted inserted replaced
9770:41f302d41839 9771:9812dde4323e
119 /* File not found. */ 119 /* File not found. */
120 if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) { 120 if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) {
121 gaim_xfer_request_accepted(xfer, filename); 121 gaim_xfer_request_accepted(xfer, filename);
122 } 122 }
123 else { 123 else {
124 /*
125 * XXX - I believe this will never happen when using
126 * gaim_request_file() because filename is always an
127 * existing file. Someone verify that. --Mark
128 */
124 gaim_notify_error(NULL, NULL, 129 gaim_notify_error(NULL, NULL,
125 _("That file does not exist."), NULL); 130 _("That file does not exist."), NULL);
126 131
127 gaim_xfer_request_denied(xfer); 132 gaim_xfer_request_denied(xfer);
128 } 133 }
135 140
136 gaim_xfer_request_denied(xfer); 141 gaim_xfer_request_denied(xfer);
137 } 142 }
138 else { 143 else {
139 if (S_ISDIR(st.st_mode)) { 144 if (S_ISDIR(st.st_mode)) {
140 /* XXX */ 145 /*
146 * XXX - Sending a directory should be valid for some protocols.
147 */
141 gaim_xfer_request_denied(xfer); 148 gaim_xfer_request_denied(xfer);
142 } 149 }
143 else if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) { 150 else if (gaim_xfer_get_type(xfer) == GAIM_XFER_RECEIVE) {
144 gaim_xfer_request_accepted(xfer, filename); 151 gaim_xfer_request_accepted(xfer, filename);
145 } 152 }
874 881
875 void 882 void
876 gaim_xfer_cancel_remote(GaimXfer *xfer) 883 gaim_xfer_cancel_remote(GaimXfer *xfer)
877 { 884 {
878 GaimXferUiOps *ui_ops; 885 GaimXferUiOps *ui_ops;
879 886 gchar *msg;
880 g_return_if_fail(xfer != NULL); 887
888 g_return_if_fail(xfer != NULL);
889
890 gaim_request_close_with_handle(xfer);
891
892 msg = g_strdup_printf(_("%s canceled the transfer of %s"),
893 xfer->who, gaim_xfer_get_filename(xfer));
894 gaim_xfer_error(gaim_xfer_get_type(xfer), xfer->who, msg);
895 g_free(msg);
881 896
882 gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_REMOTE); 897 gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_REMOTE);
883 898
884 if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) 899 if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND)
885 { 900 {