From 00fc8b0d541ba1ea15e9ffa0520d9a21e7f1c262 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 5 Oct 2004 14:10:44 +0000 Subject: [PATCH] Set action_name. (#154526, John Finlay) 2004-10-05 Matthias Clasen * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set action_name. (#154526, John Finlay) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkuimanager.c | 2 +- 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 633a68fe9d..8db337657f 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): Warn if the window is not foreign after all. (#151378, Gustavo Carneiro) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 633a68fe9d..8db337657f 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): Warn if the window is not foreign after all. (#151378, Gustavo Carneiro) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 633a68fe9d..8db337657f 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): Warn if the window is not foreign after all. (#151378, Gustavo Carneiro) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 633a68fe9d..8db337657f 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): Warn if the window is not foreign after all. (#151378, Gustavo Carneiro) diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 4e27555648..2589414116 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -1673,7 +1673,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;