Patch from Kai Willadsen <kaiw@itee.uq.edu.au> in bug #120349.

2004-07-09  Mark McLoughlin  <mark@skynet.ie>

        Patch from Kai Willadsen <kaiw@itee.uq.edu.au> in
        bug #120349.

        * doc/gconf/gconf.sgml,
          doc/gconf/tmpl/gconf-client.sgml,
          doc/gconf/tmpl/gconf.sgml,
          doc/intro-article.sgml,
          gconf/gconf-client.h,
          gconf/gconf-listeners.h: bring the docs up to
        date with the patch that we're using GObject instead
        of GtkObject.

7 files changed, 27 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index ba449cee..502a873b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-07-09  Mark McLoughlin  <mark@skynet.ie>
+
+	Patch from Kai Willadsen <kaiw@itee.uq.edu.au> in
+	bug #120349.
+
+	* doc/gconf/gconf.sgml,
+	  doc/gconf/tmpl/gconf-client.sgml,
+	  doc/gconf/tmpl/gconf.sgml,
+	  doc/intro-article.sgml,
+	  gconf/gconf-client.h,
+	  gconf/gconf-listeners.h: bring the docs up to
+	date with the patch that we're using GObject instead
+	of GtkObject.
+
 2004-07-07  Fernando Herrera  <fherrera@onirica.com>
 
 	* gconf/default.path.in: Removed outdated comment.
diff --git a/doc/gconf/gconf.sgml b/doc/gconf/gconf.sgml
index 95cf575a..b672b927 100644
--- a/doc/gconf/gconf.sgml
+++ b/doc/gconf/gconf.sgml
@@ -774,7 +774,7 @@ print_value(GConfValue* value)
     </sect1>
   </chapter>
 
-  <!-- GTK Object wrapper -->
+  <!-- GObject wrapper -->
   <chapter id="gconf-client">
     <title><structname>GConfClient</structname> higher-level API</title>
     
@@ -1276,7 +1276,7 @@ key and their effect on the application.
 
   <!-- GConfClient reference -->
   <chapter id="gconf-client-reference">
-    <title><structname>GtkObject</structname> Wrapper Reference (<structname>GConfClient</structname>)</title>
+    <title><structname>GObject</structname> Wrapper Reference (<structname>GConfClient</structname>)</title>
 
     &GConfClient;
 
diff --git a/doc/gconf/tmpl/gconf-client.sgml b/doc/gconf/tmpl/gconf-client.sgml
index 56e5cf49..917bdef4 100644
--- a/doc/gconf/tmpl/gconf-client.sgml
+++ b/doc/gconf/tmpl/gconf-client.sgml
@@ -3,7 +3,7 @@ GConfClient
 
 <!-- ##### SECTION Short_Description ##### -->
 
-#GtkObject-based convenience wrapper
+#GObject-based convenience wrapper
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
@@ -141,8 +141,8 @@ handling.  #GConfClient can pop up a dialog in the default signal handler for
 "error" or "unreturned_error." You can specify that no errors are handled, only
 unreturned errors are handled, or all errors are handled with this enumeration.
 You can prevent specific errors from being handled automatically by stopping the
-signal emission before the default signal handler is called (see the GTK+
-documentation, gtk_signal_emit_stop_by_name() for example).
+signal emission before the default signal handler is called (see the GLib
+documentation, g_signal_stop_emission_by_name() for example).
 </para>
 
 @GCONF_CLIENT_HANDLE_NONE: never run a default error handler.
diff --git a/doc/gconf/tmpl/gconf.sgml b/doc/gconf/tmpl/gconf.sgml
index 0167672c..f973d9c3 100644
--- a/doc/gconf/tmpl/gconf.sgml
+++ b/doc/gconf/tmpl/gconf.sgml
@@ -15,7 +15,7 @@ schema names with keys.
 </para>
 
 <para>
-Most of this interface is replicated in the #GtkObject wrapper
+Most of this interface is replicated in the #GObject wrapper
 (#GConfClient object); an alternative to the value-setting functions
 is the #GConfChangeSet interface.
 </para>
@@ -93,7 +93,7 @@ server.  The server will notify the client when any key at or below
 @namespace_section is set or unset. Try to watch the smallest possible part of
 the namespace; otherwise you will slow down the server and your application with
 unnecessary notifications. Note that you should prefer gconf_client_notify_add()
-if you're using the #GtkObject wrapper library, because
+if you're using the #GObject wrapper library, because
 gconf_client_notify_add() does not require a client-server conversation for
 every callback. gconf_engine_notify_add() requests a different server notification for
 every callback. The function returns an ID you can use to remove the
diff --git a/doc/intro-article.sgml b/doc/intro-article.sgml
index 939eea48..841cf9d9 100644
--- a/doc/intro-article.sgml
+++ b/doc/intro-article.sgml
@@ -449,10 +449,8 @@
       <sect3>
         <title><structname>GConfClient</structname></title>
         <para>
-          <structname>GConfClient</structname> is located in a separate library
-          from GConf itself, because to use it you must link with
-          GTK+. <structname>GConfClient</structname> derives from
-          <structname>GtkObject</structname> and is a wrapper for the
+          <structname>GConfClient</structname> derives from
+          <structname>GObject</structname> and is a wrapper for the
           <structname>GConfEngine</structname> type.  It adds a few nice
           features:
           <itemizedlist>
@@ -481,7 +479,7 @@
             </listitem>
             <listitem>
               <para>
-                It uses the GTK signal system. Instead of using
+                It uses the GObject signal system. Instead of using
                 GConf's custom callback API for notification, you can
                 simply connect to a <literal>"value_changed"</literal>
                 signal. 
@@ -597,11 +595,7 @@
     <para>
       Although the examples use <structname>GConfClient</structname>,
       remember that it's also possible to use
-      <structname>GConfEngine</structname> directly, to avoid linking
-      to GTK. Also, in the next version of GTK and glib the object
-      system will be moved to glib, so
-      <structname>GConfClient</structname> can move to the main GConf
-      library.
+      <structname>GConfEngine</structname> directly.
     </para>
 
     <sect2>
diff --git a/gconf/gconf-client.h b/gconf/gconf-client.h
index 1f54d2d7..a9e5d106 100644
--- a/gconf/gconf-client.h
+++ b/gconf/gconf-client.h
@@ -199,7 +199,7 @@ void         gconf_client_notify (GConfClient* client, const char* key);
 /* 
  * Error handling happens in the default signal handler, so you can
  * selectively override the default handling by connecting to the error
- * signal and calling gtk_signal_emit_stop()
+ * signal and calling g_signal_stop_emission()
  */
 
 void              gconf_client_set_error_handling(GConfClient* client,
diff --git a/gconf/gconf-listeners.h b/gconf/gconf-listeners.h
index 7231b073..c5019662 100644
--- a/gconf/gconf-listeners.h
+++ b/gconf/gconf-listeners.h
@@ -30,7 +30,7 @@ extern "C" {
  * The listeners object is used to store listeners who want notification
  * of changes in a namespace section.
  *
- * It's shared between gconfd and the GtkObject convenience wrapper.
+ * It's shared between gconfd and the GObject convenience wrapper.
  * It's also a public API.
  */