# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1081793262 0
# Node ID f6203301aa197c1ecd6b661844a1b82d16517c4a
# Parent  818abe01efc63ca0cf1b2da3a5b6b9b90695a534
[gaim-migrate @ 9393]
fix for bug 932991

committer: Tailor Script <tailor@pidgin.im>

diff -r 818abe01efc6 -r f6203301aa19 ChangeLog
--- a/ChangeLog	Mon Apr 12 13:14:02 2004 +0000
+++ b/ChangeLog	Mon Apr 12 18:07:42 2004 +0000
@@ -16,6 +16,7 @@
 	* The Clear button in privacy works (Robert Mibus)
 	* MSN error reporting works again (Stu Tomlinson)
 	* All away messages should now show up in tooltips
+	* Removing zepher budies no longer crashes (Arun A. Tharuvai)
 
 version 0.76 (04/01/2004):
 	New Features:
diff -r 818abe01efc6 -r f6203301aa19 src/protocols/zephyr/zephyr.c
--- a/src/protocols/zephyr/zephyr.c	Mon Apr 12 13:14:02 2004 +0000
+++ b/src/protocols/zephyr/zephyr.c	Mon Apr 12 18:07:42 2004 +0000
@@ -1028,21 +1028,20 @@
 
 static void zephyr_remove_buddy(GaimConnection *gc, const char *buddy, const char *group) { 
         GaimBuddy *b;
-        fprintf(stderr,"In zephyr_remove_buddy\n");
-        if ((b=gaim_find_buddy(zgc->account,buddy)))
-                gaim_blist_remove_buddy(b);
-        else 
+        fprintf(stderr,"In zephyr_remove_buddy %s %s\n",buddy,group);
+        if (!(b=gaim_find_buddy(zgc->account,buddy))) {
                 fprintf(stderr,"attempt to remove non-existent buddy %s\n",buddy);
+            /*    gaim_blist_remove_buddy(b); */
+	}
 }
 
 static void zephyr_remove_buddies(GaimConnection *gc, GList *buddies, const char *group) {
         GaimBuddy *b;
         while(buddies) {
                 if ((b=gaim_find_buddy(zgc->account,buddies->data))) {
-                        gaim_blist_remove_buddy(b);
-                }  else {
                         fprintf(stderr,"attempt to remove non-existent buddy %s\n",(char *)buddies->data);
-                }
+                        /*  gaim_blist_remove_buddy(b); */
+                } 
         }      
 }