comparison libpurple/ft.c @ 29792:8b452039c329

propagate from branch 'im.pidgin.pidgin' (head 53abc38e3dfd2e9f8ae8c3e6532379d4b0dc333b) to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 4d135ac4918d2e985a66786a6c07473911498c4f)
author Marcus Lundblad <ml@update.uu.se>
date Sun, 12 Jul 2009 20:47:45 +0000
parents d0588e403877 740760605cc1
children 399756f65c88
comparison
equal deleted inserted replaced
29791:8781cfb550bb 29792:8b452039c329
702 702
703 g_return_if_fail(xfer != NULL); 703 g_return_if_fail(xfer != NULL);
704 704
705 if (completed == TRUE) { 705 if (completed == TRUE) {
706 char *msg = NULL; 706 char *msg = NULL;
707 PurpleConversation *conv;
708
707 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_DONE); 709 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_DONE);
708 710
709 if (purple_xfer_get_filename(xfer) != NULL) 711 if (purple_xfer_get_filename(xfer) != NULL)
710 msg = g_strdup_printf(_("Transfer of file %s complete"), 712 {
711 purple_xfer_get_filename(xfer)); 713 char *filename = g_markup_escape_text(purple_xfer_get_filename(xfer), -1);
714 if (purple_xfer_get_local_filename(xfer)
715 && purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE)
716 {
717 char *local = g_markup_escape_text(purple_xfer_get_local_filename(xfer), -1);
718 msg = g_strdup_printf(_("Transfer of file <A HREF=\"file://%s\">%s</A> complete"),
719 local, filename);
720 g_free(local);
721 }
722 else
723 msg = g_strdup_printf(_("Transfer of file %s complete"),
724 filename);
725 g_free(filename);
726 }
712 else 727 else
713 msg = g_strdup(_("File transfer complete")); 728 msg = g_strdup(_("File transfer complete"));
714 purple_xfer_conversation_write(xfer, msg, FALSE); 729
730 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, xfer->who,
731 purple_xfer_get_account(xfer));
732
733 if (conv != NULL)
734 purple_conversation_write(conv, NULL, msg, PURPLE_MESSAGE_SYSTEM, time(NULL));
715 g_free(msg); 735 g_free(msg);
716 } 736 }
717 737
718 ui_ops = purple_xfer_get_ui_ops(xfer); 738 ui_ops = purple_xfer_get_ui_ops(xfer);
719 739