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

Accept unnamed separators. (#369112, Christian Persch)

Browse Source 
2007-04-26  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Accept
        unnamed separators.  (#369112, Christian Persch)



svn path=/trunk/; revision=17649
This commit is contained in:
Matthias Clasen
2007-04-26 05:54:21 +00:00
committed by Matthias Clasen
parent 6563aaec03
commit 2a29ec5176
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-04-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Accept
unnamed separators. (#369112, Christian Persch)
2007-04-26 Matthias Clasen <mclasen@redhat.com> 2007-04-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaccelgroup.c (gtk_accel_group_finalize): Don't access * gtk/gtkaccelgroup.c (gtk_accel_group_finalize): Don't access

4
gtk/gtkuimanager.c
View File

@ -1609,7 +1609,7 @@ gtk_ui_manager_add_ui (GtkUIManager *self,
g_return_if_fail (GTK_IS_UI_MANAGER (self)); g_return_if_fail (GTK_IS_UI_MANAGER (self));
g_return_if_fail (merge_id > 0); g_return_if_fail (merge_id > 0);
g_return_if_fail (name != NULL); g_return_if_fail (name != NULL || type == GTK_UI_MANAGER_SEPARATOR);
node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE); node = get_node (self, path, NODE_TYPE_UNDECIDED, FALSE);
sibling = NULL; sibling = NULL;
@ -1710,7 +1710,7 @@ gtk_ui_manager_add_ui (GtkUIManager *self,
} }
child = get_child_node (self, node, sibling, child = get_child_node (self, node, sibling,
name, strlen (name), name, name ? strlen (name) : 0,
node_type, TRUE, top); node_type, TRUE, top);
if (action != NULL) if (action != NULL)