Move gconf-backend.h here, I don't see why it was in the public headers

2000-09-09  Havoc Pennington  <hp@pobox.com>

* gconf/Makefile.am (libgconf_1_la_SOURCES): Move gconf-backend.h
here, I don't see why it was in the public headers


Throughout, rename a bunch of stuff:

#!/usr/bin/perl -pi.bak

s/gconf_notify_add/gconf_engine_notify_add/g;
s/gconf_notify_remove/gconf_engine_notify_remove/g;
s/gconf_get_without_default/gconf_engine_get_without_default/g;
s/gconf_get_full/gconf_engine_get_full/g;
s/gconf_get_with_locale/gconf_engine_get_with_locale/g;
s/gconf_get_default_from_schema/gconf_engine_get_default_from_schema/g;
s/gconf_unset/gconf_engine_unset/g;
s/gconf_associate_schema/gconf_engine_associate_schema/g;
s/gconf_all_entries/gconf_engine_all_entries/g;
s/gconf_all_dirs/gconf_engine_all_dirs/g;
s/gconf_suggest_sync/gconf_engine_suggest_sync/g;
s/gconf_dir_exists/gconf_engine_dir_exists/g;
s/gconf_get_float/gconf_engine_get_float/g;
s/gconf_get_int/gconf_engine_get_int/g;
s/gconf_get_bool/gconf_engine_get_bool/g;
s/gconf_get_schema/gconf_engine_get_schema/g;
s/gconf_get_list/gconf_engine_get_list/g;
s/gconf_get_pair/gconf_engine_get_pair/g;
s/gconf_set_float/gconf_engine_set_float/g;
s/gconf_set_int/gconf_engine_set_int/g;
s/gconf_set_string/gconf_engine_set_string/g;
s/gconf_set_bool/gconf_engine_set_bool/g;
s/gconf_set_schema/gconf_engine_set_schema/g;
s/gconf_set_list/gconf_engine_set_list/g;
s/gconf_set_pair/gconf_engine_set_pair/g;

s/gconf_commit_change_set/gconf_engine_commit_change_set/g;
s/gconf_create_reverse_change_set/gconf_engine_reverse_change_set/g;
s/gconf_create_change_set_from_currentv/gconf_engine_change_set_from_currentv/g;
s/gconf_create_change_set_from_current/gconf_engine_change_set_from_current/g;

s/gconf_schema_destroy/gconf_schema_free/g;
s/gconf_value_destroy/gconf_value_free/g;
s/gconf_listeners_destroy/gconf_listeners_free/g;
s/gconf_entry_destroy/gconf_entry_free/g;

s/gconf_client_create_change_set_from_current/gconf_client_change_set_from_current/g;
s/gconf_client_create_change_set_from_currentv/gconf_client_change_set_from_currentv/g;
s/gconf_client_create_reverse_change_set/gconf_client_reverse_change_set/g;

## These require some care, since they can be the prefix for unrelated stuff.
s/gconf_get /gconf_engine_get /g;
s/gconf_set /gconf_engine_set /g;

s/gconf_get\(/gconf_engine_get (/g;
s/gconf_set\(/gconf_engine_set (/g;

1 files changed, 3 insertions, 3 deletions

diff --git a/examples/basic-gconf-app.c b/examples/basic-gconf-app.c
index a7df70af..dde55c18 100644
--- a/examples/basic-gconf-app.c
+++ b/examples/basic-gconf-app.c
@@ -336,7 +336,7 @@ prefs_dialog_apply(GtkWidget* dialog)
 
   if (revert_cs == NULL)
     {
-      revert_cs = gconf_client_create_change_set_from_current(client,
+      revert_cs = gconf_client_change_set_from_current(client,
                                                               NULL,
                                                               "/apps/basic-gconf-app/foo",
                                                               "/apps/basic-gconf-app/bar",
@@ -396,7 +396,7 @@ update_entry(GtkWidget* dialog, GConfChangeSet* cs, const gchar* config_key)
               else
                 g_warning("Wrong type for default value of %s", config_key);
 
-              gconf_value_destroy(def);
+              gconf_value_free(def);
             }
           else
             gtk_entry_set_text(GTK_ENTRY(entry), "");
@@ -506,7 +506,7 @@ create_config_entry(GtkWidget* prefs_dialog, GConfClient* client, const gchar* c
     }
 
   if (initial)
-    gconf_value_destroy(initial);
+    gconf_value_free(initial);
   
   gtk_object_set_data(GTK_OBJECT(entry), "client", client);
   gtk_object_set_data(GTK_OBJECT(entry), "key", g_strdup(config_key));