# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1049344205 0
# Node ID 21cfdb9af2eb85827db01a1ed2f08f28b8c05302
# Parent  804b25d09a5bc9a843f04e226dfb9943700759f2
[gaim-migrate @ 5303]
This fixes the renaming of groups on the sever-side.
Thanks to The Nathan Walp for pointing it out.
Thanks to The Sean for making a totally sweet buddy list.
Thanks to Ethan for just being totally sweet in general.
And thanks to Alf for trying to hard to eat cats.

I also took out an unused function from oscar.c

committer: Tailor Script <tailor@pidgin.im>

diff -r 804b25d09a5b -r 21cfdb9af2eb src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Thu Apr 03 04:23:30 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Apr 03 04:30:05 2003 +0000
@@ -5369,32 +5369,6 @@
 	do_ask_dialog(buf, _("Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"), data, _("Connect"), oscar_direct_im, _("Cancel"), oscar_cancel_direct_im, my_protocol->plug ? my_protocol->plug->handle : NULL, FALSE);
 }
 
-static void oscar_get_away_msg(struct gaim_connection *gc, char *who) {
-	struct oscar_data *od = gc->proto_data;
-	od->evilhack = g_slist_append(od->evilhack, g_strdup(normalize(who)));
-	if (od->icq) {
-		struct buddy *budlight = gaim_find_buddy(gc->account, who);
-		if (budlight)
-			if ((budlight->uc >> 16) & (AIM_ICQ_STATE_AWAY || AIM_ICQ_STATE_DND || AIM_ICQ_STATE_OUT || AIM_ICQ_STATE_BUSY || AIM_ICQ_STATE_CHAT)) {
-					char *state_msg = gaim_icq_status((budlight->uc & 0xffff0000) >> 16);
-					char *dialog_msg = g_strdup_printf(_("<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>Remote client does not support sending status messages.</I><BR>"), who, state_msg);
-					g_show_info_text(gc, who, 2, dialog_msg, NULL);
-					free(state_msg);
-					free(dialog_msg);
-				}
-			else {
-				char *state_msg = gaim_icq_status((budlight->uc & 0xffff0000) >> 16);
-				char *dialog_msg = g_strdup_printf(_("<B>UIN:</B> %s<BR><B>Status:</B> %s<HR><I>User has no status message.</I><BR>"), who, state_msg);
-				g_show_info_text(gc, who, 2, dialog_msg, NULL);
-				free(state_msg);
-				free(dialog_msg);
-			}
-		else
-			do_error_dialog("Could not find contact in local list, therefore unable to request status message.\n", NULL, GAIM_ERROR);
-	} else
-		oscar_get_info(gc, who);
-}
-
 static void oscar_set_permit_deny(struct gaim_connection *gc) {
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
 #ifdef NOSSI
@@ -5531,7 +5505,7 @@
 #if 0
 		pbm = g_new0(struct proto_buddy_menu, 1);
 		pbm->label = _("Get Status Msg");
-		pbm->callback = oscar_get_away_msg;
+		pbm->callback = oscar_get_icqstatusmsg;
 		pbm->gc = gc;
 		m = g_list_append(m, pbm);
 #endif
diff -r 804b25d09a5b -r 21cfdb9af2eb src/server.c
--- a/src/server.c	Thu Apr 03 04:23:30 2003 +0000
+++ b/src/server.c	Thu Apr 03 04:30:05 2003 +0000
@@ -391,13 +391,14 @@
 {
 	if (g && g->prpl && old_group && new_name) {
 		GList *tobemoved = NULL;
-		GSList *original;
+		GaimBlistNode *b = ((GaimBlistNode*)old_group)->child;
 
-		/*		for (original=old_group->members; original; original=g_slist_next(original)) {
-			struct buddy *b = original->data;
-			if(b->account == g->account)
-				tobemoved = g_list_append(tobemoved, b->name);
-				} */
+		while (b) {
+			struct buddy *bd = (struct buddy *)b;
+			if (bd->account = g->account)
+				tobemoved = g_list_append(tobemoved, bd->name);
+			b = b->next;
+		}
 
 		if (g->prpl->rename_group) {
 			/* prpl's might need to check if the group already