update xchat to 1468

This commit is contained in:
berkeviktor@aol.com 2010-09-19 05:28:27 +02:00
parent e2f68f4399
commit 7233fb459c
4 changed files with 50 additions and 50 deletions

View File

@ -1,9 +1,9 @@
[Setup] [Setup]
AppName=XChat-WDK AppName=XChat-WDK
AppVerName=XChat-WDK 1464-6 AppVerName=XChat-WDK 1468
AppVersion=14.64.6 AppVersion=14.68
VersionInfoVersion=14.64.6 VersionInfoVersion=14.68
OutputBaseFilename=XChat-WDK 1464-6 OutputBaseFilename=XChat-WDK 1468
AppPublisher=XChat-WDK AppPublisher=XChat-WDK
AppPublisherURL=http://code.google.com/p/xchat-wdk/ AppPublisherURL=http://code.google.com/p/xchat-wdk/
AppCopyright=Copyright (C) 1998-2010 Peter Zelezny AppCopyright=Copyright (C) 1998-2010 Peter Zelezny

View File

@ -6,7 +6,7 @@
#define USE_GTKSPELL #define USE_GTKSPELL
#endif*/ #endif*/
#define PACKAGE_NAME "xchat" #define PACKAGE_NAME "xchat"
#define PACKAGE_VERSION "1464-6" #define PACKAGE_VERSION "1468"
#define XCHATLIBDIR "." #define XCHATLIBDIR "."
#define XCHATSHAREDIR "." #define XCHATSHAREDIR "."
#define OLD_PERL #define OLD_PERL

View File

@ -1 +1 @@
1464-6 1468

View File

