changeset 4960:42bd8ab53234

[gaim-migrate @ 5294] 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. committer: Tailor Script <[e-mail]>

--- a/pixmaps/status/default/Makefile.am	Wed Apr 02 05:50:04 2003 +0000
+++ b/pixmaps/status/default/Makefile.am	Wed Apr 02 06:32:54 2003 +0000
@@ -4,4 +4,5 @@
 gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default
 
 gaimstatuspix_DATA = login.png aim.png icq.png msn.png jabber.png yahoo.png gadu-gadu.png napster.png irc.png \
-	   	     activebuddy.png admin.png aol.png away.png wireless.png offline.png
+		     activebuddy.png admin.png aol.png away.png wireless.png offline.png \
+		     dnd.png freeforchat.png invisible.png na.png occupied.png

Binary file pixmaps/status/default/dnd.png has changed

Binary file pixmaps/status/default/freeforchat.png has changed

Binary file pixmaps/status/default/invisible.png has changed

Binary file pixmaps/status/default/na.png has changed

Binary file pixmaps/status/default/occupied.png has changed

--- a/src/buddy.c	Wed Apr 02 05:50:04 2003 +0000
+++ b/src/buddy.c	Wed Apr 02 06:32:54 2003 +0000
@@ -315,7 +315,6 @@
 		g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(show_rename_group), node);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	} else if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
-		
 		/* Protocol specific options */
 		prpl = find_prpl(((struct buddy*)node)->account->protocol);
 

--- a/src/gaim.h	Wed Apr 02 05:50:04 2003 +0000
+++ b/src/gaim.h	Wed Apr 02 06:32:54 2003 +0000
@@ -232,7 +232,7 @@
 #define OPT_BLIST_NO_MT_GRP		0x00000100
 #define OPT_BLIST_SHOW_WARN		0x00000200
 #define OPT_BLIST_GREY_IDLERS		0x00000400
-#define OPT_BLIST_BOTTOM_TAB		0X00000800
+/* define OPT_BLIST_TOMBSTONE		0x00000800 */
 #define OPT_BLIST_POPUP                 0x00001000
 #define OPT_BLIST_SHOW_ICONS            0x00002000 
 #define OPT_BLIST_SHOW_OFFLINE          0x00004000

--- a/src/prefs.c	Wed Apr 02 05:50:04 2003 +0000
+++ b/src/prefs.c	Wed Apr 02 06:32:54 2003 +0000
@@ -710,12 +710,6 @@
 	gaim_button(_("Show all c_hats in one tabbed window"), &chat_options, OPT_CHAT_ONE_WINDOW,
 		    vbox);
 
-	vbox = make_frame (ret, _("Buddy List Tabs"));
-	dd = gaim_dropdown(vbox, _("Tab _placement:"), &blist_options, OPT_BLIST_BOTTOM_TAB,
-		      _("Top"), 0,
-		      _("Bottom"), OPT_BLIST_BOTTOM_TAB, NULL);
-	gtk_size_group_add_widget(sg, dd);
-
 	vbox = make_frame (ret, _("Tab Options"));
 	button = gaim_button(_("Show _close button on tabs."), &convo_options, OPT_CONVO_NO_X_ON_TAB, vbox);
 	convo_options ^= OPT_CONVO_NO_X_ON_TAB;

--- a/src/protocols/oscar/oscar.c	Wed Apr 02 05:50:04 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Apr 02 06:32:54 2003 +0000
@@ -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)