obs gtk 2.24 is utter, unusable crap, revert to gtk 2.16

6 files changed, 120 insertions, 102 deletions

diff --git a/build/dep-extract-x64.bat b/build/dep-extract-x64.bat
index d6381cb3..efc6386d 100644
--- a/build/dep-extract-x64.bat
+++ b/build/dep-extract-x64.bat
@@ -2,22 +2,23 @@
 set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef

 

 cd ..\dep-x64

-7z x -y *.rpm

-7z x *.cpio

-del *.cpio

-xcopy /q /s /i usr\x86_64-w64-mingw32\sys-root\mingw\* .

-rmdir /q /s usr

-set OPATH=%PATH%

-set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64

-cd lib

-for %%A in (..\bin\*.dll) do (

-	gendef %%A

-	lib /nologo /machine:x64 /def:%%~nA.def

-)

-cd ..

-set PATH=%OPATH%

+::obs 7z x -y *.rpm

+::obs 7z x *.cpio

+::obs del *.cpio

+::obs xcopy /q /s /i usr\x86_64-w64-mingw32\sys-root\mingw\* .

+::obs rmdir /q /s usr

+::obs set OPATH=%PATH%

+::obs set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64

+::obs cd lib

+::obs for %%A in (..\bin\*.dll) do (

+::obs 	gendef %%A

+::obs 	lib /nologo /machine:x64 /def:%%~nA.def

+::obs )

+::obs cd ..

+::obs set PATH=%OPATH%

+7z x -y *.zip

 7z x *.7z

-copy /y ..\build\glibconfig-x64.h lib\glib-2.0\include\glibconfig.h

+::obs copy /y ..\build\glibconfig-x64.h lib\glib-2.0\include\glibconfig.h

 cd share\locale

 del /q /s gettext-tools.mo

 del /q /s gettext-runtime.mo

diff --git a/build/dep-extract-x86.bat b/build/dep-extract-x86.bat
index 93e73ee4..9fd3d6e2 100644
--- a/build/dep-extract-x86.bat
+++ b/build/dep-extract-x86.bat
@@ -2,22 +2,23 @@
 set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef

 

 cd ..\dep-x86

-7z x -y *.rpm

-7z x *.cpio

-del *.cpio

-xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* .

-rmdir /q /s usr

-set OPATH=%PATH%

-set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE

-cd lib

-for %%A in (..\bin\*.dll) do (

-	gendef %%A

-	lib /nologo /machine:x86 /def:%%~nA.def

-)

-cd ..

-set PATH=%OPATH%

+::obs 7z x -y *.rpm

+::obs 7z x *.cpio

+::obs del *.cpio

+::obs xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* .

+::obs rmdir /q /s usr

+::obs set OPATH=%PATH%

+::obs set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE

+::obs cd lib

+::obs for %%A in (..\bin\*.dll) do (

+::obs 	gendef %%A

+::obs 	lib /nologo /machine:x86 /def:%%~nA.def

+::obs )

+::obs cd ..

+::obs set PATH=%OPATH%

+7z x -y *.zip

 7z x *.7z

-copy /y ..\build\glibconfig-x86.h lib\glib-2.0\include\glibconfig.h

+::obs copy /y ..\build\glibconfig-x86.h lib\glib-2.0\include\glibconfig.h

 cd share\locale

 del /q /s gettext-tools.mo

 del /q /s gettext-runtime.mo

diff --git a/build/release-x64.bat b/build/release-x64.bat
index e2f91991..4e658fc6 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -7,11 +7,11 @@ echo 2> portable-mode
 move portable-mode %XCHAT_DEST%
 copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
 copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%
-copy ..\src\gtk2-prefs\gtk2-prefs.exe %XCHAT_DEST%
+::obs copy ..\src\gtk2-prefs\gtk2-prefs.exe %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libffi-5.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libffi-5.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
@@ -23,21 +23,23 @@ copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
 xcopy /q /s /i etc %XCHAT_DEST%\etc
 xcopy /q /s /i share %XCHAT_DEST%\share
-xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes
+::obs xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes
 copy ..\COPYING %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST%
