Mercurial > pidgin
diff libpurple/protocols/jabber/presence.c @ 21360:e747ac0c42d6
propagate from branch 'im.pidgin.pidgin.next.minor' (head bd8f1d754a1b94e5ade30c3b135178b236f7b49a)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 5d84bcfaddc07cab4419ab9f04b31626421b97ff)
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Mon, 15 Oct 2007 10:45:46 +0000 |
| parents | fa3c4c5dea66 a20ef7180680 |
| children | 665e04562de0 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Sun Oct 14 21:20:50 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Mon Oct 15 10:45:46 2007 +0000 @@ -512,7 +512,7 @@ if((chat = jabber_chat_find(js, jid->node, jid->domain))) { chat->config_dialog_type = PURPLE_REQUEST_ACTION; chat->config_dialog_handle = - purple_request_action(js->gc, + purple_request_action_with_hint(js->gc, _("Create New Room"), _("Create New Room"), _("You are creating a new room. Would" @@ -520,7 +520,7 @@ " accept the default settings?"), /* Default Action */ 1, purple_connection_get_account(js->gc), NULL, chat->conv, - chat, 2, + PURPLE_REQUEST_UI_HINT_CONV, chat, 2, _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); }