11 files changed, 36 insertions, 47 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat
index 6d87c5d2..44e13af4 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -6,7 +6,11 @@ set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\Win
 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
 set OPATH=%PATH%
 set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.12-x64\bin
+cd common
 nmake -f makefile.mak clean
+cd ..\fe-gtk
+nmake -f makefile.mak clean
+cd ..
 nmake -f makefile.mak
 cd ..\plugins\ewc
 nmake -f makefile.mak clean
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 9e919d3b..6eddb451 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -6,6 +6,9 @@ set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
 set OPATH=%PATH%
 set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw32\bin;c:\mozilla-build\perl-5.12-x86\bin
 nmake -f makefile.mak clean
+cd pixmaps
+nmake -f makefile.mak
+cd ..
 nmake -f makefile.mak
 cd ..\plugins\ewc
 nmake -f makefile.mak clean
diff --git a/build/deps-x64.txt b/build/deps-x64.txt
index 11e3025b..cfc0d9cc 100644
--- a/build/deps-x64.txt
+++ b/build/deps-x64.txt
@@ -4,23 +4,12 @@ http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/cairo_1.8.10-3_win64.
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/cairo-dev_1.8.10-3_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/expat_2.0.1-3_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/fontconfig_2.8.0-2_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/fontconfig-dev_2.8.0-2_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/freetype_2.4.2-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/freetype-dev_2.4.2-1_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime_0.17-3_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/gettext-runtime-dev_0.17-3_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.24/glib_2.24.0-1_win64.zip
+http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libpng_1.4.3-1_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/glib/2.24/glib-dev_2.24.0-1_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.16/gtk+_2.16.6-2_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/gtk+/2.16/gtk+-dev_2.16.6-2_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/jpeg_8-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/jpeg-dev_8-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libpng_1.4.3-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libpng-dev_1.4.3-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libtiff_3.9.1-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/libtiff-dev_3.9.1-1_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango_1.28.0-1_win64.zip
 http://ftp.gnome.org/pub/gnome/binaries/win64/pango/1.28/pango-dev_1.28.0-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/pkg-config_0.23-2_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/zlib_1.2.5-1_win64.zip
-http://ftp.gnome.org/pub/gnome/binaries/win64/dependencies/zlib-dev_1.2.5-1_win64.zip
diff --git a/build/deps-x86.txt b/build/deps-x86.txt
index a860b4c6..2a0d9c09 100644
--- a/build/deps-x86.txt
+++ b/build/deps-x86.txt
@@ -4,24 +4,15 @@ http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo_1.8.10-4_win32.
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/cairo-dev_1.8.10-4_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/expat_2.0.1-1_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig_2.8.0-2_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/fontconfig-dev_2.8.0-2_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype_2.4.2-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/freetype-dev_2.4.2-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-tools-0.17.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-0.17-1.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime-dev-0.17-1.zip
+http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-tools-0.17.zip
+http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.3-1_win32.zip
+http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.24/glib_2.24.2-1_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.24/glib-dev_2.24.2-1_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/gtk+_2.16.6-2_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/gtk+-dev_2.16.6-2_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/jpeg_8-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/jpeg-dev_8-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng_1.4.3-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libpng-dev_1.4.3-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libtiff_3.9.2-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/libtiff-dev_3.9.2-1_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango_1.28.1-1_win32.zip
 http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28/pango-dev_1.28.1-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.23-3_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib-dev_1.2.5-2_win32.zip
diff --git a/build/release-x64.bat b/build/release-x64.bat
index 78afa278..dcff6892 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -10,9 +10,9 @@ copy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%\libgio-2.0-0.dll.x64
 copy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%\libglib-2.0-0.dll.x64
 copy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%\libgmodule-2.0-0.dll.x64
 copy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%\libgobject-2.0-0.dll.x64
-::copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64
+copy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%\libgthread-2.0-0.dll.x64
 copy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%\libpng14-14.dll.x64
-copy %GTK_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
+::copy %GTK_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
 copy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%\libgdk-win32-2.0-0.dll.x64
 copy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%\libcairo-2.dll.x64
 copy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%\libfontconfig-1.dll.x64
@@ -24,11 +24,12 @@ copy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%\libpangoft2-1.0-0.dll.x64
 copy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%\libpangowin32-1.0-0.dll.x64
 copy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%\libatk-1.0-0.dll.x64
 copy %GTK_BIN%\libintl-8.dll %XCHAT_DEST%\libintl-8.dll.x64
-copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
+::copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64
 copy %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64
-copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
+::copy %GTK_BIN%\..\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\libgail.dll.x64
 copy %SSL_BIN%\libeay32.dll %XCHAT_DEST%\libeay32.dll.x64
 copy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%\ssleay32.dll.x64
+copy %SSL_BIN%\zlib1.dll %XCHAT_DEST%\zlib1.dll.x64
 copy ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\xcewc.dll.x64
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\xclua.dll.x64
 copy ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\xcperl.dll.x64
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 12d08118..f31097ee 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -12,9 +12,9 @@ xcopy %GTK_BIN%\libgio-2.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libglib-2.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libgmodule-2.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libgobject-2.0-0.dll %XCHAT_DEST%
-::xcopy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
+xcopy %GTK_BIN%\libgthread-2.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libpng14-14.dll %XCHAT_DEST%
-xcopy %GTK_BIN%\zlib1.dll %XCHAT_DEST%
+::xcopy %GTK_BIN%\zlib1.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libcairo-2.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libfontconfig-1.dll %XCHAT_DEST%
@@ -26,14 +26,16 @@ xcopy %GTK_BIN%\libpangoft2-1.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libpangowin32-1.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\libatk-1.0-0.dll %XCHAT_DEST%
 xcopy %GTK_BIN%\intl.dll %XCHAT_DEST%
-xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0
-rmdir /Q /S %XCHAT_DEST%\lib\gtk-2.0\include
+::xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0
+::rmdir /Q /S %XCHAT_DEST%\lib\gtk-2.0\include
+xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
 xcopy /S /I etc %XCHAT_DEST%\etc
 xcopy ..\COPYING %XCHAT_DEST%
 xcopy %SSL_BIN%\..\LICENSE.OPENSSL %XCHAT_DEST%
 xcopy %SSL_BIN%\..\LICENSE.ZLIB %XCHAT_DEST%
 xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST%
 xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST%
+xcopy %SSL_BIN%\zlib1.dll %XCHAT_DEST%
 xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins\
 xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\
diff --git a/build/xchat-wdk.iss b/build/xchat-wdk.iss
index 85905968..076b9df2 100644
--- a/build/xchat-wdk.iss
+++ b/build/xchat-wdk.iss
@@ -1,9 +1,9 @@
 [Setup]
 AppName=XChat-WDK
-AppVerName=XChat-WDK r1459-3
-AppVersion=14.59.3
-VersionInfoVersion=14.59.3
-OutputBaseFilename=XChat-WDK r1459-3
+AppVerName=XChat-WDK r1459-4
+AppVersion=14.59.4
+VersionInfoVersion=14.59.4
+OutputBaseFilename=XChat-WDK r1459-4
 AppPublisher=XChat-WDK
 AppPublisherURL=http://code.google.com/p/xchat-wdk/
 AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
@@ -104,8 +104,8 @@ Source: "libgmodule-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgmodule-2.0-
 Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
 Source: "libgobject-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgobject-2.0-0.dll"; Components: libs; Tasks: x64
 
-;Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
-;Source: "libgthread-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgthread-2.0-0.dll"; Components: libs; Tasks: x64
+Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
+Source: "libgthread-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgthread-2.0-0.dll"; Components: libs; Tasks: x64
 
 Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs; Tasks: x86
 Source: "libgtk-win32-2.0-0.dll.x64"; DestDir: "{app}"; DestName: "libgtk-win32-2.0-0.dll"; Components: libs; Tasks: x64
@@ -136,14 +136,14 @@ Source: "zlib1.dll.x64"; DestDir: "{app}"; DestName: "zlib1.dll"; Components: li
 
 
 
-Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86
-Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; DestName: "libpixmap.dll"; Components: libs; Tasks: x64
+;Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86
+;Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll.x64"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; DestName: "libpixmap.dll"; Components: libs; Tasks: x64
 
 Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs; Tasks: x86
 Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll.x64"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; DestName: "libwimp.dll"; Components: libs; Tasks: x64
 
-Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs; Tasks: x86
-Source: "lib\gtk-2.0\modules\libgail.dll.x64"; DestDir: "{app}\lib\gtk-2.0\modules"; DestName: "libgail.dll"; Components: libs; Tasks: x64
+;Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs; Tasks: x86
+;Source: "lib\gtk-2.0\modules\libgail.dll.x64"; DestDir: "{app}\lib\gtk-2.0\modules"; DestName: "libgail.dll"; Components: libs; Tasks: x64
 
 
 
diff --git a/config.h b/config.h
index e53fc305..8f566a53 100644
--- a/config.h
+++ b/config.h
@@ -6,7 +6,7 @@
 #define USE_GTKSPELL
 #endif*/
 #define PACKAGE_NAME "xchat"
-#define PACKAGE_VERSION "r1459-3"
+#define PACKAGE_VERSION "r1459-4"
 #define XCHATLIBDIR "."
 #define XCHATSHAREDIR "."
 #define OLD_PERL
diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak
index f5198181..cd4ca1db 100644
--- a/src/fe-gtk/makefile.mak
+++ b/src/fe-gtk/makefile.mak
@@ -32,6 +32,7 @@ xchat-icon.obj: xchat.res
 
 clean:
 	del *.obj
+	del fe-gtk\mmx_cmod.o
 	del $(PROG)
 	del xchat.rc
 	del xchat.RES
diff --git a/src/makefile.mak b/src/makefile.mak
index 89f897d7..5864f956 100644
--- a/src/makefile.mak
+++ b/src/makefile.mak
@@ -1,8 +1,6 @@
 all:
 	copy ..\plugins\xchat-plugin.h common
-	@cd pixmaps
-	@-$(MAKE) -f makefile.mak $@
-	@cd ..\common
+	@cd common
 	@-$(MAKE) -f makefile.mak $@
 	@cd ..\fe-gtk
 	@-$(MAKE) -f makefile.mak $@
diff --git a/src/makeinc.skel b/src/makeinc.skel
index 6a679141..f9d30deb 100644
--- a/src/makeinc.skel
+++ b/src/makeinc.skel
@@ -35,7 +35,7 @@ OPENSSLPATH = c:\mozilla-build\build\openssl-wdk-1.0.0a-x86
 CFLAGS = $(CFLAGS) /DUSE_OPENSSL /I$(OPENSSLPATH)\include
 LIBS = $(LIBS) /libpath:$(OPENSSLPATH)\lib libeay32.lib ssleay32.lib
 
-SPELL = -Ic:\mozilla-build\build\gtkspell-x86\include\gtkspell-2.0
+#SPELL = -Ic:\mozilla-build\build\gtkspell-x86\include\gtkspell-2.0
 #LIBS = $(LIBS) /libpath:c:\mozilla-build\build\gtkspell-x86\lib libgtkspell.a
 
 LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj