diff --git a/config.h b/config.h index cfd8697f..71dfadc3 100644 --- a/config.h +++ b/config.h @@ -3,7 +3,7 @@ #define USE_GMODULE #define USE_PLUGIN #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "r1444" +#define PACKAGE_VERSION "r1451" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL diff --git a/xchat-wdk.patch b/xchat-wdk.patch index e514f498..f9dc1ad0 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-07-30 21:54:00 +0200 +--- xchat-wdk.orig/plugins/perl/perl.c 2010-08-10 11:15:00 +0200 ++++ xchat-wdk/plugins/perl/perl.c 2010-08-10 16:29:30 +0200 @@ -16,13 +16,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ @@ -17,7 +17,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi #ifdef ENABLE_NLS #include #endif -@@ -1340,14 +1341,14 @@ +@@ -1337,14 +1338,14 @@ FreeLibrary (lib); lib = NULL; thread_mbox ("Cannot open " PERL_DLL "\n\n" @@ -38,7 +38,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugi } 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-07-30 21:45:34 +0200 ++++ xchat-wdk/plugins/python/python.c 2010-08-10 16:29:30 +0200 @@ -51,12 +51,13 @@ * */ @@ -66,7 +66,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-07-30 21:52:48 +0200 ++++ xchat-wdk/plugins/tcl/tclplugin.c 2010-08-10 16:29:30 +0200 @@ -32,8 +32,6 @@ #include #define bzero(mem, sz) memset((mem), 0, (sz)) @@ -86,8 +86,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p } FreeLibrary(lib); 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-08-10 16:26:52 +0200 +--- xchat-wdk.orig/src/common/cfgfiles.c 2010-08-07 09:14:45 +0200 ++++ xchat-wdk/src/common/cfgfiles.c 2010-08-10 16:29:30 +0200 @@ -17,7 +17,6 @@ */ @@ -125,7 +125,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src } return xdir_fs; } -@@ -676,7 +683,10 @@ +@@ -677,7 +684,10 @@ prefs.mainwindow_save = 1; prefs.bantype = 2; prefs.input_balloon_time = 20; @@ -138,7 +138,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/chanopt.c 2010-08-10 16:29:30 +0200 @@ -3,7 +3,6 @@ #include #include @@ -149,7 +149,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/ctcp.c 2010-08-10 16:29:30 +0200 @@ -18,7 +18,6 @@ #include @@ -169,7 +169,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/dcc.c 2010-08-10 16:29:30 +0200 @@ -31,7 +31,6 @@ #include #include @@ -189,7 +189,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/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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/ignore.c 2010-08-10 16:29:30 +0200 @@ -19,7 +19,6 @@ #include #include @@ -200,7 +200,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/inbound.c 2010-08-10 16:29:30 +0200 @@ -21,7 +21,6 @@ #include #include @@ -211,7 +211,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/inet.h 2010-08-10 16:29:30 +0200 @@ -24,9 +24,8 @@ #ifdef USE_IPV6 #include @@ -225,7 +225,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/msproxy.c 2010-08-10 16:29:30 +0200 @@ -26,7 +26,6 @@ #include #include @@ -236,7 +236,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/network.c 2010-08-10 16:29:30 +0200 @@ -21,7 +21,6 @@ #include #include @@ -247,7 +247,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/notify.c 2010-08-10 16:29:30 +0200 @@ -22,7 +22,6 @@ #include #include @@ -258,7 +258,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/outbound.c 2010-08-10 16:29:30 +0200 @@ -32,7 +32,6 @@ #include #endif @@ -269,7 +269,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/proto-irc.c 2010-08-10 16:29:30 +0200 @@ -18,7 +18,6 @@ /* IRC RFC1459(+commonly used extensions) protocol implementation */ @@ -280,7 +280,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-08-10 15:56:29 +0200 ++++ xchat-wdk/src/common/server.c 2010-08-10 16:29:30 +0200 @@ -26,7 +26,6 @@ #include #include @@ -313,7 +313,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/servlist.c 2010-08-10 16:29:30 +0200 @@ -21,7 +21,6 @@ #include #include @@ -324,7 +324,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/ssl.c 2010-08-10 16:29:30 +0200 @@ -17,6 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ @@ -338,7 +338,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/text.c 2010-08-10 16:29:30 +0200 @@ -19,13 +19,11 @@ #include #include @@ -410,7 +410,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/util.c 2010-08-10 16:29:30 +0200 @@ -17,10 +17,11 @@ */ @@ -484,7 +484,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/common/xchat.c 2010-08-10 16:29:30 +0200 @@ -22,7 +22,6 @@ #include #include @@ -494,8 +494,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co #define WANTSOCKET #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-07-30 21:45:34 +0200 +--- xchat-wdk.orig/src/common/xchat.h 2010-08-07 09:14:45 +0200 ++++ xchat-wdk/src/common/xchat.h 2010-08-10 16:29:30 +0200 @@ -12,12 +12,14 @@ #include "history.h" @@ -523,7 +523,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/about.c 2010-08-10 16:29:30 +0200 @@ -113,11 +113,15 @@ gtk_container_add (GTK_CONTAINER (vbox), label); g_get_charset (&locale); @@ -551,7 +551,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/banlist.c 2010-08-10 16:29:30 +0200 @@ -19,7 +19,6 @@ #include #include @@ -562,7 +562,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/chanlist.c 2010-08-10 16:29:30 +0200 @@ -19,7 +19,6 @@ #include #include @@ -573,7 +573,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/editlist.c 2010-08-10 16:29:30 +0200 @@ -19,7 +19,6 @@ #include #include @@ -584,7 +584,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-08-10 16:29:30 +0200 @@ -19,7 +19,6 @@ #include #include @@ -627,7 +627,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-08-10 16:29:30 +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 @@ -639,7 +639,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/fkeys.c 2010-08-10 16:29:30 +0200 @@ -20,7 +20,6 @@ #include #include @@ -650,7 +650,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-08-10 16:29:30 +0200 @@ -22,7 +22,6 @@ #include #include @@ -661,7 +661,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/joind.c 2010-08-10 16:29:30 +0200 @@ -9,7 +9,6 @@ #include @@ -672,7 +672,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/menu.c 2010-08-10 16:29:30 +0200 @@ -20,7 +20,6 @@ #include #include @@ -683,7 +683,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/palette.c 2010-08-10 16:29:30 +0200 @@ -18,7 +18,6 @@ #include @@ -694,7 +694,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-08-10 16:29:30 +0200 @@ -1,7 +1,6 @@ /* Copyright (C) 2006-2007 Peter Zelezny. */ @@ -792,7 +792,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/rawlog.c 2010-08-10 16:29:30 +0200 @@ -19,7 +19,6 @@ #include #include @@ -803,7 +803,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/setup.c 2010-08-10 16:29:30 +0200 @@ -333,7 +333,11 @@ {ST_3OGGLE, N_("Show tray balloons on:"), 0, 0, (void *)balloonlist, 0}, #endif @@ -818,7 +818,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-08-10 16:29:30 +0200 @@ -31,6 +31,20 @@ /*#include "gtkspell-iso-codes.h" #include "sexy-marshal.h"*/ @@ -842,7 +842,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-07-30 21:45:34 +0200 ++++ xchat-wdk/src/fe-gtk/xtext.c 2010-08-10 16:29:30 +0200 @@ -42,7 +42,6 @@ #include #include