# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1039590851 0
# Node ID c3c36d2444af9511995adf96743aa1b0b88d3097
# Parent  c3968c878c68b535264a49ff631b446bf7ee8ebe
[gaim-migrate @ 4270]
Thanks, phroggie!!

committer: Tailor Script <tailor@pidgin.im>

diff -r c3968c878c68 -r c3c36d2444af Makefile.mingw
--- a/Makefile.mingw	Wed Dec 11 02:09:43 2002 +0000
+++ b/Makefile.mingw	Wed Dec 11 07:14:11 2002 +0000
@@ -87,6 +87,29 @@
 			$(GAIM_PIXMAPS)/text_normal.png \
 			$(GAIM_PIXMAPS)/text_smaller.png 
 
+PIXMAPS_SMILEYS =	$(GAIM_PIXMAPS)/angel.png \
+ 			$(GAIM_PIXMAPS)/bigsmile.png \
+ 			$(GAIM_PIXMAPS)/burp.png \
+			$(GAIM_PIXMAPS)/cool.png \
+ 			$(GAIM_PIXMAPS)/crossedlips.png \
+ 			$(GAIM_PIXMAPS)/cry.png \
+ 			$(GAIM_PIXMAPS)/embarrassed.png \
+ 			$(GAIM_PIXMAPS)/kiss.png \
+ 			$(GAIM_PIXMAPS)/moneymouth.png \
+ 			$(GAIM_PIXMAPS)/sad.png \
+ 			$(GAIM_PIXMAPS)/scream.png \
+ 			$(GAIM_PIXMAPS)/smile.png \
+ 			$(GAIM_PIXMAPS)/think.png \
+ 			$(GAIM_PIXMAPS)/tongue.png \
+ 			$(GAIM_PIXMAPS)/wink.png \
+ 			$(GAIM_PIXMAPS)/yell.png \
+ 			$(GAIM_PIXMAPS)/luke.png \
+ 			$(GAIM_PIXMAPS)/oneeye.png \
+			$(GAIM_PIXMAPS)/crazy.png \
+ 			$(GAIM_PIXMAPS)/mrt.png \
+ 			$(GAIM_PIXMAPS)/download.png \
+ 			$(GAIM_PIXMAPS)/farted.png
+
 PIXMAPS =		$(GAIM_PIXMAPS)/away.png \
 			$(GAIM_PIXMAPS)/connect.png \
 			$(GAIM_PIXMAPS)/msgpend.png \
@@ -94,6 +117,7 @@
 			$(GAIM_PIXMAPS)/offline.png \
 			$(GAIM_PIXMAPS)/online.png \
 			$(GAIM_PIXMAPS)/logo.png
+			
 
 SOUNDS =		$(GAIM_SOUNDS)/leave.wav \
 			$(GAIM_SOUNDS)/redalert.wav \
@@ -134,6 +158,7 @@
 	mkdir -p $(GAIM_INSTALL_DIR)/pixmaps/gaim/dialogs
 	mkdir -p $(GAIM_INSTALL_DIR)/pixmaps/gaim/buttons
 	mkdir -p $(GAIM_INSTALL_DIR)/pixmaps/gaim/menus
+	mkdir -p $(GAIM_INSTALL_DIR)/pixmaps/gaim/smileys/default
 	mkdir -p $(GAIM_INSTALL_DIR)/sounds/gaim
 	$(MAKE) -C $(PO) -f Makefile.mingw install
 	$(MAKE) -C $(GAIM_SRC) -f Makefile.mingw install
@@ -148,6 +173,7 @@
 	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
 	cp $(PIXMAPS_DIALOGS) $(GAIM_INSTALL_DIR)/pixmaps/gaim/dialogs
 	cp $(PIXMAPS_BUTTONS) $(GAIM_INSTALL_DIR)/pixmaps/gaim/buttons
+	cp $(PIXMAPS_SMILEYS) $(GAIM_INSTALL_DIR)/pixmaps/gaim/smileys/default
 	cp $(PIXMAPS_MENUS) $(GAIM_INSTALL_DIR)/pixmaps/gaim/menus
 	cp $(PIXMAPS) $(GAIM_INSTALL_DIR)/pixmaps/gaim
 	cp $(SOUNDS) $(GAIM_INSTALL_DIR)/sounds/gaim
diff -r c3968c878c68 -r c3c36d2444af src/dialogs.c
--- a/src/dialogs.c	Wed Dec 11 02:09:43 2002 +0000
+++ b/src/dialogs.c	Wed Dec 11 07:14:11 2002 +0000
@@ -3641,35 +3641,35 @@
 	
 	smiley_box = gtk_toolbar_new();
 	gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
-#define GDS G_DIR_SEPARATOR_S	
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "angel.png", "O:-)");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "bigsmile.png", ":-D");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "burp.png", ":-!");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "crossedlips.png", ":-X");
+
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "angel.png", NULL), "O:-)");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "bigsmile.png", NULL), ":-D");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "burp.png", NULL), ":-!");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "crossedlips.png", NULL), ":-X");
 
 	smiley_box = gtk_toolbar_new();
 	gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
-       
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "cry.png", ":'(");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "embarrassed.png", ":-[");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "kiss.png", ":-*");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "moneymouth.png", ":-$");
+      
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "cry.png", NULL), ":'(");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "embarrassed.png", NULL), ":-[");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "kiss.png", NULL), ":-*");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "moneymouth.png", NULL), ":-$");
 
 	smiley_box = gtk_toolbar_new();
 	gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
 	
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "sad.png", ":-(");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "scream.png", "=-O");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "smile.png", ":-)");
-      	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "cool.png", "8-)");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "sad.png", NULL), ":-(");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "scream.png", NULL), "=-O");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "smile.png", NULL), ":-)");
+      	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "cool.png", NULL), "8-)");
 
 	smiley_box = gtk_toolbar_new();
 	gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
 
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "think.png", ":-/");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "tongue.png", ":-P");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "wink.png", ";-)");
-	toolbar_add_smiley(c, smiley_box, DATADIR GDS "pixmaps" GDS "gaim" GDS "smileys" GDS "default" GDS "yell.png", ">:o");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "think.png", NULL), ":-/");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "tongue.png", NULL), ":-P");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "wink.png", NULL), ";-)");
+	toolbar_add_smiley(c, smiley_box, g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "yell.png", NULL), ">:o");
 
 	gtk_container_add(GTK_CONTAINER(dialog), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);