@ -1,6 +1,6 @@
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/perl/perl.c xchat-wdk/plugins/perl/perl.c 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-08-26 04:18:04 +0200 --- xchat-wdk.orig/plugins/perl/perl.c 2010-08-26 04:18:04 +0200
+++ xchat-wdk/plugins/perl/perl.c 2010-09-06 10:25:57 +0200 +++ xchat-wdk/plugins/perl/perl.c 2010-09-19 05:27:43 +0200
@@ -22,12 +22,15 @@ @@ -22,12 +22,15 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -41,7 +41,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 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.orig/plugins/python/python.c 2010-05-16 06:31:54 +0200
+++ xchat-wdk/plugins/python/python.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/plugins/python/python.c 2010-09-19 05:27:43 +0200
@@ -53,10 +53,10 @@ @@ -53,10 +53,10 @@
#include <glib.h> #include <glib.h>
@ -103,7 +103,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p
if (m == NULL) { if (m == NULL) {
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/plugins/tcl/tclplugin.c 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.orig/plugins/tcl/tclplugin.c 2010-03-21 01:49:42 +0100
+++ xchat-wdk/plugins/tcl/tclplugin.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/plugins/tcl/tclplugin.c 2010-09-19 05:27:43 +0200
@@ -32,8 +32,6 @@ @@ -32,8 +32,6 @@
#include <windows.h> #include <windows.h>
#define bzero(mem, sz) memset((mem), 0, (sz)) #define bzero(mem, sz) memset((mem), 0, (sz))
@ -124,7 +124,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p
FreeLibrary(lib); FreeLibrary(lib);
diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugins/xdcc/xdcc.c diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugins/xdcc/xdcc.c
--- xchat-wdk.orig/plugins/xdcc/xdcc.c 2002-12-26 04:35:09 +0100 --- xchat-wdk.orig/plugins/xdcc/xdcc.c 2002-12-26 04:35:09 +0100
+++ xchat-wdk/plugins/xdcc/xdcc.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/plugins/xdcc/xdcc.c 2010-09-19 05:27:43 +0200
@@ -2,11 +2,11 @@ @@ -2,11 +2,11 @@
#include <glib.h> #include <glib.h>
@ -140,7 +140,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/xdcc/xdcc.c xchat-wdk/plugi
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src/common/cfgfiles.c 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 2010-08-07 09:14:45 +0200 --- xchat-wdk.orig/src/common/cfgfiles.c 2010-08-07 09:14:45 +0200
+++ xchat-wdk/src/common/cfgfiles.c 2010-09-17 16:36:12 +0200 +++ xchat-wdk/src/common/cfgfiles.c 2010-09-19 05:27:43 +0200
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
*/ */
@ -205,7 +205,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
prefs.notify_timeout = 15; prefs.notify_timeout = 15;
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/common/chanopt.c 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.orig/src/common/chanopt.c 2008-06-15 06:40:29 +0200
+++ xchat-wdk/src/common/chanopt.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/chanopt.c 2010-09-19 05:27:43 +0200
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -216,7 +216,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/chanopt.c xchat-wdk/src/
#include <fcntl.h> #include <fcntl.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ctcp.c xchat-wdk/src/common/ctcp.c 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.orig/src/common/ctcp.c 2010-05-30 04:28:04 +0200
+++ xchat-wdk/src/common/ctcp.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/ctcp.c 2010-09-19 05:27:43 +0200
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
#include <stdio.h> #include <stdio.h>
@ -236,7 +236,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 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.orig/src/common/dcc.c 2010-05-30 04:28:04 +0200
+++ xchat-wdk/src/common/dcc.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/dcc.c 2010-09-19 05:27:43 +0200
@@ -31,7 +31,6 @@ @@ -31,7 +31,6 @@
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
@ -256,7 +256,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) 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 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.orig/src/common/ignore.c 2006-04-15 09:00:39 +0200
+++ xchat-wdk/src/common/ignore.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/ignore.c 2010-09-19 05:27:43 +0200
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -267,7 +267,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ignore.c xchat-wdk/src/c
#include <fcntl.h> #include <fcntl.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/common/inbound.c 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.orig/src/common/inbound.c 2010-05-30 04:28:04 +0200
+++ xchat-wdk/src/common/inbound.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/inbound.c 2010-09-19 05:27:43 +0200
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -278,7 +278,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inbound.c xchat-wdk/src/
#define WANTARPA #define WANTARPA
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/common/inet.h 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.orig/src/common/inet.h 2005-09-03 12:57:48 +0200
+++ xchat-wdk/src/common/inet.h 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/inet.h 2010-09-19 05:27:43 +0200
@@ -24,9 +24,8 @@ @@ -24,9 +24,8 @@
#ifdef USE_IPV6 #ifdef USE_IPV6
#include <winsock2.h> #include <winsock2.h>
@ -292,7 +292,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/inet.h xchat-wdk/src/com
#define set_blocking(sok) { \ #define set_blocking(sok) { \
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/common/msproxy.c 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.orig/src/common/msproxy.c 2006-04-16 17:32:17 +0200
+++ xchat-wdk/src/common/msproxy.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/msproxy.c 2010-09-19 05:27:43 +0200
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -303,7 +303,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/msproxy.c xchat-wdk/src/
#define WANTSOCKET #define WANTSOCKET
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/network.c xchat-wdk/src/common/network.c 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.orig/src/common/network.c 2006-04-16 10:11:26 +0200
+++ xchat-wdk/src/common/network.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/network.c 2010-09-19 05:27:43 +0200
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -314,7 +314,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 */ #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 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.orig/src/common/notify.c 2008-06-08 09:58:58 +0200
+++ xchat-wdk/src/common/notify.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/notify.c 2010-09-19 05:27:43 +0200
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -325,7 +325,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/notify.c xchat-wdk/src/c
#include "xchat.h" #include "xchat.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src/common/outbound.c 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.orig/src/common/outbound.c 2010-05-30 04:28:04 +0200
+++ xchat-wdk/src/common/outbound.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/outbound.c 2010-09-19 05:27:43 +0200
@@ -32,7 +32,6 @@ @@ -32,7 +32,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
@ -336,7 +336,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/outbound.c xchat-wdk/src
#include <sys/stat.h> #include <sys/stat.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk/src/common/plugin-timer.c diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk/src/common/plugin-timer.c
--- xchat-wdk.orig/src/common/plugin-timer.c 2005-02-02 11:03:51 +0100 --- xchat-wdk.orig/src/common/plugin-timer.c 2005-02-02 11:03:51 +0100
+++ xchat-wdk/src/common/plugin-timer.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/plugin-timer.c 2010-09-19 05:27:43 +0200
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -348,7 +348,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk
#define strcasecmp stricmp #define strcasecmp stricmp
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/common/plugin.c diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/common/plugin.c
--- xchat-wdk.orig/src/common/plugin.c 2010-08-14 03:46:21 +0200 --- xchat-wdk.orig/src/common/plugin.c 2010-08-14 03:46:21 +0200
+++ xchat-wdk/src/common/plugin.c 2010-08-26 18:55:08 +0200 +++ xchat-wdk/src/common/plugin.c 2010-09-19 05:27:43 +0200
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
#include "text.h" #include "text.h"
#define PLUGIN_C #define PLUGIN_C
@ -369,7 +369,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/c
{ {
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/src/common/proto-irc.c 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.orig/src/common/proto-irc.c 2010-05-30 04:28:04 +0200
+++ xchat-wdk/src/common/proto-irc.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/proto-irc.c 2010-09-19 05:27:43 +0200
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
/* IRC RFC1459(+commonly used extensions) protocol implementation */ /* IRC RFC1459(+commonly used extensions) protocol implementation */
@ -380,7 +380,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/sr
#include <stdlib.h> #include <stdlib.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/common/server.c 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.orig/src/common/server.c 2010-05-30 04:28:04 +0200
+++ xchat-wdk/src/common/server.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/server.c 2010-09-19 05:27:43 +0200
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -409,7 +409,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 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.orig/src/common/servlist.c 2010-05-16 09:43:49 +0200
+++ xchat-wdk/src/common/servlist.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/servlist.c 2010-09-19 05:27:43 +0200
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
@ -420,7 +420,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/servlist.c xchat-wdk/src
#include <glib/ghash.h> #include <glib/ghash.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/common/ssl.c 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.orig/src/common/ssl.c 2007-03-28 10:35:06 +0200
+++ xchat-wdk/src/common/ssl.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/ssl.c 2010-09-19 05:27:43 +0200
@@ -17,12 +17,12 @@ @@ -17,12 +17,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
@ -437,7 +437,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/comm
#ifndef HAVE_SNPRINTF #ifndef HAVE_SNPRINTF
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/text.c xchat-wdk/src/common/text.c 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.orig/src/common/text.c 2010-05-30 04:28:04 +0200
+++ xchat-wdk/src/common/text.c 2010-09-19 01:32:44 +0200 +++ xchat-wdk/src/common/text.c 2010-09-19 05:27:43 +0200
@@ -19,13 +19,11 @@ @@ -19,13 +19,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -515,7 +515,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 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.orig/src/common/util.c 2008-02-07 02:50:37 +0100
+++ xchat-wdk/src/common/util.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/common/util.c 2010-09-19 05:27:43 +0200
@@ -16,11 +16,13 @@ @@ -16,11 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
@ -601,7 +601,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 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.orig/src/common/xchat.c 2008-06-08 09:58:58 +0200
+++ xchat-wdk/src/common/xchat.c 2010-09-07 15:14:16 +0200 +++ xchat-wdk/src/common/xchat.c 2010-09-19 05:27:43 +0200
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
#include <time.h> #include <time.h>
#include <sys/types.h> #include <sys/types.h>
@ -631,7 +631,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
"NAME LEAVE\n" "CMD part &2\n\n"\ "NAME LEAVE\n" "CMD part &2\n\n"\
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/common/xchat.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 2010-08-07 09:14:45 +0200 --- xchat-wdk.orig/src/common/xchat.h 2010-08-07 09:14:45 +0200
+++ xchat-wdk/src/common/xchat.h 2010-09-17 16:37:57 +0200 +++ xchat-wdk/src/common/xchat.h 2010-09-19 05:27:43 +0200
@@ -12,12 +12,14 @@ @@ -12,12 +12,14 @@
#include "history.h" #include "history.h"
@ -667,7 +667,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.h xchat-wdk/src/co
unsigned int ctcp_time_limit; /*seconds of floods */ unsigned int ctcp_time_limit; /*seconds of floods */
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe-gtk/about.c 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.orig/src/fe-gtk/about.c 2010-05-16 09:43:49 +0200
+++ xchat-wdk/src/fe-gtk/about.c 2010-08-30 12:43:12 +0200 +++ xchat-wdk/src/fe-gtk/about.c 2010-09-19 05:27:43 +0200
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
#include "../common/xchat.h" #include "../common/xchat.h"
@ -734,7 +734,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/about.c xchat-wdk/src/fe
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/banlist.c xchat-wdk/src/fe-gtk/banlist.c 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.orig/src/fe-gtk/banlist.c 2010-05-16 05:20:22 +0200
+++ xchat-wdk/src/fe-gtk/banlist.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/banlist.c 2010-09-19 05:27:43 +0200
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -745,7 +745,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 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.orig/src/fe-gtk/chanlist.c 2008-02-24 04:46:02 +0100
+++ xchat-wdk/src/fe-gtk/chanlist.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/chanlist.c 2010-09-19 05:27:43 +0200
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -756,7 +756,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 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.orig/src/fe-gtk/editlist.c 2006-03-13 09:33:45 +0100
+++ xchat-wdk/src/fe-gtk/editlist.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/editlist.c 2010-09-19 05:27:43 +0200
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -767,7 +767,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src
#include <sys/stat.h> #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 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-08-14 03:46:21 +0200 --- xchat-wdk.orig/src/fe-gtk/fe-gtk.c 2010-08-14 03:46:21 +0200
+++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-09-19 05:27:43 +0200
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -804,7 +804,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/f
sess = find_dialog (serv_list->data, "(warnings)"); sess = find_dialog (serv_list->data, "(warnings)");
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/fe-gtk/fe-gtk.h 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.orig/src/fe-gtk/fe-gtk.h 2010-05-30 08:31:29 +0200
+++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-09-19 05:27:43 +0200
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
/* If you're compiling this for Windows, your release is un-official /* 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 * and not condoned. Please don't use the XChat name. Make up your
@ -816,7 +816,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.h xchat-wdk/src/f
#endif #endif
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe-gtk/fkeys.c 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.orig/src/fe-gtk/fkeys.c 2008-02-24 06:09:34 +0100
+++ xchat-wdk/src/fe-gtk/fkeys.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/fkeys.c 2010-09-19 05:27:43 +0200
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
@ -827,7 +827,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fkeys.c xchat-wdk/src/fe
#include <ctype.h> #include <ctype.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/fe-gtk/gtkutil.c 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.orig/src/fe-gtk/gtkutil.c 2009-07-18 14:38:10 +0200
+++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-09-19 05:27:43 +0200
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <sys/types.h> #include <sys/types.h>
@ -838,7 +838,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 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.orig/src/fe-gtk/joind.c 2006-12-26 05:56:55 +0100
+++ xchat-wdk/src/fe-gtk/joind.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/joind.c 2010-09-19 05:27:43 +0200
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
#include <sys/types.h> #include <sys/types.h>
@ -849,7 +849,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/maingui.c xchat-wdk/src/fe-gtk/maingui.c 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 2010-05-16 05:20:22 +0200 --- xchat-wdk.orig/src/fe-gtk/maingui.c 2010-05-16 05:20:22 +0200
+++ xchat-wdk/src/fe-gtk/maingui.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/maingui.c 2010-09-19 05:27:43 +0200
@@ -214,60 +214,10 @@ @@ -214,60 +214,10 @@
away_list = mg_attr_list_create (&colors[COL_AWAY], FALSE); away_list = mg_attr_list_create (&colors[COL_AWAY], FALSE);
} }
@ -957,7 +957,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/
} }
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-gtk/menu.c 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.orig/src/fe-gtk/menu.c 2010-05-16 06:24:24 +0200
+++ xchat-wdk/src/fe-gtk/menu.c 2010-09-06 11:41:18 +0200 +++ xchat-wdk/src/fe-gtk/menu.c 2010-09-19 05:27:43 +0200
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
@ -968,7 +968,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-
#include <windows.h> #include <windows.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/fe-gtk/palette.c 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.orig/src/fe-gtk/palette.c 2010-05-16 05:20:22 +0200
+++ xchat-wdk/src/fe-gtk/palette.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/palette.c 2010-09-19 05:27:43 +0200
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
#include <stdio.h> #include <stdio.h>
@ -979,7 +979,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/
#include <fcntl.h> #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 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-08-14 03:46:21 +0200 --- xchat-wdk.orig/src/fe-gtk/plugin-tray.c 2010-08-14 03:46:21 +0200
+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-08-30 04:24:14 +0200 +++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-09-19 05:27:43 +0200
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
/* Copyright (C) 2006-2007 Peter Zelezny. */ /* Copyright (C) 2006-2007 Peter Zelezny. */
@ -1106,7 +1106,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
return 1; /* return 1 for success */ return 1; /* return 1 for success */
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/src/fe-gtk/plugingui.c diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/src/fe-gtk/plugingui.c
--- xchat-wdk.orig/src/fe-gtk/plugingui.c 2010-05-16 05:20:22 +0200 --- xchat-wdk.orig/src/fe-gtk/plugingui.c 2010-05-16 05:20:22 +0200
+++ xchat-wdk/src/fe-gtk/plugingui.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/plugingui.c 2010-09-19 05:27:43 +0200
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#include "../common/xchat.h" #include "../common/xchat.h"
#define PLUGIN_C #define PLUGIN_C
@ -1118,7 +1118,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/sr
#include "../common/outbound.h" #include "../common/outbound.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/fe-gtk/rawlog.c 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.orig/src/fe-gtk/rawlog.c 2010-05-16 05:20:22 +0200
+++ xchat-wdk/src/fe-gtk/rawlog.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/rawlog.c 2010-09-19 05:27:43 +0200
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -1129,7 +1129,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/f
#include "fe-gtk.h" #include "fe-gtk.h"
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe-gtk/setup.c 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.orig/src/fe-gtk/setup.c 2008-02-08 10:04:45 +0100
+++ xchat-wdk/src/fe-gtk/setup.c 2010-09-15 18:50:47 +0200 +++ xchat-wdk/src/fe-gtk/setup.c 2010-09-19 05:27:43 +0200
@@ -363,7 +363,6 @@ @@ -363,7 +363,6 @@
{ST_END, 0, 0, 0, 0, 0} {ST_END, 0, 0, 0, 0, 0}
}; };
@ -1165,7 +1165,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c 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.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-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-09-19 05:27:43 +0200
@@ -31,6 +31,20 @@ @@ -31,6 +31,20 @@
/*#include "gtkspell-iso-codes.h" /*#include "gtkspell-iso-codes.h"
#include "sexy-marshal.h"*/ #include "sexy-marshal.h"*/
@ -1189,7 +1189,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 * 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 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.orig/src/fe-gtk/xtext.c 2008-08-29 13:24:17 +0200
+++ xchat-wdk/src/fe-gtk/xtext.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-gtk/xtext.c 2010-09-19 05:27:43 +0200
@@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
@ -1200,7 +1200,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe
#include <gtk/gtkselection.h> #include <gtk/gtkselection.h>
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-text/fe-text.c xchat-wdk/src/fe-text/fe-text.c diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-text/fe-text.c xchat-wdk/src/fe-text/fe-text.c
--- xchat-wdk.orig/src/fe-text/fe-text.c 2008-08-29 13:24:17 +0200 --- xchat-wdk.orig/src/fe-text/fe-text.c 2008-08-29 13:24:17 +0200
+++ xchat-wdk/src/fe-text/fe-text.c 2010-08-26 15:53:53 +0200 +++ xchat-wdk/src/fe-text/fe-text.c 2010-09-19 05:27:43 +0200
@@ -22,9 +22,13 @@ @@ -22,9 +22,13 @@
#ifdef HAVE_STRINGS_H #ifdef HAVE_STRINGS_H
#include <strings.h> #include <strings.h>