From f2f361cb12c09c209390d1271036a13fd3b9ed95 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 4 Aug 2004 00:06:30 +0000 Subject: [PATCH] Make gtk_ui_manager_add_ui() accept paths with a leading "/ui". (#149077, Tue Aug 3 20:03:33 2004 Matthias Clasen * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui() accept paths with a leading "/ui". (#149077, David Malcolm) --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkuimanager.c | 5 +++-- 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebe229529b..bf54146ea0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Aug 3 20:03:33 2004 Matthias Clasen + + * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui() + accept paths with a leading "/ui". (#149077, David Malcolm) + +Tue Aug 3 19:59:29 2004 Matthias Clasen + + * gtk/gtkiconview.c: Fix some warnings. + Tue Aug 3 18:38:40 2004 Matthias Clasen * gtk/gtktreemodelfilter.c: Correct the return type diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ebe229529b..bf54146ea0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Tue Aug 3 20:03:33 2004 Matthias Clasen + + * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui() + accept paths with a leading "/ui". (#149077, David Malcolm) + +Tue Aug 3 19:59:29 2004 Matthias Clasen + + * gtk/gtkiconview.c: Fix some warnings. + Tue Aug 3 18:38:40 2004 Matthias Clasen * gtk/gtktreemodelfilter.c: Correct the return type diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ebe229529b..bf54146ea0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Tue Aug 3 20:03:33 2004 Matthias Clasen + + * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui() + accept paths with a leading "/ui". (#149077, David Malcolm) + +Tue Aug 3 19:59:29 2004 Matthias Clasen + + * gtk/gtkiconview.c: Fix some warnings. + Tue Aug 3 18:38:40 2004 Matthias Clasen * gtk/gtktreemodelfilter.c: Correct the return type diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ebe229529b..bf54146ea0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Tue Aug 3 20:03:33 2004 Matthias Clasen + + * gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui() + accept paths with a leading "/ui". (#149077, David Malcolm) + +Tue Aug 3 19:59:29 2004 Matthias Clasen + + * gtk/gtkiconview.c: Fix some warnings. + Tue Aug 3 18:38:40 2004 Matthias Clasen * gtk/gtktreemodelfilter.c: Correct the return type diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 9b07ab524c..0974604085 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -711,8 +711,6 @@ gtk_ui_manager_get_widget (GtkUIManager *self, * widget */ gtk_ui_manager_ensure_update (self); - if (strncmp ("/ui", path, 3) == 0) - path += 3; node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE); if (node == NULL) @@ -915,6 +913,9 @@ get_node (GtkUIManager *self, const gchar *pos, *end; GNode *parent, *node; + if (strncmp ("/ui", path, 3) == 0) + path += 3; + end = path + strlen (path); pos = path; parent = node = NULL;