@@ -45,7 +47,8 @@ copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.0 %XCHAT_DEST%\LICENSE.GTK
 copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.1 %XCHAT_DEST%\LICENSE.CAIRO
 copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST%
-copy %DEPS_ROOT%\share\doc\libxml2-2.7.8\Copyright %XCHAT_DEST%\LICENSE.LIBXML
+copy %DEPS_ROOT%\LICENSE.LIBXML %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\share\doc\libxml2-2.7.8\Copyright %XCHAT_DEST%\LICENSE.LIBXML
 copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST%
@@ -57,7 +60,7 @@ copy ..\plugins\doat\xcdoat.dll %XCHAT_DEST%\plugins
 copy ..\plugins\exec\xcexec.dll %XCHAT_DEST%\plugins
 copy ..\plugins\fishlim\xcfishlim.dll %XCHAT_DEST%\plugins
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
-copy ..\plugins\gtkpref\xcgtkpref.dll %XCHAT_DEST%\plugins
+::obs copy ..\plugins\gtkpref\xcgtkpref.dll %XCHAT_DEST%\plugins
 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 81c1bd7f..a2598399 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -7,13 +7,14 @@ echo 2> portable-mode
 move portable-mode %XCHAT_DEST%
 copy ..\src\fe-gtk\xchat.exe %XCHAT_DEST%
 copy ..\src\fe-text\xchat-text.exe %XCHAT_DEST%
-copy ..\src\gtk2-prefs\gtk2-prefs.exe %XCHAT_DEST%
+::obs copy ..\src\gtk2-prefs\gtk2-prefs.exe %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libatk-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libcairo-2.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libexpat-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libffi-5.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libffi-5.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libfontconfig-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\freetype6.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libfreetype-6.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgdk_pixbuf-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgdk-win32-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgio-2.0-0.dll %XCHAT_DEST%
@@ -22,22 +23,25 @@ copy %DEPS_ROOT%\bin\libgmodule-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgobject-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgthread-2.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libgtk-win32-2.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\intl.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libintl-8.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libjasper-1.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libjpeg-8.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpango-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangocairo-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangoft2-1.0-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpangowin32-1.0-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
-copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libpng14-14.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
+copy %DEPS_ROOT%\bin\libxml2.dll %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
 xcopy /q /s /i etc %XCHAT_DEST%\etc
 xcopy /q /s /i share %XCHAT_DEST%\share
-xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes
+::obs xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes
 copy ..\COPYING %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST%
@@ -45,7 +49,8 @@ copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.0 %XCHAT_DEST%\LICENSE.GTK
 copy %DEPS_ROOT%\share\gettext\intl\COPYING.LIB-2.1 %XCHAT_DEST%\LICENSE.CAIRO
 copy %DEPS_ROOT%\LICENSE.LUA %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.ENCHANT %XCHAT_DEST%
-copy %DEPS_ROOT%\share\doc\libxml2-2.7.8\Copyright %XCHAT_DEST%\LICENSE.LIBXML
+copy %DEPS_ROOT%\LICENSE.LIBXML %XCHAT_DEST%
+::obs copy %DEPS_ROOT%\share\doc\libxml2-2.7.8\Copyright %XCHAT_DEST%\LICENSE.LIBXML
 copy %DEPS_ROOT%\bin\libeay32.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\ssleay32.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\zlib1.dll %XCHAT_DEST%
@@ -57,7 +62,7 @@ copy ..\plugins\doat\xcdoat.dll %XCHAT_DEST%\plugins
 copy ..\plugins\exec\xcexec.dll %XCHAT_DEST%\plugins
 copy ..\plugins\fishlim\xcfishlim.dll %XCHAT_DEST%\plugins
 copy ..\plugins\lua\xclua.dll %XCHAT_DEST%\plugins
-copy ..\plugins\gtkpref\xcgtkpref.dll %XCHAT_DEST%\plugins
+::obs copy ..\plugins\gtkpref\xcgtkpref.dll %XCHAT_DEST%\plugins
 copy ..\plugins\mpcinfo\xcmpcinfo.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-512.dll %XCHAT_DEST%\plugins
 copy ..\plugins\perl\xcperl-514.dll %XCHAT_DEST%\plugins
