Mercurial > pidgin.yaz
comparison libpurple/ft.c @ 29125:44b5e5fe2f93
merge of '0a7ca4f8823e2b4c92a9fdac0c7a81f3ee853de5'
and '4185001f1d8e8d7c894fa194202f7051f06cb59f'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 03 Dec 2009 05:43:23 +0000 |
| parents | 52dc24a5069f |
| children | 811c12e6d965 1e19c439fa7a b0f1698c52f8 |
comparison
equal
deleted
inserted
replaced
| 29072:f60d53a686b6 | 29125:44b5e5fe2f93 |
|---|---|
| 227 return; | 227 return; |
| 228 | 228 |
| 229 escaped = g_markup_escape_text(message, -1); | 229 escaped = g_markup_escape_text(message, -1); |
| 230 | 230 |
| 231 if (is_error) | 231 if (is_error) |
| 232 flags = PURPLE_MESSAGE_ERROR; | 232 flags |= PURPLE_MESSAGE_ERROR; |
| 233 | 233 |
| 234 purple_conversation_write(conv, NULL, escaped, flags, time(NULL)); | 234 purple_conversation_write(conv, NULL, escaped, flags, time(NULL)); |
| 235 g_free(escaped); | 235 g_free(escaped); |
| 236 } | 236 } |
| 237 | 237 |