Mercurial > pidgin.yaz
diff src/ft.c @ 10225:ecf3ce2e2ab1
[gaim-migrate @ 11357]
This is mostly a patch from Felipe Contreras that eliminates MSN switchboard
errors and fixes MSN buddy icon syncronization, with some tweaks by me.
Thank Felipe if it works, blame me if something broke.
I also fixed a couple of text markup escaping things, fixed a glib warning that
was bugging me, fix a rare SILC crash, and make gtkstatusselector.c compile
(but do nothing) with gtk < 2.4
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sun, 21 Nov 2004 17:48:09 +0000 |
parents | 0aca774bef87 |
children | a66cf83552dc |
line wrap: on
line diff
--- a/src/ft.c Sun Nov 21 06:16:23 2004 +0000 +++ b/src/ft.c Sun Nov 21 17:48:09 2004 +0000 @@ -246,7 +246,7 @@ static void gaim_xfer_ask_recv(GaimXfer *xfer) { - char *buf, *size_buf; + char *buf, *size_buf, *escaped; size_t size; /* If we have already accepted the request, ask the destination file @@ -255,10 +255,12 @@ size = gaim_xfer_get_size(xfer); size_buf = gaim_str_size_to_units(size); + escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1); buf = g_strdup_printf(_("%s wants to send you %s (%s)"), - xfer->who, gaim_xfer_get_filename(xfer), + xfer->who, escaped, size_buf); g_free(size_buf); + g_free(escaped); if (xfer->message != NULL) serv_got_im(gaim_account_get_connection(xfer->account), @@ -904,14 +906,16 @@ gaim_xfer_cancel_local(GaimXfer *xfer) { GaimXferUiOps *ui_ops; - char *msg = NULL; + char *msg = NULL, *escaped; g_return_if_fail(xfer != NULL); gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_LOCAL); + escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1); msg = g_strdup_printf(_("You canceled the transfer of %s"), - gaim_xfer_get_filename(xfer)); + escaped); + g_free(escaped); gaim_xfer_conversation_write(xfer, msg, FALSE); g_free(msg); @@ -953,15 +957,17 @@ gaim_xfer_cancel_remote(GaimXfer *xfer) { GaimXferUiOps *ui_ops; - gchar *msg; + gchar *msg, *escaped; g_return_if_fail(xfer != NULL); gaim_request_close_with_handle(xfer); gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_REMOTE); + escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1); msg = g_strdup_printf(_("%s canceled the transfer of %s"), - xfer->who, gaim_xfer_get_filename(xfer)); + xfer->who, escaped); + g_free(escaped); gaim_xfer_conversation_write(xfer, msg, TRUE); gaim_xfer_error(gaim_xfer_get_type(xfer), xfer->who, msg); g_free(msg);