diff options
author | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-08-30 04:27:12 +0200 |
---|---|---|
committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-08-30 04:27:12 +0200 |
commit | e8ca68f6434e940fe1e441e4a5f1fd4e0a903a77 (patch) | |
tree | 0eba98e03ea9b59a477fd72d2ff2b49e9a6d8706 /xchat-wdk.patch | |
parent | 366f700c4a5a0f76cb6dfc6c15de70ae31334c21 (diff) |
really disable plugin-tray if xtray is loaded
Diffstat (limited to 'xchat-wdk.patch')
-rw-r--r-- | xchat-wdk.patch | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 91a78a08..e912b5ec 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 <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-08-30 02:48:50 +0200 ++++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-08-30 04:24:14 +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; +@@ -803,7 +802,7 @@ + } + else + { +- if (prefs.gui_tray) ++ if (prefs.gui_tray && !((_access( "plugins/xtray.dll", 0 )) != -1)) + tray_init (); + } + } @@ -835,7 +834,7 @@ xchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL); |