Updating branch refs/heads/master
to 1e9e329c7e4f8a2ed6019bfe980f80c301b4d715 (commit)
from 4fa3dbe337f29e4029f0c9d0bb7aedd42c691e78 (commit)
commit 1e9e329c7e4f8a2ed6019bfe980f80c301b4d715
Author: Andrzej <[email protected]>
Date: Mon Aug 26 18:30:06 2013 +0100
Workaround for a crash in gtk3 version of xfce4-indicator-plugin
wrapper/wrapper-plug.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 14bac51..173ebf6 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -111,9 +111,11 @@ wrapper_plug_init (WrapperPlug *plug)
/* old versions of gtk don't support transparent tray icons, if we
* set an argb colormap on the tray, the icons won't be embedded because
* the socket-plugin implementation requires identical colormaps */
- if (gtk_check_version (2, 16, 0) != NULL
- && strcmp (wrapper_name, "systray") == 0)
- return;
+
+ /* FIXIT temporarily disabled because it crashes xfce4-indicator-plugin */
+ /* if (gtk_check_version (2, 16, 0) != NULL
+ * && strcmp (wrapper_name, "systray") == 0)
+ * return; */
/* set the colormap */
screen = gtk_window_get_screen (GTK_WINDOW (plug));
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
