# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1036736362 0
# Node ID b8398b505b03f719873cb1738f6dfc6ddbe0296a
# Parent  30f52e7afd1d8945b5aedaed4b1da76701d4bf4a
[gaim-migrate @ 4095]
ok

committer: Tailor Script <tailor@pidgin.im>

diff -r 30f52e7afd1d -r b8398b505b03 Makefile.mingw
--- a/Makefile.mingw	Fri Nov 08 06:10:35 2002 +0000
+++ b/Makefile.mingw	Fri Nov 08 06:19:22 2002 +0000
@@ -73,6 +73,8 @@
 
 PIXMAPS_BUTTONS =	$(GAIM_PIXMAPS)/edit.png \
 			$(GAIM_PIXMAPS)/accounts.png \
+			$(GAIM_PIXMAPS)/change-bgcolor-small.png \
+			$(GAIM_PIXMAPS)/change-fgcolor-small.png \
 			$(GAIM_PIXMAPS)/preferences.png \
 			$(GAIM_PIXMAPS)/signon.png \
 			$(GAIM_PIXMAPS)/insert-image-small.png \
diff -r 30f52e7afd1d -r b8398b505b03 pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Fri Nov 08 06:10:35 2002 +0000
+++ b/pixmaps/Makefile.am	Fri Nov 08 06:19:22 2002 +0000
@@ -14,6 +14,8 @@
 		broken.xpm			\
 		burp.xpm			\
 		cancel.xpm			\
+		change-bgcolor-small.png \
+		change-fgcolor-small.png \
 		close.xpm			\
 		connect.png			\
 		crazy4.xpm			\
diff -r 30f52e7afd1d -r b8398b505b03 pixmaps/change-bgcolor-small.png
Binary file pixmaps/change-bgcolor-small.png has changed
diff -r 30f52e7afd1d -r b8398b505b03 pixmaps/change-fgcolor-small.png
Binary file pixmaps/change-fgcolor-small.png has changed
diff -r 30f52e7afd1d -r b8398b505b03 src/conversation.c
--- a/src/conversation.c	Fri Nov 08 06:10:35 2002 +0000
+++ b/src/conversation.c	Fri Nov 08 06:19:22 2002 +0000
@@ -2250,14 +2250,14 @@
 		gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
 
 		/* Font Color */
-		button = gaim_pixbuf_toolbar_button_from_stock("gtk-select-color");
+		button = gaim_pixbuf_toolbar_button_from_file("change-fgcolor-small.png");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_fg_color), c);
 		c->fgcolorbtn = button; /* We should remember this */
 
 		/* Font Color */
-		button = gaim_pixbuf_toolbar_button_from_stock("gtk-select-color");
+		button = gaim_pixbuf_toolbar_button_from_file("change-bgcolor-small.png");
 		gtk_size_group_add_widget(sg, button);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_bg_color), c);