changeset 6792:62aec9fd7aca

[gaim-migrate @ 7331] Jesse Farmer (vann) writes: " Oops! gaim_privacy_deny_add only adds someone to the server list if they're not already in the local deny list, but this is exactly the situation with Yahoo! when you add someone to the deny list who is also on your buddy list. The call to gaim_privacy_deny_add was changed to serv_add_deny, and also some formatting issues were cleared up (tabs instead of spaces). The diff is against the "latest" CVS sources in that I applied all the available patches." committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 08 Sep 2003 10:07:14 +0000
parents 9927df765fae
children 3d84c933b939
files src/protocols/yahoo/yahoo.c
diffstat 1 files changed, 14 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/yahoo/yahoo.c	Mon Sep 08 03:03:53 2003 +0000
+++ b/src/protocols/yahoo/yahoo.c	Mon Sep 08 10:07:14 2003 +0000
@@ -914,26 +914,25 @@
 	GaimAccount *account;
 	gchar *name;
 
-        if (!b)
-                return;
+	if (!b)
+		return;
 
-        g = gaim_find_buddys_group(b);
-        name = g_strdup(b->name);
-        account = b->account;
+	g = gaim_find_buddys_group(b);
+	name = g_strdup(b->name);
+	account = b->account;
 
-        gaim_debug(GAIM_DEBUG_INFO, "blist",
-                           "Removing '%s' from buddy list.\n", b->name);
-        serv_remove_buddy(account->gc, name, g->name);
-        gaim_blist_remove_buddy(b);
-
-	gaim_privacy_deny_add(account, name, 0);
+	gaim_debug(GAIM_DEBUG_INFO, "blist",
+		"Removing '%s' from buddy list.\n", b->name);
+	serv_remove_buddy(account->gc, name, g->name);
+	gaim_blist_remove_buddy(b);
 
-        gaim_blist_save();
+	serv_add_deny(account->gc, name);
+	gaim_blist_save();
 
-        c = gaim_find_conversation_with_account(name, account);
+	c = gaim_find_conversation_with_account(name, account);
 
-        if (c != NULL)
-                gaim_conversation_update(c, GAIM_CONV_UPDATE_REMOVE);
+	if (c != NULL)
+		gaim_conversation_update(c, GAIM_CONV_UPDATE_REMOVE);
 
 	g_free(name);
 }