# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 965553218 0
# Node ID 83b0caceea9a9553b9f4b92e1cd0933b4de401aa
# Parent  7f8b85e2e89488a668b728acc5ed0cdc4a7f6851
[gaim-migrate @ 633]
This is just a little test.  Let me know what you think, guys.  I'll either
do something similiar to this or not like this at all.  Also, the toolbar
where BOLD/ITALIC/ETC are will be changing as well.

committer: Tailor Script <tailor@pidgin.im>

diff -r 7f8b85e2e894 -r 83b0caceea9a pixmaps/tb_search.xpm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/tb_search.xpm	Sun Aug 06 09:13:38 2000 +0000
@@ -0,0 +1,155 @@
+/* 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 7f8b85e2e894 -r 83b0caceea9a pixmaps/tmp_send.xpm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/tmp_send.xpm	Sun Aug 06 09:13:38 2000 +0000
@@ -0,0 +1,162 @@
+/* XPM */
+static char * tmp_send_xpm[] = {
+"24 24 135 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #7B7B78",
+"@ 	c #C7C7C3",
+"# 	c #F1F0EB",
+"$ 	c #BFBFBC",
+"% 	c #5F5E5E",
+"& 	c #E3E3DF",
+"* 	c #F3F3EF",
+"= 	c #F2F2EE",
+"- 	c #F1F1EC",
+"; 	c #F0EFEB",
+"> 	c #D2D2CD",
+", 	c #969592",
+"' 	c #616060",
+") 	c #B5B5B4",
+"! 	c #F8F8F6",
+"~ 	c #F7F7F5",
+"{ 	c #F6F6F3",
+"] 	c #F5F5F2",
+"^ 	c #F4F4F0",
+"/ 	c #F2F1ED",
+"( 	c #F1F0EC",
+"_ 	c #F0EFEA",
+": 	c #EFEEE9",
+"< 	c #4F4F4D",
+"[ 	c #BDBCB8",
+"} 	c #A7A6A3",
+"| 	c #C6C6C4",
+"1 	c #7C7C7B",
+"2 	c #525251",
+"3 	c #DBDBD9",
+"4 	c #F5F4F1",
+"5 	c #F4F3F0",
+"6 	c #F3F2EE",
+"7 	c #999894",
+"8 	c #62625F",
+"9 	c #BCBCB6",
+"0 	c #EBE9E3",
+"a 	c #838381",
+"b 	c #D7D6D4",
+"c 	c #A8A8A6",
+"d 	c #515150",
+"e 	c #7E7D7C",
+"f 	c #DAD9D5",
+"g 	c #EFEEE8",
+"h 	c #EEEDE7",
+"i 	c #4F4E4C",
+"j 	c #BCBBB6",
+"k 	c #EBE9E2",
+"l 	c #EAE8E1",
+"m 	c #F6F5F2",
+"n 	c #F4F3EF",
+"o 	c #B5B4B1",
+"p 	c #9B9A97",
+"q 	c #646361",
+"r 	c #92918E",
+"s 	c #EEEDE8",
+"t 	c #EDECE6",
+"u 	c #4E4E4C",
+"v 	c #797976",
+"w 	c #797874",
+"x 	c #E9E8E1",
+"y 	c #E8E7DF",
+"z 	c #B4B3AF",
+"A 	c #D0D0CD",
+"B 	c #F2F2ED",
+"C 	c #BFBEBA",
+"D 	c #BEBDB9",
+"E 	c #7A7A77",
+"F 	c #979691",
+"G 	c #EAE9E2",
+"H 	c #959590",
+"I 	c #787773",
+"J 	c #B8B7B0",
+"K 	c #E6E4DC",
+"L 	c #A9A9A6",
+"M 	c #626260",
+"N 	c #ECEBE4",
+"O 	c #EBEAE3",
+"P 	c #E9E7E0",
+"Q 	c #E8E6DF",
+"R 	c #E7E5DD",
+"S 	c #777671",
+"T 	c #93918C",
+"U 	c #BEBDB8",
+"V 	c #989793",
+"W 	c #ECEAE4",
+"X 	c #E8E6DE",
+"Y 	c #E6E4DB",
+"Z 	c #E4E3DA",
+"` 	c #75746F",
+" .	c #91908A",
+"..	c #EEECE7",
+"+.	c #62615F",
+"@.	c #EBEAE4",
+"#.	c #E7E6DE",
+"$.	c #E6E5DC",
+"%.	c #E5E4DB",
+"&.	c #E4E2DA",
+"*.	c #CCCBC4",
+"=.	c #A3A29D",
+"-.	c #B6B5B2",
+";.	c #BCBCB7",
+">.	c #CDCCC6",
+",.	c #959490",
+"'.	c #ECEBE5",
+").	c #61615E",
+"!.	c #E9E8E0",
+"~.	c #CECDC7",
+"{.	c #797875",
+"].	c #969590",
+"^.	c #CFCEC8",
+"/.	c #AEADA8",
+"(.	c #282828",
+"_.	c #6D675E",
+":.	c #786F64",
+"<.	c #585754",
+"[.	c #7B7A76",
+"}.	c #736A5B",
+"|.	c #908570",
+"1.	c #928875",
+"2.	c #665C4E",
+"3.	c #8C816F",
+"4.	c #9B907F",
+"5.	c #0F0E0B",
+"6.	c #AB9A87",
+"7.	c #A8967F",
+"8.	c #998873",
+"9.	c #B6A38A",
+"0.	c #8C7C69",
+"a.	c #C8B298",
+"b.	c #B7A38A",
+"c.	c #DAC2A5",
+"d.	c #B49E84",
+"                                                ",
+"                                                ",
+"                          . . . .               ",
+"                . . . . . + @ # $ .             ",
+"      . . . . . % $ & * = - ; > , .             ",
+"    . ' ) ! ~ { ] ^ * / ( _ : < [ } .           ",
+"    . | 1 2 3 4 5 6 / # _ : 7 8 9 0 .           ",
+"    . a b c d e f / # _ g h i j k l .           ",
+"      . m 4 n o p q r s t u v w x y z .         ",
+"      . A * B ( ; C D E u F G H I J K .         ",
+"      . L / ( _ : M t N O l P Q R S T .         ",
+"        . # _ g U V W 0 l P X R Y Z `  ..       ",
+"        . ; g ..+.@.G x y #.$.%.&.*.=.. .       ",
+"        . -.t ;.F G x y #.K >.,.. . .           ",
+"          . '.).G !.Q ~.H . . . . .             ",
+"          . {.].^./.. . .     (._.:..           ",
+"          . <.[.. .         . }.|.1.2..         ",
+"            . .           . . . 3.4.. 5..       ",
+"                              . 6.7..           ",
+"                            . 8.9.9.0..         ",
+"                            . a.a.a.a..         ",
+"                          . b.c.c.c.c.d..       ",
+"                          . . . . . . . .       ",
+"                                                "};
diff -r 7f8b85e2e894 -r 83b0caceea9a src/aim.c
--- a/src/aim.c	Sun Aug 06 03:35:17 2000 +0000
+++ b/src/aim.c	Sun Aug 06 09:13:38 2000 +0000
@@ -608,6 +608,7 @@
         
 
         show_login();
+	new_conversation("None");
         gtk_main();
         
 #endif /* USE_APPLET */
diff -r 7f8b85e2e894 -r 83b0caceea9a src/conversation.c
--- a/src/conversation.c	Sun Aug 06 03:35:17 2000 +0000
+++ b/src/conversation.c	Sun Aug 06 09:13:38 2000 +0000
@@ -68,6 +68,12 @@
 #include "pixmaps/luke03.xpm"
 #include "pixmaps/oneeye.xpm"
 
+#include "pixmaps/tmp_send.xpm"
+#include "pixmaps/gnome_remove.xpm"
+#include "pixmaps/gnome_add.xpm"
+#include "pixmaps/cancel.xpm"
+#include "pixmaps/warn.xpm"
+#include "pixmaps/tb_search.xpm"
 
 int state_lock=0;
 
@@ -1425,13 +1431,13 @@
 	GtkWidget *block;
 	GtkWidget *close;
 	GtkWidget *entry;
-	GtkWidget *toolbar;
 	GtkWidget *bbox;
 	GtkWidget *vbox;
 	GtkWidget *vbox2;
 	GtkWidget *paned;
 	GtkWidget *add;
-	
+	GtkWidget *toolbar;
+
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
 
@@ -1439,16 +1445,17 @@
 	aol_icon(win->window);
         
 	c->window = win;
-        
-	send = gtk_button_new_with_label(_("Send"));
-	info = gtk_button_new_with_label(_("Info"));
-	warn = gtk_button_new_with_label(_("Warn"));
-	close = gtk_button_new_with_label(_("Close"));
+       
+
+	send = picture_button2(win, _("Send"), tmp_send_xpm);
+	info = picture_button2(win, _("Info"), tb_search_xpm);
+	warn = picture_button2(win, _("Warn"), warn_xpm);
+	close = picture_button2(win, _("Close"), cancel_xpm);
 	if (find_buddy(c->name) != NULL)
-		add = gtk_button_new_with_label(_("Remove"));
+		add = picture_button2(win, _("Remove"), gnome_remove_xpm);
 	else
-		add = gtk_button_new_with_label(_("Add"));
-	block = gtk_button_new_with_label(_("Block"));
+		add = picture_button2(win, _("Add"), gnome_add_xpm);
+	block = picture_button2(win, _("Block"), tmp_send_xpm);
 
 	/* use a slicker look if the user wants to */
 	if (display_options & OPT_DISP_COOL_LOOK)