diff --git a/build/xchat-wdk-x64.skel.iss b/build/xchat-wdk-x64.skel.iss
index edc6b4e4..a98e4338 100644
--- a/build/xchat-wdk-x64.skel.iss
+++ b/build/xchat-wdk-x64.skel.iss
@@ -31,7 +31,7 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom
 Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed

 Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning

 Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning

-Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning

+;obs Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning

 ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins"; Description: "Plugins"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\checksum"; Description: "Checksum"; Types: full custom; Flags: disablenouninstallwarning

@@ -43,7 +43,7 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; F
 Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning

-;Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning

+Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning

 Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning

 Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning

 Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom; Flags: disablenouninstallwarning

@@ -87,6 +87,7 @@ Source: "LICENSE.CAIRO"; DestDir: "{app}"; Components: libs
 Source: "LICENSE.LUA"; DestDir: "{app}"; Components: libs

 Source: "LICENSE.ENCHANT"; DestDir: "{app}"; Components: libs

 Source: "LICENSE.LIBXML"; DestDir: "{app}"; Components: libs

+Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Components: libs

 ;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Components: libs and not gtkengines

 Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: createallsubdirs recursesubdirs; Components: libs

 Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations

@@ -97,7 +98,7 @@ Source: "libatk-1.0-0.dll"; DestDir: "{app}"; Components: libs
 Source: "libcairo-2.dll"; DestDir: "{app}"; Components: libs

 Source: "libeay32.dll"; DestDir: "{app}"; Components: libs

 Source: "libexpat-1.dll"; DestDir: "{app}"; Components: libs

-Source: "libffi-5.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libffi-5.dll"; DestDir: "{app}"; Components: libs

 Source: "libfreetype-6.dll"; DestDir: "{app}"; Components: libs

 Source: "libfontconfig-1.dll"; DestDir: "{app}"; Components: libs

 Source: "libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Components: libs

@@ -109,19 +110,21 @@ Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs
 Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libintl-8.dll"; DestDir: "{app}"; Components: libs

-Source: "libjasper-1.dll"; DestDir: "{app}"; Components: libs

-Source: "libjpeg-8.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libjasper-1.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libjpeg-8.dll"; DestDir: "{app}"; Components: libs

 Source: "libpango-1.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libpangocairo-1.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libpangoft2-1.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libpangowin32-1.0-0.dll"; DestDir: "{app}"; Components: libs

-Source: "libpixman-1-0.dll"; DestDir: "{app}"; Components: libs

-Source: "libtiff-3.dll"; DestDir: "{app}"; Components: libs

-Source: "libpng15-15.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libpixman-1-0.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libtiff-3.dll"; DestDir: "{app}"; Components: libs

+Source: "libpng14-14.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libpng15-15.dll"; DestDir: "{app}"; Components: libs

 Source: "lua51.dll"; DestDir: "{app}"; Components: libs

 Source: "ssleay32.dll"; DestDir: "{app}"; Components: libs

 Source: "zlib1.dll"; DestDir: "{app}"; Components: libs

-Source: "libxml2-2.dll"; DestDir: "{app}"; Components: libs

+Source: "libxml2.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libxml2-2.dll"; DestDir: "{app}"; Components: libs

 Source: "libenchant.dll"; DestDir: "{app}"; Components: libs

 

 Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: libs

@@ -130,19 +133,19 @@ Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\
 Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs

 Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs

 

-Source: "etc\gtkpref.png"; DestDir: "{app}\etc"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libcrux-engine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libglide.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libhcengine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libindustrial.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libmist.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libmurrine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libredmond95.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libthinice.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "plugins\xcgtkpref.dll"; DestDir: "{app}\plugins"; Components: gtkengines

-Source: "share\themes\*"; DestDir: "{app}\share\themes"; Flags: createallsubdirs recursesubdirs; Components: gtkengines

-Source: "gtk2-prefs.exe"; DestDir: "{app}"; Components: gtkengines

+;obs Source: "etc\gtkpref.png"; DestDir: "{app}\etc"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libcrux-engine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libglide.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libhcengine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libindustrial.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libmist.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libmurrine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libredmond95.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libthinice.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "plugins\xcgtkpref.dll"; DestDir: "{app}\plugins"; Components: gtkengines

