Mercurial > pidgin
comparison libpurple/protocols/jabber/presence.c @ 22771:43233dc1d40b
applied changes from 4c5110037671f84e3e775214c32692b5b23c11e1
through ae37fe6b64c30704715a369df88bd76674a39b1a
applied changes from 4c5110037671f84e3e775214c32692b5b23c11e1
through ae37fe6b64c30704715a369df88bd76674a39b1a
applied changes from b28057d6ade7c221b0616c3b02e86659e2d8b10b
through 52c0efb045580dac7b6f5e40c91002e917e0cae3
Plucked changes for the chat-join-failed signal and associated server.c
function from im.pidgin.pidgin, as these necessitate a minor version bump.
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Tue, 29 Apr 2008 03:59:28 +0000 |
| parents | e1012f92ba3b |
| children | 424037c8a343 |
comparison
equal
deleted
inserted
replaced
| 22770:e1012f92ba3b | 22771:43233dc1d40b |
|---|---|
| 573 title = g_strdup_printf(_("Error in chat %s"), from); | 573 title = g_strdup_printf(_("Error in chat %s"), from); |
| 574 if (g_hash_table_size(chat->members) == 0) | 574 if (g_hash_table_size(chat->members) == 0) |
| 575 serv_got_chat_left(js->gc, chat->id); | 575 serv_got_chat_left(js->gc, chat->id); |
| 576 } else { | 576 } else { |
| 577 title = g_strdup_printf(_("Error joining chat %s"), from); | 577 title = g_strdup_printf(_("Error joining chat %s"), from); |
| 578 purple_serv_got_join_chat_failed(js->gc, room_jid); | |
| 578 } | 579 } |
| 579 purple_notify_error(js->gc, title, title, msg); | 580 purple_notify_error(js->gc, title, title, msg); |
| 580 g_free(title); | 581 g_free(title); |
| 581 g_free(msg); | 582 g_free(msg); |
| 582 | 583 |