# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1169672600 0
# Node ID deeaffeda047bc14a219fa3694be4fba2ccda6dc
# Parent  3a943f4af57efe88eb392dc2003f24488f606d63# Parent  1ec72a759b5c8e772e4235ba73dadf922fba2b6f
merge of '7daaf59bc033f5665ab67b267aa5b270469e3ead'
     and 'eac90dc3715014deec3d806ac48c6c6be16a4c4d'

diff -r 3a943f4af57e -r deeaffeda047 libpurple/win32/win32dep.h
--- a/libpurple/win32/win32dep.h	Wed Jan 24 21:02:37 2007 +0000
+++ b/libpurple/win32/win32dep.h	Wed Jan 24 21:03:20 2007 +0000
@@ -28,6 +28,11 @@
 #include "wgaimerror.h"
 #include "libc_interface.h"
 
+/* rpcndr.h defines small as char, causing problems, so we need to undefine it */
+#ifdef _WIN32
+#undef small
+#endif
+
 /*
  *  PROTOS
  */
diff -r 3a943f4af57e -r deeaffeda047 pidgin/pixmaps/emotes/Makefile.am
--- a/pidgin/pixmaps/emotes/Makefile.am	Wed Jan 24 21:02:37 2007 +0000
+++ b/pidgin/pixmaps/emotes/Makefile.am	Wed Jan 24 21:03:20 2007 +0000
@@ -1,1 +1,3 @@
 SUBDIRS=default none
+
+EXTRA_DIST = Makefile.mingw
diff -r 3a943f4af57e -r deeaffeda047 pidgin/pixmaps/emotes/default/Makefile.am
--- a/pidgin/pixmaps/emotes/default/Makefile.am	Wed Jan 24 21:02:37 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/Makefile.am	Wed Jan 24 21:03:20 2007 +0000
@@ -1,1 +1,5 @@
 SUBDIRS=22 scalable
+
+EXTRA_DIST= \
+	22/Makefile.mingw \
+	scalable/Makefile.mingw
diff -r 3a943f4af57e -r deeaffeda047 pidgin/pixmaps/emotes/none/Makefile.am
--- a/pidgin/pixmaps/emotes/none/Makefile.am	Wed Jan 24 21:02:37 2007 +0000
+++ b/pidgin/pixmaps/emotes/none/Makefile.am	Wed Jan 24 21:03:20 2007 +0000
@@ -1,4 +1,5 @@
 gaimsmileypixdir = $(datadir)/pixmaps/gaim/smileys/none
 gaimsmileypix_DATA = theme 
 
-EXTRA_DIST = $(gaimsmileypix_DATA)
+EXTRA_DIST = $(gaimsmileypix_DATA) \
+	Makefile.mingw
diff -r 3a943f4af57e -r deeaffeda047 pidgin/pixmaps/status/16/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.mingw	Wed Jan 24 21:03:20 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 '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff -r 3a943f4af57e -r deeaffeda047 pidgin/pixmaps/status/22/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/22/Makefile.mingw	Wed Jan 24 21:03:20 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 '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff -r 3a943f4af57e -r deeaffeda047 pidgin/pixmaps/status/32/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/32/Makefile.mingw	Wed Jan 24 21:03:20 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 '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff -r 3a943f4af57e -r deeaffeda047 pidgin/pixmaps/status/Makefile.am
--- a/pidgin/pixmaps/status/Makefile.am	Wed Jan 24 21:02:37 2007 +0000
+++ b/pidgin/pixmaps/status/Makefile.am	Wed Jan 24 21:03:20 2007 +0000
@@ -1,2 +1,7 @@
 SUBDIRS = 16 22 32
 
+EXTRA_DIST = \
+	16/Makefile.mingw \
+	22/Makefile.mingw \
+	32/Makefile.mingw
+