+;obs Source: "share\themes\*"; DestDir: "{app}\share\themes"; Flags: createallsubdirs recursesubdirs; Components: gtkengines

+;obs Source: "gtk2-prefs.exe"; DestDir: "{app}"; Components: gtkengines

 

 Source: "plugins\xcchecksum.dll"; DestDir: "{app}\plugins"; Components: plugins\checksum

 Source: "plugins\xcdoat.dll"; DestDir: "{app}\plugins"; Components: plugins\doat

@@ -155,7 +158,7 @@ Source: "plugins\xcupd.dll"; DestDir: "{app}\plugins"; Components: plugins\upd
 Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Components: plugins\winamp

 Source: "etc\system.png"; DestDir: "{app}\etc"; Components: plugins\winsys

 Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Components: plugins\winsys

-;Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: plugins\xtray

+Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: plugins\xtray

 Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Components: plugins\wmpa

 

 Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: langs\lua

diff --git a/build/xchat-wdk-x86.skel.iss b/build/xchat-wdk-x86.skel.iss
index 70f781bb..e8f114ac 100644
--- a/build/xchat-wdk-x86.skel.iss
+++ b/build/xchat-wdk-x86.skel.iss
@@ -30,7 +30,7 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom
 Name: "libs"; Description: "XChat-WDK"; Types: normal full minimal custom; Flags: fixed

 Name: "xctext"; Description: "XChat-Text"; Types: full custom; Flags: disablenouninstallwarning

 Name: "translations"; Description: "Translations"; Types: normal full custom; Flags: disablenouninstallwarning

-Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning

+;obs Name: "gtkengines"; Description: "GTK+ Engines"; Types: full custom; Flags: disablenouninstallwarning

 ;Name: "spelling"; Description: "Spelling Dictionaries"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins"; Description: "Plugins"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\checksum"; Description: "Checksum"; Types: full custom; Flags: disablenouninstallwarning

@@ -42,7 +42,7 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; F
 Name: "plugins\winamp"; Description: "Winamp"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\winsys"; Description: "WinSys"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: full custom; Flags: disablenouninstallwarning

-;Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning

+Name: "plugins\xtray"; Description: "X-Tray"; Types: full custom; Flags: disablenouninstallwarning

 Name: "langs"; Description: "Language Interfaces"; Types: full custom; Flags: disablenouninstallwarning

 Name: "langs\lua"; Description: "Lua"; Types: full custom; Flags: disablenouninstallwarning

 Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: full custom; Flags: disablenouninstallwarning

@@ -86,6 +86,7 @@ Source: "LICENSE.CAIRO"; DestDir: "{app}"; Components: libs
 Source: "LICENSE.LUA"; DestDir: "{app}"; Components: libs

 Source: "LICENSE.ENCHANT"; DestDir: "{app}"; Components: libs

 Source: "LICENSE.LIBXML"; DestDir: "{app}"; Components: libs

+Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Components: libs

 ;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Components: libs and not gtkengines

 Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: createallsubdirs recursesubdirs; Components: libs

 Source: "locale\*"; DestDir: "{app}\locale"; Flags: createallsubdirs recursesubdirs; Components: translations

@@ -96,8 +97,9 @@ Source: "libatk-1.0-0.dll"; DestDir: "{app}"; Components: libs
 Source: "libcairo-2.dll"; DestDir: "{app}"; Components: libs

 Source: "libeay32.dll"; DestDir: "{app}"; Components: libs

 Source: "libexpat-1.dll"; DestDir: "{app}"; Components: libs

-Source: "libffi-5.dll"; DestDir: "{app}"; Components: libs

-Source: "libfreetype-6.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libffi-5.dll"; DestDir: "{app}"; Components: libs

+Source: "freetype6.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libfreetype-6.dll"; DestDir: "{app}"; Components: libs

 Source: "libfontconfig-1.dll"; DestDir: "{app}"; Components: libs

 Source: "libgdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libgdk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs

@@ -107,20 +109,23 @@ Source: "libgmodule-2.0-0.dll"; DestDir: "{app}"; Components: libs
 Source: "libgobject-2.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libgthread-2.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libgtk-win32-2.0-0.dll"; DestDir: "{app}"; Components: libs

