diff --git a/ChangeLog b/ChangeLog index 1dfdc901b3..a2afc7b022 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-05 Matthias Clasen + * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set + action_name. (#154526, John Finlay) + * gdk/x11/gdkwindow-x11.c (gdk_window_foreign_new_for_display): Return a new reference to an existing GdkWindow if one already exists. (#151378, Gustavo Carneiro) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1dfdc901b3..a2afc7b022 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-10-05 Matthias Clasen + * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set + action_name. (#154526, John Finlay) + * gdk/x11/gdkwindow-x11.c (gdk_window_foreign_new_for_display): Return a new reference to an existing GdkWindow if one already exists. (#151378, Gustavo Carneiro) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1dfdc901b3..a2afc7b022 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-10-05 Matthias Clasen + * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set + action_name. (#154526, John Finlay) + * gdk/x11/gdkwindow-x11.c (gdk_window_foreign_new_for_display): Return a new reference to an existing GdkWindow if one already exists. (#151378, Gustavo Carneiro) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1dfdc901b3..a2afc7b022 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-10-05 Matthias Clasen + * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set + action_name. (#154526, John Finlay) + * gdk/x11/gdkwindow-x11.c (gdk_window_foreign_new_for_display): Return a new reference to an existing GdkWindow if one already exists. (#151378, Gustavo Carneiro) diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 9a143c609f..a42ce5e26f 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -1674,7 +1674,7 @@ gtk_ui_manager_add_ui (GtkUIManager *self, node_prepend_ui_reference (NODE_INFO (child), merge_id, action_quark); - if (NODE_INFO (node)->action_name == 0) + if (NODE_INFO (child)->action_name == 0) NODE_INFO (child)->action_name = action_quark; NODE_INFO (child)->dirty = TRUE;