diff libpurple/protocols/oscar/peer.c @ 21560:665e04562de0

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

--- a/libpurple/protocols/oscar/peer.c	Fri Nov 16 03:39:04 2007 +0000
+++ b/libpurple/protocols/oscar/peer.c	Sat Nov 17 00:12:30 2007 +0000
@@ -1035,7 +1035,7 @@
 		buf = g_strdup_printf(_("%s has just asked to directly connect to %s"),
 				sn, purple_account_get_username(account));
 
-		purple_request_action_with_hint(conn, NULL, buf,
+		purple_request_action(conn, NULL, buf,
 						_("This requires a direct connection between "
 						  "the two computers and is necessary for IM "
 						  "Images.  Because your IP address will be "
@@ -1043,7 +1043,7 @@
 						  "risk."),
 						PURPLE_DEFAULT_ACTION_NONE,
 						account, sn, NULL,
-						PURPLE_REQUEST_UI_HINT_BUDDY, conn, 2,
+						conn, 2,
 						_("C_onnect"), G_CALLBACK(peer_connection_got_proposition_yes_cb),
 						_("Cancel"), G_CALLBACK(peer_connection_got_proposition_no_cb));
 	}