Mercurial > pidgin

comparison src/protocols/yahoo/yahoo_filexfer.c @ 10937:ca3e0882d377

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 12721] sf patch #1202156, from Bleeter Yaluser . Forward port privacy . Tidy up whitespace . Remove file TX send limit committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 24 May 2005 04:54:27 +0000
parents f2e86683cafc
children be22eb8fa671
comparison
equal deleted inserted replaced
10936:ea9e65f52b4b 10937:ca3e0882d377
164 gc = xfer_data->gc; 164 gc = xfer_data->gc;
165 yd = gc->proto_data; 165 yd = gc->proto_data;
166 account = gaim_connection_get_account(gc); 166 account = gaim_connection_get_account(gc);
167 167
168 if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) { 168 if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) {
169 if (0 && gaim_xfer_get_size(xfer) >= 1048577) { 169 if (yd->jp) {
170 gaim_notify_error(gc, NULL, _("File Transfer Failed"), 170 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
171 _("Gaim cannot send files over Yahoo! that are bigger than " 171 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
172 "One Megabyte (1,048,576 bytes).")); 172 yahoo_sendfile_connected, xfer) == -1)
173 gaim_xfer_cancel_local(xfer); 173 {
174 gaim_notify_error(gc, NULL, _("File Transfer Failed"),
175 _("Unable to establish file descriptor."));
176 gaim_xfer_cancel_remote(xfer);
177 }
174 } else { 178 } else {
175 if (yd->jp) { 179 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
176 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST), 180 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
177 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT), 181 yahoo_sendfile_connected, xfer) == -1)
178 yahoo_sendfile_connected, xfer) == -1) 182 {
179 { 183 gaim_notify_error(gc, NULL, _("File Transfer Failed"),
180 gaim_notify_error(gc, NULL, _("File Transfer Failed"), 184 _("Unable to establish file descriptor."));
181 _("Unable to establish file descriptor.")); 185 gaim_xfer_cancel_remote(xfer);
182 gaim_xfer_cancel_remote(xfer);
183 }
184 } else {
185 if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
186 gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
187 yahoo_sendfile_connected, xfer) == -1)
188 {
189 gaim_notify_error(gc, NULL, _("File Transfer Failed"),
190 _("Unable to establish file descriptor."));
191 gaim_xfer_cancel_remote(xfer);
192 }
193 } 186 }
194 } 187 }
195 } else { 188 } else {
196 xfer->fd = gaim_proxy_connect(account, xfer_data->host, xfer_data->port, 189 xfer->fd = gaim_proxy_connect(account, xfer_data->host, xfer_data->port,
197 yahoo_receivefile_connected, xfer); 190 yahoo_receivefile_connected, xfer);