Mercurial > pidgin.yaz
diff libpurple/protocols/silc/chat.c @ 21353:8ae227dca885
merge of '00bf7296307f96f5c68d6e5edf219fb4a50bb947'
and '3468b1f73a715bd59ad22726232214da77cf67f7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 16 Nov 2007 23:27:07 +0000 |
| parents | 0cb8d5304f4f 73c5f5bfeb39 |
| children | fcb848b2d669 |
line wrap: on
line diff
--- a/libpurple/protocols/silc/chat.c Fri Nov 16 23:03:22 2007 +0000 +++ b/libpurple/protocols/silc/chat.c Fri Nov 16 23:27:07 2007 +0000 @@ -304,7 +304,7 @@ purple_request_file)with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE, G_CALLBACK(silcpurple_chat_chpk_add), G_CALLBACK(silcpurple_chat_chpk_cancel), - purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc); return; } @@ -445,7 +445,7 @@ _("Channel Authentication"), t, fields, _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), - purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc); if (channel_pubkeys) silc_dlist_uninit(channel_pubkeys); return; @@ -480,7 +480,7 @@ _("Channel Authentication"), t, fields, _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb), _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok), - purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, sgc); + purple_connection_get_account(sg->gc), NULL, NULL, "conversation", sgc); } static void @@ -614,7 +614,7 @@ purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields, _("Add"), G_CALLBACK(silcpurple_chat_prv_add), _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel), - purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, p); + purple_connection_get_account(gc), NULL, NULL, "conversation", p); } @@ -744,7 +744,7 @@ tmp, FALSE, FALSE, NULL, _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb), _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb), - purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_HINT_CONV, s); + purple_connection_get_account(gc), NULL, NULL, "conversation", s); } static void