diff --git a/config.h b/config.h index 83f0e5e3..072daa11 100644 --- a/config.h +++ b/config.h @@ -3,7 +3,7 @@ #define USE_GMODULE #define USE_PLUGIN #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "r1439-1" +#define PACKAGE_VERSION "r1441" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL diff --git a/src/makeinc.mak b/src/makeinc.mak index a1c08211..f588793c 100644 --- a/src/makeinc.mak +++ b/src/makeinc.mak @@ -5,7 +5,7 @@ IPV6 = YES CC = cl LINK = link -CFLAGS = $(CFLAGS) /Ox /c /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 +CFLAGS = $(CFLAGS) /Ox /c /MD /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL CPPFLAGS = /c /MD /nologo /DWIN32 LDFLAGS = /subsystem:windows /nologo LIBS = $(LIBS) gdi32.lib shell32.lib user32.lib advapi32.lib imm32.lib ole32.lib winmm.lib diff --git a/xchat-wdk.patch b/xchat-wdk.patch index b79df5b6..161d5cff 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -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-05-30 11:01:25 +0200 ++++ xchat-wdk/plugins/perl/perl.c 2010-06-15 21:34:26 +0200 @@ -16,13 +16,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ @@ -35,7 +35,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi "Make sure perl's bin directory is in your PATH."); 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-05-16 06:31:54 +0200 -+++ xchat-wdk/plugins/python/python.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/plugins/python/python.c 2010-06-15 21:34:26 +0200 @@ -51,12 +51,13 @@ * */ @@ -63,7 +63,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-05-30 11:01:25 +0200 ++++ xchat-wdk/plugins/tcl/tclplugin.c 2010-06-15 21:34:26 +0200 @@ -32,8 +32,6 @@ #include #define bzero(mem, sz) memset((mem), 0, (sz)) @@ -75,7 +75,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/cfgfiles.c 2010-06-15 21:34:26 +0200 @@ -17,7 +17,6 @@ */ @@ -126,7 +126,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src #ifdef WIN32 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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/chanopt.c 2010-06-15 21:34:26 +0200 @@ -3,7 +3,6 @@ #include #include @@ -137,7 +137,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/ #include 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 2010-05-30 04:28:04 +0200 -+++ xchat-wdk/src/common/ctcp.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/ctcp.c 2010-06-15 21:34:26 +0200 @@ -18,7 +18,6 @@ #include @@ -157,7 +157,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 2010-05-30 04:28:04 +0200 -+++ xchat-wdk/src/common/dcc.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/dcc.c 2010-06-15 21:34:26 +0200 @@ -31,7 +31,6 @@ #include #include @@ -177,7 +177,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/identd.c 2010-06-15 21:34:26 +0200 @@ -1,6 +1,10 @@ /* simple identd server for xchat under win32 */ @@ -200,12 +200,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/identd.h 2010-06-15 21:34:26 +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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/ignore.c 2010-06-15 21:34:27 +0200 @@ -19,7 +19,6 @@ #include #include @@ -216,7 +216,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/c #include 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 2010-05-30 04:28:04 +0200 -+++ xchat-wdk/src/common/inbound.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/inbound.c 2010-06-15 21:34:27 +0200 @@ -21,7 +21,6 @@ #include #include @@ -227,7 +227,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/inet.h 2010-06-15 21:34:27 +0200 @@ -24,9 +24,8 @@ #ifdef USE_IPV6 #include @@ -241,7 +241,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/msproxy.c 2010-06-15 21:34:27 +0200 @@ -26,7 +26,6 @@ #include #include @@ -252,7 +252,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/network.c 2010-06-15 21:34:27 +0200 @@ -21,7 +21,6 @@ #include #include @@ -263,7 +263,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/notify.c 2010-06-15 21:34:27 +0200 @@ -22,7 +22,6 @@ #include #include @@ -274,7 +274,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 2010-05-30 04:28:04 +0200 -+++ xchat-wdk/src/common/outbound.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/outbound.c 2010-06-15 21:34:27 +0200 @@ -32,7 +32,6 @@ #include #endif @@ -285,7 +285,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src #include 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 2010-05-30 04:28:04 +0200 -+++ xchat-wdk/src/common/proto-irc.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/proto-irc.c 2010-06-15 21:34:27 +0200 @@ -18,7 +18,6 @@ /* IRC RFC1459(+commonly used extensions) protocol implementation */ @@ -296,7 +296,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/sr #include 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 2010-05-30 04:28:04 +0200 -+++ xchat-wdk/src/common/server.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/server.c 2010-06-15 21:34:27 +0200 @@ -26,7 +26,6 @@ #include #include @@ -338,7 +338,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 2010-05-16 09:43:49 +0200 -+++ xchat-wdk/src/common/servlist.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/servlist.c 2010-06-15 21:34:27 +0200 @@ -21,7 +21,6 @@ #include #include @@ -349,7 +349,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src #include 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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/ssl.c 2010-06-15 21:34:27 +0200 @@ -17,6 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ @@ -363,7 +363,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/comm #include /* 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 2010-05-30 04:28:04 +0200 -+++ xchat-wdk/src/common/text.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/text.c 2010-06-15 21:34:27 +0200 @@ -19,13 +19,11 @@ #include #include @@ -435,7 +435,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/util.c 2010-06-15 21:34:27 +0200 @@ -17,10 +17,11 @@ */ @@ -509,7 +509,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/xchat.c 2010-06-15 21:34:27 +0200 @@ -22,7 +22,6 @@ #include #include @@ -520,7 +520,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/common/xchat.h 2010-06-15 21:34:27 +0200 @@ -12,12 +12,14 @@ #include "history.h" @@ -548,7 +548,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 2010-05-16 09:43:49 +0200 -+++ xchat-wdk/src/fe-gtk/about.c 2010-05-30 11:10:09 +0200 ++++ xchat-wdk/src/fe-gtk/about.c 2010-06-15 21:34:27 +0200 @@ -113,11 +113,15 @@ gtk_container_add (GTK_CONTAINER (vbox), label); g_get_charset (&locale); @@ -576,7 +576,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe get_cpu_str(), 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 2010-05-16 05:20:22 +0200 -+++ xchat-wdk/src/fe-gtk/banlist.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/banlist.c 2010-06-15 21:34:27 +0200 @@ -19,7 +19,6 @@ #include #include @@ -587,7 +587,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/chanlist.c 2010-06-15 21:34:27 +0200 @@ -19,7 +19,6 @@ #include #include @@ -598,7 +598,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/editlist.c 2010-06-15 21:34:27 +0200 @@ -19,7 +19,6 @@ #include #include @@ -609,7 +609,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src #include 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 2010-05-16 05:20:22 +0200 -+++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-06-15 21:34:27 +0200 @@ -19,7 +19,6 @@ #include #include @@ -652,7 +652,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/f } 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 2010-05-30 08:31:29 +0200 -+++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-05-30 11:01:45 +0200 ++++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-06-15 21:34:27 +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. Make up your @@ -664,7 +664,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/fkeys.c 2010-06-15 21:34:27 +0200 @@ -20,7 +20,6 @@ #include #include @@ -675,7 +675,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe #include 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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-06-15 21:34:27 +0200 @@ -22,7 +22,6 @@ #include #include @@ -686,7 +686,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/joind.c 2010-06-15 21:34:27 +0200 @@ -9,7 +9,6 @@ #include @@ -697,7 +697,7 @@ 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/menu.c xchat-wdk/src/fe-gtk/menu.c --- xchat-wdk.orig/src/fe-gtk/menu.c 2010-05-16 06:24:24 +0200 -+++ xchat-wdk/src/fe-gtk/menu.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/menu.c 2010-06-15 21:34:27 +0200 @@ -20,7 +20,6 @@ #include #include @@ -708,7 +708,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe- #include 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 2010-05-16 05:20:22 +0200 -+++ xchat-wdk/src/fe-gtk/palette.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/palette.c 2010-06-15 21:34:27 +0200 @@ -18,7 +18,6 @@ #include @@ -719,7 +719,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/ #include 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 2010-05-16 03:40:42 +0200 -+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-06-15 21:34:27 +0200 @@ -1,7 +1,6 @@ /* Copyright (C) 2006-2007 Peter Zelezny. */ @@ -817,7 +817,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/ return XCHAT_EAT_NONE; 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 2010-05-16 05:20:22 +0200 -+++ xchat-wdk/src/fe-gtk/rawlog.c 2010-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/rawlog.c 2010-06-15 21:34:27 +0200 @@ -19,7 +19,6 @@ #include #include @@ -828,7 +828,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/setup.c 2010-06-15 21:34:27 +0200 @@ -333,7 +333,11 @@ {ST_3OGGLE, N_("Show tray balloons on:"), 0, 0, (void *)balloonlist, 0}, #endif @@ -843,7 +843,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe {ST_TOGGLE, N_("Enable system tray icon"), P_OFFINTNL(gui_tray), 0, 0, 0}, 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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-06-15 21:34:27 +0200 @@ -31,6 +31,20 @@ /*#include "gtkspell-iso-codes.h" #include "sexy-marshal.h"*/ @@ -867,7 +867,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-05-30 11:01:25 +0200 ++++ xchat-wdk/src/fe-gtk/xtext.c 2010-06-15 21:34:27 +0200 @@ -42,7 +42,6 @@ #include #include