[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.327,1.328

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv13826/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
I "made" some status icons for ICQ away states.  They suck.  Someone 
with some skills of an artist please to try improve them.  Or even just 
whichever one you hate the most.  Really, new icons are welcome.  Email 
them to mark izat kingant dizot net and we'll put them under 
consideration.

I actually think the DND and free for chat icons look pretty nice.  The 
NA on the NA icon is not readable enough.  The invisible is plain and 
not very meaningful.  The occupied is not easily discernable and stupid.

I also removed the option to have buddy list tabs at the top or bottom 
of the buddy list.

And I took out my April Fools joke.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- oscar.c	2 Apr 2003 05:50:04 -0000	1.327
+++ oscar.c	2 Apr 2003 06:32:54 -0000	1.328
@@ -227,8 +227,6 @@
 
 	fu16_t iconcsumlen;
 	fu8_t iconcsum[30];
-
-	double shoesize;
 };
 
 struct name_data {
@@ -1833,9 +1831,6 @@
 		free(b16);
 	}
 
-	bi->shoesize = (rand()%5)+7;
-	if (rand()%2)  bi->shoesize+=0.5;
-
 	serv_got_update(gc, info->sn, 1, info->warnlevel/10, signon, time_idle, type);
 
 	return 1;
@@ -3082,13 +3077,6 @@
 			g_free(status);
 		}
 
-		{
-			char *tmp;
-			tmp = yay;
-			yay = g_strdup_printf("%s\n<b>Shoe Size:</b> %2.1f", tmp, bi->shoesize);
-			g_free(tmp);
-		}
-
 		return yay;
 	} else {
 		return NULL;
@@ -5208,21 +5196,18 @@
 		emblems[i++] = "offline";
 
 	if (b->name && (b->uc & 0xffff0000) && isdigit(b->name[0])) {
-/*		int uc = b->uc >> 16;
+		int uc = b->uc >> 16;
 		if (uc & AIM_ICQ_STATE_INVISIBLE)
-			emblems[i++] = "icq_invisible";
+			emblems[i++] = "invisible";
 		else if (uc & AIM_ICQ_STATE_CHAT)
-			emblems[i++] = "icq_chat";
+			emblems[i++] = "freeforchat";
 		else if (uc & AIM_ICQ_STATE_DND)
-			emblems[i++] = "icq_dnd";
+			emblems[i++] = "dnd";
 		else if (uc & AIM_ICQ_STATE_OUT)
-			emblems[i++] = "icq_out";
+			emblems[i++] = "na";
 		else if (uc & AIM_ICQ_STATE_BUSY)
-			emblems[i++] = "icq_busy";
+			emblems[i++] = "occupied";
 		else if (uc & AIM_ICQ_STATE_AWAY)
-			emblems[i++] = "icq_away";
-*/
-		if (b->uc & UC_UNAVAILABLE) 
 			emblems[i++] = "away";
 	} else {
 		if (b->uc & UC_UNAVAILABLE)