-Source: "libintl-8.dll"; DestDir: "{app}"; Components: libs

-Source: "libjasper-1.dll"; DestDir: "{app}"; Components: libs

-Source: "libjpeg-8.dll"; DestDir: "{app}"; Components: libs

+Source: "intl.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libintl-8.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libjasper-1.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libjpeg-8.dll"; DestDir: "{app}"; Components: libs

 Source: "libpango-1.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libpangocairo-1.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libpangoft2-1.0-0.dll"; DestDir: "{app}"; Components: libs

 Source: "libpangowin32-1.0-0.dll"; DestDir: "{app}"; Components: libs

-Source: "libpixman-1-0.dll"; DestDir: "{app}"; Components: libs

-Source: "libtiff-3.dll"; DestDir: "{app}"; Components: libs

-Source: "libpng15-15.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libpixman-1-0.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libtiff-3.dll"; DestDir: "{app}"; Components: libs

+Source: "libpng14-14.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libpng15-15.dll"; DestDir: "{app}"; Components: libs

 Source: "lua51.dll"; DestDir: "{app}"; Components: libs

 Source: "ssleay32.dll"; DestDir: "{app}"; Components: libs

 Source: "zlib1.dll"; DestDir: "{app}"; Components: libs

-Source: "libxml2-2.dll"; DestDir: "{app}"; Components: libs

+Source: "libxml2.dll"; DestDir: "{app}"; Components: libs

+;obs Source: "libxml2-2.dll"; DestDir: "{app}"; Components: libs

 Source: "libenchant.dll"; DestDir: "{app}"; Components: libs

 

 Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Components: libs

@@ -129,19 +134,19 @@ Source: "lib\gtk-2.0\2.10.0\engines\libpixmap.dll"; DestDir: "{app}\lib\gtk-2.0\
 Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: libs

 Source: "lib\gtk-2.0\modules\libgail.dll"; DestDir: "{app}\lib\gtk-2.0\modules"; Components: libs

 

-Source: "etc\gtkpref.png"; DestDir: "{app}\etc"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libcrux-engine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libglide.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libhcengine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libindustrial.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libmist.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libmurrine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libredmond95.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "lib\gtk-2.0\2.10.0\engines\libthinice.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

-Source: "plugins\xcgtkpref.dll"; DestDir: "{app}\plugins"; Components: gtkengines

-Source: "share\themes\*"; DestDir: "{app}\share\themes"; Flags: createallsubdirs recursesubdirs; Components: gtkengines

-Source: "gtk2-prefs.exe"; DestDir: "{app}"; Components: gtkengines

+;obs Source: "etc\gtkpref.png"; DestDir: "{app}\etc"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libcrux-engine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libglide.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libhcengine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libindustrial.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libmist.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libmurrine.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libredmond95.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "lib\gtk-2.0\2.10.0\engines\libthinice.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Components: gtkengines

+;obs Source: "plugins\xcgtkpref.dll"; DestDir: "{app}\plugins"; Components: gtkengines

+;obs Source: "share\themes\*"; DestDir: "{app}\share\themes"; Flags: createallsubdirs recursesubdirs; Components: gtkengines

+;obs Source: "gtk2-prefs.exe"; DestDir: "{app}"; Components: gtkengines

 

 Source: "plugins\xcchecksum.dll"; DestDir: "{app}\plugins"; Components: plugins\checksum

 Source: "plugins\xcdoat.dll"; DestDir: "{app}\plugins"; Components: plugins\doat

@@ -154,7 +159,7 @@ Source: "plugins\xcupd.dll"; DestDir: "{app}\plugins"; Components: plugins\upd
 Source: "plugins\xcwinamp.dll"; DestDir: "{app}\plugins"; Components: plugins\winamp

 Source: "etc\system.png"; DestDir: "{app}\etc"; Components: plugins\winsys

 Source: "plugins\xcwinsys.dll"; DestDir: "{app}\plugins"; Components: plugins\winsys

-;Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: plugins\xtray

+Source: "plugins\xtray.dll"; DestDir: "{app}\plugins"; Components: plugins\xtray

 Source: "plugins\xcwmpa.dll"; DestDir: "{app}\plugins"; Components: plugins\wmpa

 

 Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: langs\lua