This changes quite a bit of stuff; if anything breaks, let me know.

2000-07-14  Havoc Pennington  <hp@pobox.com>

* gconf/gconf-sources.c (gconf_sources_query_value): Fix memleak
of schema_name in case where we return a value
(hash_lookup_defaults_func): Fix bug where we returned the schema
instead of the default value stored in the schema, when returning
default values for a directory listing, which GConfClient did in
order to preload its cache. (Upshot: GConfClient with preloading
was broken if you had schemas.)

2000-07-13  Havoc Pennington  <hp@pobox.com>

* gconf/gconfd.c (shutdown_contexts): fix cheesy race condition
(context_list may not exist at this point)

2000-07-12  Havoc Pennington  <hp@pobox.com>

* gconf.spec.in: Change spec file to reflect my fooling with
names of things

* configure.in: Some files converted to .in files, so we can
do versioning

* gconf-config.in: output versioned names for libs and includes

* gconf/Makefile.am: version all installed files

* wrappers/gtk/Makefile.am: put version in the name of
everything

* wrappers/gtk/testgconfclient.c (main): remove ref/sink to
reflect change to GConfClient

5 files changed, 16 insertions, 16 deletions

diff --git a/doc/gconf/Makefile.am b/doc/gconf/Makefile.am
index 25e2af15..9c97101c 100644
--- a/doc/gconf/Makefile.am
+++ b/doc/gconf/Makefile.am
@@ -7,7 +7,7 @@ DOC_MODULE=gconf
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gconf.sgml
 
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/$(MAJOR_VERSION)
 
 # not sure this will work...
 LDFLAGS=$(ORBIT_LIBS) $(GTK_LIBS) $(OAF_LIBS) $(top_builddir)/wrappers/gtk/.libs/libgconf-gtk.a $(top_builddir)/gconf/.libs/libgconf.a
diff --git a/doc/gconf/gconf.sgml b/doc/gconf/gconf.sgml
index af8bcdf2..1d7db415 100644
--- a/doc/gconf/gconf.sgml
+++ b/doc/gconf/gconf.sgml
@@ -619,9 +619,9 @@
         connection to a configuration database. Normally the database
         you're connecting to is the user's default database, defined
         by all the sources in their configuration source
-        path. <function>gconf_engine_new()</function> returns a handle to
+        path. <function>gconf_engine_get_default()</function> returns a handle to
         this default
-        database. <function>gconf_engine_new_with_address()</function>
+        database. <function>gconf_engine_get_default_with_address()</function>
         returns a handle to a single configuration source; normally,
         applications will not use this function&mdash;it's intended
         for system configuration tools and the like.        
@@ -639,14 +639,14 @@
         <funcsynopsis>
           <funcsynopsisinfo>#include &lt;gconf/gconf.h&gt;</funcsynopsisinfo>
           <funcdef>GConfEngine*
-            <function>gconf_engine_new</function>
+            <function>gconf_engine_get_default</function>
           </funcdef>
           <void>
         </funcsynopsis>        
         <funcsynopsis>
           <funcsynopsisinfo>#include &lt;gconf/gconf.h&gt;</funcsynopsisinfo>
           <funcdef>GConfEngine*
-            <function>gconf_engine_new_with_address</function>
+            <function>gconf_engine_get_default_with_address</function>
           </funcdef>
           <paramdef>const gchar* <parameter>address</parameter></paramdef>
         </funcsynopsis>
diff --git a/doc/gconf/tmpl/gconf-client.sgml b/doc/gconf/tmpl/gconf-client.sgml
index a7743f60..0ab14be2 100644
--- a/doc/gconf/tmpl/gconf-client.sgml
+++ b/doc/gconf/tmpl/gconf-client.sgml
@@ -33,7 +33,7 @@ Signals when a value changes or an error occurs.
 If you use #GConfClient, you should not use the underlying #GConfEngine
 directly, or you'll break things. This is why there's no
 gconf_client_get_engine() function; in fact, if you create the #GConfClient with
