Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/oscar/authorization.c	Sat Jan 26 00:31:50 2013 -0500
+++ b/libpurple/protocols/oscar/authorization.c	Sat Jan 26 02:46:29 2013 -0500
@@ -67,7 +67,7 @@
 }
 
 static void
-oscar_auth_grant(gpointer cbdata)
+oscar_auth_grant(const char *message, gpointer cbdata)
 {
 	struct name_data *data = cbdata;
 	PurpleConnection *gc = data->gc;
@@ -79,8 +79,9 @@
 }
 
 static void
-oscar_auth_dontgrant(struct name_data *data, char *msg)
+oscar_auth_dontgrant(const char *msg, gpointer cbdata)
 {
+	struct name_data *data = cbdata;
 	PurpleConnection *gc = data->gc;
 	OscarData *od = purple_connection_get_protocol_data(gc);
 
@@ -89,18 +90,6 @@
 	oscar_free_name_data(data);
 }
 
-static void
-oscar_auth_dontgrant_msgprompt(gpointer cbdata)
-{
-	struct name_data *data = cbdata;
-	purple_request_input(data->gc, NULL, _("Authorization Denied Message:"),
-					   NULL, _("No reason given."), TRUE, FALSE, NULL,
-					   _("_OK"), G_CALLBACK(oscar_auth_dontgrant),
-					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
-					   purple_connection_get_account(data->gc), data->name, NULL,
-					   data);
-}
-
 void
 oscar_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored)
 {
@@ -127,5 +116,5 @@
 
 	purple_account_request_authorization(account, data->name, NULL, data->nick,
 		reason, purple_find_buddy(account, data->name) != NULL,
-		oscar_auth_grant, oscar_auth_dontgrant_msgprompt, data);
+		oscar_auth_grant, oscar_auth_dontgrant, data);
 }