[Xfce4-commits] <xfce4-panel:devel> Do set the systray rgba colormap if the gtk version is 2.16.0 or newer.

[Nick Schermer]

Updating branch refs/heads/devel
         to e84edaa9d5515e551ffe10e8985332a6ae4a86f1 (commit)
       from aaa1410fdfaf0ee32cc7ea2785230784d9144066 (commit)

commit e84edaa9d5515e551ffe10e8985332a6ae4a86f1
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 22 20:34:38 2009 +0100

    Do set the systray rgba colormap if the gtk version is 2.16.0 or newer.

 wrapper/wrapper-plug.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index e502db1..0188998 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -87,10 +87,15 @@ wrapper_plug_init (WrapperPlug *plug)
   g_signal_connect (G_OBJECT (plug), "composited-changed",
                     G_CALLBACK (wrapper_plug_set_colormap), NULL);
 
+  /* 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;
+
   /* set the colormap */
-  /* HACK: the systray can't handle composited windows! */
-  if (strcmp (wrapper_name, "systray") != 0)
-    wrapper_plug_set_colormap (plug);
+  wrapper_plug_set_colormap (plug);
 }