From 8a6409240f47a087097fd617e172ee70db48e6ca Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 30 Aug 2010 02:57:48 +0200 Subject: re-enable xtray, disable plugin-tray if installed --- xchat-wdk.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'xchat-wdk.patch') diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 66534a27..91a78a08 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -943,7 +943,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/ #include 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-08-26 15:53:53 +0200 ++++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-08-30 02:48:50 +0200 @@ -1,8 +1,7 @@ /* Copyright (C) 2006-2007 Peter Zelezny. */ @@ -1050,6 +1050,15 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/ word[1], network); return XCHAT_EAT_NONE; +@@ -835,7 +834,7 @@ + + xchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL); + +- if (prefs.gui_tray) ++ if (prefs.gui_tray && !((_access( "plugins/xtray.dll", 0 )) != -1)) + tray_init (); + + 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-08-26 15:53:53 +0200 -- cgit 1.4.1