diff --git a/config.h b/config.h index 5f5fdedc..34c6aca7 100644 --- a/config.h +++ b/config.h @@ -3,7 +3,7 @@ #define USE_GMODULE #define USE_PLUGIN #define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "r1412" +#define PACKAGE_VERSION "r1412-2" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 8ff873ce..b87eaedb 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -75,7 +75,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/plugins/tcl/tclplugin.c xchat-wdk/p #include "xchat-plugin.h" 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 2009-01-02 06:56:12 +0100 -+++ xchat-wdk/src/common/cfgfiles.c 2010-05-02 13:04:17 +0200 ++++ xchat-wdk/src/common/cfgfiles.c 2010-05-02 20:18:12 +0200 @@ -17,7 +17,6 @@ */ @@ -95,9 +95,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/common/cfgfiles.c xchat-wdk/src prefs.mainwindow_save = 1; prefs.bantype = 2; prefs.input_balloon_time = 20; -- prefs.input_flash_priv = prefs.input_flash_hilight = 1; + prefs.input_flash_priv = prefs.input_flash_hilight = 1; - prefs.input_tray_priv = prefs.input_tray_hilight = 1; -+ prefs.input_flash_priv = prefs.input_flash_hilight = prefs.input_flash_chans = 0; + prefs.input_tray_priv = prefs.input_tray_hilight = prefs.input_tray_chans = 0; prefs.autodccsend = 2; /* browse mode */ #ifdef WIN32 @@ -761,19 +760,16 @@ 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/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-05-02 13:04:18 +0200 -@@ -332,11 +332,15 @@ ++++ xchat-wdk/src/fe-gtk/setup.c 2010-05-02 20:20:48 +0200 +@@ -332,11 +332,13 @@ #ifndef WIN32 {ST_3OGGLE, N_("Show tray balloons on:"), 0, 0, (void *)balloonlist, 0}, #endif - {ST_3OGGLE, N_("Blink tray icon on:"), 0, 0, (void *)trayblinklist, 0}, -- {ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0}, + /* we don't use the xchat plugin-tray */ + /* {ST_3OGGLE, N_("Blink tray icon on:"), 0, 0, (void *)trayblinklist, 0}, */ -+ -+ /* this causes a crash for some reason, disable it */ -+ /* {ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0}, */ -+ ++ + {ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0}, {ST_3OGGLE, N_("Make a beep sound on:"), 0, 0, (void *)beeplist, 0}, - {ST_TOGGLE, N_("Enable system tray icon"), P_OFFINTNL(gui_tray), 0, 0, 0},