diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-10-05 14:12:24 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-10-05 14:12:24 +0000 |
| commit | 63f3fc79c6edd8188f5e7ed2d60650b76275ff48 (patch) | |
| tree | 5d134117ce02475d9fa3a6160279d4ec1fef507d | |
| parent | 221db8e02516702b14e12e19f3256b2d49a4f256 (diff) | |
| download | gdk-pixbuf-63f3fc79c6edd8188f5e7ed2d60650b76275ff48.tar.gz | |
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)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | gtk/gtkuimanager.c | 2 |
5 files changed, 13 insertions, 1 deletions
@@ -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): 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 1dfdc901b..a2afc7b02 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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): 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 1dfdc901b..a2afc7b02 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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): 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 1dfdc901b..a2afc7b02 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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): 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 9a143c609..a42ce5e26 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; |