Mercurial > pidgin
comparison libpurple/protocols/jabber/presence.c @ 22783:f160d3f5e070
merge of '08062d1b1267b18fa3d47ea8eded7e2b826b7e8c'
and '0ed9d51dcce10da3af15dd44273af472eea6cb0c'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 29 Apr 2008 05:39:10 +0000 |
| parents | a95fcf01f72c e1012f92ba3b |
| children | 424037c8a343 |
comparison
equal
deleted
inserted
replaced
| 22782:a95fcf01f72c | 22783:f160d3f5e070 |
|---|---|
| 585 title = g_strdup_printf(_("Error in chat %s"), from); | 585 title = g_strdup_printf(_("Error in chat %s"), from); |
| 586 if (g_hash_table_size(chat->members) == 0) | 586 if (g_hash_table_size(chat->members) == 0) |
| 587 serv_got_chat_left(js->gc, chat->id); | 587 serv_got_chat_left(js->gc, chat->id); |
| 588 } else { | 588 } else { |
| 589 title = g_strdup_printf(_("Error joining chat %s"), from); | 589 title = g_strdup_printf(_("Error joining chat %s"), from); |
| 590 purple_serv_got_join_chat_failed(js->gc, room_jid); | |
| 591 } | 590 } |
| 592 purple_notify_error(js->gc, title, title, msg); | 591 purple_notify_error(js->gc, title, title, msg); |
| 593 g_free(title); | 592 g_free(title); |
| 594 g_free(msg); | 593 g_free(msg); |
| 595 | 594 |