-gconf_client_new(), there is no (legitimate) way to obtain a pointer to the
+gconf_client_get_default(), there is no (legitimate) way to obtain a pointer to the
 underlying #GConfEngine. If you create a #GConfClient from an existing engine,
 you'll have to be disciplined enough to avoid using that engine directly.
 <footnote>
@@ -187,7 +187,7 @@ Casts a pointer to a #GConfClient*.
 @obj: a #GConfClient.
 
 
-<!-- ##### FUNCTION gconf_client_new ##### -->
+<!-- ##### FUNCTION gconf_client_get_default ##### -->
 <para>
 Creates a new #GConfClient using the default #GConfEngine. Normally this is the
 engine you want.
@@ -196,7 +196,7 @@ engine you want.
 @Returns: a new #GConfClient.
 
 
-<!-- ##### FUNCTION gconf_client_new_with_engine ##### -->
+<!-- ##### FUNCTION gconf_client_get_for_engine ##### -->
 <para>
 Creates a new #GConfClient with a specific #GConfEngine. Only specialized
 configuration-related programs should need to call this function.  The
diff --git a/doc/gconf/tmpl/gconf-engine.sgml b/doc/gconf/tmpl/gconf-engine.sgml
index d7631759..462bf284 100644
--- a/doc/gconf/tmpl/gconf-engine.sgml
+++ b/doc/gconf/tmpl/gconf-engine.sgml
@@ -8,11 +8,11 @@ a GConf "database"
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 A #GConfEngine represents a connection to the GConf database. The
-default #GConfEngine, returned from gconf_engine_new(), represents the
+default #GConfEngine, returned from gconf_engine_get_default(), represents the
 user's normal configuration source search path. Configuration-related
 utilities, such as a configuration editor tool, might wish to access a
 particular configuration source directly; they can obtain a
-non-default #GConfEngine with gconf_engine_new_from_address().
+non-default #GConfEngine with gconf_engine_get_for_address().
 </para>
 
 <para>
@@ -32,7 +32,7 @@ An opaque data type representing one or more configuration sources.
 
 @dummy: 
 
-<!-- ##### FUNCTION gconf_engine_new ##### -->
+<!-- ##### FUNCTION gconf_engine_get_default ##### -->
 <para>
 Returns the default #GConfEngine. All clients should use this, unless 
 they are special configuration-related tools. The caller of this
@@ -46,11 +46,11 @@ before exiting your application.
 @Returns: the default #GConfEngine.
 
 
-<!-- ##### FUNCTION gconf_engine_new_from_address ##### -->
+<!-- ##### FUNCTION gconf_engine_get_for_address ##### -->
 <para>
 Creates a special #GConfEngine; mostly useful for specialized
 GConf-related tools. Normal clients shouldn't need to use it.
-As with gconf_engine_new(), the returned #GConfEngine should be
+As with gconf_engine_get_default(), the returned #GConfEngine should be
 unreferenced by the caller of this function.
 </para>
 
@@ -76,7 +76,7 @@ Increases the reference count of a #GConfEngine by one.
 @conf: a #GConfEngine.
 
 
-<!-- ##### FUNCTION gconf_engine_new_local ##### -->
+<!-- ##### FUNCTION gconf_engine_get_local ##### -->
 <para>
 
 </para>
diff --git a/doc/intro-article.sgml b/doc/intro-article.sgml
index 21a61c6f..0297fcf5 100644
--- a/doc/intro-article.sgml
+++ b/doc/intro-article.sgml
@@ -674,7 +674,7 @@ main(int argc, char** argv)
   gtk_init(&amp;argc, &amp;argv);
   gconf_init(argc, argv, NULL);
 
-  client = gconf_client_new();
+  client = gconf_client_get_default();
   
   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
@@ -765,7 +765,7 @@ main(int argc, char** argv)
 
   gtk_container_add(GTK_CONTAINER(window), entry);  
 
-  client = gconf_client_new();
+  client = gconf_client_get_default();
 
   gconf_client_add_dir(client,
                        "/extra/test/directory",