# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1194300238 0
# Node ID 3635ddf4170f5f4d410313aa0528f1e3047963da
# Parent  75ad6af0b02c7f59a169636df6f637247f53e910# Parent  1f8e878cc5019781095559584ac0d86d6ea4e842
merge of '6f297cb9eebbeafa2feb340ad3f46f4157854b90'
     and '8a99c217891d1f2b2baaeaa0a98248f5eddfc160'

diff -r 75ad6af0b02c -r 3635ddf4170f pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Mon Nov 05 20:53:22 2007 +0000
+++ b/pidgin/Makefile.mingw	Mon Nov 05 22:03:58 2007 +0000
@@ -20,6 +20,8 @@
 
 LDFLAGS := $(WINAPP)
 
+#CFLAGS += -DWINPIDGIN_USE_GLIB_IO_CHANNEL=1
+
 ##
 ## INCLUDE PATHS
 ##
@@ -167,7 +169,6 @@
 clean:
 	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
-	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) clean
 	rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
 	rm -f $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a $(PIDGIN_TARGET).def
 	rm -f $(EXE_TARGET).exe
diff -r 75ad6af0b02c -r 3635ddf4170f pidgin/pixmaps/Makefile.mingw
--- a/pidgin/pixmaps/Makefile.mingw	Mon Nov 05 20:53:22 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Mon Nov 05 22:03:58 2007 +0000
@@ -36,5 +36,3 @@
 	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
 
-clean:
-	$(MAKE) -C emotes -f $(MINGW_MAKEFILE) clean || exit 1 ;\