From 8bc0c3da4ed90a3e4c02971af7c2b0e26c3d8f8d Mon Sep 17 00:00:00 2001
From: stooke <unknown>
Date: Mon, 3 Jun 2019 16:39:07 +0100
Subject: [PATCH] 8214765: All TrayIcon MessageType icons does not show up with
 gtk3 option set Reviewed-by: serb, psadhukhan, clanger

---
 .../classes/sun/awt/X11/InfoWindow.java       | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/solaris/classes/sun/awt/X11/InfoWindow.java b/src/solaris/classes/sun/awt/X11/InfoWindow.java
index 20c6174c2..fef9704d0 100644
--- a/src/solaris/classes/sun/awt/X11/InfoWindow.java
+++ b/src/solaris/classes/sun/awt/X11/InfoWindow.java
@@ -414,12 +414,24 @@ public abstract class InfoWindow extends Window {
 
         private void loadGtkImages() {
             if (!gtkImagesLoaded) {
-                errorImage = (Image)Toolkit.getDefaultToolkit().getDesktopProperty(
-                    "gtk.icon.gtk-dialog-error.6.rtl");
-                warnImage = (Image)Toolkit.getDefaultToolkit().getDesktopProperty(
-                    "gtk.icon.gtk-dialog-warning.6.rtl");
-                infoImage = (Image)Toolkit.getDefaultToolkit().getDesktopProperty(
-                    "gtk.icon.gtk-dialog-info.6.rtl");
+                //check whether the gtk version is >= 3.10 as the Icon names were
+                //changed from this release
+                UNIXToolkit tk = (UNIXToolkit) Toolkit.getDefaultToolkit();
+                if (tk.checkGtkVersion(3, 10, 0)) {
+                    errorImage = (Image) tk.getDesktopProperty(
+                            "gtk.icon.dialog-error.6.rtl");
+                    warnImage = (Image) tk.getDesktopProperty(
+                            "gtk.icon.dialog-warning.6.rtl");
+                    infoImage = (Image) tk.getDesktopProperty(
+                            "gtk.icon.dialog-information.6.rtl");
+                } else {
+                    errorImage = (Image) tk.getDesktopProperty(
+                            "gtk.icon.gtk-dialog-error.6.rtl");
+                    warnImage = (Image) tk.getDesktopProperty(
+                            "gtk.icon.gtk-dialog-warning.6.rtl");
+                    infoImage = (Image) tk.getDesktopProperty(
+                            "gtk.icon.gtk-dialog-info.6.rtl");
+                }
                 gtkImagesLoaded = true;
             }
         }
@@ -492,4 +504,3 @@ public abstract class InfoWindow extends Window {
         }
     }
 }
-
-- 
GitLab