callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2004-08-04 00:06:30 +00:00 committed by Matthias Clasen
parent a8139b2d59
commit f2f361cb12
5 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
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> Tue Aug 3 18:38:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelfilter.c: Correct the return type * gtk/gtktreemodelfilter.c: Correct the return type

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
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> Tue Aug 3 18:38:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelfilter.c: Correct the return type * gtk/gtktreemodelfilter.c: Correct the return type

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
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> Tue Aug 3 18:38:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelfilter.c: Correct the return type * gtk/gtktreemodelfilter.c: Correct the return type

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
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> Tue Aug 3 18:38:40 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreemodelfilter.c: Correct the return type * gtk/gtktreemodelfilter.c: Correct the return type

5
gtk/gtkuimanager.c
View File

@ -711,8 +711,6 @@ gtk_ui_manager_get_widget (GtkUIManager *self,
* widget */ * widget */
gtk_ui_manager_ensure_update (self); gtk_ui_manager_ensure_update (self);
if (strncmp ("/ui", path, 3) == 0)
path += 3;
node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE); node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE);
if (node == NULL) if (node == NULL)
@ -915,6 +913,9 @@ get_node (GtkUIManager *self,
const gchar *pos, *end; const gchar *pos, *end;
GNode *parent, *node; GNode *parent, *node;
if (strncmp ("/ui", path, 3) == 0)
path += 3;
end = path + strlen (path); end = path + strlen (path);
pos = path; pos = path;
parent = node = NULL; parent = node = NULL;