* gtkutil.c (create_dialog): Don't use gtk_dialog_get_action_area on

Gt+ >= 3.12, or gtk_misc_set_alignment on Gtk+ >= 3.14.
(make_widget_for_menu_item): Don't use gtk_misc_set_alignment on
Gtk+ >= 3.14 (Bug#18674).
(update_frame_tool_bar): Don't use  gtk_misc_set_padding on
Gtk+ >= 3.14 (Bug#18674).

* gtkutil.c (xg_update_menubar, xg_update_menu_item): Only call
g_object_notify for label if Gtk+ >= 2.16 (Bug#16522).

diff --git a/src/ChangeLog b/src/ChangeLog
index 02d7ef0d3a4060e86dd3cbf959808cc97a3808d6..8bb9d84ffe0bd206a26728640df53aaf5bde0a23 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-10-19  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * gtkutil.c (xg_update_menubar, xg_update_menu_item): Only call
+       g_object_notify for label if Gtk+ >= 2.16 (Bug#16522).
+
        * xterm.h (x_output): Remove net_wm_state_hidden_seen.
 
        * xterm.c (handle_one_xevent): Check return value from

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 759219a377dcd3db40c913c99a490a7003b5d9a4..01360244c2e42031abb96c506af3b69bbd0e187d 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2816,8 +2816,9 @@ xg_update_menubar (GtkWidget *menubar,
              bridge that might be loaded) that the item's label has
              changed.  */
           gtk_label_set_text (wlabel, utf8_label);
+#if GTK_CHECK_VERSION (2, 16, 0)
           g_object_notify (G_OBJECT (witem), "label");
-
+#endif
           if (utf8_label) g_free (utf8_label);
           iter = g_list_next (iter);
           val = val->next;
@@ -2996,8 +2997,10 @@ xg_update_menu_item (widget_value *val,
         }
     }
 
+#if GTK_CHECK_VERSION (2, 16, 0)
   if (label_changed) /* See comment in xg_update_menubar.  */
     g_object_notify (G_OBJECT (w), "label");
+#endif
 }
 
 /* Update the toggle menu item W so it corresponds to VAL.  */