disable faulty tray icon menus

This commit is contained in:
berkeviktor@aol.com 2011-01-10 09:37:09 +01:00
parent 23e53ae46c
commit 4c4d9ee76e
1 changed files with 28 additions and 5 deletions

View File

@ -1635,7 +1635,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-11-16 09:26:23 +0100 --- xchat-wdk.orig/src/fe-gtk/plugin-tray.c 2010-11-16 09:26:23 +0100
+++ xchat-wdk/src/fe-gtk/plugin-tray.c 2010-12-28 14:57:33 +0100 +++ xchat-wdk/src/fe-gtk/plugin-tray.c 2011-01-10 09:32:04 +0100
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
/* Copyright (C) 2006-2007 Peter Zelezny. */ /* Copyright (C) 2006-2007 Peter Zelezny. */
@ -1668,7 +1668,30 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
tray_stop_flash (); tray_stop_flash ();
tray_reset_counts (); tray_reset_counts ();
@@ -650,15 +649,15 @@ @@ -585,11 +584,12 @@
/*gtk_menu_set_screen (GTK_MENU (menu), gtk_widget_get_screen (widget));*/
if (tray_get_window_status () == WS_HIDDEN)
- tray_make_item (menu, _("_Restore"), tray_menu_restore_cb, NULL);
+ tray_make_item (menu, _("_Restore Window"), tray_menu_restore_cb, NULL);
else
- tray_make_item (menu, _("_Hide"), tray_menu_restore_cb, NULL);
+ tray_make_item (menu, _("_Hide Window"), tray_menu_restore_cb, NULL);
tray_make_item (menu, NULL, tray_menu_quit_cb, NULL);
+#if 0
submenu = mg_submenu (menu, _("_Blink on"));
blink_item (&prefs.input_tray_chans, submenu, _("Channel Message"));
blink_item (&prefs.input_tray_priv, submenu, _("Private Message"));
@@ -606,6 +606,7 @@
gtk_widget_set_sensitive (item, FALSE);
tray_make_item (menu, NULL, tray_menu_quit_cb, NULL);
+#endif
mg_create_icon_item (_("_Quit"), GTK_STOCK_QUIT, menu, tray_menu_quit_cb, NULL);
menu_add_plugin_items (menu, "\x5$TRAY", NULL);
@@ -650,15 +651,15 @@
/* FIXME: hides any previous private messages */ /* FIXME: hides any previous private messages */
tray_hilight_count++; tray_hilight_count++;
if (tray_hilight_count == 1) if (tray_hilight_count == 1)
@ -1687,7 +1710,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
word[1], xchat_get_info (ph, "channel")); word[1], xchat_get_info (ph, "channel"));
return XCHAT_EAT_NONE; return XCHAT_EAT_NONE;
@@ -676,14 +675,14 @@ @@ -676,14 +677,14 @@
tray_pub_count++; tray_pub_count++;
if (tray_pub_count == 1) if (tray_pub_count == 1)
@ -1705,7 +1728,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
word[1], xchat_get_info (ph, "channel")); word[1], xchat_get_info (ph, "channel"));
return XCHAT_EAT_NONE; return XCHAT_EAT_NONE;
@@ -705,14 +704,14 @@ @@ -705,14 +706,14 @@
tray_priv_count++; tray_priv_count++;
if (tray_priv_count == 1) if (tray_priv_count == 1)
@ -1723,7 +1746,7 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/plugin-tray.c xchat-wdk/
from, network); from, network);
} }
@@ -758,15 +757,15 @@ @@ -758,15 +759,15 @@
tray_file_count++; tray_file_count++;
if (tray_file_count == 1) if (tray_file_count == 1)