moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-29 20:52:16 -05:00
Code Issues Releases Wiki Activity

really disable plugin-tray if xtray is loaded

Browse Source
This commit is contained in:
berkeviktor@aol.com 2010-08-30 04:27:12 +02:00
parent 366f700c4a
commit e8ca68f643
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xchat-wdk.patch
View File

@ -943,7 +943,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/palette.c xchat-wdk/src/
#include <fcntl.h> #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 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.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 @@ @@ -1,8 +1,7 @@
/* Copyright (C) 2006-2007 Peter Zelezny. */ /* 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); word[1], network);
return XCHAT_EAT_NONE; 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 @@ @@ -835,7 +834,7 @@
xchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL); xchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL);