# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1034576488 0
# Node ID c78e0c0315142b5feaf6746149e0da0849b982e3
# Parent  7ad266626a5f608b388caeefacac39c91b5bf533
[gaim-migrate @ 3819]
some changes.

committer: Tailor Script <tailor@pidgin.im>

diff -r 7ad266626a5f -r c78e0c031514 pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Mon Oct 14 06:13:01 2002 +0000
+++ b/pixmaps/Makefile.am	Mon Oct 14 06:21:28 2002 +0000
@@ -9,12 +9,9 @@
 		away.png			\
 		away_big.xpm			\
 		away_small.xpm			\
-		bgcolor.xpm			\
-		big.xpm				\
 		bigsmile.xpm			\
 		block.xpm			\
 		block_small.xpm			\
-		bold.xpm			\
 		broken.xpm			\
 		burp.xpm			\
 		cancel.xpm			\
@@ -29,7 +26,6 @@
 		embarrassed.xpm			\
 		exit_small.xpm			\
 		farted.xpm			\
-		fgcolor.xpm			\
 		fontface.xpm			\
 		fontface2.xpm			\
 		gaim.png			\
@@ -46,10 +42,8 @@
 		insert-smiley-small.png \
 		image_icon.xpm			\
 		import_small.xpm		\
-		italic.xpm			\
 		join.xpm			\
 		kiss.xpm			\
-		link.xpm			\
 		login_icon.xpm			\
 		logo.png		\
 		logo.xpm			\
@@ -61,7 +55,6 @@
 		msgpend.png			\
 		msgunread.png			\
 		no_icon.xpm			\
-		normal.xpm			\
 		offline.png			\
 		ok.xpm				\
 		oneeye.xpm			\
@@ -79,7 +72,6 @@
 		search_small.xpm		\
 		send_small.xpm			\
 		signon.png \
-		small.xpm			\
 		smile.xpm			\
 		smile8.xpm			\
 		smile_icon.xpm			\
@@ -89,11 +81,10 @@
 		status-game.xpm			\
 		status-here.xpm			\
 		status-idle.xpm			\
-		strike.xpm			\
 		tb_forward.xpm			\
 		tb_redo.xpm			\
 		tb_refresh.xpm			\
-		tb_search.xpm			\
+		tb_search.xpm	\
 		tb_undo.xpm			\
 		text_bigger.png			\
 		text_normal.png	\
@@ -101,10 +92,8 @@
 		think.xpm			\
 		tmp_send.xpm			\
 		tongue.xpm			\
-		underline.xpm			\
 		warn.xpm			\
 		wink.xpm			\
