# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1170013747 0
# Node ID d79ca56a462695054c524f636631495de814ed55
# Parent  d49d8b7e168c850b1f425d6bf9ff33158ca11870
more win32 build fixes for build changes

diff -r d49d8b7e168c -r d79ca56a4626 config.h.mingw
--- a/config.h.mingw	Sun Jan 28 19:41:21 2007 +0000
+++ b/config.h.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -643,3 +643,5 @@
 #define HAVE_VSNPRINTF 1
 
 #define SIZEOF_TIME_T 4
+
+#define PIDGIN_NAME "Pidgin"
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/gtkdebug.c
--- a/pidgin/gtkdebug.c	Sun Jan 28 19:41:21 2007 +0000
+++ b/pidgin/gtkdebug.c	Sun Jan 28 19:49:07 2007 +0000
@@ -182,7 +182,7 @@
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox),
 					  hbox);
-	img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
+	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
 								   GTK_ICON_SIZE_DIALOG);
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Sun Jan 28 19:41:21 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sun Jan 28 19:49:07 2007 +0000
@@ -47,11 +47,6 @@
 		typed.png			\
 		typing.png			\
 		Makefile.mingw			\
-		smileys/Makefile.mingw		\
-		smileys/default/Makefile.mingw	\
-		smileys/none/Makefile.mingw	\
-		status/default/Makefile.mingw	\
-		status/Makefile.mingw		\
 		gaim-install.ico		\
 		gaim.ico			\
 		gaim_16.ico			\
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/dialogs/16/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/dialogs/16/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+GAIM_TOP := ../../../..
+include $(GAIM_TOP)/libpurple/win32/global.mak
+
+datadir = $(GAIM_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
+	fi;
+
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/dialogs/64/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/dialogs/64/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+GAIM_TOP := ../../../..
+include $(GAIM_TOP)/libpurple/win32/global.mak
+
+datadir = $(GAIM_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
+	fi;
+
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/dialogs/Makefile.am
--- a/pidgin/pixmaps/dialogs/Makefile.am	Sun Jan 28 19:41:21 2007 +0000
+++ b/pidgin/pixmaps/dialogs/Makefile.am	Sun Jan 28 19:49:07 2007 +0000
@@ -1,1 +1,6 @@
 SUBDIRS = 16 64
+
+EXTRA_DIST = \
+	Makefile.mingw \
+	16/Makefile.mingw \
+	64/Makefile.mingw
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/dialogs/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/dialogs/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,16 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/emblems/16/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/emblems/16/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+GAIM_TOP := ../../../..
+include $(GAIM_TOP)/libpurple/win32/global.mak
+
+datadir = $(GAIM_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginemblempix_DATA)'; then \
+	  mkdir -p $(pidginemblempixdir); \
+	  cp $(pidginemblempix_DATA) $(pidginemblempixdir); \
+	fi;
+
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/emblems/Makefile.am
--- a/pidgin/pixmaps/emblems/Makefile.am	Sun Jan 28 19:41:21 2007 +0000
+++ b/pidgin/pixmaps/emblems/Makefile.am	Sun Jan 28 19:49:07 2007 +0000
@@ -1,1 +1,5 @@
 SUBDIRS = 16
+
+EXTRA_DIST = \
+	Makefile.mingw \
+	16/Makefile.mingw
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/emblems/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/emblems/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,16 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/emotes/default/22/scalable/Makefile.mingw
--- a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.mingw	Sun Jan 28 19:41:21 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-.PHONY: install
-
-install:
-
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/emotes/default/Makefile.am
--- a/pidgin/pixmaps/emotes/default/Makefile.am	Sun Jan 28 19:41:21 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/Makefile.am	Sun Jan 28 19:49:07 2007 +0000
@@ -2,4 +2,3 @@
 
 EXTRA_DIST= \
 	22/Makefile.mingw
-	22/22/scalable/Makefile.mingw
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/protocols/16/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/protocols/16/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+GAIM_TOP := ../../../..
+include $(GAIM_TOP)/libpurple/win32/global.mak
+
+datadir = $(GAIM_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/protocols/22/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/protocols/22/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+GAIM_TOP := ../../../..
+include $(GAIM_TOP)/libpurple/win32/global.mak
+
+datadir = $(GAIM_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/protocols/48/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/protocols/48/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+GAIM_TOP := ../../../..
+include $(GAIM_TOP)/libpurple/win32/global.mak
+
+datadir = $(GAIM_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/protocols/Makefile.am
--- a/pidgin/pixmaps/protocols/Makefile.am	Sun Jan 28 19:41:21 2007 +0000
+++ b/pidgin/pixmaps/protocols/Makefile.am	Sun Jan 28 19:49:07 2007 +0000
@@ -1,1 +1,8 @@
 SUBDIRS = 16 22 48
+
+EXTRA_DIST = \
+	Makefile.mingw \
+	16/Makefile.mingw \
+	22/Makefile.mingw \
+	48/Makefile.mingw
+
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/protocols/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/protocols/Makefile.mingw	Sun Jan 28 19:49:07 2007 +0000
@@ -0,0 +1,16 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
diff -r d49d8b7e168c -r d79ca56a4626 pidgin/pixmaps/status/Makefile.am
--- a/pidgin/pixmaps/status/Makefile.am	Sun Jan 28 19:41:21 2007 +0000
+++ b/pidgin/pixmaps/status/Makefile.am	Sun Jan 28 19:49:07 2007 +0000
@@ -1,6 +1,7 @@
 SUBDIRS = 16 22 32
 
 EXTRA_DIST = \
+	Makefile.mingw \
 	16/Makefile.mingw \
 	22/Makefile.mingw \
 	32/Makefile.mingw