Mercurial > pidgin
comparison libpurple/ft.c @ 25436:cddd7961901f
propagate from branch 'im.pidgin.pidgin' (head 32e078dbbf6d15a1c0a2916f1d590ea45f3c364d)
to branch 'im.pidgin.pidgin.openq' (head 2634a1410370cffba5172a684edbe1009b78107a)
author | SHiNE CsyFeK <csyfek@gmail.com> |
---|---|
date | Sun, 08 Feb 2009 10:34:31 +0000 |
parents | 568b786c36f9 |
children | 4cbe258db067 |
comparison
equal
deleted
inserted
replaced
25232:effbf24b39b1 | 25436:cddd7961901f |
---|---|
698 | 698 |
699 if (purple_xfer_get_filename(xfer) != NULL) | 699 if (purple_xfer_get_filename(xfer) != NULL) |
700 msg = g_strdup_printf(_("Transfer of file %s complete"), | 700 msg = g_strdup_printf(_("Transfer of file %s complete"), |
701 purple_xfer_get_filename(xfer)); | 701 purple_xfer_get_filename(xfer)); |
702 else | 702 else |
703 msg = g_strdup_printf(_("File transfer complete")); | 703 msg = g_strdup(_("File transfer complete")); |
704 purple_xfer_conversation_write(xfer, msg, FALSE); | 704 purple_xfer_conversation_write(xfer, msg, FALSE); |
705 g_free(msg); | 705 g_free(msg); |
706 } | 706 } |
707 | 707 |
708 ui_ops = purple_xfer_get_ui_ops(xfer); | 708 ui_ops = purple_xfer_get_ui_ops(xfer); |
1138 msg = g_strdup_printf(_("You canceled the transfer of %s"), | 1138 msg = g_strdup_printf(_("You canceled the transfer of %s"), |
1139 purple_xfer_get_filename(xfer)); | 1139 purple_xfer_get_filename(xfer)); |
1140 } | 1140 } |
1141 else | 1141 else |
1142 { | 1142 { |
1143 msg = g_strdup_printf(_("File transfer cancelled")); | 1143 msg = g_strdup(_("File transfer cancelled")); |
1144 } | 1144 } |
1145 purple_xfer_conversation_write(xfer, msg, FALSE); | 1145 purple_xfer_conversation_write(xfer, msg, FALSE); |
1146 g_free(msg); | 1146 g_free(msg); |
1147 | 1147 |
1148 if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND) | 1148 if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND) |