comparison libpurple/ft.c @ 27666:a08e84032814

merge of '2348ff22f0ff3453774b8b25b36238465580c609' and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author Paul Aurich <paul@darkrain42.org>
date Sun, 12 Jul 2009 05:43:38 +0000
parents 740760605cc1
children fd4415c0595f a7eac81575e7 8b452039c329
comparison
equal deleted inserted replaced
27186:048bcf41deef 27666:a08e84032814
694 694
695 g_return_if_fail(xfer != NULL); 695 g_return_if_fail(xfer != NULL);
696 696
697 if (completed == TRUE) { 697 if (completed == TRUE) {
698 char *msg = NULL; 698 char *msg = NULL;
699 PurpleConversation *conv;
700
699 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_DONE); 701 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_DONE);
700 702
701 if (purple_xfer_get_filename(xfer) != NULL) 703 if (purple_xfer_get_filename(xfer) != NULL)
702 msg = g_strdup_printf(_("Transfer of file %s complete"), 704 {
703 purple_xfer_get_filename(xfer)); 705 char *filename = g_markup_escape_text(purple_xfer_get_filename(xfer), -1);
706 if (purple_xfer_get_local_filename(xfer)
707 && purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE)
708 {
709 char *local = g_markup_escape_text(purple_xfer_get_local_filename(xfer), -1);
710 msg = g_strdup_printf(_("Transfer of file <A HREF=\"file://%s\">%s</A> complete"),
711 local, filename);
712 g_free(local);
713 }
714 else
715 msg = g_strdup_printf(_("Transfer of file %s complete"),
716 filename);
717 g_free(filename);
718 }
704 else 719 else
705 msg = g_strdup(_("File transfer complete")); 720 msg = g_strdup(_("File transfer complete"));
706 purple_xfer_conversation_write(xfer, msg, FALSE); 721
722 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, xfer->who,
723 purple_xfer_get_account(xfer));
724
725 if (conv != NULL)
726 purple_conversation_write(conv, NULL, msg, PURPLE_MESSAGE_SYSTEM, time(NULL));
707 g_free(msg); 727 g_free(msg);
708 } 728 }
709 729
710 ui_ops = purple_xfer_get_ui_ops(xfer); 730 ui_ops = purple_xfer_get_ui_ops(xfer);
711 731