iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update xchat to r1489

Browse Source
This commit is contained in:
berkeviktor@aol.com 2011-01-25 23:58:02 +01:00
parent d2c5bda0b8
commit d735424d33
1 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
xchat-wdk.patch
View File

@ -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 2011-01-14 00:56:00 +0100
+++ xchat-wdk/plugins/perl/perl.c 2011-01-16 04:37:59 +0100
+++ xchat-wdk/plugins/perl/perl.c 2011-01-25 23:56:28 +0100
@@ -22,12 +22,15 @@
#include <sys/types.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
--- xchat-wdk.orig/plugins/python/python.c 2010-12-28 03:50:24 +0100
+++ xchat-wdk/plugins/python/python.c 2011-01-16 04:37:59 +0100
+++ xchat-wdk/plugins/python/python.c 2011-01-25 23:56:28 +0100
@@ -53,10 +53,10 @@
#include <glib.h>
@ -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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/plugins/tcl/tclplugin.c 2011-01-25 23:56:28 +0100
@@ -32,8 +32,6 @@
#include <windows.h>
#define bzero(mem, sz) memset((mem), 0, (sz))
@ -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/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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/plugins/xdcc/xdcc.c 2011-01-25 23:56:28 +0100
@@ -2,11 +2,11 @@
#include <glib.h>
@ -103,7 +103,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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/cfgfiles.c 2011-01-25 23:56:28 +0100
@@ -17,7 +17,6 @@
*/
@ -217,7 +217,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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/chanopt.c 2011-01-25 23:56:28 +0100
@@ -3,7 +3,6 @@
#include <stdio.h>
#include <string.h>
@ -228,7 +228,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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/ctcp.c 2011-01-25 23:56:28 +0100
@@ -18,7 +18,6 @@
#include <stdio.h>
@ -248,7 +248,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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/dcc.c 2011-01-25 23:56:28 +0100
@@ -31,7 +31,6 @@
#include <time.h>
#include <errno.h>
@ -278,7 +278,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/comm
return FALSE;
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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/ignore.c 2011-01-25 23:56:28 +0100
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <stdio.h>
@ -289,7 +289,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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/inbound.c 2011-01-25 23:56:28 +0100
@@ -21,7 +21,6 @@
#include <stdlib.h>
#include <stdio.h>
@ -300,7 +300,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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/inet.h 2011-01-25 23:56:28 +0100
@@ -24,9 +24,8 @@
#ifdef USE_IPV6
#include <winsock2.h>
@ -314,7 +314,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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/msproxy.c 2011-01-25 23:56:28 +0100
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
@ -325,7 +325,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 2011-01-16 04:37:59 +0100
+++ xchat-wdk/src/common/network.c 2011-01-25 23:56:28 +0100
@@ -21,7 +21,6 @@
#include <stdlib.h>
#include <string.h>
@ -336,7 +336,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/notify.c 2011-01-25 23:56:28 +0100
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <sys/stat.h>
@ -347,7 +347,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/outbound.c 2011-01-25 23:56:28 +0100
@@ -32,7 +32,6 @@
#include <sys/wait.h>
#endif
@ -358,7 +358,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/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/src/common/plugin-timer.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/plugin-timer.c 2011-01-25 23:56:28 +0100
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <string.h>
@ -370,7 +370,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk
#define strcasecmp stricmp
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-12-28 03:56:42 +0100
+++ xchat-wdk/src/common/plugin.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/plugin.c 2011-01-25 23:56:28 +0100
@@ -34,7 +34,7 @@
#include "text.h"
#define PLUGIN_C
@ -400,7 +400,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/c
sess = ph->context;
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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/proto-irc.c 2011-01-25 23:56:28 +0100
@@ -18,7 +18,6 @@
/* IRC RFC1459(+commonly used extensions) protocol implementation */
@ -410,8 +410,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/proto-irc.c xchat-wdk/sr
#include <stdio.h>
#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 2011-01-16 04:38:00 +0100
--- xchat-wdk.orig/src/common/server.c 2011-01-25 11:46:54 +0100
+++ xchat-wdk/src/common/server.c 2011-01-25 23:56:28 +0100
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
@ -420,7 +420,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c
#include <errno.h>
#include <fcntl.h>
@@ -838,33 +837,6 @@
@@ -845,33 +844,6 @@
fe_set_throttle (serv);
}
@ -454,7 +454,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c
/* connect() successed */
static void
@@ -1388,12 +1360,7 @@
@@ -1395,12 +1367,7 @@
static int
http_read_line (int print_fd, int sok, char *buf, int len)
{
@ -467,7 +467,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c
if (len >= 1)
{
/* print the message out (send it to the parent process) */
@@ -1738,7 +1705,7 @@
@@ -1795,7 +1762,7 @@
}
#endif
serv->childpid = pid;
@ -477,8 +477,8 @@ 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 2011-01-16 04:38:00 +0100
--- xchat-wdk.orig/src/common/servlist.c 2011-01-25 11:26:25 +0100
+++ xchat-wdk/src/common/servlist.c 2011-01-25 23:56:28 +0100
@@ -21,7 +21,6 @@
#include <string.h>
#include <sys/types.h>
@ -489,7 +489,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/ssl.c 2011-01-25 23:56:28 +0100
@@ -17,12 +17,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
@ -506,7 +506,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/text.c 2011-01-25 23:56:28 +0100
@@ -19,13 +19,11 @@
#include <stdlib.h>
#include <stdio.h>
@ -584,7 +584,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/util.c 2011-01-25 23:56:28 +0100
@@ -16,11 +16,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
@ -753,7 +753,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/util.h xchat-wdk/src/common/util.h
--- xchat-wdk.orig/src/common/util.h 2008-02-07 02:50:37 +0100
+++ xchat-wdk/src/common/util.h 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/common/util.h 2011-01-25 23:56:28 +0100
@@ -43,6 +43,11 @@
int strip_hidden_attribute (char *src, char *dst);
char *errorstring (int err);
@ -767,8 +767,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.h xchat-wdk/src/com
void move_file_utf8 (char *src_dir, char *dst_dir, char *fname, int dccpermissions);
int mkdir_utf8 (char *dir);
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 2011-01-16 04:38:00 +0100
--- xchat-wdk.orig/src/common/xchat.c 2011-01-25 11:46:54 +0100
+++ xchat-wdk/src/common/xchat.c 2011-01-25 23:56:28 +0100
@@ -22,7 +22,6 @@
#include <time.h>
#include <sys/types.h>
@ -786,7 +786,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
#include "plugin.h"
#include "plugin-timer.h"
#include "notify.h"
@@ -583,6 +582,7 @@
@@ -590,6 +589,7 @@
"NAME DMSG\n" "CMD msg =%2 &3\n\n"\
"NAME EXIT\n" "CMD quit\n\n"\
"NAME GREP\n" "CMD lastlog -r &2\n\n"\
@ -795,8 +795,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/xchat.c xchat-wdk/src/co
"NAME KILL\n" "CMD quote KILL %2 :&3\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
--- xchat-wdk.orig/src/common/xchat.h 2010-08-07 09:14:45 +0200
+++ xchat-wdk/src/common/xchat.h 2011-01-16 04:38:00 +0100
--- xchat-wdk.orig/src/common/xchat.h 2011-01-25 11:46:54 +0100
+++ xchat-wdk/src/common/xchat.h 2011-01-25 23:56:28 +0100
@@ -12,12 +12,14 @@
#include "history.h"
@ -844,7 +844,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 */
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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/about.c 2011-01-25 23:56:28 +0100
@@ -39,6 +39,7 @@
#include "../common/xchat.h"
@ -945,7 +945,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
--- xchat-wdk.orig/src/fe-gtk/banlist.c 2010-05-16 05:20:22 +0200
+++ xchat-wdk/src/fe-gtk/banlist.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/banlist.c 2011-01-25 23:56:28 +0100
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <stdlib.h>
@ -956,7 +956,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/chanlist.c 2011-01-25 23:56:28 +0100
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <stdlib.h>
@ -967,7 +967,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/chanview-tabs.c xchat-wdk/src/fe-gtk/chanview-tabs.c
--- xchat-wdk.orig/src/fe-gtk/chanview-tabs.c 2005-11-21 06:25:39 +0100
+++ xchat-wdk/src/fe-gtk/chanview-tabs.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/chanview-tabs.c 2011-01-25 23:56:28 +0100
@@ -144,8 +144,8 @@
for (i = adj->value; ((i > new_value) && (tab_left_is_moving)); i -= 0.1)
{
@ -992,7 +992,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanview-tabs.c xchat-wd
gtk_adjustment_set_value (adj, new_value);
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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/editlist.c 2011-01-25 23:56:28 +0100
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <stdlib.h>
@ -1003,7 +1003,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src
#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-08-14 03:46:21 +0200
+++ xchat-wdk/src/fe-gtk/fe-gtk.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/fe-gtk.c 2011-01-25 23:56:28 +0100
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <string.h>
@ -1171,7 +1171,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)");
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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/fe-gtk.h 2011-01-25 23:56:28 +0100
@@ -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
@ -1183,7 +1183,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/fkeys.c 2011-01-25 23:56:28 +0100
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <sys/types.h>
@ -1194,7 +1194,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/gtkutil.c 2011-01-25 23:56:28 +0100
@@ -22,7 +22,6 @@
#include <stdarg.h>
#include <sys/types.h>
@ -1480,7 +1480,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/gtkutil.c xchat-wdk/src/
dialog = gtk_file_chooser_dialog_new (title, NULL,
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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/joind.c 2011-01-25 23:56:28 +0100
@@ -9,7 +9,6 @@
#include <sys/types.h>
@ -1491,7 +1491,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-12-28 04:16:34 +0100
+++ xchat-wdk/src/fe-gtk/maingui.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/maingui.c 2011-01-25 23:56:28 +0100
@@ -53,6 +53,7 @@
#include "../common/plugin.h"
#include "../common/modes.h"
@ -1616,7 +1616,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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/menu.c 2011-01-25 23:56:28 +0100
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <fcntl.h>
@ -1659,7 +1659,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/menu.c xchat-wdk/src/fe-
g_signal_connect (G_OBJECT (item), "activate",
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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/palette.c 2011-01-25 23:56:28 +0100
@@ -18,7 +18,6 @@
#include <stdio.h>
@ -1670,7 +1670,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/
#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-11-16 09:26:23 +0100
+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2011-01-25 23:56:28 +0100
@@ -1,14 +1,14 @@
/* Copyright (C) 2006-2007 Peter Zelezny. */
@ -1838,7 +1838,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
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
--- xchat-wdk.orig/src/fe-gtk/plugingui.c 2010-05-16 05:20:22 +0200
+++ xchat-wdk/src/fe-gtk/plugingui.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/plugingui.c 2011-01-25 23:56:29 +0100
@@ -35,7 +35,7 @@
#include "../common/xchat.h"
#define PLUGIN_C
@ -1861,7 +1861,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/sr
static void
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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/rawlog.c 2011-01-25 23:56:29 +0100
@@ -19,7 +19,6 @@
#include <stdio.h>
#include <string.h>
@ -1872,7 +1872,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/search.c xchat-wdk/src/fe-gtk/search.c
--- xchat-wdk.orig/src/fe-gtk/search.c 2010-05-16 05:20:22 +0200
+++ xchat-wdk/src/fe-gtk/search.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/search.c 2011-01-25 23:56:29 +0100
@@ -153,7 +153,7 @@
_("_Find"));
g_object_set_data (G_OBJECT (wid), "e", entry);
@ -1883,9 +1883,9 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/search.c xchat-wdk/src/f
gtk_widget_show (win);
}
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/src/fe-gtk/servlistgui.c
--- xchat-wdk.orig/src/fe-gtk/servlistgui.c 2010-08-07 09:14:45 +0200
+++ xchat-wdk/src/fe-gtk/servlistgui.c 2011-01-16 04:38:00 +0100
@@ -1782,7 +1782,7 @@
--- xchat-wdk.orig/src/fe-gtk/servlistgui.c 2011-01-25 11:28:02 +0100
+++ xchat-wdk/src/fe-gtk/servlistgui.c 2011-01-25 23:56:29 +0100
@@ -1812,7 +1812,7 @@
gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav);
g_signal_connect (G_OBJECT (checkbutton_fav), "toggled",
G_CALLBACK (fav_servlist), 0);
@ -1895,8 +1895,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/
vbuttonbox2 = gtk_vbutton_box_new ();
gtk_box_set_spacing (GTK_BOX (vbuttonbox2), 3);
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 2011-01-16 04:38:00 +0100
--- xchat-wdk.orig/src/fe-gtk/setup.c 2011-01-25 11:46:54 +0100
+++ xchat-wdk/src/fe-gtk/setup.c 2011-01-25 23:56:29 +0100
@@ -109,19 +109,32 @@
N_("Give each person on IRC a different color"),0,0},
{ST_TOGGLR, N_("Indent nick names"), P_OFFINTNL(indent_nicks),
@ -1975,7 +1975,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
static const setting logging_settings[] =
{
@@ -1708,7 +1737,7 @@
@@ -1711,7 +1740,7 @@
N_("General"),
N_("Logging"),
N_("Sound"),
@ -1984,7 +1984,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
NULL,
N_("Network"),
N_("Network setup"),
@@ -1729,10 +1758,19 @@
@@ -1732,10 +1761,19 @@
setup_add_page (cata[3], book, setup_create_page (userlist_settings));
setup_add_page (cata[4], book, setup_create_page (tabs_settings));
setup_add_page (cata[5], book, setup_create_color_page ());
@ -2007,7 +2007,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
--- 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 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2011-01-25 23:56:29 +0100
@@ -31,6 +31,8 @@
/*#include "gtkspell-iso-codes.h"
#include "sexy-marshal.h"*/
@ -2034,7 +2034,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat
have_enchant = TRUE;
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 2010-12-17 08:58:17 +0100
+++ xchat-wdk/src/fe-gtk/xtext.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/xtext.c 2011-01-25 23:56:29 +0100
@@ -42,7 +42,6 @@
#include <ctype.h>
#include <stdlib.h>
@ -2129,7 +2129,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.c xchat-wdk/src/fe
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.h xchat-wdk/src/fe-gtk/xtext.h
--- xchat-wdk.orig/src/fe-gtk/xtext.h 2010-12-17 08:58:17 +0100
+++ xchat-wdk/src/fe-gtk/xtext.h 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-gtk/xtext.h 2011-01-25 23:56:29 +0100
@@ -270,6 +270,7 @@
xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
void gtk_xtext_buffer_free (xtext_buffer *buf);
@ -2140,7 +2140,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/xtext.h xchat-wdk/src/fe
#endif
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/src/fe-text/fe-text.c 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-text/fe-text.c 2011-01-25 23:56:29 +0100
@@ -22,60 +22,51 @@
#ifdef HAVE_STRINGS_H
#include <strings.h>
@ -2800,7 +2800,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-text/fe-text.c xchat-wdk/src
fe_gui_info (session *sess, int info_type)
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-text/fe-text.h xchat-wdk/src/fe-text/fe-text.h
--- xchat-wdk.orig/src/fe-text/fe-text.h 2002-11-28 11:41:32 +0100
+++ xchat-wdk/src/fe-text/fe-text.h 2011-01-16 04:38:00 +0100
+++ xchat-wdk/src/fe-text/fe-text.h 2011-01-25 23:56:29 +0100
@@ -1,29 +1 @@
-
-typedef int (*socket_callback) (void *source, int condition, void *user_data);