Mercurial > pidgin
comparison libpurple/server.c @ 21098:7e200a629109
explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a'
and '49d0219884ede2c6c571f2df73e29dffa86f54ad'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 14 Oct 2007 02:13:14 +0000 |
parents | 285bb637a2b7 |
children | 8c9aad9479c0 |
comparison
equal
deleted
inserted
replaced
21093:5e46cdf9ef2b | 21098:7e200a629109 |
---|---|
797 g_snprintf(buf2, sizeof(buf2), | 797 g_snprintf(buf2, sizeof(buf2), |
798 _("%s has invited %s to the chat room %s\n"), | 798 _("%s has invited %s to the chat room %s\n"), |
799 who, purple_account_get_username(account), name); | 799 who, purple_account_get_username(account), name); |
800 | 800 |
801 | 801 |
802 purple_request_accept_cancel(gc, NULL, _("Accept chat invitation?"), buf2, | 802 purple_request_accept_cancel_with_hint(gc, NULL, _("Accept chat invitation?"), buf2, |
803 PURPLE_DEFAULT_ACTION_NONE, account, who, NULL, | 803 PURPLE_DEFAULT_ACTION_NONE, account, who, NULL, |
804 cid, G_CALLBACK(chat_invite_accept), | 804 "chat", cid, G_CALLBACK(chat_invite_accept), |
805 G_CALLBACK(chat_invite_reject)); | 805 G_CALLBACK(chat_invite_reject)); |
806 } | 806 } |
807 else if (plugin_return > 0) | 807 else if (plugin_return > 0) |
808 chat_invite_accept(cid); | 808 chat_invite_accept(cid); |
809 else | 809 else |