From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 21 Apr 2010 10:15:30 +0000 (+0100)
Subject: Add mention of GConfBridge in conversion docs
X-Git-Tag: 2.25.2~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9176175fc878bde7143d22f5671b58836985bf44;p=platform%2Fupstream%2Fglib.git

Add mention of GConfBridge in conversion docs

https://bugzilla.gnome.org/show_bug.cgi?id=616384
---

diff --git a/docs/reference/gio/migrating.xml b/docs/reference/gio/migrating.xml
index 955e758..39a544d 100644
--- a/docs/reference/gio/migrating.xml
+++ b/docs/reference/gio/migrating.xml
@@ -216,7 +216,7 @@ start_monitoring_trash (void)
     </section>
 
     <section>
-      <title>GConfClient API conversion</title>
+      <title>GConfClient (and GConfBridge) API conversion</title>
 
       <para>
         Most people use GConf via the high-level #GConfClient API.
@@ -250,11 +250,17 @@ start_monitoring_trash (void)
               <row><entry>gconf_client_get_default_from_schema()</entry><entry>no equivalent, applications are expected to know their schema</entry></row>
               <row><entry>gconf_client_all_entries()</entry><entry>no equivalent, applications are expected to know their schema, and GSettings does not allow schema-less entries</entry></row>
               <row><entry>gconf_client_get_without_default()</entry><entry>no equivalent</entry></row>
+              <row><entry>gconf_bridge_bind_property()</entry><entry>g_settings_bind()</entry></row>
+              <row><entry>gconf_bridge_bind_property_full()</entry><entry>g_settings_bind_with_mapping()</entry></row>
             </tbody>
           </tgroup>
         </table>
       </para>
       <para>
+        GConfBridge was a third-party library that used GConf to bind an object property
+        to a particular configuration key. GSettings offers this service itself.
+      </para>
+      <para>
         There is a pattern that is sometimes used for GConf, where a setting can have
         explicit 'value A', explicit 'value B' or 'use the system default'. With GConf,
         'use the system default' is sometimes implemented by unsetting the user value.