diff src/protocols/jabber/roster.c @ 7955:119a22025818

[gaim-migrate @ 8630] fun jabber stuff, which isn't done yet. mostly harmless, and committing this now makes the next commit that much easier for a lazy person such as myself to type. committer: Tailor Script <[e-mail]>

--- a/src/protocols/jabber/roster.c	Mon Dec 29 07:19:55 2003 +0000
+++ b/src/protocols/jabber/roster.c	Mon Dec 29 08:59:22 2003 +0000
@@ -55,7 +55,7 @@
 		const char *alias, GSList *groups)
 {
 	GSList *buddies, *g2, *l;
-	int present =0, idle=0, signon=0, state=0;
+	int present =0, idle=0, state=0;
 
 	buddies = gaim_find_buddies(js->gc->account, jid);
 
@@ -70,7 +70,6 @@
 
 	if(buddies) {
 		present = ((GaimBuddy*)buddies->data)->present;
-		signon = ((GaimBuddy*)buddies->data)->signon;
 		idle = ((GaimBuddy*)buddies->data)->idle;
 		state = ((GaimBuddy*)buddies->data)->uc;
 	}
@@ -82,6 +81,11 @@
 		buddies = g_slist_remove(buddies, b);
 
 		if((l = g_slist_find_custom(g2, g->name, (GCompareFunc)strcmp))) {
+			const char *servernick;
+
+			if((servernick = gaim_blist_node_get_string((GaimBlistNode*)b, "servernick")))
+				serv_got_alias(js->gc, jid, servernick);
+
 			if(alias && (!b->alias || strcmp(b->alias, alias)))
 				gaim_blist_alias_buddy(b, alias);
 			g_free(l->data);
@@ -101,11 +105,11 @@
 		}
 
 		b->present = present;
-		b->signon = signon;
 		b->idle = idle;
 		b->uc = state;
 
 		gaim_blist_add_buddy(b, NULL, g, NULL);
+		gaim_blist_alias_buddy(b, alias);
 		g_free(g2->data);
 		g2 = g_slist_delete_link(g2, g2);
 	}