summaryrefslogtreecommitdiff
path: root/gtk/gtkuimanager.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-04-26 05:54:21 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-04-26 05:54:21 +0000
commit2a29ec5176d30e1c83e8b506c795181955e61159 (patch)
treebe056244143fd8ea21c9a63ddcb03d5d771b6f39 /gtk/gtkuimanager.c
parent6563aaec037e5ea0bf8365505fc8bf80226ce397 (diff)
downloadgtk+-2a29ec5176d30e1c83e8b506c795181955e61159.tar.gz
Accept unnamed separators. (#369112, Christian Persch)
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
Diffstat (limited to 'gtk/gtkuimanager.c')
-rw-r--r--gtk/gtkuimanager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 041adad374..529c296035 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -1609,7 +1609,7 @@ gtk_ui_manager_add_ui (GtkUIManager *self,
g_return_if_fail (GTK_IS_UI_MANAGER (self));
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);
sibling = NULL;
@@ -1710,7 +1710,7 @@ gtk_ui_manager_add_ui (GtkUIManager *self,
}
child = get_child_node (self, node, sibling,
- name, strlen (name),
+ name, name ? strlen (name) : 0,
node_type, TRUE, top);
if (action != NULL)