update xchat to r1454
This commit is contained in:
parent
9e4457690a
commit
e8e3eeeef5
|
@ -1,8 +1,8 @@
|
|||
[Setup]
|
||||
AppName=XChat-WDK (x64)
|
||||
AppVerName=XChat WDK (x64) r1452
|
||||
AppVersion=14.52
|
||||
VersionInfoVersion=14.52
|
||||
AppVerName=XChat WDK (x64) r1454
|
||||
AppVersion=14.54
|
||||
VersionInfoVersion=14.54
|
||||
AppPublisher=XChat-WDK
|
||||
AppPublisherURL=http://code.google.com/p/xchat-wdk/
|
||||
AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
|
||||
|
@ -18,7 +18,7 @@ DefaultGroupName=XChat-WDK
|
|||
SolidCompression=yes
|
||||
SourceDir=..\..\xchat-wdk-x64
|
||||
OutputDir=.
|
||||
OutputBaseFilename=XChat-WDK r1452 x64
|
||||
OutputBaseFilename=XChat-WDK r1454 x64
|
||||
FlatComponentsList=no
|
||||
ArchitecturesAllowed=x64
|
||||
ArchitecturesInstallIn64BitMode=x64
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
[Setup]
|
||||
AppName=XChat-WDK (x86)
|
||||
AppVerName=XChat WDK (x86) r1452
|
||||
AppVersion=14.52
|
||||
VersionInfoVersion=14.52
|
||||
AppVerName=XChat WDK (x86) r1454
|
||||
AppVersion=14.54
|
||||
VersionInfoVersion=14.54
|
||||
AppPublisher=XChat-WDK
|
||||
AppPublisherURL=http://code.google.com/p/xchat-wdk/
|
||||
AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
|
||||
|
@ -18,7 +18,7 @@ DefaultGroupName=XChat-WDK
|
|||
SolidCompression=yes
|
||||
SourceDir=..\..\xchat-wdk-x86
|
||||
OutputDir=.
|
||||
OutputBaseFilename=XChat-WDK r1452 x86
|
||||
OutputBaseFilename=XChat-WDK r1454 x86
|
||||
FlatComponentsList=no
|
||||
ArchitecturesAllowed=x86 x64
|
||||
|
||||
|
|
2
config.h
2
config.h
|
@ -6,7 +6,7 @@
|
|||
#define USE_GTKSPELL
|
||||
#endif*/
|
||||
#define PACKAGE_NAME "xchat"
|
||||
#define PACKAGE_VERSION "r1452"
|
||||
#define PACKAGE_VERSION "r1454"
|
||||
#define XCHATLIBDIR "."
|
||||
#define XCHATSHAREDIR "."
|
||||
#define OLD_PERL
|
||||
|
|
|
@ -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-08-10 11:15:00 +0200
|
||||
+++ xchat-wdk/plugins/perl/perl.c 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/plugins/perl/perl.c 2010-08-14 04:31:42 +0200
|
||||
@@ -16,13 +16,14 @@
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
@ -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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/plugins/python/python.c 2010-08-14 04:31:42 +0200
|
||||
@@ -53,10 +53,10 @@
|
||||
|
||||
#include <glib.h>
|
||||
|
@ -100,7 +100,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p
|
|||
if (m == NULL) {
|
||||
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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/plugins/tcl/tclplugin.c 2010-08-14 04:31:42 +0200
|
||||
@@ -32,8 +32,6 @@
|
||||
#include <windows.h>
|
||||
#define bzero(mem, sz) memset((mem), 0, (sz))
|
||||
|
@ -121,7 +121,7 @@ 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/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/plugins/xdcc/xdcc.c 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/plugins/xdcc/xdcc.c 2010-08-14 04:31:42 +0200
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
#include <glib.h>
|
||||
|
@ -137,7 +137,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
|
||||
--- xchat-wdk.orig/src/common/cfgfiles.c 2010-08-07 09:14:45 +0200
|
||||
+++ xchat-wdk/src/common/cfgfiles.c 2010-08-14 01:18:30 +0200
|
||||
+++ xchat-wdk/src/common/cfgfiles.c 2010-08-14 04:31:42 +0200
|
||||
@@ -17,7 +17,6 @@
|
||||
*/
|
||||
|
||||
|
@ -185,7 +185,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src
|
|||
prefs.notify_timeout = 15;
|
||||
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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/chanopt.c 2010-08-14 04:31:42 +0200
|
||||
@@ -3,7 +3,6 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
@ -196,7 +196,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 2010-05-30 04:28:04 +0200
|
||||
+++ xchat-wdk/src/common/ctcp.c 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/ctcp.c 2010-08-14 04:31:42 +0200
|
||||
@@ -18,7 +18,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -216,7 +216,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/dcc.c 2010-08-14 04:31:42 +0200
|
||||
@@ -31,7 +31,6 @@
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
|
@ -236,7 +236,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/ignore.c 2010-08-14 04:31:42 +0200
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
@ -247,7 +247,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 2010-05-30 04:28:04 +0200
|
||||
+++ xchat-wdk/src/common/inbound.c 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/inbound.c 2010-08-14 04:31:42 +0200
|
||||
@@ -21,7 +21,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
@ -258,7 +258,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/inet.h 2010-08-14 04:31:42 +0200
|
||||
@@ -24,9 +24,8 @@
|
||||
#ifdef USE_IPV6
|
||||
#include <winsock2.h>
|
||||
|
@ -272,7 +272,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/msproxy.c 2010-08-14 04:31:42 +0200
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
@ -283,7 +283,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/network.c 2010-08-14 04:31:42 +0200
|
||||
@@ -21,7 +21,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -294,7 +294,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/notify.c 2010-08-14 04:31:42 +0200
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
@ -305,7 +305,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/outbound.c 2010-08-14 04:31:42 +0200
|
||||
@@ -32,7 +32,6 @@
|
||||
#include <sys/wait.h>
|
||||
#endif
|
||||
|
@ -316,7 +316,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 2010-05-30 04:28:04 +0200
|
||||
+++ xchat-wdk/src/common/proto-irc.c 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/proto-irc.c 2010-08-14 04:31:42 +0200
|
||||
@@ -18,7 +18,6 @@
|
||||
|
||||
/* IRC RFC1459(+commonly used extensions) protocol implementation */
|
||||
|
@ -327,7 +327,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 2010-05-30 04:28:04 +0200
|
||||
+++ xchat-wdk/src/common/server.c 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/server.c 2010-08-14 04:31:42 +0200
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
@ -356,7 +356,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/servlist.c 2010-08-14 04:31:42 +0200
|
||||
@@ -21,7 +21,6 @@
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -367,7 +367,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/ssl.c 2010-08-14 04:31:42 +0200
|
||||
@@ -17,12 +17,12 @@
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
@ -384,7 +384,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/ssl.c xchat-wdk/src/comm
|
|||
#ifndef HAVE_SNPRINTF
|
||||
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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/text.c 2010-08-14 04:31:42 +0200
|
||||
@@ -19,13 +19,11 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
@ -456,7 +456,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/util.c 2010-08-14 04:31:42 +0200
|
||||
@@ -16,11 +16,13 @@
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
@ -542,7 +542,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/xchat.c 2010-08-14 04:31:42 +0200
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <time.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -553,7 +553,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 2010-08-07 09:14:45 +0200
|
||||
+++ xchat-wdk/src/common/xchat.h 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/common/xchat.h 2010-08-14 04:31:42 +0200
|
||||
@@ -12,12 +12,14 @@
|
||||
|
||||
#include "history.h"
|
||||
|
@ -581,7 +581,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/about.c 2010-08-14 04:31:42 +0200
|
||||
@@ -113,11 +113,15 @@
|
||||
gtk_container_add (GTK_CONTAINER (vbox), label);
|
||||
g_get_charset (&locale);
|
||||
|
@ -609,7 +609,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/banlist.c 2010-08-14 04:31:42 +0200
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -620,7 +620,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/chanlist.c 2010-08-14 04:31:42 +0200
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -631,7 +631,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/editlist.c 2010-08-14 04:31:42 +0200
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -641,8 +641,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src
|
|||
#include <sys/types.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
|
||||
--- 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-08-14 01:14:54 +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-14 04:31:42 +0200
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
@ -668,24 +668,9 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/fe-gtk.c xchat-wdk/src/f
|
|||
#include "gtkutil.h"
|
||||
#include "maingui.h"
|
||||
#include "pixmaps.h"
|
||||
@@ -844,11 +846,11 @@
|
||||
switch (info_type)
|
||||
{
|
||||
case 0: /* native window pointer (for plugins) */
|
||||
-#ifdef WIN32
|
||||
+/*#ifdef WIN32
|
||||
return GDK_WINDOW_HWND (sess->gui->window->window);
|
||||
-#else
|
||||
+#else*/
|
||||
return sess->gui->window;
|
||||
-#endif
|
||||
+/*#endif*/
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-08-14 04:31:42 +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
|
||||
|
@ -697,7 +682,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/fkeys.c 2010-08-14 04:31:42 +0200
|
||||
@@ -20,7 +20,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -708,7 +693,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-08-14 04:31:42 +0200
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <stdarg.h>
|
||||
#include <sys/types.h>
|
||||
|
@ -719,7 +704,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/joind.c 2010-08-14 04:31:42 +0200
|
||||
@@ -9,7 +9,6 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
|
@ -730,7 +715,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
|
||||
--- xchat-wdk.orig/src/fe-gtk/maingui.c 2010-05-16 05:20:22 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/maingui.c 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/maingui.c 2010-08-14 04:31:42 +0200
|
||||
@@ -214,60 +214,10 @@
|
||||
away_list = mg_attr_list_create (&colors[COL_AWAY], FALSE);
|
||||
}
|
||||
|
@ -838,7 +823,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
|
||||
--- xchat-wdk.orig/src/fe-gtk/menu.c 2010-05-16 06:24:24 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/menu.c 2010-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/menu.c 2010-08-14 04:31:42 +0200
|
||||
@@ -20,7 +20,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
|
@ -849,7 +834,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-
|
|||
#include <windows.h>
|
||||
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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/palette.c 2010-08-14 04:31:42 +0200
|
||||
@@ -18,7 +18,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -859,8 +844,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/
|
|||
#include <sys/stat.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
|
||||
--- 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-08-14 01:14:54 +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-14 04:31:42 +0200
|
||||
@@ -1,7 +1,6 @@
|
||||
/* Copyright (C) 2006-2007 Peter Zelezny. */
|
||||
|
||||
|
@ -958,7 +943,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/rawlog.c 2010-08-14 04:31:42 +0200
|
||||
@@ -19,7 +19,6 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
@ -969,7 +954,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/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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-08-14 04:31:42 +0200
|
||||
@@ -31,6 +31,20 @@
|
||||
/*#include "gtkspell-iso-codes.h"
|
||||
#include "sexy-marshal.h"*/
|
||||
|
@ -993,7 +978,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-08-14 01:14:54 +0200
|
||||
+++ xchat-wdk/src/fe-gtk/xtext.c 2010-08-14 04:31:42 +0200
|
||||
@@ -42,7 +42,6 @@
|
||||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
|
|
Loading…
Reference in New Issue