Make gtk_ui_manager_add_ui() accept paths with a leading "/ui". (#149077,

Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkuimanager.c (get_node): Make gtk_ui_manager_add_ui()
	accept paths with a leading "/ui".  (#149077, David Malcolm)

ChangeLog

+Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* 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  <maclas@gmx.de>
+
+	* gtk/gtkiconview.c: Fix some warnings.
+
 Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreemodelfilter.c: Correct the return type

ChangeLog.pre-2-10

+Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* 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  <maclas@gmx.de>
+
+	* gtk/gtkiconview.c: Fix some warnings.
+
 Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreemodelfilter.c: Correct the return type

ChangeLog.pre-2-6

+Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* 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  <maclas@gmx.de>
+
+	* gtk/gtkiconview.c: Fix some warnings.
+
 Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreemodelfilter.c: Correct the return type

ChangeLog.pre-2-8

+Tue Aug  3 20:03:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* 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  <maclas@gmx.de>
+
+	* gtk/gtkiconview.c: Fix some warnings.
+
 Tue Aug  3 18:38:40 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktreemodelfilter.c: Correct the return type

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;