moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-12-21 23:28:51 -05:00
Code Issues Releases Wiki Activity

update gtk to 2.20, update msvc to 2010

Browse Source
This commit is contained in:
berkeviktor@aol.com 2010-05-02 14:22:54 +02:00
parent d2db3c24da
commit 2be50f16f8
6 changed files with 84 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-x64.bat
View File

@ -2,7 +2,7 @@
set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include;c:\mozilla-build\build\openssl-0.9.8j-wdk-x64\include
set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\openssl-0.9.8j-wdk-x64\lib
set OPATH=%PATH%
set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.10-x64\bin
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.10-x64\bin
cd ..\src
nmake -f makefile.mak clean
nmake -f makefile.mak

2
build/build-x86.bat
View File

@ -2,7 +2,7 @@
set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include;c:\mozilla-build\build\openssl-0.9.8j-wdk-x86\include
set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\openssl-0.9.8j-wdk-x86\lib
set OPATH=%PATH%
set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw\bin;c:\mozilla-build\perl-5.10-x86\bin
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\mingw\bin;c:\mozilla-build\perl-5.10-x86\bin
cd ..\src
nmake -f makefile.mak clean
nmake -f makefile.mak

1
build/release-x64.bat
View File

@ -11,6 +11,7 @@ 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%\libpng14-14.dll %XCHAT_DEST%
xcopy %GTK_BIN%\zlib1.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%

1
build/release-x86.bat
View File

@ -11,6 +11,7 @@ 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%\libpng14-14.dll %XCHAT_DEST%
xcopy %GTK_BIN%\zlib1.dll %XCHAT_DEST%
xcopy %GTK_BIN%\libgdk-win32-2.0-0.dll %XCHAT_DEST%

2
config.h
View File

@ -3,7 +3,7 @@
#define USE_GMODULE
#define USE_PLUGIN
#define PACKAGE_NAME "xchat"
#define PACKAGE_VERSION "r1409-9"
#define PACKAGE_VERSION "r1409-10"
#define XCHATLIBDIR "."
#define XCHATSHAREDIR "."
#define OLD_PERL

120
xchat-wdk.patch
View File

