summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-04-13 20:06:12 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-04-13 20:06:12 +0000
commit157943b584fc9251f10154a630acc056ae73af82 (patch)
treec0dfce62f4f1afb16c43b3c7619c73026cab3282 /docs
parent5854707bd97fa9b5206353a98dbcfa4b578c4604 (diff)
downloadgdk-pixbuf-157943b584fc9251f10154a630acc056ae73af82.tar.gz
Don't crash if a node has no name. (start_element_handler): Accept
2004-04-13 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (get_child_node): Don't crash if a node has no name. (start_element_handler): Accept separators without unique names. (#133302, Anders Carlsson) * gtk/gtkuimanager.c (node_remove_ui_reference): Don't leak list nodes. (#138862, Morten Welinder)
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/ChangeLog4
-rw-r--r--docs/reference/gtk/tmpl/gtkuimanager.sgml3
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index a109d03f1..8bbf232b5 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-13 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/tmpl/gtkuimanager.sgml: Some corrections.
+
2004-04-13 Federico Mena Quintero <federico@ximian.com>
* gtk/tmpl/gtkfilechooser.sgml: Typo fix.
diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml
index 8355b05db..e9700b176 100644
--- a/docs/reference/gtk/tmpl/gtkuimanager.sgml
+++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml
@@ -29,6 +29,7 @@ roughly described by the following DTD.
&lt;!ATTLIST toolbar name &num;IMPLIED &gt;
&lt;!ATTLIST popup name &num;IMPLIED &gt;
&lt;!ATTLIST placeholder name &num;IMPLIED &gt;
+&lt;!ATTLIST separator name &num;IMPLIED &gt;
&lt;!ATTLIST menu name &num;IMPLIED
action &num;REQUIRED
position (top|bot) &num;IMPLIED &gt;
@@ -126,7 +127,7 @@ The most remarkable feature of #GtkUIManager is that it can overlay a set
of menuitems and toolitems over another one, and demerge them later.
</para>
<para>
-Merging is done based on the name of the XML elements. Each element is
+Merging is done based on the names of the XML elements. Each element is
identified by a path which consists of the names of its anchestors, separated
by slashes. For example, the menuitem named "Left" in the example above
has the path <literal>/ui/menubar/JustifyMenu/Left</literal> and the