diff options
| author | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-08-30 02:57:48 +0200 |
|---|---|---|
| committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-08-30 02:57:48 +0200 |
| commit | 8a6409240f47a087097fd617e172ee70db48e6ca (patch) | |
| tree | 83fa6159c4e5cb5f236c6a1626baeb20d3550614 /xchat-wdk.patch | |
| parent | 2a04adc8832212adba4a7e2173290fa0dc84d5f2 (diff) | |
re-enable xtray, disable plugin-tray if installed
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 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 <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-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 |