-		wood.xpm			\
 		yell.xpm			
 
 
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/bgcolor.xpm
--- a/pixmaps/bgcolor.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/* XPM */
-static char *bgcolor_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"15 12 4 1",
-"  c None",
-". c Magenta",
-"X c Gray60",
-"o c Blue",
-/* pixels */
-"ooooooooooooooo",
-"ooooooooooooooo",
-"ooooooo ooooooo",
-"oooooo   oooooo",
-"oooooo   oooooo",
-"ooooo  o  ooooo",
-"ooooo     ooooo",
-"oooo  ooo  oooo",
-"oooo  ooo  oooo",
-"ooo    o    ooo",
-"ooooooooooooooo",
-"ooooooooooooooo",
-};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/big.xpm
--- a/pixmaps/big.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/* XPM */
-static char *big_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"17 13 7 1",
-"  c Gray0",
-". c Gray40",
-"X c #666666669999",
-"o c Magenta",
-"O c #999999996666",
-"+ c Gray60",
-"@ c None",
-/* pixels */
-"@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@",
-"@@@ @@@@@@@ @@@@@",
-"@@   @@@@@@ @@@@@",
-"@     @@@@   @@@@",
-"@     @@@@   @@@@",
-"@ . . @@@  @  @@@",
-"@XOXO.@@@  @  @@@",
-"@OXOX@@@@     @@@",
-"@XOXO.@@  @@@  @@",
-"@@@@@@@@  @@@  @@",
-"@@@@@@@    @    @",
-"@@@@@@@@@@@@@@@@@",
-};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/bold.xpm
--- a/pixmaps/bold.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-/* XPM */
-static char * bold_xpm[] = {
-"12 11 2 1",
-" 	c None",
-".	c #000000",
-"            ",
-"  .......   ",
-"   ... ...  ",
-"   ... ...  ",
-"   ... ...  ",
-"   ......   ",
-"   ... ...  ",
-"   ... ...  ",
-"   ... ...  ",
-"  .......   ",
-"            "};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/fgcolor.xpm
--- a/pixmaps/fgcolor.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/* XPM */
-static char *fgcolor_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 13 4 1",
-"  c Blue",
-". c Magenta",
-"X c Gray60",
-"o c None",
-/* pixels */
-"oooooooooooooooo",
-"oooooooooooooooo",
-"oooooooooooooooo",
-"oooooooooooooooo",
-"oooooooo ooooooo",
-"ooooooo   oooooo",
-"ooooooo   oooooo",
-"oooooo  o  ooooo",
-"oooooo     ooooo",
-"ooooo  ooo  oooo",
-"ooooo  ooo  oooo",
-"oooo    o    ooo",
-"oooooooooooooooo",
-};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/italic.xpm
--- a/pixmaps/italic.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-/* XPM */
-static char * italic_xpm[] = {
-"14 11 2 1",
-" 	c None",
-".	c #000000",
-"              ",
-"       ...... ",
-"         ..   ",
-"        ..    ",
-"       ..     ",
-"      ..      ",
-"     ..       ",
-"    ..        ",
-"   ..         ",
-" ......       ",
-"              "};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/link.xpm
--- a/pixmaps/link.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/* XPM */
-static char * link_xpm[] = {
-"14 14 5 1",
-" 	c None",
-".	c #2F2F60",
-"+	c #CFCFFF",
-"@	c #FFFFFF",
-"#	c #6060CF",
-"           .. ",
-"          .+@.",
-"      ....+@#.",
-"     .+@.+@#. ",
-"    .+@.+@#.  ",
-"   .+@..##..  ",
-"  .+@.  ..+.  ",
-" .+@.  @.+@.  ",
-" .@.. @.+@.   ",
-" ..+ ..+@.    ",
-" .+@#.+@.     ",
-".+@#.+@.      ",
-".@#....       ",
-"...           "};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/normal.xpm
--- a/pixmaps/normal.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/* XPM */
-static char *normal_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"16 13 4 1",
-"  c Gray0",
-". c Magenta",
-"X c Gray60",
-"o c None",
-/* pixels */
-"oooooooooooooooo",
-"oooooooooooooooo",
-"oooooooooooooooo",
-"oooooooooooooooo",
-"oooooooo ooooooo",
-"ooooooo   oooooo",
-"ooooooo   oooooo",
-"oooooo  o  ooooo",
-"oooooo     ooooo",
-"ooooo  ooo  oooo",
-"ooooo  ooo  oooo",
-"oooo    o    ooo",
-"oooooooooooooooo",
-};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/small.xpm
--- a/pixmaps/small.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/* XPM */
-static char *small_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"17 13 5 1",
-"  c Gray0",
-". c Gray40",
-"X c Magenta",
-"o c Gray60",
-"O c None",
-/* pixels */
-"OOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOO",
-"OOOOOOOOOO.o.o.OO",
-"OOOOOOOOOOo.o.oOO",
-"OOOOOOOOOO.o.o.OO",
-"OOOO OOOOO  .  OO",
-"OOOO OOOOO     OO",
-"OOO   OOOO     OO",
-"OOO O OOOOO   OOO",
-"OO  O  OOOOO OOOO",
-"OOOOOOOOOOOOOOOOO",
-};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/strike.xpm
--- a/pixmaps/strike.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/* XPM */
-static char * strike_xpm[] = {
-"15 13 2 1",
-" 	c None",
-".	c #000000",
-"               ",
-"               ",
-"     .... .    ",
-"    ..   ..    ",
-"    ..    .    ",
-"    ...        ",
-" ............. ",
-"        ...    ",
-"    .    ..    ",
-"    ..   ..    ",
-"    . ....     ",
-"               ",
-"               "};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/tb_search.xpm
--- a/pixmaps/tb_search.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/* XPM */
-static char * tb_search_xpm[] = {
-"24 24 128 2",
-"  	c None",
-" .	c #000000",
-" +	c #ADAD9C",
-" @	c #959585",
-" #	c #DCDCC5",
-" $	c #DFDFC8",
-" %	c #242424",
-" &	c #A7A796",
-" *	c #D7D7C1",
-" =	c #D9D9C3",
-" -	c #DCDCC4",
-" ;	c #DDDDC7",
-" >	c #E1E1CA",
-" ,	c #A6A694",
-" '	c #D6D6BF",
-" )	c #D8D8C2",
-" !	c #DBDBC4",
-" ~	c #DFDFC7",
-" {	c #E3E3CB",
-" ]	c #B2B29F",
-" ^	c #7C7C7C",
-" /	c #646464",
-" (	c #D5D5BD",
-" _	c #D5D5BF",
-" :	c #D7D7C0",
-" <	c #DADAC3",
-" [	c #DEDEC6",
-" }	c #E1E1C9",
-" |	c #E5E5CD",
-" 1	c #E9E9D1",
-" 2	c #343434",
-" 3	c #E7E7E7",
-" 4	c #373736",
-" 5	c #B8B8A6",
-" 6	c #D3D3BC",
-" 7	c #D9D9C2",
-" 8	c #DDDDC5",
-" 9	c #E0E0C8",
-" 0	c #E8E8D0",
-" a	c #ECECD4",
-" b	c #EEEED5",
-" c	c #ECECEC",
-" d	c #EDEDED",
-" e	c #3D3D37",
-" f	c #CECEB7",
-" g	c #E6E6CE",
-" h	c #EAEAD2",
-" i	c #F1F1D8",
-" j	c #A5A594",
-" k	c #EEEEE5",
-" l	c #3C3C3C",
-" m	c #8F8F80",
-" n	c #D0D0B9",
-" o	c #B4B4A0",
-" p	c #46463E",
-" q	c #090908",
-" r	c #4A4A42",
-" s	c #C1C1AD",
-" t	c #F2F2D9",
-" u	c #F3F3DA",
-" v	c #EEEEE6",
-" w	c #505050",
-" x	c #929282",
-" y	c #D1D1B9",
-" z	c #B0B09D",
-" A	c #33332D",
-" B	c #9D9D8D",
-" C	c #CFCFB9",
-" D	c #C4C4AF",
-" E	c #8D8D7F",
-" F	c #34342F",
-" G	c #C3C3AF",
-" H	c #F4F4DB",
-" I	c #F5F5DC",
-" J	c #969686",
-" K	c #D2D2BC",
-" L	c #45453E",
-" M	c #9C9C8C",
-" N	c #E2E2D0",
-" O	c #EDEDE5",
-" P	c #C0C0AC",
-" Q	c #828274",
-" R	c #4B4B43",
-" S	c #BEBEAB",
-" T	c #797973",
-" U	c #D8D8C1",
-" V	c #DDDDC6",
-" W	c #080807",
-" X	c #FBFBFA",
-" Y	c #C3C3AE",
-" Z	c #B5B5A2",
-" `	c #A6A695",
-". 	c #959586",
-"..	c #98988F",
-".+	c #080808",
-".@	c #CACAB5",
-".#	c #DDDDD0",
-".$	c #B7B7A4",
-".%	c #AAAA98",
-".&	c #9B9B8B",
-".*	c #8C8C7D",
-".=	c #818174",
-".-	c #E2E2CA",
-".;	c #46463F",
-".>	c #929283",
-".,	c #BABAA7",
-".'	c #ADAD9B",
-".)	c #9F9F8E",
-".!	c #909081",
-".~	c #727266",
-".{	c #4B4B44",
-".]	c #BEBEAE",
-".^	c #33332E",
-"./	c #878779",
-".(	c #A0A090",
-"._	c #737367",
-".:	c #4E4E4E",
-".<	c #BEBEAA",
-".[	c #404040",
-".}	c #6F6F6F",
-".|	c #EBEBD3",
-".1	c #EDEDD4",
-".2	c #EFEFD6",
-".3	c #F0F0D7",
-".4	c #BBBBA8",
-".5	c #CDCDB8",
-".6	c #4D4D45",
-".7	c #A6A696",
-"                                                ",
-"                                                ",
-"                           .                    ",
-"                       . . + .                  ",
-"                   . . @ # $ %                  ",
-"               . . & * = - ; > .                ",
-"           . . , ' * * ) ! ~ { ] .              ",
-"         . ^ / ' ( _ : < [ } | 1 2              ",
-"         . 3 4 5 6 * 7 8 9 | 0 a b .            ",
-"         . c d e f _ ! 9 g 0 h b i j .          ",
-"         . k k l m n o p q q r s t u .          ",
-"         . v w x y z A B C D E F G H I .        ",
-"         . . J K ! L M N O P ] Q R I I S .      ",
-"         . T U 7 V W _ X Y Z `.  q I I I ) .    ",
-"         ... ! # $.+.@.#.$.%.&.* q I I I.= .    ",
-"           . ~ 9.-.;.>.,.'.).!.~.{ I I . .      ",
-"           ..] | |.,.^./.(.>._ . . < .          ",
-"            .: 0 1 h.< r q q.[.} . .            ",
-"             ..| a.1.2 i t t < . . . .          ",
-"               ..2.3 i t 1 j .     . . .        ",
-"               ..4 t u.5.6 .         . . .      ",
-"                 . u.7 .               . .      ",
-"                   . .                          ",
-"                                                "};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/underline.xpm
--- a/pixmaps/underline.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-/* XPM */
-static char * underline_xpm[] = {
-"12 12 2 1",
-" 	c None",
-".	c #000000",
-"            ",
-"  ..   ..   ",
-"  ..   ..   ",
-"  ..   ..   ",
-"  ..   ..   ",
-"  ..   ..   ",
-"  ..   ..   ",
-"   .. ..    ",
-"    ...     ",
-"            ",
-"  .......   ",
-"            "};
diff -r 7ad266626a5f -r c78e0c031514 pixmaps/wood.xpm
--- a/pixmaps/wood.xpm	Mon Oct 14 06:13:01 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/* XPM */
-static char * wood_xpm[] = {
-"14 15 63 1",
-" 	c None",
-".	c #45060E",
-"+	c #47060C",
-"@	c #44050D",
-"#	c #44060B",
-"$	c #1E701E",
-"%	c #4F0D17",
-"&	c #5A212A",
-"*	c #4C1012",
-"=	c #350E13",
-"-	c #46050D",
-";	c #583839",
-">	c #480B10",
-",	c #58383B",
-"'	c #331016",
-")	c #5A373B",
-"!	c #47050F",
-"~	c #58383D",
-"{	c #4B0E15",
-"]	c #5B3938",
-"^	c #4D0C14",
-"/	c #56393B",
-"(	c #59393C",
-"_	c #48070F",
-":	c #86666B",
-"<	c #4C0D16",
-"[	c #490B10",
-"}	c #5A373D",
-"|	c #5B1F27",
-"1	c #4C0E13",
-"2	c #573939",
-"3	c #4A0D14",
-"4	c #4A0B14",
-"5	c #5B393A",
-"6	c #521419",
-"7	c #4A0D15",
-"8	c #5B373B",
-"9	c #331112",
-"0	c #59363A",
-"a	c #51141B",
-"b	c #583A3C",
-"c	c #320F13",
-"d	c #856767",
-"e	c #75474D",
-"f	c #53171D",
-"g	c #5A3839",
-"h	c #59393E",
-"i	c #49080C",
-"j	c #836668",
-"k	c #490810",
-"l	c #321011",
-"m	c #FEFEFE",
-"n	c #85656A",
-"o	c #450A10",
-"p	c #480610",
-"q	c #46080D",
-"r	c #F8F4F5",
-"s	c #FFFFFD",
-"t	c #490A13",
-"u	c #48070D",
-"v	c #350E11",
-"w	c #330E15",
-"x	c #470A0F",
-"              ",
-"          .+@#",
-"    $$   %&*=-",
-"    $;  >,'))!",
-"     ,~{,]^/(-",
-"     ~_:<[}|_ ",
-"     12345/   ",
-"    6,7890    ",
-"   abcdc;~    ",
-"  ef)g)hh     ",
-" i^9;(jk      ",
-" lmnopq       ",
-" lrstu        ",
-" vcwx         ",
-"              "};
diff -r 7ad266626a5f -r c78e0c031514 src/buddy.c
--- a/src/buddy.c	Mon Oct 14 06:13:01 2002 +0000
+++ b/src/buddy.c	Mon Oct 14 06:21:28 2002 +0000
@@ -51,6 +51,7 @@
 #include "win32dep.h"
 #endif
 
+#include "pixmaps/tb_search.xpm"
 #include "pixmaps/login_icon.xpm"
 #include "pixmaps/logout_icon.xpm"
 #include "pixmaps/no_icon.xpm"
@@ -75,7 +76,6 @@
 
 #include "pixmaps/tmp_send.xpm"
 #include "pixmaps/send_small.xpm"
-#include "pixmaps/tb_search.xpm"
 #include "pixmaps/join.xpm"
 #include "pixmaps/gnome_add.xpm"
 #include "pixmaps/gnome_remove.xpm"
diff -r 7ad266626a5f -r c78e0c031514 src/buddy_chat.c
--- a/src/buddy_chat.c	Mon Oct 14 06:13:01 2002 +0000
+++ b/src/buddy_chat.c	Mon Oct 14 06:21:28 2002 +0000
@@ -1302,7 +1302,7 @@
 	if (!(chat_options & OPT_CHAT_ONE_WINDOW))
 		gtk_window_set_focus(GTK_WINDOW(b->window), b->entry);
 
-	toolbar = build_conv_toolbar2(b);
+	toolbar = build_conv_toolbar(b);
 	gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 
 	gtk_object_set_user_data(GTK_OBJECT(chatentry), b);
diff -r 7ad266626a5f -r c78e0c031514 src/conversation.c
--- a/src/conversation.c	Mon Oct 14 06:13:01 2002 +0000
+++ b/src/conversation.c	Mon Oct 14 06:21:28 2002 +0000
@@ -50,19 +50,8 @@
 #include "win32dep.h"
 #endif
 
