summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2008-07-28 15:35:07 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-07-28 15:35:07 +0000
commita2b61b1e4695df69326a5ae52f66291e25825649 (patch)
treef0276969975655bbd23c086da7be4eca3a9c57b8 /docs
parent6f84cab2a882e42b3c829836f1874fc2c856165f (diff)
Add a GIcon implementation that can add an emblem to another icon.
2008-07-28 Matthias Clasen <mclasen@redhat.com> * gemblemedicon.[hc]: Add a GIcon implementation that can add an emblem to another icon. * gio.h: * Makefile.am: * gio.symbols: Glue * gloadableicon.c: * gfileicon.c: Small documenatation additions. svn path=/trunk/; revision=7263
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/ChangeLog5
-rw-r--r--docs/reference/gio/gio-docs.xml1
-rw-r--r--docs/reference/gio/gio-sections.txt11
3 files changed, 17 insertions, 0 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index aa136151f..b28d39c9c 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-28 Matthias Clasen <mclasen2redhat.com>
+
+ * gio/gio-sections.txt:
+ * gio/gio-docs.xml: Add GEmblemedIcon
+
2008-07-21 Matthias Clasen <mclasen2redhat.com>
* === Released 2.17.4 ===
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
index a9b727986..3a5af391f 100644
--- a/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@ -83,6 +83,7 @@
<xi:include href="xml/gfileicon.xml"/>
<xi:include href="xml/gloadableicon.xml"/>
<xi:include href="xml/gthemedicon.xml"/>
+ <xi:include href="xml/gemblemedicon.xml"/>
</chapter>
<chapter id="utils">
<title>Utilities</title>
diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index 2306731ce..60b7d01c5 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -417,6 +417,17 @@ g_file_icon_get_type
</SECTION>
<SECTION>
+<FILE>gemblemedicon</FILE>
+<TITLE>GEmblemedIcon</TITLE>
+GEmblemedIcon
+g_emblemed_icon_new
+g_emblemed_icon_get_icon
+g_emblemed_icon_get_emblem
+<SUBSECTION Private>
+g_emblemed_icon_get_type
+</SECTION>
+
+<SECTION>
<FILE>ginputstream</FILE>
<TITLE>GInputStream</TITLE>
GInputStream