Mercurial > pidgin
comparison libpurple/protocols/toc/toc.c @ 21560:665e04562de0
This merge has the effect of reverting the hinting code from trunk.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 17 Nov 2007 00:12:30 +0000 |
parents | 6de09629f091 fcb848b2d669 |
children | cc8903c59d6b |
comparison
equal
deleted
inserted
replaced
21544:9b4d1af17ced | 21560:665e04562de0 |
---|---|
2214 (ft->message) ? ft->message : ""); | 2214 (ft->message) ? ft->message : ""); |
2215 } else { | 2215 } else { |
2216 g_snprintf(buf, sizeof(buf), _("%s requests you to send them a file"), ft->user); | 2216 g_snprintf(buf, sizeof(buf), _("%s requests you to send them a file"), ft->user); |
2217 } | 2217 } |
2218 | 2218 |
2219 purple_request_accept_cancel_with_hint(ft->gc, NULL, buf, NULL, | 2219 purple_request_accept_cancel(ft->gc, NULL, buf, NULL, |
2220 PURPLE_DEFAULT_ACTION_NONE, PURPLE_REQUEST_UI_HINT_XFER, ft, | 2220 PURPLE_DEFAULT_ACTION_NONE, ft, |
2221 G_CALLBACK(toc_accept_ft), | 2221 G_CALLBACK(toc_accept_ft), |
2222 G_CALLBACK(toc_reject_ft)); | 2222 G_CALLBACK(toc_reject_ft)); |
2223 } | 2223 } |
2224 #endif | 2224 #endif |
2225 | 2225 |