im.pidgin.pidgin.next.minor: 403dd7caf39b853d3f3620441ea1abebb19cfa03

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 403dd7caf39b853d3f3620441ea1abebb19cfa03
Ancestor: 165073d8eae363b3051adbc4bf7923b0bb34f4d6
Author: rlaager at pidgin.im
Date: 2007-10-14T02:43:06
Branch: im.pidgin.pidgin.next.minor

Modified files:
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/silc/chat.c

ChangeLog: 

Fix up some broken changes in the request API UI hint changes.

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/sys_msg.c	c94f7d23d689103073fe27a5871e3c8fb4125137
+++ libpurple/protocols/qq/sys_msg.c	ebd4d19515aaf232eac040bda94c82ac71e48f74
@@ -83,7 +83,7 @@ static void _qq_search_before_auth_with_
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 
 	nombre = uid_to_purple_name(uid);
-	purple_request_action
+	purple_request_action_with_hint
 	    (gc, NULL, _("Do you want to approve the request?"), "", 2,
 		 purple_connection_get_account(gc), nombre, NULL,
 		 "chat", g, 2,
@@ -106,11 +106,11 @@ static void _qq_search_before_add_with_g
 
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 	nombre = uid_to_purple_name(uid);
-	purple_request_action
+	purple_request_action_with_hint
 	    (gc, NULL, _("Do you want to add this buddy?"), "", 2,
 		 purple_connection_get_account(gc), nombre, NULL,
 		 "buddy", g, 2,
-	     _("Cancel"), NULL,
+		 _("Cancel"), NULL,
 		 _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid));
 	g_free(nombre);
 }
@@ -239,7 +239,7 @@ static void _qq_process_msg_sys_add_cont
 	reason = g_strdup_printf(_("Message: %s"), msg_utf8);
 	_qq_sys_msg_log_write(gc, message, from);
 
-	purple_request_action
+	purple_request_action_with_hint
 	    (gc, NULL, message, reason, 2,
 		purple_connection_get_account(gc), name, NULL,
 		 "buddy", g, 3,
============================================================
--- libpurple/protocols/silc/chat.c	62f8dd4f1c241be82e86a938dc5b092e62a3365b
+++ libpurple/protocols/silc/chat.c	f3430f1c59fc15f276f43b239dedd381b6cc69f3
@@ -301,7 +301,7 @@ silcpurple_chat_chpk_cb(SilcPurpleChauth
 	f = purple_request_fields_get_field(fields, "list");
 	if (!purple_request_field_list_get_selected(f)) {
 		/* Add new public key */
-		purple_request_file)with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE,
+		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, "conversation", sgc);