[Emacs-diffs] trunk r118160: * gtkutil.c (create_dialog): Don't use gtk_dialog_get_action_area on

[Jan D.]

------------------------------------------------------------
revno: 118160
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18674
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2014-10-19 19:27:53 +0200
message:
  * 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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/gtkutil.c                  gtkutil.c-20091113204419-o5vbwnq5f7feedwu-2527

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-19 17:07:54 +0000
+++ b/src/ChangeLog     2014-10-19 17:27:53 +0000
@@ -1,5 +1,8 @@
 2014-10-19  Jan Djärv  <address@hidden>
 
+       * 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

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2014-10-19 16:28:49 +0000
+++ b/src/gtkutil.c     2014-10-19 17:27:53 +0000
@@ -2816,8 +2816,9 @@
              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 @@
         }
     }
 
+#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.  */