pidgin: db28b75a: Don't remove the PurpleBuddy from our bu...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: db28b75aaabae69cf3b4824e98586e7b724ca898
Ancestor: 1a7e06847c54bcc655b26e490e252226cb700af6
Author: markdoliner at pidgin.im
Date: 2008-04-16T06:47:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/db28b75aaabae69cf3b4824e98586e7b724ca898

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

Don't remove the PurpleBuddy from our buddy list if we don't send them
an authorization request.  Also fixes the bug where the buddy got removed
from your blist if you click "Re-request Authorization" on the context
menu but then clicked cancel.

Fixes #3964.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	2230ed22743266f1ee53a0c01f9ad3c3201ac309
+++ libpurple/protocols/oscar/oscar.c	8448fa1768017509dd7be0c29b0d1a849b9a5541
@@ -2274,19 +2274,6 @@ static void
 }
 
 static void
-purple_auth_dontrequest(struct name_data *data)
-{
-	PurpleConnection *gc = data->gc;
-	PurpleBuddy *b = purple_find_buddy(purple_connection_get_account(gc), data->name);
-
-	/* Remove from local list */
-	purple_blist_remove_buddy(b);
-
-	oscar_free_name_data(data);
-}
-
-
-static void
 purple_auth_sendrequest(PurpleConnection *gc, const char *name)
 {
 	struct name_data *data;
@@ -2298,12 +2285,11 @@ purple_auth_sendrequest(PurpleConnection
 	purple_request_input(data->gc, NULL, _("Authorization Request Message:"),
 					   NULL, _("Please authorize me!"), TRUE, FALSE, NULL,
 					   _("_OK"), G_CALLBACK(purple_auth_request),
-					   _("_Cancel"), G_CALLBACK(purple_auth_dontrequest),
+					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
 					   purple_connection_get_account(gc), name, NULL,
 					   data);
 }
 
-
 static void
 purple_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored)
 {