diff options
| -rw-r--r-- | xchat-wdk.patch | 186 |
1 files changed, 53 insertions, 133 deletions
diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 06f03cc5..21d8e468 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-12-22 04:53:06 +0100 -+++ xchat-wdk/plugins/perl/perl.c 2010-12-28 02:18:45 +0100 ++++ xchat-wdk/plugins/perl/perl.c 2010-12-28 14:44:17 +0100 @@ -22,12 +22,15 @@ #include <sys/types.h> #include <sys/stat.h> @@ -40,8 +40,8 @@ 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-12-28 02:21:18 +0100 +--- xchat-wdk.orig/plugins/python/python.c 2010-12-28 03:50:24 +0100 ++++ xchat-wdk/plugins/python/python.c 2010-12-28 14:44:17 +0100 @@ -53,10 +53,10 @@ #include <glib.h> @@ -64,46 +64,9 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/python/python.c xchat-wdk/p #else #define VERSION "0.8" #endif -@@ -1161,6 +1161,27 @@ - PyObject_SetAttrString(m, "__version__", o); - - if (filename) { -+#ifdef WIN32 -+ /* more info: -+ * http://bytes.com/topic/python/answers/840542-pyrun_simplefile-crashes#post3364174 -+ * http://effbot.org/pyfaq/pyrun-simplefile-crashes-on-windows-but-not-on-unix-why.htm -+ */ -+ PyObject* PyFileObject = PyFile_FromString(filename, "r"); -+ if (PyFileObject == NULL) { -+ xchat_printf(ph, "Can't open file %s: %s\n", -+ filename, strerror(errno)); -+ goto error; -+ } -+ -+ if (PyRun_SimpleFile(PyFile_AsFile(PyFileObject), filename) != 0) { -+ xchat_printf(ph, "Error loading module %s\n", -+ filename); -+ goto error; -+ } -+ -+ plugin->filename = filename; -+ filename = NULL; -+#else - FILE *fp; - - plugin->filename = filename; -@@ -1184,7 +1205,7 @@ - goto error; - } - fclose(fp); -- -+#endif - m = PyDict_GetItemString(PyImport_GetModuleDict(), - "__main__"); - 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-12-28 02:18:45 +0100 ++++ xchat-wdk/plugins/tcl/tclplugin.c 2010-12-28 14:44:17 +0100 @@ -32,8 +32,6 @@ #include <windows.h> #define bzero(mem, sz) memset((mem), 0, (sz)) @@ -124,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 2010-12-28 02:18:45 +0100 ++++ xchat-wdk/plugins/xdcc/xdcc.c 2010-12-28 14:44:17 +0100 @@ -2,11 +2,11 @@ #include <glib.h> @@ -140,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 2010-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/cfgfiles.c 2010-12-28 14:44:17 +0100 @@ -17,7 +17,6 @@ */ @@ -244,7 +207,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/chanopt.c 2010-12-28 14:44:18 +0100 @@ -3,7 +3,6 @@ #include <stdio.h> #include <string.h> @@ -255,7 +218,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/ctcp.c 2010-12-28 14:44:18 +0100 @@ -18,7 +18,6 @@ #include <stdio.h> @@ -275,7 +238,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/dcc.c 2010-12-28 14:44:18 +0100 @@ -31,7 +31,6 @@ #include <time.h> #include <errno.h> @@ -305,7 +268,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 2010-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/ignore.c 2010-12-28 14:44:18 +0100 @@ -19,7 +19,6 @@ #include <stdlib.h> #include <stdio.h> @@ -316,7 +279,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/inbound.c 2010-12-28 14:44:18 +0100 @@ -21,7 +21,6 @@ #include <stdlib.h> #include <stdio.h> @@ -327,7 +290,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/inet.h 2010-12-28 14:44:18 +0100 @@ -24,9 +24,8 @@ #ifdef USE_IPV6 #include <winsock2.h> @@ -341,7 +304,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/msproxy.c 2010-12-28 14:44:18 +0100 @@ -26,7 +26,6 @@ #include <stdio.h> #include <string.h> @@ -352,7 +315,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/network.c 2010-12-28 14:44:18 +0100 @@ -21,7 +21,6 @@ #include <stdlib.h> #include <string.h> @@ -363,7 +326,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/notify.c 2010-12-28 14:44:18 +0100 @@ -22,7 +22,6 @@ #include <sys/types.h> #include <sys/stat.h> @@ -374,7 +337,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/outbound.c 2010-12-28 14:44:18 +0100 @@ -32,7 +32,6 @@ #include <sys/wait.h> #endif @@ -385,7 +348,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/plugin-timer.c 2010-12-28 14:44:18 +0100 @@ -1,7 +1,7 @@ #include <stdlib.h> #include <string.h> @@ -396,8 +359,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin-timer.c xchat-wdk #ifdef WIN32 #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-12-28 02:18:45 +0100 +--- xchat-wdk.orig/src/common/plugin.c 2010-12-28 03:56:42 +0100 ++++ xchat-wdk/src/common/plugin.c 2010-12-28 14:44:18 +0100 @@ -34,7 +34,7 @@ #include "text.h" #define PLUGIN_C @@ -407,18 +370,9 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/plugin.c xchat-wdk/src/c #include "plugin.h" -@@ -1212,7 +1212,7 @@ - static const char * const dcc_fields[] = - { - "iaddress32","icps", "sdestfile","sfile", "snick", "iport", -- "ipos", "iposhigh", "iresume", "iresumehigh" "isize", "isizehigh", "istatus", "itype", NULL -+ "ipos", "iposhigh", "iresume", "iresumehigh", "isize", "isizehigh", "istatus", "itype", NULL - }; - static const char * const channels_fields[] = - { 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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/proto-irc.c 2010-12-28 14:44:18 +0100 @@ -18,7 +18,6 @@ /* IRC RFC1459(+commonly used extensions) protocol implementation */ @@ -429,7 +383,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/server.c 2010-12-28 14:44:18 +0100 @@ -26,7 +26,6 @@ #include <stdio.h> #include <string.h> @@ -496,7 +450,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/servlist.c 2010-12-28 14:44:18 +0100 @@ -21,7 +21,6 @@ #include <string.h> #include <sys/types.h> @@ -507,7 +461,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/ssl.c 2010-12-28 14:44:18 +0100 @@ -17,12 +17,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ @@ -524,7 +478,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/text.c 2010-12-28 14:44:18 +0100 @@ -19,13 +19,11 @@ #include <stdlib.h> #include <stdio.h> @@ -602,7 +556,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/util.c 2010-12-28 14:44:18 +0100 @@ -16,11 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ @@ -771,7 +725,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 2010-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/util.h 2010-12-28 14:44:18 +0100 @@ -43,6 +43,11 @@ int strip_hidden_attribute (char *src, char *dst); char *errorstring (int err); @@ -786,7 +740,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/util.h xchat-wdk/src/com 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 2010-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/xchat.c 2010-12-28 14:44:18 +0100 @@ -22,7 +22,6 @@ #include <time.h> #include <sys/types.h> @@ -814,7 +768,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/common/xchat.h 2010-12-28 14:44:18 +0100 @@ -12,12 +12,14 @@ #include "history.h" @@ -852,7 +806,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-12-28 02:18:45 +0100 ++++ xchat-wdk/src/fe-gtk/about.c 2010-12-28 14:44:18 +0100 @@ -39,6 +39,7 @@ #include "../common/xchat.h" @@ -953,7 +907,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/banlist.c 2010-12-28 14:44:18 +0100 @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> @@ -964,7 +918,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/chanlist.c 2010-12-28 14:44:18 +0100 @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> @@ -975,7 +929,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/chanview-tabs.c 2010-12-28 14:44:18 +0100 @@ -144,8 +144,8 @@ for (i = adj->value; ((i > new_value) && (tab_left_is_moving)); i -= 0.1) { @@ -1000,7 +954,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/editlist.c 2010-12-28 14:44:19 +0100 @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdlib.h> @@ -1011,7 +965,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/fe-gtk.c 2010-12-28 14:44:19 +0100 @@ -19,7 +19,6 @@ #include <stdio.h> #include <string.h> @@ -1048,7 +1002,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/fe-gtk.h 2010-12-28 14:44:19 +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 @@ -1060,7 +1014,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/fkeys.c 2010-12-28 14:44:19 +0100 @@ -20,7 +20,6 @@ #include <stdlib.h> #include <sys/types.h> @@ -1071,7 +1025,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/gtkutil.c 2010-12-28 14:44:19 +0100 @@ -22,7 +22,6 @@ #include <stdarg.h> #include <sys/types.h> @@ -1357,7 +1311,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 2010-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/joind.c 2010-12-28 14:44:19 +0100 @@ -9,7 +9,6 @@ #include <sys/types.h> @@ -1367,8 +1321,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/joind.c xchat-wdk/src/fe #include <stdio.h> 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-12-28 02:18:46 +0100 +--- xchat-wdk.orig/src/fe-gtk/maingui.c 2010-12-28 04:16:34 +0100 ++++ xchat-wdk/src/fe-gtk/maingui.c 2010-12-28 14:44:19 +0100 @@ -214,60 +214,10 @@ away_list = mg_attr_list_create (&colors[COL_AWAY], FALSE); } @@ -1450,41 +1404,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/ } /* set a tab plain, red, light-red, or blue */ -@@ -1190,7 +1136,14 @@ - "Close them all?"), i); - 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 && prefs.tab_pos == 6) -+ { -+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT); -+ } -+ else -+ { -+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); -+ } - gtk_widget_show (dialog); - } - } -@@ -2489,7 +2442,7 @@ - if (prefs.lagometer & 1) - { - gui->lagometer = wid = gtk_progress_bar_new (); -- gtk_widget_set_size_request (wid, 1, 8); -+ gtk_widget_set_size_request (wid, 1, 10); - - wid = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (wid), gui->lagometer); -@@ -2504,7 +2457,7 @@ - if (prefs.throttlemeter & 1) - { - gui->throttlemeter = wid = gtk_progress_bar_new (); -- gtk_widget_set_size_request (wid, 1, 8); -+ gtk_widget_set_size_request (wid, 1, 10); - - wid = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (wid), gui->throttlemeter); -@@ -2957,11 +2910,7 @@ +@@ -2972,11 +2918,7 @@ gtk_xtext_check_marker_visibility (GTK_XTEXT (current_sess->gui->xtext)); plugin_emit_dummy_print (current_sess, "Focus Window"); } @@ -1496,7 +1416,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/maingui.c xchat-wdk/src/ return FALSE; } -@@ -2972,11 +2921,7 @@ +@@ -2987,11 +2929,7 @@ if (!sess->server->server_session) sess->server->server_session = sess; gtk_xtext_check_marker_visibility(GTK_XTEXT (current_sess->gui->xtext)); @@ -1510,7 +1430,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/menu.c 2010-12-28 14:44:19 +0100 @@ -20,7 +20,6 @@ #include <stdlib.h> #include <fcntl.h> @@ -1521,7 +1441,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/palette.c 2010-12-28 14:44:19 +0100 @@ -18,7 +18,6 @@ #include <stdio.h> @@ -1532,7 +1452,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 2010-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-12-28 14:44:19 +0100 @@ -1,8 +1,7 @@ /* Copyright (C) 2006-2007 Peter Zelezny. */ @@ -1641,7 +1561,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/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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/plugingui.c 2010-12-28 14:44:19 +0100 @@ -35,7 +35,7 @@ #include "../common/xchat.h" #define PLUGIN_C @@ -1664,7 +1584,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 2010-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/rawlog.c 2010-12-28 14:44:19 +0100 @@ -19,7 +19,6 @@ #include <stdio.h> #include <string.h> @@ -1675,7 +1595,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/search.c 2010-12-28 14:44:19 +0100 @@ -153,7 +153,7 @@ _("_Find")); g_object_set_data (G_OBJECT (wid), "e", entry); @@ -1687,7 +1607,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/servlistgui.c 2010-12-28 14:44:19 +0100 @@ -1782,7 +1782,7 @@ gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav); g_signal_connect (G_OBJECT (checkbutton_fav), "toggled", @@ -1699,7 +1619,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/setup.c 2010-12-28 14:44:19 +0100 @@ -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), @@ -1753,7 +1673,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 2010-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-12-28 14:44:19 +0100 @@ -31,6 +31,8 @@ /*#include "gtkspell-iso-codes.h" #include "sexy-marshal.h"*/ @@ -1780,7 +1700,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 2010-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-gtk/xtext.c 2010-12-28 14:44:19 +0100 @@ -42,7 +42,6 @@ #include <ctype.h> #include <stdlib.h> @@ -1800,7 +1720,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-12-28 02:18:46 +0100 ++++ xchat-wdk/src/fe-text/fe-text.c 2010-12-28 14:44:19 +0100 @@ -22,9 +22,13 @@ #ifdef HAVE_STRINGS_H #include <strings.h> |