comparison: libpurple/server.c
libpurple/server.c
- changeset 24526
- c302510b1137
- parent 23875
- d7e5f66cbfc9
- child 24640
- ee34d5b80aa9
- child 24955
- 77727fac30c6
- child 26152
- d4b5bdf689a0
equal
deleted
inserted
replaced
| 24519:d4af3d043211 | 24526:c302510b1137 |
|---|---|
| 259 purple_blist_server_alias_buddy(b, alias); | 259 purple_blist_server_alias_buddy(b, alias); |
| 260 | 260 |
| 261 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account); | 261 conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, b->name, account); |
| 262 if(conv != NULL && alias != NULL && strcmp(alias, who)) | 262 if(conv != NULL && alias != NULL && strcmp(alias, who)) |
| 263 { | 263 { |
| 264 char *escaped = g_markup_escape_text(who, -1); | |
| 265 char *escaped2 = g_markup_escape_text(alias, -1); | |
| 264 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), | 266 char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), |
| 265 who, alias); | 267 escaped, escaped2); |
| 266 | 268 |
| 267 purple_conversation_write(conv, NULL, tmp, | 269 purple_conversation_write(conv, NULL, tmp, |
| 268 PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, | 270 PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, |
| 269 time(NULL)); | 271 time(NULL)); |
| 270 | 272 |
| 271 g_free(tmp); | 273 g_free(tmp); |
| 274 g_free(escaped2); | |
| 275 g_free(escaped); | |
| 272 } | 276 } |
| 273 } | 277 } |
| 274 } | 278 } |
| 275 | 279 |
| 276 void | 280 void |
