diff libpurple/protocols/jabber/presence.c @ 21560:665e04562de0

This merge has the effect of reverting the hinting code from trunk.

--- a/libpurple/protocols/jabber/presence.c	Fri Nov 16 03:39:04 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sat Nov 17 00:12:30 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_with_hint(js->gc,
+								purple_request_action(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,
-										PURPLE_REQUEST_UI_HINT_CONV, chat, 2,
+										chat, 2,
 										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
 										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
 						}