@ -1,6 +1,6 @@
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugins/perl/perl.c
--- xchat-wdk.orig/plugins/perl/perl.c 2010-03-23 01:06:59 +0100
+++ xchat-wdk/plugins/perl/perl.c 2010-03-30 01:17:15 +0200
+++ xchat-wdk/plugins/perl/perl.c 2010-05-02 13:04:17 +0200
@@ -16,13 +16,14 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
@ -19,7 +19,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi
#endif
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/plugins/python/python.c
--- xchat-wdk.orig/plugins/python/python.c 2010-03-17 09:07:51 +0100
+++ xchat-wdk/plugins/python/python.c 2010-03-31 13:25:58 +0200
+++ xchat-wdk/plugins/python/python.c 2010-05-02 13:04:17 +0200
@@ -51,12 +51,13 @@
*
*/
@ -47,7 +47,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p
#endif
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/plugins/tcl/tclplugin.c
--- xchat-wdk.orig/plugins/tcl/tclplugin.c 2010-03-21 01:49:42 +0100
+++ xchat-wdk/plugins/tcl/tclplugin.c 2010-03-29 12:57:17 +0200
+++ xchat-wdk/plugins/tcl/tclplugin.c 2010-05-02 13:04:17 +0200
@@ -32,8 +32,6 @@
#include <windows.h>
#define bzero(mem, sz) memset((mem), 0, (sz))
@ -59,7 +59,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p
#include "xchat-plugin.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c
--- xchat-wdk.orig/src/common/cfgfiles.c 2009-01-02 06:56:12 +0100
+++ xchat-wdk/src/common/cfgfiles.c 2010-04-02 08:25:16 +0200
+++ xchat-wdk/src/common/cfgfiles.c 2010-05-02 13:04:17 +0200
@@ -17,7 +17,6 @@
*/
@ -88,7 +88,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
prefs.identd = 1;
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/common/chanopt.c
--- xchat-wdk.orig/src/common/chanopt.c 2008-06-15 06:40:29 +0200
+++ xchat-wdk/src/common/chanopt.c 2010-03-29 12:58:02 +0200
+++ xchat-wdk/src/common/chanopt.c 2010-05-02 13:04:17 +0200
@@ -3,7 +3,6 @@
#include <stdio.h>
#include <string.h>
@ -99,7 +99,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/
#include <fcntl.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ctcp.c xchat-wdk/src/common/ctcp.c
--- xchat-wdk.orig/src/common/ctcp.c 2006-10-03 06:11:54 +0200
+++ xchat-wdk/src/common/ctcp.c 2010-03-31 12:43:27 +0200
+++ xchat-wdk/src/common/ctcp.c 2010-05-02 13:04:17 +0200
@@ -18,7 +18,6 @@
#include <stdio.h>
@ -119,7 +119,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ctcp.c xchat-wdk/src/com
}
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/common/dcc.c
--- xchat-wdk.orig/src/common/dcc.c 2007-02-06 05:45:13 +0100
+++ xchat-wdk/src/common/dcc.c 2010-03-29 13:17:58 +0200
+++ xchat-wdk/src/common/dcc.c 2010-05-02 13:04:17 +0200
@@ -31,7 +31,6 @@
#include <time.h>
#include <errno.h>
@ -139,7 +139,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/comm
if ((dcc->fp == -1 ? stat (dcc->destfile_fs, &st_a) : fstat (dcc->fp, &st_a)) == -1)
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/identd.c xchat-wdk/src/common/identd.c
--- xchat-wdk.orig/src/common/identd.c 2004-05-24 15:47:58 +0200
+++ xchat-wdk/src/common/identd.c 2010-03-29 18:04:55 +0200
+++ xchat-wdk/src/common/identd.c 2010-05-02 13:04:17 +0200
@@ -1,6 +1,10 @@
/* simple identd server for xchat under win32 */
@ -162,12 +162,12 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/identd.c xchat-wdk/src/c
DWORD tid;
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/identd.h xchat-wdk/src/common/identd.h
--- xchat-wdk.orig/src/common/identd.h 1970-01-01 01:00:00 +0100
+++ xchat-wdk/src/common/identd.h 2010-03-29 18:05:16 +0200
+++ xchat-wdk/src/common/identd.h 2010-05-02 13:04:17 +0200
@@ -0,0 +1 @@
+void identd_start (char *username);
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/common/ignore.c
--- xchat-wdk.orig/src/common/ignore.c 2006-04-15 09:00:39 +0200
+++ xchat-wdk/src/common/ignore.c 2010-03-29 12:58:18 +0200
+++ xchat-wdk/src/common/ignore.c 2010-05-02 13:04:17 +0200
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <stdio.h>
@ -178,7 +178,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/c
#include <fcntl.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/common/inbound.c
--- xchat-wdk.orig/src/common/inbound.c 2008-03-19 05:28:57 +0100
+++ xchat-wdk/src/common/inbound.c 2010-03-29 12:58:16 +0200
+++ xchat-wdk/src/common/inbound.c 2010-05-02 13:04:18 +0200
@@ -21,7 +21,6 @@
#include <stdlib.h>
#include <stdio.h>
@ -189,7 +189,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/
#define WANTARPA
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/common/inet.h
--- xchat-wdk.orig/src/common/inet.h 2005-09-03 12:57:48 +0200
+++ xchat-wdk/src/common/inet.h 2010-03-29 15:36:39 +0200
+++ xchat-wdk/src/common/inet.h 2010-05-02 13:04:18 +0200
@@ -24,9 +24,8 @@
#ifdef USE_IPV6
#include <winsock2.h>
@ -203,7 +203,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/com
#define set_blocking(sok) { \
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/common/msproxy.c
--- xchat-wdk.orig/src/common/msproxy.c 2006-04-16 17:32:17 +0200
+++ xchat-wdk/src/common/msproxy.c 2010-03-29 12:58:13 +0200
+++ xchat-wdk/src/common/msproxy.c 2010-05-02 13:04:18 +0200
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
@ -214,7 +214,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/
#define WANTSOCKET
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/network.c xchat-wdk/src/common/network.c
--- xchat-wdk.orig/src/common/network.c 2006-04-16 10:11:26 +0200
+++ xchat-wdk/src/common/network.c 2010-03-29 12:58:40 +0200
+++ xchat-wdk/src/common/network.c 2010-05-02 13:04:18 +0200
@@ -21,7 +21,6 @@
#include <stdlib.h>
#include <string.h>
@ -225,7 +225,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/network.c xchat-wdk/src/
#include "../../config.h" /* grab USE_IPV6 and LOOKUPD defines */
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/notify.c xchat-wdk/src/common/notify.c
--- xchat-wdk.orig/src/common/notify.c 2008-06-08 09:58:58 +0200
+++ xchat-wdk/src/common/notify.c 2010-03-29 12:58:37 +0200
+++ xchat-wdk/src/common/notify.c 2010-05-02 13:04:18 +0200
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/stat.h>
@ -236,7 +236,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/notify.c xchat-wdk/src/c
#include "xchat.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src/common/outbound.c
--- xchat-wdk.orig/src/common/outbound.c 2009-01-02 06:56:12 +0100
+++ xchat-wdk/src/common/outbound.c 2010-03-29 12:58:34 +0200
+++ xchat-wdk/src/common/outbound.c 2010-05-02 13:04:18 +0200
@@ -32,7 +32,6 @@
#include <sys/wait.h>
#endif
@ -247,7 +247,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src
#include <sys/stat.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/src/common/proto-irc.c
--- xchat-wdk.orig/src/common/proto-irc.c 2008-05-25 07:36:25 +0200
+++ xchat-wdk/src/common/proto-irc.c 2010-03-29 12:58:59 +0200
+++ xchat-wdk/src/common/proto-irc.c 2010-05-02 13:04:18 +0200
@@ -18,7 +18,6 @@
/* IRC RFC1459(+commonly used extensions) protocol implementation */
@ -258,7 +258,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/sr
#include <stdlib.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/common/server.c
--- xchat-wdk.orig/src/common/server.c 2008-02-17 09:54:55 +0100
+++ xchat-wdk/src/common/server.c 2010-03-29 17:36:30 +0200
+++ xchat-wdk/src/common/server.c 2010-05-02 13:04:18 +0200
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
@ -300,7 +300,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src/common/servlist.c
--- xchat-wdk.orig/src/common/servlist.c 2009-10-25 10:21:58 +0100
+++ xchat-wdk/src/common/servlist.c 2010-03-29 12:58:54 +0200
+++ xchat-wdk/src/common/servlist.c 2010-05-02 13:04:18 +0200
@@ -21,7 +21,6 @@
#include <string.h>
#include <sys/types.h>
@ -311,7 +311,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src
#include <glib/ghash.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/common/ssl.c
--- xchat-wdk.orig/src/common/ssl.c 2007-03-28 10:35:06 +0200
+++ xchat-wdk/src/common/ssl.c 2010-03-31 10:48:05 +0200
+++ xchat-wdk/src/common/ssl.c 2010-05-02 13:04:18 +0200
@@ -17,6 +17,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
@ -325,7 +325,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/comm
#include <time.h> /* asctime() */
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/common/text.c
--- xchat-wdk.orig/src/common/text.c 2009-12-31 03:19:50 +0100
+++ xchat-wdk/src/common/text.c 2010-04-18 17:37:08 +0200
+++ xchat-wdk/src/common/text.c 2010-05-02 13:04:18 +0200
@@ -19,13 +19,11 @@
#include <stdlib.h>
#include <stdio.h>
@ -397,7 +397,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/com
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/common/util.c
--- xchat-wdk.orig/src/common/util.c 2008-02-07 02:50:37 +0100
+++ xchat-wdk/src/common/util.c 2010-03-30 03:24:31 +0200
+++ xchat-wdk/src/common/util.c 2010-05-02 13:04:18 +0200
@@ -17,10 +17,11 @@
*/
@ -471,7 +471,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.c xchat-wdk/src/com
}
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/common/xchat.c
--- xchat-wdk.orig/src/common/xchat.c 2008-06-08 09:58:58 +0200
+++ xchat-wdk/src/common/xchat.c 2010-03-29 12:59:15 +0200
+++ xchat-wdk/src/common/xchat.c 2010-05-02 13:04:18 +0200
@@ -22,7 +22,6 @@
#include <time.h>
#include <sys/types.h>
@ -482,7 +482,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
#include "inet.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/common/xchat.h
--- xchat-wdk.orig/src/common/xchat.h 2008-08-29 12:59:11 +0200
+++ xchat-wdk/src/common/xchat.h 2010-03-30 03:24:19 +0200
+++ xchat-wdk/src/common/xchat.h 2010-05-02 13:04:18 +0200
@@ -12,12 +12,14 @@
#include "history.h"
@ -510,7 +510,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/co
#define X_OK 1
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe-gtk/about.c
--- xchat-wdk.orig/src/fe-gtk/about.c 2008-06-08 09:58:58 +0200
+++ xchat-wdk/src/fe-gtk/about.c 2010-04-02 10:27:10 +0200
+++ xchat-wdk/src/fe-gtk/about.c 2010-05-02 13:04:18 +0200
@@ -119,7 +119,7 @@
"%s\n\n"
#ifdef WIN32
@ -522,7 +522,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
"<b>Charset</b>: %s "
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/banlist.c xchat-wdk/src/fe-gtk/banlist.c
--- xchat-wdk.orig/src/fe-gtk/banlist.c 2008-09-01 11:28:58 +0200
+++ xchat-wdk/src/fe-gtk/banlist.c 2010-03-29 12:59:40 +0200
+++ xchat-wdk/src/fe-gtk/banlist.c 2010-05-02 13:04:18 +0200
@@ -21,7 +21,6 @@
#include <stdio.h>
#include <stdlib.h>
@ -533,7 +533,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/banlist.c xchat-wdk/src/
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanlist.c xchat-wdk/src/fe-gtk/chanlist.c
--- xchat-wdk.orig/src/fe-gtk/chanlist.c 2008-02-24 04:46:02 +0100
+++ xchat-wdk/src/fe-gtk/chanlist.c 2010-03-29 12:59:37 +0200
+++ xchat-wdk/src/fe-gtk/chanlist.c 2010-05-02 13:04:18 +0200
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <stdlib.h>
@ -544,7 +544,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanlist.c xchat-wdk/src
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src/fe-gtk/editlist.c
--- xchat-wdk.orig/src/fe-gtk/editlist.c 2006-03-13 09:33:45 +0100
+++ xchat-wdk/src/fe-gtk/editlist.c 2010-03-29 12:59:34 +0200
+++ xchat-wdk/src/fe-gtk/editlist.c 2010-05-02 13:04:18 +0200
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <stdlib.h>
@ -555,7 +555,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src
#include <sys/stat.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/fe-gtk/fe-gtk.c
--- xchat-wdk.orig/src/fe-gtk/fe-gtk.c 2008-02-29 03:19:00 +0100
+++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-03-30 04:22:55 +0200
+++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-05-02 13:38:38 +0200
@@ -21,7 +21,6 @@
#include <stdio.h>
#include <string.h>
@ -598,9 +598,18 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/f
return 0;
}
@@ -819,7 +822,7 @@
switch (info_type)
{
case 0: /* window status */
- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window)))
+ if (!gtk_widget_get_visible (sess->gui->window))
return 2; /* hidden (iconified or systray) */
#if GTK_CHECK_VERSION(2,4,0)
if (gtk_window_is_active (GTK_WINDOW (sess->gui->window)))
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/fe-gtk/fe-gtk.h
--- xchat-wdk.orig/src/fe-gtk/fe-gtk.h 2008-06-08 09:58:58 +0200
+++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-03-29 17:52:49 +0200
+++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-05-02 13:04:18 +0200
@@ -4,7 +4,7 @@
/* If you're compiling this for Windows, your release is un-official
* and not condoned. Please don't use the XChat name. Call it YChat
@ -612,7 +621,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/f
#endif
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe-gtk/fkeys.c
--- xchat-wdk.orig/src/fe-gtk/fkeys.c 2008-02-24 06:09:34 +0100
+++ xchat-wdk/src/fe-gtk/fkeys.c 2010-03-29 12:59:56 +0200
+++ xchat-wdk/src/fe-gtk/fkeys.c 2010-05-02 13:04:18 +0200
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <sys/types.h>
@ -623,7 +632,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe
#include <ctype.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/fe-gtk/gtkutil.c
--- xchat-wdk.orig/src/fe-gtk/gtkutil.c 2009-07-18 14:38:10 +0200
+++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-03-29 12:59:54 +0200
+++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-05-02 13:04:18 +0200
@@ -22,7 +22,6 @@
#include <stdarg.h>
#include <sys/types.h>
@ -634,7 +643,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/joind.c xchat-wdk/src/fe-gtk/joind.c
--- xchat-wdk.orig/src/fe-gtk/joind.c 2006-12-26 05:56:55 +0100
+++ xchat-wdk/src/fe-gtk/joind.c 2010-03-29 13:00:16 +0200
+++ xchat-wdk/src/fe-gtk/joind.c 2010-05-02 13:04:18 +0200
@@ -9,7 +9,6 @@
#include <sys/types.h>
@ -645,7 +654,27 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/joind.c xchat-wdk/src/fe
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/fe-gtk/maingui.c
--- xchat-wdk.orig/src/fe-gtk/maingui.c 2008-06-08 09:58:58 +0200
+++ xchat-wdk/src/fe-gtk/maingui.c 2010-03-30 12:57:53 +0200
+++ xchat-wdk/src/fe-gtk/maingui.c 2010-05-02 13:51:46 +0200
@@ -599,7 +599,7 @@
int num;
GtkWidget *f = NULL;
- if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box))
+ if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box))
f = current_sess->gui->input_box;
num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box);
@@ -809,8 +809,8 @@
static void
mg_hide_empty_pane (GtkPaned *pane)
{
- if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) &&
- (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2)))
+ if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) &&
+ (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2)))
{
gtk_widget_hide (GTK_WIDGET (pane));
return;
@@ -1320,12 +1320,12 @@
gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
GTK_BUTTONBOX_END);
@ -663,7 +692,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/
gtk_widget_show (button);
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-gtk/menu.c
--- xchat-wdk.orig/src/fe-gtk/menu.c 2008-06-10 14:05:00 +0200
+++ xchat-wdk/src/fe-gtk/menu.c 2010-03-29 13:00:13 +0200
+++ xchat-wdk/src/fe-gtk/menu.c 2010-05-02 13:54:19 +0200
@@ -22,7 +22,6 @@
#include <stdlib.h>
#include <fcntl.h>
@ -672,9 +701,18 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-
#ifdef WIN32
#include <windows.h>
@@ -1670,7 +1669,7 @@
menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
{
/* GTK2.2 behaviour */
- return GTK_WIDGET_IS_SENSITIVE (widget);
+ return gtk_widget_get_visible (widget);
}
#endif
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/fe-gtk/palette.c
--- xchat-wdk.orig/src/fe-gtk/palette.c 2006-03-13 09:33:45 +0100
+++ xchat-wdk/src/fe-gtk/palette.c 2010-03-29 13:00:11 +0200
+++ xchat-wdk/src/fe-gtk/palette.c 2010-05-02 13:04:18 +0200
@@ -20,7 +20,6 @@
#include <stdio.h>
@ -685,7 +723,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/
#include <fcntl.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/src/fe-gtk/plugin-tray.c
--- xchat-wdk.orig/src/fe-gtk/plugin-tray.c 2008-08-29 12:59:11 +0200
+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-03-31 12:25:02 +0200
+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-05-02 13:04:18 +0200
@@ -1,7 +1,6 @@
/* Copyright (C) 2006-2007 Peter Zelezny. */
@ -696,7 +734,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
#include "../common/xchatc.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/fe-gtk/rawlog.c
--- xchat-wdk.orig/src/fe-gtk/rawlog.c 2008-02-24 06:09:34 +0100
+++ xchat-wdk/src/fe-gtk/rawlog.c 2010-03-29 13:00:30 +0200
+++ xchat-wdk/src/fe-gtk/rawlog.c 2010-05-02 13:04:18 +0200
@@ -21,7 +21,6 @@
#include <stdio.h>
#include <string.h>
@ -707,7 +745,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/f
#include "fe-gtk.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe-gtk/setup.c
--- xchat-wdk.orig/src/fe-gtk/setup.c 2008-02-08 10:04:45 +0100
+++ xchat-wdk/src/fe-gtk/setup.c 2010-04-02 08:34:37 +0200
+++ xchat-wdk/src/fe-gtk/setup.c 2010-05-02 13:04:18 +0200
@@ -332,11 +332,15 @@
#ifndef WIN32
{ST_3OGGLE, N_("Show tray balloons on:"), 0, 0, (void *)balloonlist, 0},
@ -729,7 +767,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
{ST_LABEL, N_("Highlighted messages are ones where your nickname is mentioned, but also:"), 0, 0, 0, 1},
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c
--- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c 2006-07-17 07:51:02 +0200
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-03-29 14:42:33 +0200
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-05-02 13:04:18 +0200
@@ -31,6 +31,20 @@
/*#include "gtkspell-iso-codes.h"
#include "sexy-marshal.h"*/
@ -753,7 +791,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat
* compile-time dependency. This makes it so I don't have to hear the
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe-gtk/xtext.c
--- xchat-wdk.orig/src/fe-gtk/xtext.c 2008-08-29 13:24:17 +0200
+++ xchat-wdk/src/fe-gtk/xtext.c 2010-03-29 13:00:27 +0200
+++ xchat-wdk/src/fe-gtk/xtext.c 2010-05-02 13:04:18 +0200
@@ -42,7 +42,6 @@
#include <ctype.h>
#include <stdlib.h>