--- old/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c	2016-06-23 12:14:27.244348768 +0530
+++ new/src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c	2016-06-23 12:14:27.052348768 +0530
@@ -563,8 +563,8 @@
      * Strip the AT-SPI GTK_MODULEs if present
      */
     gtk_modules_env = getenv ("GTK_MODULES");
-    if (gtk_modules_env && strstr (gtk_modules_env, "atk-bridge") ||
-        gtk_modules_env && strstr (gtk_modules_env, "gail"))
+    if ((gtk_modules_env && strstr (gtk_modules_env, "atk-bridge")) ||
+        (gtk_modules_env && strstr (gtk_modules_env, "gail")))
     {
         /* the new env will be smaller than the old one */
         gchar *s, *new_env = SAFE_SIZE_STRUCT_ALLOC(malloc,
@@ -578,7 +578,7 @@
 
             /* strip out 'atk-bridge' and 'gail' */
             size_t PREFIX_LENGTH = strlen(ENV_PREFIX);
-            while (s = strtok(tmp_env, ":"))
+            while ((s = strtok(tmp_env, ":")))
             {
                 if ((!strstr (s, "atk-bridge")) && (!strstr (s, "gail")))
                 {
@@ -897,14 +897,16 @@
     {
         case BUTTON:
         case TABLE_HEADER:
-            if (init_result = (NULL == gtk3_widgets[_GTK_BUTTON_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_BUTTON_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_BUTTON_TYPE] = (*fp_gtk_button_new)();
             }
             result = gtk3_widgets[_GTK_BUTTON_TYPE];
             break;
         case CHECK_BOX:
-            if (init_result = (NULL == gtk3_widgets[_GTK_CHECK_BUTTON_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_CHECK_BUTTON_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_CHECK_BUTTON_TYPE] =
                     (*fp_gtk_check_button_new)();
@@ -912,7 +914,8 @@
             result = gtk3_widgets[_GTK_CHECK_BUTTON_TYPE];
             break;
         case CHECK_BOX_MENU_ITEM:
-            if (init_result = (NULL == gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_CHECK_MENU_ITEM_TYPE] =
                     (*fp_gtk_check_menu_item_new)();
@@ -933,7 +936,8 @@
             result = gtk3_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE];
             break;*/
         case COMBO_BOX:
-            if (init_result = (NULL == gtk3_widgets[_GTK_COMBO_BOX_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_COMBO_BOX_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_COMBO_BOX_TYPE] =
                     (*fp_gtk_combo_box_new)();
@@ -941,8 +945,9 @@
             result = gtk3_widgets[_GTK_COMBO_BOX_TYPE];
             break;
         case COMBO_BOX_ARROW_BUTTON:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]))
+            init_result = 
+                (NULL == gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] =
                      (*fp_gtk_toggle_button_new)();
@@ -950,8 +955,9 @@
             result = gtk3_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE];
             break;
         case COMBO_BOX_TEXT_FIELD:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]))
+            init_result =
+                (NULL == gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]);
+            if (init_result)
             {
                 result = gtk3_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] =
                      (*fp_gtk_entry_new)();
@@ -961,7 +967,8 @@
         case DESKTOP_ICON:
         case INTERNAL_FRAME_TITLE_PANE:
         case LABEL:
-            if (init_result = (NULL == gtk3_widgets[_GTK_LABEL_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_LABEL_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_LABEL_TYPE] =
                     (*fp_gtk_label_new)(NULL);
@@ -971,7 +978,8 @@
         case DESKTOP_PANE:
         case PANEL:
         case ROOT_PANE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_CONTAINER_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_CONTAINER_TYPE]);
+            if (init_result)
             {
                 /* There is no constructor for a container type.  I've
                  * chosen GtkFixed container since it has a default
@@ -985,7 +993,8 @@
         case EDITOR_PANE:
         case TEXT_AREA:
         case TEXT_PANE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TEXT_VIEW_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_TEXT_VIEW_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_TEXT_VIEW_TYPE] =
                     (*fp_gtk_text_view_new)();
@@ -995,7 +1004,8 @@
         case FORMATTED_TEXT_FIELD:
         case PASSWORD_FIELD:
         case TEXT_FIELD:
-            if (init_result = (NULL == gtk3_widgets[_GTK_ENTRY_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_ENTRY_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_ENTRY_TYPE] =
                     (*fp_gtk_entry_new)();
@@ -1003,7 +1013,8 @@
             result = gtk3_widgets[_GTK_ENTRY_TYPE];
             break;
         case HANDLE_BOX:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HANDLE_BOX_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_HANDLE_BOX_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_HANDLE_BOX_TYPE] =
                     (*fp_gtk_handle_box_new)();
@@ -1015,7 +1026,8 @@
         case HSCROLL_BAR_BUTTON_RIGHT:
         case HSCROLL_BAR_TRACK:
         case HSCROLL_BAR_THUMB:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HSCROLLBAR_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_HSCROLLBAR_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_HSCROLLBAR_TYPE] =
                     (*fp_gtk_hscrollbar_new)(create_adjustment());
@@ -1023,7 +1035,8 @@
             result = gtk3_widgets[_GTK_HSCROLLBAR_TYPE];
             break;
         case HSEPARATOR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HSEPARATOR_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_HSEPARATOR_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_HSEPARATOR_TYPE] =
                     (*fp_gtk_hseparator_new)();
@@ -1033,7 +1046,8 @@
         case HSLIDER:
         case HSLIDER_THUMB:
         case HSLIDER_TRACK:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HSCALE_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_HSCALE_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_HSCALE_TYPE] =
                     (*fp_gtk_scale_new)(GTK_ORIENTATION_HORIZONTAL, NULL);
@@ -1042,21 +1056,24 @@
             break;
         case HSPLIT_PANE_DIVIDER:
         case SPLIT_PANE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HPANED_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_HPANED_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_HPANED_TYPE] = (*fp_gtk_hpaned_new)();
             }
             result = gtk3_widgets[_GTK_HPANED_TYPE];
             break;
         case IMAGE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_IMAGE_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_IMAGE_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_IMAGE_TYPE] = (*fp_gtk_image_new)();
             }
             result = gtk3_widgets[_GTK_IMAGE_TYPE];
             break;
         case INTERNAL_FRAME:
-            if (init_result = (NULL == gtk3_widgets[_GTK_WINDOW_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_WINDOW_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_WINDOW_TYPE] =
                     (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL);
@@ -1064,7 +1081,8 @@
             result = gtk3_widgets[_GTK_WINDOW_TYPE];
             break;
         case TOOL_TIP:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TOOLTIP_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_TOOLTIP_TYPE]);
+            if (init_result)
             {
                 result = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL);
                 gtk3_widgets[_GTK_TOOLTIP_TYPE] = result;
@@ -1075,7 +1093,8 @@
         case TABLE:
         case TREE:
         case TREE_CELL:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TREE_VIEW_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_TREE_VIEW_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_TREE_VIEW_TYPE] =
                     (*fp_gtk_tree_view_new)();
@@ -1083,14 +1102,16 @@
             result = gtk3_widgets[_GTK_TREE_VIEW_TYPE];
             break;
         case TITLED_BORDER:
-            if (init_result = (NULL == gtk3_widgets[_GTK_FRAME_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_FRAME_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_FRAME_TYPE] = fp_gtk_frame_new(NULL);
             }
             result = gtk3_widgets[_GTK_FRAME_TYPE];
             break;
         case POPUP_MENU:
-            if (init_result = (NULL == gtk3_widgets[_GTK_MENU_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_MENU_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_MENU_TYPE] =
                     (*fp_gtk_menu_new)();
@@ -1100,7 +1121,8 @@
         case MENU:
         case MENU_ITEM:
         case MENU_ITEM_ACCELERATOR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_MENU_ITEM_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_MENU_ITEM_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_MENU_ITEM_TYPE] =
                     (*fp_gtk_menu_item_new)();
@@ -1108,7 +1130,8 @@
             result = gtk3_widgets[_GTK_MENU_ITEM_TYPE];
             break;
         case MENU_BAR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_MENU_BAR_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_MENU_BAR_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_MENU_BAR_TYPE] =
                     (*fp_gtk_menu_bar_new)();
@@ -1117,7 +1140,8 @@
             break;
         case COLOR_CHOOSER:
         case OPTION_PANE:
-            if (init_result = (NULL == gtk3_widgets[_GTK_DIALOG_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_DIALOG_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_DIALOG_TYPE] =
                     (*fp_gtk_dialog_new)();
@@ -1125,8 +1149,9 @@
             result = gtk3_widgets[_GTK_DIALOG_TYPE];
             break;
         case POPUP_MENU_SEPARATOR:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]))
+            init_result =
+                    (NULL == gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE] =
                     (*fp_gtk_separator_menu_item_new)();
@@ -1134,7 +1159,8 @@
             result = gtk3_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE];
             break;
         case HPROGRESS_BAR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE] =
                     (*fp_gtk_progress_bar_new)();
@@ -1142,7 +1168,8 @@
             result = gtk3_widgets[_GTK_HPROGRESS_BAR_TYPE];
             break;
         case VPROGRESS_BAR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE] =
                     (*fp_gtk_progress_bar_new)();
@@ -1157,7 +1184,8 @@
             result = gtk3_widgets[_GTK_VPROGRESS_BAR_TYPE];
             break;
         case RADIO_BUTTON:
-            if (init_result = (NULL == gtk3_widgets[_GTK_RADIO_BUTTON_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_RADIO_BUTTON_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_RADIO_BUTTON_TYPE] =
                     (*fp_gtk_radio_button_new)(NULL);
@@ -1165,8 +1193,9 @@
             result = gtk3_widgets[_GTK_RADIO_BUTTON_TYPE];
             break;
         case RADIO_BUTTON_MENU_ITEM:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE]))
+            init_result =
+                    (NULL == gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE] =
                     (*fp_gtk_radio_menu_item_new)(NULL);
@@ -1174,8 +1203,9 @@
             result = gtk3_widgets[_GTK_RADIO_MENU_ITEM_TYPE];
             break;
         case SCROLL_PANE:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE]))
+            init_result =
+                    (NULL == gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_SCROLLED_WINDOW_TYPE] =
                     (*fp_gtk_scrolled_window_new)(NULL, NULL);
@@ -1185,7 +1215,8 @@
         case SPINNER:
         case SPINNER_ARROW_BUTTON:
         case SPINNER_TEXT_FIELD:
-            if (init_result = (NULL == gtk3_widgets[_GTK_SPIN_BUTTON_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_SPIN_BUTTON_TYPE]);
+            if (init_result)
             {
                 result = gtk3_widgets[_GTK_SPIN_BUTTON_TYPE] =
                     (*fp_gtk_spin_button_new)(NULL, 0, 0);
@@ -1196,7 +1227,8 @@
         case TABBED_PANE_TAB_AREA:
         case TABBED_PANE_CONTENT:
         case TABBED_PANE_TAB:
-            if (init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_NOTEBOOK_TYPE] =
                     (*fp_gtk_notebook_new)(NULL);
@@ -1204,7 +1236,8 @@
             result = gtk3_widgets[_GTK_NOTEBOOK_TYPE];
             break;
         case TOGGLE_BUTTON:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE] =
                     (*fp_gtk_toggle_button_new)(NULL);
@@ -1213,7 +1246,8 @@
             break;
         case TOOL_BAR:
         case TOOL_BAR_DRAG_WINDOW:
-            if (init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_TOOLBAR_TYPE] =
                     (*fp_gtk_toolbar_new)(NULL);
@@ -1221,8 +1255,9 @@
             result = gtk3_widgets[_GTK_TOOLBAR_TYPE];
             break;
         case TOOL_BAR_SEPARATOR:
-            if (init_result =
-                    (NULL == gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]))
+            init_result =
+                    (NULL == gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE] =
                     (*fp_gtk_separator_tool_item_new)();
@@ -1230,7 +1265,8 @@
             result = gtk3_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE];
             break;
         case VIEWPORT:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VIEWPORT_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_VIEWPORT_TYPE]);
+            if (init_result)
             {
                 GtkAdjustment *adjustment = create_adjustment();
                 gtk3_widgets[_GTK_VIEWPORT_TYPE] =
@@ -1243,7 +1279,8 @@
         case VSCROLL_BAR_BUTTON_DOWN:
         case VSCROLL_BAR_TRACK:
         case VSCROLL_BAR_THUMB:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VSCROLLBAR_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_VSCROLLBAR_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_VSCROLLBAR_TYPE] =
                     (*fp_gtk_vscrollbar_new)(create_adjustment());
@@ -1251,7 +1288,8 @@
             result = gtk3_widgets[_GTK_VSCROLLBAR_TYPE];
             break;
         case VSEPARATOR:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VSEPARATOR_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_VSEPARATOR_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_VSEPARATOR_TYPE] =
                     (*fp_gtk_vseparator_new)();
@@ -1261,7 +1299,8 @@
         case VSLIDER:
         case VSLIDER_THUMB:
         case VSLIDER_TRACK:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VSCALE_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_VSCALE_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_VSCALE_TYPE] =
                     (*fp_gtk_scale_new)(GTK_ORIENTATION_VERTICAL, NULL);
@@ -1275,7 +1314,8 @@
              fp_gtk_range_set_inverted((GtkRange*)result, TRUE);
             break;
         case VSPLIT_PANE_DIVIDER:
-            if (init_result = (NULL == gtk3_widgets[_GTK_VPANED_TYPE]))
+            init_result = (NULL == gtk3_widgets[_GTK_VPANED_TYPE]);
+            if (init_result)
             {
                 gtk3_widgets[_GTK_VPANED_TYPE] = (*fp_gtk_vpaned_new)();
             }
@@ -1989,11 +2029,7 @@
 static guint8 recode_color(gdouble channel)
 {
     guint16 result = (guint16)(channel * 65535);
-    if (result < 0) {
-        result = 0;
-    } else if (result > 65535) {
-        result = 65535;
-    }
+
     return (guint8)( result >> 8);
 }