-#include "pixmaps/bold.xpm"
-#include "pixmaps/italic.xpm"
-#include "pixmaps/underline.xpm"
-#include "pixmaps/strike.xpm"
-#include "pixmaps/small.xpm"
-#include "pixmaps/normal.xpm"
-#include "pixmaps/big.xpm"
 #include "pixmaps/fontface.xpm"
-#include "pixmaps/fgcolor.xpm"
-#include "pixmaps/bgcolor.xpm"
-#include "pixmaps/link.xpm"
 #include "pixmaps/smile_icon.xpm"
-#include "pixmaps/wood.xpm"
 #include "pixmaps/search_small.xpm"
 #include "pixmaps/save_small.xpm"
 #include "pixmaps/speaker.xpm"
@@ -2236,7 +2225,7 @@
 
 }
 
-GtkWidget *build_conv_toolbar2(struct conversation *c)
+GtkWidget *build_conv_toolbar(struct conversation *c)
 {
 		GtkWidget *vbox;
 		GtkWidget *hbox;
@@ -2365,273 +2354,6 @@
 		return vbox;
 }
 
-GtkWidget *build_conv_toolbar(struct conversation *c)
-{
-	GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i,
-	    *wood_i, *viewer_i, *fgcolor_i, *bgcolor_i, *link_i, *font_i, *smiley_i, *save_i, *image_i;
-	GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p,
-	    *wood_p, *viewer_p, *fgcolor_p, *bgcolor_p, *link_p, *font_p, *smiley_p, *save_p, *image_p;
-	GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood, *viewer,
-	    *fgcolorbtn, *bgcolorbtn, *link, *font, *smiley, *save, *image;
-	GdkBitmap *mask;
-	GtkWidget *toolbar;
-	GtkWidget *win;
-	GtkWidget *entry;
-
-	toolbar = gtk_toolbar_new();
-	win = c->window;
-	entry = c->entry;
-
-	bold_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, bold_xpm);
-	bold_p = gtk_pixmap_new(bold_i, mask);
-	gtk_widget_show(bold_p);
-	gdk_bitmap_unref(mask);
-
-	italic_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, italic_xpm);
-	italic_p = gtk_pixmap_new(italic_i, mask);
-	gtk_widget_show(italic_p);
-	gdk_bitmap_unref(mask);
-
-	underline_i = gdk_pixmap_create_from_xpm_d(win->window, &mask,
-						   &win->style->white, underline_xpm);
-	underline_p = gtk_pixmap_new(underline_i, mask);
-	gtk_widget_show(underline_p);
-	gdk_bitmap_unref(mask);
-
-	strike_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, strike_xpm);
-	strike_p = gtk_pixmap_new(strike_i, mask);
-	gtk_widget_show(strike_p);
-	gdk_bitmap_unref(mask);
-
-	small_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, small_xpm);
-	small_p = gtk_pixmap_new(small_i, mask);
-	gtk_widget_show(small_p);
-	gdk_bitmap_unref(mask);
-
-	normal_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, normal_xpm);
-	normal_p = gtk_pixmap_new(normal_i, mask);
-	gtk_widget_show(normal_p);
-	gdk_bitmap_unref(mask);
-
-	big_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, big_xpm);
-	big_p = gtk_pixmap_new(big_i, mask);
-	gtk_widget_show(big_p);
-	gdk_bitmap_unref(mask);
-
-	font_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, fontface_xpm);
-	font_p = gtk_pixmap_new(font_i, mask);
-	gtk_widget_show(font_p);
-	gdk_bitmap_unref(mask);
-
-	fgcolor_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, fgcolor_xpm);
-	fgcolor_p = gtk_pixmap_new(fgcolor_i, mask);
-	gtk_widget_show(fgcolor_p);
-	gdk_bitmap_unref(mask);
-
-	bgcolor_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, bgcolor_xpm);
-	bgcolor_p = gtk_pixmap_new(bgcolor_i, mask);
-	gtk_widget_show(bgcolor_p);
-	gdk_bitmap_unref(mask);
-
-	link_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, link_xpm);
-	link_p = gtk_pixmap_new(link_i, mask);
-	gtk_widget_show(link_p);
-	gdk_bitmap_unref(mask);
-
-	smiley_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, smile_icon_xpm);
-	smiley_p = gtk_pixmap_new(smiley_i, mask);
-	gtk_widget_show(smiley_p);
-	gdk_bitmap_unref(mask);
-
-	image_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, image_icon_xpm);
-	image_p = gtk_pixmap_new(image_i, mask);
-	gtk_widget_show(image_p);
-	gdk_bitmap_unref(mask);
-
-	wood_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, wood_xpm);
-	wood_p = gtk_pixmap_new(wood_i, mask);
-	gtk_widget_show(wood_p);
-	gdk_bitmap_unref(mask);
-
-	viewer_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, search_small_xpm);
-	viewer_p = gtk_pixmap_new(viewer_i, mask);
-	gtk_widget_show(viewer_p);
-	gdk_bitmap_unref(mask);
-
-	save_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, save_small_xpm);
-	save_p = gtk_pixmap_new(save_i, mask);
-	gtk_widget_show(save_p);
-	gdk_bitmap_unref(mask);
-
-	speaker_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, speaker_xpm);
-	speaker_p = gtk_pixmap_new(speaker_i, mask);
-	gtk_widget_show(speaker_p);
-	gdk_bitmap_unref(mask);
-	c->makesound = 1;
-
-	bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					  GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
-					  NULL, _("Bold Text"), _("Bold"), bold_p,
-					  GTK_SIGNAL_FUNC(do_bold), entry);
-	italic = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, NULL, _("Italics Text"),
-					    _("Italics"), italic_p, GTK_SIGNAL_FUNC(do_italic), entry);
-	underline = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					       GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					       NULL, NULL, _("Underline Text"),
-					       _("Underline"), underline_p,
-					       GTK_SIGNAL_FUNC(do_underline), entry);
-	strike =
-	    gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
-				       NULL, _("Strike through Text"), _("Strike"), strike_p,
-				       GTK_SIGNAL_FUNC(do_strike), entry);
-
-	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
-	small = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-					NULL, _("Decrease font size"), _("Small"),
-					small_p, GTK_SIGNAL_FUNC(do_small), entry);
-	normal = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-					 NULL, _("Normal font size"), _("Normal"),
-					 normal_p, GTK_SIGNAL_FUNC(do_normal), entry);
-	big = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-				      NULL, _("Increase font size"), _("Big"),
-				      big_p, GTK_SIGNAL_FUNC(do_big), entry);
-
-	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
-	font = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					  GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					  NULL, NULL, _("Select Font"),
-					  _("Font"), font_p, GTK_SIGNAL_FUNC(toggle_font), c);
-	fgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-						GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-						NULL, NULL, _("Text Color"),
-						_("Color"), fgcolor_p, GTK_SIGNAL_FUNC(toggle_fg_color),
-						c);
-	bgcolorbtn =
-	    gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
-				       NULL, _("Background Color"), _("Color"), bgcolor_p,
-				       GTK_SIGNAL_FUNC(toggle_bg_color), c);
-
-	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
-	link = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					  GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					  NULL, NULL, _("Insert Link"),
-					  _("Link"), link_p, GTK_SIGNAL_FUNC(toggle_link), c);
-	smiley = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, NULL, _("Insert smiley face"), _("Smiley"),
-					    smiley_p, GTK_SIGNAL_FUNC(insert_smiley), c);
-	image = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-					    NULL, _("Insert IM Image"), _("Image"),
-					    image_p, GTK_SIGNAL_FUNC(insert_image), c);
-	
-	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
-	wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					  GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					  NULL, NULL, _("Enable logging"),
-					  _("Logging"), wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c);
-	state_lock = 1;
-	if (find_log_info(c->name))
-		 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), TRUE);
-	else
-		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE);
-	state_lock = 0;
-
-	if (!c->is_chat) {
-		viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-		            			NULL, _("Show Log Viewer"), _("Viewer"),
-						viewer_p, GTK_SIGNAL_FUNC(conv_show_log), GINT_TO_POINTER(c->name));
-	} else {
-		viewer = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-						NULL, _("Show Log Viewer"), _("Viewer"),
-        					viewer_p, GTK_SIGNAL_FUNC(chat_show_log), GINT_TO_POINTER(c->name));
-	}
-	
-	save = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-				       NULL, _("Save Conversation"),
-				       _("Save"), save_p, GTK_SIGNAL_FUNC(save_convo), c);
-
-	speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					     GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					     NULL, NULL, _("Toggle Sound"),
-					     _("Sound"), speaker_p, GTK_SIGNAL_FUNC(toggle_sound), c);
-	c->makesound = 1;
-
-	/* use a slicker look if the user wants to */
-	if (misc_options & OPT_MISC_COOL_LOOK) {
-		gtk_button_set_relief(GTK_BUTTON(bold), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(italic), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(underline), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(strike), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(small), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(normal), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(big), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(font), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(fgcolorbtn), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(bgcolorbtn), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(link), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(smiley), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(image), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(wood), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(viewer), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(save), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(speaker), GTK_RELIEF_NONE);
-	}
-
-	gtk_widget_show(toolbar);
-
-	gdk_pixmap_unref(bold_i);
-	gdk_pixmap_unref(italic_i);
-	gdk_pixmap_unref(underline_i);
-	gdk_pixmap_unref(strike_i);
-	gdk_pixmap_unref(small_i);
-	gdk_pixmap_unref(normal_i);
-	gdk_pixmap_unref(big_i);
-	gdk_pixmap_unref(font_i);
-	gdk_pixmap_unref(fgcolor_i);
-	gdk_pixmap_unref(bgcolor_i);
-	gdk_pixmap_unref(link_i);
-	gdk_pixmap_unref(smiley_i);
-	gdk_pixmap_unref(wood_i);
-	gdk_pixmap_unref(viewer_i);
-	gdk_pixmap_unref(save_i);
-	gdk_pixmap_unref(speaker_i);
-	gdk_pixmap_unref(image_i);
-
-	c->toolbar = toolbar;
-	c->bold = bold;
-	c->strike = strike;
-	c->italic = italic;
-	c->underline = underline;
-	c->log_button = wood;
-	c->viewer_button = viewer;
-	c->fgcolorbtn = fgcolorbtn;
-	c->bgcolorbtn = bgcolorbtn;
-	c->link = link;
-	c->wood = wood;
-	c->font = font;
-	c->smiley = smiley;
-	c->imagebtn = image;
-	c->speaker = speaker;
-	c->speaker_p = speaker_p;
-
-	if (c->is_chat)
-		gtk_widget_set_sensitive(c->log_button, ((logging_options & OPT_LOG_CHATS)) ? FALSE : TRUE);
-	else
-		gtk_widget_set_sensitive(c->log_button, ((logging_options & OPT_LOG_CONVOS)) ? FALSE : TRUE);		
-	gtk_widget_set_sensitive(c->bold, ((font_options & OPT_FONT_BOLD)) ? FALSE : TRUE);
-	gtk_widget_set_sensitive(c->italic, ((font_options & OPT_FONT_ITALIC)) ? FALSE : TRUE);
-	gtk_widget_set_sensitive(c->underline, ((font_options & OPT_FONT_UNDERLINE)) ? FALSE : TRUE);
-	gtk_widget_set_sensitive(c->strike, ((font_options & OPT_FONT_STRIKE)) ? FALSE : TRUE);
-
-	return toolbar;
-}
-
 static void convo_sel_send(GtkObject *m, struct gaim_connection *c)
 {
 	struct conversation *cnv = gtk_object_get_user_data(m);
@@ -3198,7 +2920,7 @@
 	if (!(im_options & OPT_IM_ONE_WINDOW))
 		gtk_window_set_focus(GTK_WINDOW(c->window), c->entry);
 
-	toolbar = build_conv_toolbar2(c);
+	toolbar = build_conv_toolbar(c);
 	gtk_box_pack_start(GTK_BOX(vbox2), toolbar, FALSE, FALSE, 0);
 
 	gtk_object_set_user_data(GTK_OBJECT(entry), c);