Mercurial > pidgin
comparison libpurple/server.c @ 20597:591267f6f1d5
propagate from branch 'im.pidgin.pidgin' (head 025faf23aaac403798451974c320c4de6df470d5)
to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience' (head bab8f4f115d13e3eb53165748f147eae91ee250d)
author | Gabriel Schulhof <nix@go-nix.ca> |
---|---|
date | Sat, 22 Sep 2007 09:48:07 +0000 |
parents | 7393ee28c819 6a0d9fa477d4 |
children | 285bb637a2b7 |
comparison
equal
deleted
inserted
replaced
20596:7d072354544a | 20597:591267f6f1d5 |
---|---|
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(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 |