Set action_name. (#154526, John Finlay)
2004-10-05 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Set action_name. (#154526, John Finlay)
This commit is contained in:
committed by
Matthias Clasen
parent
7c01e990d0
commit
00fc8b0d54
@@ -1,5 +1,8 @@
|
||||
2004-10-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* 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)
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
2004-10-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* 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)
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
2004-10-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* 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)
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
2004-10-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* 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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user