diff src/protocols/yahoo/yay.c @ 2501:227cc42ffa6e

[gaim-migrate @ 2514] i should have hidden something ultra-secret in this. committer: Tailor Script <[e-mail]>

--- a/src/protocols/yahoo/yay.c	Sun Oct 14 05:52:36 2001 +0000
+++ b/src/protocols/yahoo/yay.c	Sun Oct 14 11:36:36 2001 +0000
@@ -107,14 +107,12 @@
 		serv_got_update(gc, b->name, 0, 0, 0, 0, 0, 0);
 	else {
 		if (status == YAHOO_STATUS_AVAILABLE)
-			serv_got_update(gc, b->name, 1, 0, 0, 0, UC_NORMAL, 0);
+			serv_got_update(gc, b->name, 1, 0, 0, 0, 0, 0);
 		else if (status == YAHOO_STATUS_IDLE) {
 			time(&tmptime);
-			serv_got_update(gc, b->name, 1, 0, 0, tmptime - 600,
-					(status << 5) | UC_NORMAL, 0);
+			serv_got_update(gc, b->name, 1, 0, 0, tmptime - 600, (status << 1), 0);
 		} else
-			serv_got_update(gc, b->name, 1, 0, 0, 0,
-					(status << 5) | UC_UNAVAILABLE, 0);
+			serv_got_update(gc, b->name, 1, 0, 0, 0, (status << 1) | UC_UNAVAILABLE, 0);
 		if (status == YAHOO_STATUS_CUSTOM) {
 			gpointer val = g_hash_table_lookup(yd->hash, b->name);
 			if (val)
@@ -545,9 +543,9 @@
 }
 
 static char **yahoo_list_icon(int uc) {
-	if ((uc >> 5) == YAHOO_STATUS_IDLE)
+	if ((uc >> 1) == YAHOO_STATUS_IDLE)
 		return status_idle_xpm;
-	else if (uc == UC_NORMAL)
+	else if (uc == 0)
 		return status_here_xpm;
 	return status_away_xpm;
 }
@@ -585,12 +583,12 @@
 						  segfault and get the bug report. */
 	static char buf[1024];
 
-	if (b->uc & UC_NORMAL)
+	if (!(b->uc & UC_UNAVAILABLE))
 		return NULL;
 
 	pbm = g_new0(struct proto_buddy_menu, 1);
-	if ((b->uc >> 5) != YAHOO_STATUS_CUSTOM)
-		g_snprintf(buf, sizeof buf, "Status: %s", yahoo_get_status_string(b->uc >> 5));
+	if ((b->uc >> 1) != YAHOO_STATUS_CUSTOM)
+		g_snprintf(buf, sizeof buf, "Status: %s", yahoo_get_status_string(b->uc >> 1));
 	else
 		g_snprintf(buf, sizeof buf, "Custom Status: %s",
 			   (char *)g_hash_table_lookup(yd->hash, b->name));
@@ -602,7 +600,7 @@
 	return m;
 }
 
-static GList *yahoo_away_states() {
+static GList *yahoo_away_states(struct gaim_connection *gc) {
 	GList *m = NULL;
 
 	m = g_list_append(m, "Available");