# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1257017325 0
# Node ID 05d2ceedcc74089419c615006c958e29b05f5cd8
# Parent  62e4159afc8479e8e2b57a5f9102313c80ee6eb2# Parent  583d842a25fff3f607742d1efa9df3cd50afc084
merge of '6746d602d91ae610baffb8629463407a20b7b2fd'
     and 'acac0b2e548e3d512ca885de0480a38f0c5c4eae'

diff -r 62e4159afc84 -r 05d2ceedcc74 libpurple/plugins/perl/Makefile.mingw
--- a/libpurple/plugins/perl/Makefile.mingw	Sat Oct 31 19:20:50 2009 +0000
+++ b/libpurple/plugins/perl/Makefile.mingw	Sat Oct 31 19:28:45 2009 +0000
@@ -7,10 +7,12 @@
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = perl
 
 # Perl headers with /* /* */ type comments.. Turn off warnings.
-CFLAGS += -Wno-comment
+GCCWARNINGS += -Wno-comment
 
 ##
 ## INCLUDE PATHS
diff -r 62e4159afc84 -r 05d2ceedcc74 libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw	Sat Oct 31 19:20:50 2009 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Sat Oct 31 19:28:45 2009 +0000
@@ -5,9 +5,12 @@
 #
 
 PIDGIN_TREE_TOP := ../../../..
-GCCWARNINGS := -Wno-comment -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wpointer-arith -Wundef -Wno-unused
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
+
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = Purple
 AUTOSPLIT = lib/auto/Purple/autosplit.ix
 EXTUTILS ?= C:/perl/lib/ExtUtils
diff -r 62e4159afc84 -r 05d2ceedcc74 libpurple/protocols/silc/Makefile.mingw
--- a/libpurple/protocols/silc/Makefile.mingw	Sat Oct 31 19:20:50 2009 +0000
+++ b/libpurple/protocols/silc/Makefile.mingw	Sat Oct 31 19:28:45 2009 +0000
@@ -7,6 +7,8 @@
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/bin/libsilc-1-1-2.dll \
 			$(SILC_TOOLKIT)/bin/libsilcclient-1-1-2.dll
@@ -79,7 +81,7 @@
 $(OBJECTS): $(PURPLE_CONFIG_H)
 
 $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
-	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x64000000 -o $(TARGET).dll
+	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x74000000 -o $(TARGET).dll
 
 ##
 ## CLEAN RULES
diff -r 62e4159afc84 -r 05d2ceedcc74 libpurple/protocols/silc10/Makefile.mingw
--- a/libpurple/protocols/silc10/Makefile.mingw	Sat Oct 31 19:20:50 2009 +0000
+++ b/libpurple/protocols/silc10/Makefile.mingw	Sat Oct 31 19:28:45 2009 +0000
@@ -7,6 +7,8 @@
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
 			$(SILC_TOOLKIT)/lib/silcclient.dll
diff -r 62e4159afc84 -r 05d2ceedcc74 libpurple/win32/global.mak
--- a/libpurple/win32/global.mak	Sat Oct 31 19:20:50 2009 +0000
+++ b/libpurple/win32/global.mak	Sat Oct 31 19:28:45 2009 +0000
@@ -85,7 +85,7 @@
 DEFINES += -DHAVE_CYRUS_SASL
 endif
 
-DEFINES += -DHAVE_CONFIG_H
+DEFINES += -DHAVE_CONFIG_H -DWIN32_LEAN_AND_MEAN
 
 # Use -g flag when building debug version of Pidgin (including plugins).
 # Use -fnative-struct instead of -mms-bitfields when using mingw 1.1
diff -r 62e4159afc84 -r 05d2ceedcc74 pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw	Sat Oct 31 19:20:50 2009 +0000
+++ b/pidgin/Makefile.mingw	Sat Oct 31 19:28:45 2009 +0000
@@ -7,6 +7,8 @@
 PIDGIN_TREE_TOP := ..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 NEEDED_DLLS = $(GTKSPELL_TOP)/gtkspell/libgtkspell.dll
 
 ##
@@ -55,9 +57,9 @@
 ##
 PIDGIN_C_SRC =	\
 			gtkaccount.c \
-			gtkblist.c \
+			gtkblist-theme-loader.c \
 			gtkblist-theme.c \
-			gtkblist-theme-loader.c \
+			gtkblist.c \
 			gtkcellrendererexpander.c \
 			gtkcertmgr.c \
 			gtkconn.c \
@@ -68,8 +70,8 @@
 			gtkdocklet.c \
 			gtkeventloop.c \
 			gtkft.c \
+			gtkicon-theme-loader.c \
 			gtkicon-theme.c \
-			gtkicon-theme-loader.c \
 			gtkidle.c \
 			gtkimhtml.c \
 			gtkimhtmltoolbar.c \
diff -r 62e4159afc84 -r 05d2ceedcc74 pidgin/plugins/perl/common/Makefile.mingw
--- a/pidgin/plugins/perl/common/Makefile.mingw	Sat Oct 31 19:20:50 2009 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Sat Oct 31 19:28:45 2009 +0000
@@ -5,9 +5,12 @@
 #
 
 PIDGIN_TREE_TOP := ../../../..
-GCCWARNINGS := -Wno-comment -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wpointer-arith -Wundef -Wno-unused
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
+GCCWARNINGS += -Wno-comment -Wno-unused -Wno-nested-externs
+
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
+
 TARGET = Pidgin
 EXTUTILS ?= C:/perl/lib/ExtUtils
 
diff -r 62e4159afc84 -r 05d2ceedcc74 pidgin/plugins/win32/winprefs/Makefile.mingw
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw	Sat Oct 31 19:20:50 2009 +0000
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw	Sat Oct 31 19:28:45 2009 +0000
@@ -8,6 +8,7 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = winprefs
+DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 DEFINES += -DWINVER=0x500
 
 ##