# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1208328434 0
# Node ID 3850c293ae8b29d6953fe43a10355b2bcc50c10a
# Parent  17d1054cea034106066ebfd594f5442d304c0f4e
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.

diff -r 17d1054cea03 -r 3850c293ae8b libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed Apr 16 06:27:46 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Apr 16 06:47:14 2008 +0000
@@ -2274,19 +2274,6 @@
 }
 
 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_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)
 {