--- old/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c 2016-06-23 12:14:26.740348768 +0530 +++ new/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c 2016-06-23 12:14:26.548348768 +0530 @@ -768,8 +768,8 @@ */ 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, @@ -783,7 +783,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"))) { @@ -1099,8 +1099,8 @@ ((GtkObject*)gtk2_widget)->flags &= ~GTK_HAS_FOCUS; } - if ((synth_state & MOUSE_OVER) != 0 && (synth_state & PRESSED) == 0 || - (synth_state & FOCUSED) != 0 && (synth_state & PRESSED) != 0) { + if (((synth_state & MOUSE_OVER) != 0 && (synth_state & PRESSED) == 0) || + ((synth_state & FOCUSED) != 0 && (synth_state & PRESSED) != 0)) { gtk2_widget->state = GTK_STATE_PRELIGHT; } else if ((synth_state & DISABLED) != 0) { gtk2_widget->state = GTK_STATE_INSENSITIVE; @@ -1169,14 +1169,16 @@ { case BUTTON: case TABLE_HEADER: - if (init_result = (NULL == gtk2_widgets[_GTK_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_BUTTON_TYPE] = (*fp_gtk_button_new)(); } result = gtk2_widgets[_GTK_BUTTON_TYPE]; break; case CHECK_BOX: - if (init_result = (NULL == gtk2_widgets[_GTK_CHECK_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_CHECK_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_CHECK_BUTTON_TYPE] = (*fp_gtk_check_button_new)(); @@ -1184,7 +1186,8 @@ result = gtk2_widgets[_GTK_CHECK_BUTTON_TYPE]; break; case CHECK_BOX_MENU_ITEM: - if (init_result = (NULL == gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_CHECK_MENU_ITEM_TYPE] = (*fp_gtk_check_menu_item_new)(); @@ -1205,7 +1208,8 @@ result = gtk2_widgets[_GTK_COLOR_SELECTION_DIALOG_TYPE]; break;*/ case COMBO_BOX: - if (init_result = (NULL == gtk2_widgets[_GTK_COMBO_BOX_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_COMBO_BOX_TYPE]); + if (init_result) { gtk2_widgets[_GTK_COMBO_BOX_TYPE] = (*fp_gtk_combo_box_new)(); @@ -1213,8 +1217,9 @@ result = gtk2_widgets[_GTK_COMBO_BOX_TYPE]; break; case COMBO_BOX_ARROW_BUTTON: - if (init_result = - (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(); @@ -1222,8 +1227,9 @@ result = gtk2_widgets[_GTK_COMBO_BOX_ARROW_BUTTON_TYPE]; break; case COMBO_BOX_TEXT_FIELD: - if (init_result = - (NULL == gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE]); + if (init_result) { result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] = (*fp_gtk_entry_new)(); @@ -1233,7 +1239,8 @@ case DESKTOP_ICON: case INTERNAL_FRAME_TITLE_PANE: case LABEL: - if (init_result = (NULL == gtk2_widgets[_GTK_LABEL_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_LABEL_TYPE]); + if (init_result) { gtk2_widgets[_GTK_LABEL_TYPE] = (*fp_gtk_label_new)(NULL); @@ -1243,7 +1250,8 @@ case DESKTOP_PANE: case PANEL: case ROOT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_CONTAINER_TYPE])) + init_result = (NULL == gtk2_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 @@ -1257,7 +1265,8 @@ case EDITOR_PANE: case TEXT_AREA: case TEXT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_TEXT_VIEW_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TEXT_VIEW_TYPE]); + if (init_result) { gtk2_widgets[_GTK_TEXT_VIEW_TYPE] = (*fp_gtk_text_view_new)(); @@ -1267,7 +1276,8 @@ case FORMATTED_TEXT_FIELD: case PASSWORD_FIELD: case TEXT_FIELD: - if (init_result = (NULL == gtk2_widgets[_GTK_ENTRY_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_ENTRY_TYPE]); + if (init_result) { gtk2_widgets[_GTK_ENTRY_TYPE] = (*fp_gtk_entry_new)(); @@ -1275,7 +1285,8 @@ result = gtk2_widgets[_GTK_ENTRY_TYPE]; break; case HANDLE_BOX: - if (init_result = (NULL == gtk2_widgets[_GTK_HANDLE_BOX_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HANDLE_BOX_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HANDLE_BOX_TYPE] = (*fp_gtk_handle_box_new)(); @@ -1287,7 +1298,8 @@ case HSCROLL_BAR_BUTTON_RIGHT: case HSCROLL_BAR_TRACK: case HSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk2_widgets[_GTK_HSCROLLBAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HSCROLLBAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HSCROLLBAR_TYPE] = (*fp_gtk_hscrollbar_new)(create_adjustment()); @@ -1295,7 +1307,8 @@ result = gtk2_widgets[_GTK_HSCROLLBAR_TYPE]; break; case HSEPARATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_HSEPARATOR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HSEPARATOR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HSEPARATOR_TYPE] = (*fp_gtk_hseparator_new)(); @@ -1305,7 +1318,8 @@ case HSLIDER: case HSLIDER_THUMB: case HSLIDER_TRACK: - if (init_result = (NULL == gtk2_widgets[_GTK_HSCALE_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HSCALE_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HSCALE_TYPE] = (*fp_gtk_hscale_new)(NULL); @@ -1314,21 +1328,24 @@ break; case HSPLIT_PANE_DIVIDER: case SPLIT_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_HPANED_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HPANED_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HPANED_TYPE] = (*fp_gtk_hpaned_new)(); } result = gtk2_widgets[_GTK_HPANED_TYPE]; break; case IMAGE: - if (init_result = (NULL == gtk2_widgets[_GTK_IMAGE_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_IMAGE_TYPE]); + if (init_result) { gtk2_widgets[_GTK_IMAGE_TYPE] = (*fp_gtk_image_new)(); } result = gtk2_widgets[_GTK_IMAGE_TYPE]; break; case INTERNAL_FRAME: - if (init_result = (NULL == gtk2_widgets[_GTK_WINDOW_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_WINDOW_TYPE]); + if (init_result) { gtk2_widgets[_GTK_WINDOW_TYPE] = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); @@ -1336,7 +1353,8 @@ result = gtk2_widgets[_GTK_WINDOW_TYPE]; break; case TOOL_TIP: - if (init_result = (NULL == gtk2_widgets[_GTK_TOOLTIP_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TOOLTIP_TYPE]); + if (init_result) { result = (*fp_gtk_window_new)(GTK_WINDOW_TOPLEVEL); (*fp_gtk_widget_set_name)(result, "gtk-tooltips"); @@ -1348,7 +1366,8 @@ case TABLE: case TREE: case TREE_CELL: - if (init_result = (NULL == gtk2_widgets[_GTK_TREE_VIEW_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TREE_VIEW_TYPE]); + if (init_result) { gtk2_widgets[_GTK_TREE_VIEW_TYPE] = (*fp_gtk_tree_view_new)(); @@ -1356,14 +1375,16 @@ result = gtk2_widgets[_GTK_TREE_VIEW_TYPE]; break; case TITLED_BORDER: - if (init_result = (NULL == gtk2_widgets[_GTK_FRAME_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_FRAME_TYPE]); + if (init_result) { gtk2_widgets[_GTK_FRAME_TYPE] = fp_gtk_frame_new(NULL); } result = gtk2_widgets[_GTK_FRAME_TYPE]; break; case POPUP_MENU: - if (init_result = (NULL == gtk2_widgets[_GTK_MENU_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_MENU_TYPE]); + if (init_result) { gtk2_widgets[_GTK_MENU_TYPE] = (*fp_gtk_menu_new)(); @@ -1373,7 +1394,8 @@ case MENU: case MENU_ITEM: case MENU_ITEM_ACCELERATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_MENU_ITEM_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_MENU_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_MENU_ITEM_TYPE] = (*fp_gtk_menu_item_new)(); @@ -1381,7 +1403,8 @@ result = gtk2_widgets[_GTK_MENU_ITEM_TYPE]; break; case MENU_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_MENU_BAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_MENU_BAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_MENU_BAR_TYPE] = (*fp_gtk_menu_bar_new)(); @@ -1390,7 +1413,8 @@ break; case COLOR_CHOOSER: case OPTION_PANE: - if (init_result = (NULL == gtk2_widgets[_GTK_DIALOG_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_DIALOG_TYPE]); + if (init_result) { gtk2_widgets[_GTK_DIALOG_TYPE] = (*fp_gtk_dialog_new)(); @@ -1398,8 +1422,9 @@ result = gtk2_widgets[_GTK_DIALOG_TYPE]; break; case POPUP_MENU_SEPARATOR: - if (init_result = - (NULL == gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE] = (*fp_gtk_separator_menu_item_new)(); @@ -1407,7 +1432,8 @@ result = gtk2_widgets[_GTK_SEPARATOR_MENU_ITEM_TYPE]; break; case HPROGRESS_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1415,7 +1441,8 @@ result = gtk2_widgets[_GTK_HPROGRESS_BAR_TYPE]; break; case VPROGRESS_BAR: - if (init_result = (NULL == gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE] = (*fp_gtk_progress_bar_new)(); @@ -1430,7 +1457,8 @@ result = gtk2_widgets[_GTK_VPROGRESS_BAR_TYPE]; break; case RADIO_BUTTON: - if (init_result = (NULL == gtk2_widgets[_GTK_RADIO_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_RADIO_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_RADIO_BUTTON_TYPE] = (*fp_gtk_radio_button_new)(NULL); @@ -1438,8 +1466,9 @@ result = gtk2_widgets[_GTK_RADIO_BUTTON_TYPE]; break; case RADIO_BUTTON_MENU_ITEM: - if (init_result = - (NULL == gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE] = (*fp_gtk_radio_menu_item_new)(NULL); @@ -1447,8 +1476,9 @@ result = gtk2_widgets[_GTK_RADIO_MENU_ITEM_TYPE]; break; case SCROLL_PANE: - if (init_result = - (NULL == gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE]); + if (init_result) { gtk2_widgets[_GTK_SCROLLED_WINDOW_TYPE] = (*fp_gtk_scrolled_window_new)(NULL, NULL); @@ -1458,7 +1488,8 @@ case SPINNER: case SPINNER_ARROW_BUTTON: case SPINNER_TEXT_FIELD: - if (init_result = (NULL == gtk2_widgets[_GTK_SPIN_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_SPIN_BUTTON_TYPE]); + if (init_result) { result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE] = (*fp_gtk_spin_button_new)(NULL, 0, 0); @@ -1469,7 +1500,8 @@ case TABBED_PANE_TAB_AREA: case TABBED_PANE_CONTENT: case TABBED_PANE_TAB: - if (init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE]); + if (init_result) { gtk2_widgets[_GTK_NOTEBOOK_TYPE] = (*fp_gtk_notebook_new)(NULL); @@ -1477,7 +1509,8 @@ result = gtk2_widgets[_GTK_NOTEBOOK_TYPE]; break; case TOGGLE_BUTTON: - if (init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE]); + if (init_result) { gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE] = (*fp_gtk_toggle_button_new)(NULL); @@ -1486,7 +1519,8 @@ break; case TOOL_BAR: case TOOL_BAR_DRAG_WINDOW: - if (init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_TOOLBAR_TYPE] = (*fp_gtk_toolbar_new)(NULL); @@ -1494,8 +1528,9 @@ result = gtk2_widgets[_GTK_TOOLBAR_TYPE]; break; case TOOL_BAR_SEPARATOR: - if (init_result = - (NULL == gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE])) + init_result = + (NULL == gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]); + if (init_result) { gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE] = (*fp_gtk_separator_tool_item_new)(); @@ -1503,7 +1538,8 @@ result = gtk2_widgets[_GTK_SEPARATOR_TOOL_ITEM_TYPE]; break; case VIEWPORT: - if (init_result = (NULL == gtk2_widgets[_GTK_VIEWPORT_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VIEWPORT_TYPE]); + if (init_result) { GtkAdjustment *adjustment = create_adjustment(); gtk2_widgets[_GTK_VIEWPORT_TYPE] = @@ -1516,7 +1552,8 @@ case VSCROLL_BAR_BUTTON_DOWN: case VSCROLL_BAR_TRACK: case VSCROLL_BAR_THUMB: - if (init_result = (NULL == gtk2_widgets[_GTK_VSCROLLBAR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VSCROLLBAR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VSCROLLBAR_TYPE] = (*fp_gtk_vscrollbar_new)(create_adjustment()); @@ -1524,7 +1561,8 @@ result = gtk2_widgets[_GTK_VSCROLLBAR_TYPE]; break; case VSEPARATOR: - if (init_result = (NULL == gtk2_widgets[_GTK_VSEPARATOR_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VSEPARATOR_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VSEPARATOR_TYPE] = (*fp_gtk_vseparator_new)(); @@ -1534,7 +1572,8 @@ case VSLIDER: case VSLIDER_THUMB: case VSLIDER_TRACK: - if (init_result = (NULL == gtk2_widgets[_GTK_VSCALE_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VSCALE_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VSCALE_TYPE] = (*fp_gtk_vscale_new)(NULL); @@ -1548,7 +1587,8 @@ ((GtkRange*)result)->inverted = 1; break; case VSPLIT_PANE_DIVIDER: - if (init_result = (NULL == gtk2_widgets[_GTK_VPANED_TYPE])) + init_result = (NULL == gtk2_widgets[_GTK_VPANED_TYPE]); + if (init_result) { gtk2_widgets[_GTK_VPANED_TYPE] = (*fp_gtk_vpaned_new)(); } @@ -2459,14 +2499,14 @@ static jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key) { - gint intval = NULL; + gint intval = 0; (*fp_g_object_get)(settings, key, &intval, NULL); return create_Integer(env, intval); } static jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key) { - gint intval = NULL; + gint intval = 0; (*fp_g_object_get)(settings, key, &intval, NULL); return create_Boolean(env, intval); }