From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Thu, 29 Nov 2007 03:14:06 +0000 (+0000)
Subject: Add moved stuff from gio
X-Git-Tag: GLIB_2_15_1~261
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=019f4480cfd9679471632eef0ccaad5616f86f15;p=platform%2Fupstream%2Fglib.git

Add moved stuff from gio

svn path=/trunk/; revision=5990
---

diff --git a/docs/reference/glib/glib-docs.sgml b/docs/reference/glib/glib-docs.sgml
index 1b12ed5..d4f9200 100644
--- a/docs/reference/glib/glib-docs.sgml
+++ b/docs/reference/glib/glib-docs.sgml
@@ -63,6 +63,7 @@
 <!ENTITY glib-i18n SYSTEM "xml/i18n.xml">
 <!ENTITY glib-Regex SYSTEM "xml/gregex.xml">
 <!ENTITY glib-Version SYSTEM "xml/version.xml">
+<!ENTITY glib-Uri SYSTEM "xml/gurifuncs.xml">
 
 <!ENTITY glib-Compiling SYSTEM "compiling.sgml">
 <!ENTITY glib-Building SYSTEM "building.sgml">
@@ -151,6 +152,7 @@ synchronize their operation.
     &glib-Timers;
     &glib-Spawn;
     &glib-Fileutils;
+    &glib-Uri;
     &glib-Shell;
     &glib-Option;
     &glib-Pattern-Matching;
@@ -219,5 +221,8 @@ synchronize their operation.
   <index role="2.14">
     <title>Index of new symbols in 2.14</title>
   </index>  
+  <index role="2.16">
+    <title>Index of new symbols in 2.16</title>
+  </index>  
 
 </book>
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 85de15a..a86f3ca 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -1427,6 +1427,7 @@ g_build_filename
 g_build_filenamev
 g_build_path
 g_build_pathv
+g_format_file_size_for_display
 
 <SUBSECTION>
 g_find_program_in_path
@@ -2043,6 +2044,7 @@ g_string_append
 g_string_append_c
 g_string_append_unichar
 g_string_append_len
+g_string_append_uri_escaped
 g_string_prepend
 g_string_prepend_c
 g_string_prepend_unichar
@@ -2484,7 +2486,6 @@ g_unichar_to_utf8
 <TITLE>I18N</TITLE>
 <FILE>i18n</FILE>
 <INCLUDE>glib.h,glib/gi18n.h</INCLUDE>
-_
 Q_
 C_
 N_
@@ -2503,3 +2504,17 @@ g_base64_encode
 g_base64_decode_step
 g_base64_decode
 </SECTION>
+
+<SECTION>
+<TITLE>URI Functions</TITLE>
+<FILE>gurifuncs</FILE>
+G_URI_RESERVED_CHARS_ALLOWED_IN_PATH
+G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT
+G_URI_RESERVED_CHARS_ALLOWED_IN_USERINFO
+G_URI_RESERVED_CHARS_GENERIC_DELIMITERS
+G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS
+g_uri_escape_string
+g_uri_get_scheme
+g_uri_unescape_segment
+g_uri_unescape_string
+</SECTION>