diff options
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | xchat-wdk.patch | 47 |
2 files changed, 20 insertions, 29 deletions
diff --git a/config.h b/config.h index 71dfadc3..8f0db687 100644 --- a/config.h +++ b/config.h @@ -3,7 +3,7 @@ #define USE_GMODULE #define USE_PLUGIN #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "r1451" +#define PACKAGE_VERSION "r1451-2" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 7620a07b..1290f622 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -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-10 16:29:30 +0200 ++++ xchat-wdk/plugins/python/python.c 2010-08-11 02:11:25 +0200 @@ -51,12 +51,13 @@ * */ @@ -60,7 +60,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p #ifdef WIN32 #undef WITH_THREAD /* Thread support locks up xchat on Win32. */ -#define VERSION "0.8/2.4" /* Linked to python24.dll */ -+#define VERSION "0.8/2.5" /* Linked to python24.dll */ ++#define VERSION "0.8/2.5" /* Linked to python25.dll */ #else #define VERSION "0.8" #endif @@ -87,7 +87,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/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-10 17:18:52 +0200 ++++ xchat-wdk/src/common/cfgfiles.c 2010-08-11 02:10:02 +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; } -@@ -677,11 +684,14 @@ +@@ -677,7 +684,10 @@ prefs.mainwindow_save = 1; prefs.bantype = 2; prefs.input_balloon_time = 20; @@ -136,11 +136,6 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src prefs.input_tray_priv = prefs.input_tray_hilight = 1; prefs.autodccsend = 2; /* browse mode */ #ifdef WIN32 -- prefs.identd = 1; -+ prefs.identd = 0; - #endif - strcpy (prefs.stamp_format, "[%H:%M] "); - strcpy (prefs.timestamp_log_format, "%b %d %H:%M:%S "); 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-10 16:29:30 +0200 @@ -285,7 +280,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-10 16:29:30 +0200 ++++ xchat-wdk/src/common/server.c 2010-08-11 02:09:36 +0200 @@ -26,7 +26,6 @@ #include <stdio.h> #include <string.h> @@ -294,28 +289,24 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c #include <errno.h> #include <fcntl.h> -@@ -838,6 +837,7 @@ - fe_set_throttle (serv); - } - -+/* this doesn't really work so just disable it and use the failsafe method +@@ -1390,7 +1389,7 @@ + { #ifdef WIN32 - - static int -@@ -859,11 +859,11 @@ + /* make sure waitline() uses recv() or it'll fail on win32 */ +- len = waitline (sok, buf, len, FALSE); ++ len = waitline (sok, buf, len, TRUE); + #else + len = waitline (sok, buf, len, TRUE); + #endif +@@ -1738,7 +1737,7 @@ } + #endif + serv->childpid = pid; +- serv->iotag = fe_input_add (serv->childread, FIA_READ, server_read_child, ++ serv->iotag = fe_input_add (serv->childread, FIA_READ|FIA_FD, server_read_child, + serv); } --#else -+#else*/ - - #define waitline2(source,buf,size) waitline(serv->childread,buf,size,0) - --#endif -+/*#endif*/ - - /* connect() successed */ - 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-10 16:29:30 +0200 |