Mercurial > pidgin.yaz
comparison libpurple/server.c @ 19970:6a0d9fa477d4
propagate from branch 'im.pidgin.pidgin' (head 483b6435074838149d6e95b836d4a2d9263f265d)
to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience' (head 656aa6cb789d7885b3a72600bf323c104d8ebfd8)
author | Gabriel Schulhof <nix@go-nix.ca> |
---|---|
date | Wed, 12 Sep 2007 19:11:38 +0000 |
parents | a359452f9ea2 49aea2fa0107 |
children | 591267f6f1d5 |
comparison
equal
deleted
inserted
replaced
19969:0633ecda7ed0 | 19970:6a0d9fa477d4 |
---|---|
801 who, purple_account_get_username(account), name); | 801 who, purple_account_get_username(account), name); |
802 | 802 |
803 | 803 |
804 purple_request_accept_cancel(gc, NULL, _("Accept chat invitation?"), buf2, | 804 purple_request_accept_cancel(gc, NULL, _("Accept chat invitation?"), buf2, |
805 PURPLE_DEFAULT_ACTION_NONE, account, who, NULL, | 805 PURPLE_DEFAULT_ACTION_NONE, account, who, NULL, |
806 cid, G_CALLBACK(chat_invite_accept), | 806 "chat", cid, G_CALLBACK(chat_invite_accept), |
807 G_CALLBACK(chat_invite_reject)); | 807 G_CALLBACK(chat_invite_reject)); |
808 } | 808 } |
809 else if (plugin_return > 0) | 809 else if (plugin_return > 0) |
810 chat_invite_accept(cid); | 810 chat_invite_accept(cid); |
811 else | 811 else |