reviewed by: Matthias Clasen <mclasen@redhat.com>

2006-04-12  Bastien Nocera  <hadess@hadess.net>

	reviewed by: Matthias Clasen <mclasen@redhat.com>

	* glib/gconvert.c: add more details about which RFC is concerned
	when using g_filename_to_uri (#337553)

diff --git a/ChangeLog b/ChangeLog
index 0ef48fc..d37ee5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-12  Bastien Nocera  <hadess@hadess.net>
+
+       reviewed by: Matthias Clasen <mclasen@redhat.com>
+
+       * glib/gconvert.c: add more details about which RFC is concerned
+       when using g_filename_to_uri (#337553)
+
 2006-04-12  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (parse_arg): Add an assert to make it

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0ef48fc..d37ee5b 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2006-04-12  Bastien Nocera  <hadess@hadess.net>
+
+       reviewed by: Matthias Clasen <mclasen@redhat.com>
+
+       * glib/gconvert.c: add more details about which RFC is concerned
+       when using g_filename_to_uri (#337553)
+
 2006-04-12  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/goption.c (parse_arg): Add an assert to make it

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 380dad8..eec413c 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -1831,7 +1831,8 @@ g_filename_from_uri (const gchar *uri,
  * @error: location to store the error occuring, or %NULL to ignore
  *         errors. Any of the errors in #GConvertError may occur.
  * 
- * Converts an absolute filename to an escaped ASCII-encoded URI.
+ * Converts an absolute filename to an escaped ASCII-encoded URI, with the path
+ * component following Section 3.3. of RFC 2396.
  * 
  * Return value: a newly-allocated string holding the resulting
  *               URI, or %NULL on an error.