diff options
Diffstat (limited to 'xchat-wdk.patch')
| -rw-r--r-- | xchat-wdk.patch | 148 |
1 files changed, 71 insertions, 77 deletions
diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 5666685e..5e5671da 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-08-26 04:18:04 +0200 -+++ xchat-wdk/plugins/perl/perl.c 2010-10-05 03:55:26 +0200 ++++ xchat-wdk/plugins/perl/perl.c 2010-10-07 21:25:43 +0200 @@ -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-05-16 06:31:54 +0200 -+++ xchat-wdk/plugins/python/python.c 2010-10-05 03:55:26 +0200 ++++ xchat-wdk/plugins/python/python.c 2010-10-07 21:25:43 +0200 @@ -53,10 +53,10 @@ #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) { 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-10-05 03:55:26 +0200 ++++ xchat-wdk/plugins/tcl/tclplugin.c 2010-10-07 21:25:43 +0200 @@ -32,8 +32,6 @@ #include <windows.h> #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); 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-10-05 03:55:26 +0200 ++++ xchat-wdk/plugins/xdcc/xdcc.c 2010-10-07 21:25:43 +0200 @@ -2,11 +2,11 @@ #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 --- xchat-wdk.orig/src/common/cfgfiles.c 2010-08-07 09:14:45 +0200 -+++ xchat-wdk/src/common/cfgfiles.c 2010-10-05 04:55:22 +0200 ++++ xchat-wdk/src/common/cfgfiles.c 2010-10-07 21:25:43 +0200 @@ -17,7 +17,6 @@ */ @@ -226,7 +226,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-10-05 03:55:26 +0200 ++++ xchat-wdk/src/common/chanopt.c 2010-10-07 21:25:43 +0200 @@ -3,7 +3,6 @@ #include <stdio.h> #include <string.h> @@ -237,7 +237,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-10-05 03:55:26 +0200 ++++ xchat-wdk/src/common/ctcp.c 2010-10-07 21:25:43 +0200 @@ -18,7 +18,6 @@ #include <stdio.h> @@ -257,7 +257,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/dcc.c 2010-10-07 21:25:43 +0200 @@ -31,7 +31,6 @@ #include <time.h> #include <errno.h> @@ -266,18 +266,20 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/dcc.c xchat-wdk/src/comm #include <fcntl.h> #define WANTSOCKET -@@ -1984,7 +1983,7 @@ +@@ -1983,9 +1982,7 @@ + return TRUE; /* now handle case-insensitive Filesystems: HFS+, FAT */ - #ifdef WIN32 +-#ifdef WIN32 -#warning no win32 implementation - behaviour may be unreliable -+/* warning no win32 implementation - behaviour may be unreliable */ - #else +-#else ++#ifndef WIN32 /* this fstat() shouldn't really fail */ if ((dcc->fp == -1 ? stat (dcc->destfile_fs, &st_a) : fstat (dcc->fp, &st_a)) == -1) + 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 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/ignore.c 2010-10-07 21:25:43 +0200 @@ -19,7 +19,6 @@ #include <stdlib.h> #include <stdio.h> @@ -288,7 +290,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/inbound.c 2010-10-07 21:25:43 +0200 @@ -21,7 +21,6 @@ #include <stdlib.h> #include <stdio.h> @@ -299,7 +301,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/inet.h 2010-10-07 21:25:43 +0200 @@ -24,9 +24,8 @@ #ifdef USE_IPV6 #include <winsock2.h> @@ -313,7 +315,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/msproxy.c 2010-10-07 21:25:44 +0200 @@ -26,7 +26,6 @@ #include <stdio.h> #include <string.h> @@ -324,7 +326,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/network.c 2010-10-07 21:25:44 +0200 @@ -21,7 +21,6 @@ #include <stdlib.h> #include <string.h> @@ -335,7 +337,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/notify.c 2010-10-07 21:25:44 +0200 @@ -22,7 +22,6 @@ #include <sys/types.h> #include <sys/stat.h> @@ -346,7 +348,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/outbound.c 2010-10-07 21:25:44 +0200 @@ -32,7 +32,6 @@ #include <sys/wait.h> #endif @@ -357,7 +359,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 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/plugin-timer.c 2010-10-07 21:25:44 +0200 @@ -1,7 +1,7 @@ #include <stdlib.h> #include <string.h> @@ -369,7 +371,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-08-14 03:46:21 +0200 -+++ xchat-wdk/src/common/plugin.c 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/plugin.c 2010-10-07 21:25:44 +0200 @@ -34,7 +34,7 @@ #include "text.h" #define PLUGIN_C @@ -390,7 +392,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 --- xchat-wdk.orig/src/common/proto-irc.c 2010-05-30 04:28:04 +0200 -+++ xchat-wdk/src/common/proto-irc.c 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/proto-irc.c 2010-10-07 21:25:44 +0200 @@ -18,7 +18,6 @@ /* IRC RFC1459(+commonly used extensions) protocol implementation */ @@ -401,7 +403,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/server.c 2010-10-07 21:25:44 +0200 @@ -26,7 +26,6 @@ #include <stdio.h> #include <string.h> @@ -410,16 +412,20 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/server.c xchat-wdk/src/c #include <errno.h> #include <fcntl.h> -@@ -1390,7 +1389,7 @@ +@@ -1388,12 +1387,7 @@ + static int + http_read_line (int print_fd, int sok, char *buf, int len) { - #ifdef WIN32 - /* make sure waitline() uses recv() or it'll fail on win32 */ +-#ifdef WIN32 +- /* make sure waitline() uses recv() or it'll fail on win32 */ - len = waitline (sok, buf, len, FALSE); -+ len = waitline (sok, buf, len, TRUE); - #else +-#else len = waitline (sok, buf, len, TRUE); - #endif -@@ -1738,7 +1737,7 @@ +-#endif + if (len >= 1) + { + /* print the message out (send it to the parent process) */ +@@ -1738,7 +1732,7 @@ } #endif serv->childpid = pid; @@ -430,7 +436,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/servlist.c 2010-10-07 21:25:44 +0200 @@ -21,7 +21,6 @@ #include <string.h> #include <sys/types.h> @@ -441,7 +447,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/ssl.c 2010-10-07 21:25:44 +0200 @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ @@ -458,7 +464,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/text.c 2010-10-07 21:25:44 +0200 @@ -19,13 +19,11 @@ #include <stdlib.h> #include <stdio.h> @@ -536,7 +542,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/util.c 2010-10-07 21:25:44 +0200 @@ -16,11 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ @@ -622,7 +628,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/xchat.c 2010-10-07 21:25:44 +0200 @@ -22,7 +22,6 @@ #include <time.h> #include <sys/types.h> @@ -650,7 +656,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"\ 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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/common/xchat.h 2010-10-07 21:25:44 +0200 @@ -12,12 +12,14 @@ #include "history.h" @@ -688,7 +694,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 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/about.c 2010-10-07 21:25:44 +0200 @@ -39,6 +39,7 @@ #include "../common/xchat.h" @@ -764,7 +770,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 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/banlist.c 2010-10-07 21:25:44 +0200 @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> @@ -775,7 +781,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/chanlist.c 2010-10-07 21:25:44 +0200 @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> @@ -786,7 +792,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 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/chanview-tabs.c 2010-10-07 21:25:44 +0200 @@ -144,8 +144,8 @@ for (i = adj->value; ((i > new_value) && (tab_left_is_moving)); i -= 0.1) { @@ -811,7 +817,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 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/editlist.c 2010-10-07 21:25:44 +0200 @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> @@ -822,7 +828,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 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-10-07 21:25:44 +0200 @@ -19,7 +19,6 @@ #include <stdio.h> #include <string.h> @@ -859,7 +865,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 2010-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-10-07 21:25:44 +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 @@ -871,7 +877,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/fkeys.c 2010-10-07 21:25:44 +0200 @@ -20,7 +20,6 @@ #include <stdlib.h> #include <sys/types.h> @@ -882,7 +888,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-10-07 21:25:44 +0200 @@ -22,7 +22,6 @@ #include <stdarg.h> #include <sys/types.h> @@ -893,7 +899,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-10-05 03:55:27 +0200 ++++ xchat-wdk/src/fe-gtk/joind.c 2010-10-07 21:25:44 +0200 @@ -9,7 +9,6 @@ #include <sys/types.h> @@ -904,7 +910,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-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/maingui.c 2010-10-07 21:25:44 +0200 @@ -214,60 +214,10 @@ away_list = mg_attr_list_create (&colors[COL_AWAY], FALSE); } @@ -991,13 +997,13 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/ g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (mg_tab_close_cb), sess); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); -+ if (prefs.tab_layout) ++ if (!prefs.tab_layout && prefs.tab_pos == 6) + { -+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); ++ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT); + } + else + { -+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT); ++ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); + } gtk_widget_show (dialog); } @@ -1046,7 +1052,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-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/menu.c 2010-10-07 21:25:44 +0200 @@ -20,7 +20,6 @@ #include <stdlib.h> #include <fcntl.h> @@ -1057,7 +1063,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-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/palette.c 2010-10-07 21:25:44 +0200 @@ -18,7 +18,6 @@ #include <stdio.h> @@ -1068,7 +1074,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-08-14 03:46:21 +0200 -+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-10-07 21:25:44 +0200 @@ -1,8 +1,7 @@ /* Copyright (C) 2006-2007 Peter Zelezny. */ @@ -1195,7 +1201,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 2010-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/plugingui.c 2010-10-07 21:25:44 +0200 @@ -35,7 +35,7 @@ #include "../common/xchat.h" #define PLUGIN_C @@ -1207,7 +1213,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugingui.c xchat-wdk/sr #include "../common/outbound.h" 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-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/rawlog.c 2010-10-07 21:25:44 +0200 @@ -19,7 +19,6 @@ #include <stdio.h> #include <string.h> @@ -1218,7 +1224,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 2010-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/search.c 2010-10-07 21:25:44 +0200 @@ -153,7 +153,7 @@ _("_Find")); g_object_set_data (G_OBJECT (wid), "e", entry); @@ -1230,7 +1236,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/search.c xchat-wdk/src/f } 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 2010-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/servlistgui.c 2010-10-07 21:25:44 +0200 @@ -1782,7 +1782,7 @@ gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav); g_signal_connect (G_OBJECT (checkbutton_fav), "toggled", @@ -1242,7 +1248,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/ 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 2010-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/setup.c 2010-10-07 21:25:44 +0200 @@ -109,13 +109,13 @@ N_("Give each person on IRC a different color"),0,0}, {ST_TOGGLR, N_("Indent nick names"), P_OFFINTNL(indent_nicks), @@ -1296,34 +1302,22 @@ 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 2010-10-05 03:55:28 +0200 -@@ -31,6 +31,20 @@ ++++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-10-07 21:25:44 +0200 +@@ -31,6 +31,8 @@ /*#include "gtkspell-iso-codes.h" #include "sexy-marshal.h"*/ -+/* workaround for ssize_t in VS -+ from krb/include/win-mac.h */ -+#ifndef SSIZE_T_DEFINED -+#ifdef ssize_t -+#undef ssize_t -+#endif -+#ifdef _WIN64 -+typedef __int64 ssize_t; -+#else -+typedef _W64 int ssize_t; -+#endif -+#define SSIZE_T_DEFINED -+#endif ++#include "typedef.h" + /* * Bunch of poop to make enchant into a runtime dependency rather than a * compile-time dependency. This makes it so I don't have to hear the -@@ -134,12 +148,10 @@ +@@ -134,12 +136,10 @@ GModule *enchant; gpointer funcptr; - enchant = g_module_open("libenchant", 0); -+ enchant = g_module_open("libenchant-1.dll", 0); ++ enchant = g_module_open("libenchant.dll", 0); if (enchant == NULL) { - enchant = g_module_open("libenchant.so.1", 0); @@ -1335,7 +1329,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 2008-08-29 13:24:17 +0200 -+++ xchat-wdk/src/fe-gtk/xtext.c 2010-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-gtk/xtext.c 2010-10-07 21:25:44 +0200 @@ -42,7 +42,6 @@ #include <ctype.h> #include <stdlib.h> @@ -1355,7 +1349,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-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 2010-10-05 03:55:28 +0200 ++++ xchat-wdk/src/fe-text/fe-text.c 2010-10-07 21:25:44 +0200 @@ -22,9 +22,13 @@ #ifdef HAVE_STRINGS_H #include <strings.h> |