Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Tue Apr 29 03:14:55 2008 +0000 +++ b/libpurple/protocols/jabber/presence.c Tue Apr 29 05:39:10 2008 +0000 @@ -587,7 +587,6 @@ serv_got_chat_left(js->gc, chat->id); } else { title = g_strdup_printf(_("Error joining chat %s"), from); - purple_serv_got_join_chat_failed(js->gc, room_jid); } purple_notify_error(js->gc, title, title, msg); g_free(title);