@@ -1461,7 +1468,7 @@
 		gtk_button_set_relief(GTK_BUTTON(block), GTK_RELIEF_NONE);
 	}
 	
-	bbox = gtk_hbox_new(TRUE, 0);
+	bbox = gtk_hbox_new(FALSE, 5);
 	vbox = gtk_vbox_new(FALSE, 0);
 	vbox2 = gtk_vbox_new(FALSE, 0);
 	paned = gtk_vpaned_new();
@@ -1485,13 +1492,16 @@
 	/* Text box */
 	text = gtk_html_new(NULL, NULL);
 	gtk_html_set_editable(GTK_HTML(text), FALSE);
-/*	gtk_html_set_transparent(GTK_HTML(text), (transparent) ? TRUE : FALSE);*/
+	/*
+	gtk_html_set_transparent(GTK_HTML(text), (transparent) ? TRUE : FALSE);
+	*/
+
 	c->text = text;
 
 	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-												GTK_POLICY_NEVER,
-												GTK_POLICY_ALWAYS);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), 
+			GTK_POLICY_NEVER, 
+			GTK_POLICY_AUTOMATIC);
 	gtk_widget_show(sw);
 	gtk_container_add(GTK_CONTAINER(sw), text);
 	gtk_widget_show(text);
@@ -1513,12 +1523,12 @@
 	gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c);
 	gtk_widget_set_usize(entry, 300, 25);
 
-	gtk_box_pack_start(GTK_BOX(bbox), send, TRUE, TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(bbox), info, TRUE, TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(bbox), warn, TRUE, TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(bbox), block, TRUE, TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(bbox), add, TRUE, TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(bbox), close, TRUE, TRUE, 5);
+	gtk_box_pack_end(GTK_BOX(bbox), close, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(bbox), add, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(bbox), block, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(bbox), warn, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(bbox), info, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(bbox), send, FALSE, FALSE, 0);
 	
 	/* pack and fill the rest */
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5);
diff -r 7f8b85e2e894 -r 83b0caceea9a src/gaim.h
--- a/src/gaim.h	Sun Aug 06 03:35:17 2000 +0000
+++ b/src/gaim.h	Sun Aug 06 09:13:38 2000 +0000
@@ -408,7 +408,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 622 $"
+#define REVISION "gaim:$Revision: 633 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -581,6 +581,7 @@
 extern void spell_checker(GtkWidget *);
 extern char *away_subs(char *, char *);
 extern GtkWidget *picture_button(GtkWidget *, char *, char **);
+extern GtkWidget *picture_button2(GtkWidget *, char *, char **);
 
 /* Functions in server.c */
 /* input to serv */
diff -r 7f8b85e2e894 -r 83b0caceea9a src/util.c
--- a/src/util.c	Sun Aug 06 03:35:17 2000 +0000
+++ b/src/util.c	Sun Aug 06 09:13:38 2000 +0000
@@ -913,11 +913,17 @@
 	pixmap = gtk_pixmap_new(pm, mask);
 	gtk_box_pack_end(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
 
-	label = gtk_label_new(text);
-	gtk_box_pack_start(GTK_BOX(button_box_3), label, FALSE, FALSE, 2);
+	if (text)
+	{
+		label = gtk_label_new(text);
+		gtk_box_pack_start(GTK_BOX(button_box_3), label, FALSE, FALSE, 2);
+	}
 
 	gtk_widget_show(pixmap);
-	gtk_widget_show(label);
+	if (text)
+	{
+		gtk_widget_show(label);
+	}
 	gtk_widget_show(button_box_2);
 	gtk_widget_show(button_box_3);
 	gtk_widget_show(button_box);
@@ -925,3 +931,39 @@
 		
 	return button;
 }
+
+GtkWidget *picture_button2(GtkWidget *window, char *text, char **xpm)
+{
+	GtkWidget *button;
+	GtkWidget *button_box, *button_box_2;
+	GdkBitmap *mask;
+	GdkPixmap *pm;
+	GtkWidget *pixmap;
+	GtkTooltips *tips;	
+	
+	tips = gtk_tooltips_new();
+	button = gtk_button_new();
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
+	button_box = gtk_hbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(button), button_box);
+
+	button_box_2 = gtk_hbox_new(FALSE, 0);
+
+	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+	pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
+	pixmap = gtk_pixmap_new(pm, mask);
+	gtk_box_pack_end(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
+
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	
+	gtk_widget_show(pixmap);
+	gtk_widget_show(button_box_2);
+	gtk_widget_show(button_box);
+	gtk_widget_show(button);
+	
+	gtk_tooltips_set_tip(tips, button, text, "Gaim");	
+	return button;
+}
+