[Xfce4-commits] <xfce4-panel:master> Fix to the previous commit

[Nick Schermer]

Updating branch refs/heads/master
         to f1299849ddd60c2458a6fde453e5190807541034 (commit)
       from 1e9e329c7e4f8a2ed6019bfe980f80c301b4d715 (commit)

commit f1299849ddd60c2458a6fde453e5190807541034
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Mon Aug 26 20:01:05 2013 +0100

    Fix to the previous commit

 wrapper/wrapper-plug.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 173ebf6..5723a24 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -108,14 +108,14 @@ wrapper_plug_init (WrapperPlug *plug)
   /* allow painting, else compositing won't work */
   gtk_widget_set_app_paintable (GTK_WIDGET (plug), TRUE);
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
   /* 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 */
-
-  /* FIXIT temporarily disabled because it crashes xfce4-indicator-plugin */
-  /* if (gtk_check_version (2, 16, 0) != NULL
-   *    && strcmp (wrapper_name, "systray") == 0)
-   *  return; */
+  if (gtk_check_version (2, 16, 0) != NULL
+      && strcmp (wrapper_name, "systray") == 0)
+    return;
+#endif
 
   /* set the colormap */
   screen = gtk_window_get_screen (GTK_WINDOW (plug));