Resync with eel.

2003-11-04  Marco Pesenti Gritti  <marco@gnome.org>

        * lib/eel-gconf-extensions.c: (global_client_free),
        (eel_gconf_client_get_global), (eel_gconf_handle_error),
        (eel_gconf_set_string), (eel_gconf_is_default),
        (eel_gconf_key_is_writable), (eel_gconf_monitor_add),
        (eel_gconf_monitor_remove), (eel_gconf_preload_cache),
        (eel_gconf_get_default_value), (eel_strcmp), (eel_str_is_equal),
        (simple_value_is_equal), (eel_gconf_value_is_equal),
        (eel_gconf_value_get_string_list),
        (eel_gconf_value_set_string_list), (eel_gconf_set_float),
        (eel_gconf_get_float):
        * lib/eel-gconf-extensions.h:

        Resync with eel.

        * lib/ephy-prefs.h:
        * lib/widgets/ephy-spinner.c:
        * embed/ephy-embed-prefs.h:
        * embed/mozilla/mozilla-notifiers.cpp:

        Migrate old font size settings. This will screw things
        for 1.1 users, not much we can do about it now.

1 files changed, 43 insertions, 52 deletions

diff --git a/lib/eel-gconf-extensions.h b/lib/eel-gconf-extensions.h
index df51afaa1..13196d7ee 100644
--- a/lib/eel-gconf-extensions.h
+++ b/lib/eel-gconf-extensions.h
@@ -25,63 +25,54 @@
 #ifndef EEL_GCONF_EXTENSIONS_H
 #define EEL_GCONF_EXTENSIONS_H
 
-#include <glib/gerror.h>
+#include <glib.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define EEL_GCONF_UNDEFINED_CONNECTION 0
 
-GConfClient *eel_gconf_client_get_global   (void);
-gboolean     eel_gconf_handle_error        (GError                **error);
-void         eel_gconf_set_boolean         (const char             *key,
-					    gboolean                boolean_value);
-gboolean     eel_gconf_get_boolean         (const char             *key);
-int          eel_gconf_get_integer         (const char             *key);
-void         eel_gconf_set_integer         (const char             *key,
-					    int                     int_value);
-gfloat       eel_gconf_get_float           (const char             *key);
-void         eel_gconf_set_float           (const char             *key,
-					    gfloat                 float_value);
-char *       eel_gconf_get_string          (const char             *key);
-void         eel_gconf_set_string          (const char             *key,
-					    const char             *string_value);
-GSList *     eel_gconf_get_string_list     (const char             *key);
-void         eel_gconf_set_string_list     (const char             *key,
-					    const GSList           *string_list_value);
-gboolean     eel_gconf_is_default          (const char             *key);
-gboolean     eel_gconf_monitor_add         (const char             *directory);
-gboolean     eel_gconf_monitor_remove      (const char             *directory);
-void         eel_gconf_suggest_sync        (void);
-GConfValue*  eel_gconf_get_value           (const char             *key);
-gboolean     eel_gconf_value_is_equal      (const GConfValue       *a,
-					    const GConfValue       *b);
-void         eel_gconf_set_value           (const char *key, GConfValue *value);
-void         eel_gconf_value_free          (GConfValue             *value);
-void 	     eel_gconf_unset		   (const char *key);
-
-/* Functions which weren't part of the eel-gconf-extensions.h file from eel */
-GSList *eel_gconf_get_integer_list (const char *key);
-void eel_gconf_set_integer_list (const char *key,
-				 const GSList *slist);
-guint eel_gconf_notification_add (const char *key,
-				  GConfClientNotifyFunc notification_callback,
-				  gpointer callback_data);
-void eel_gconf_notification_remove (guint notification_id);
-
-void ephy_notification_add (const char *key,
-			    GConfClientNotifyFunc notification_callback,
-			    gpointer callback_data,
-			    GList **notifiers);
-
-void ephy_notification_remove (GList **notifiers);
-
-
-#ifdef __cplusplus
-}
-#endif
+GConfClient *eel_gconf_client_get_global     (void);
+gboolean     eel_gconf_handle_error          (GError                **error);
+void         eel_gconf_set_boolean           (const char             *key,
+					      gboolean                boolean_value);
+gboolean     eel_gconf_get_boolean           (const char             *key);
+int          eel_gconf_get_integer           (const char             *key);
+void         eel_gconf_set_integer           (const char             *key,
+					      int                     int_value);
+char *       eel_gconf_get_string            (const char             *key);
+void         eel_gconf_set_string            (const char             *key,
+					      const char             *string_value);
+GSList *     eel_gconf_get_string_list       (const char             *key);
+void         eel_gconf_set_string_list       (const char             *key,
+					      const GSList           *string_list_value);
+gboolean     eel_gconf_key_is_writable       (const char             *key);
+gboolean     eel_gconf_is_default            (const char             *key);
+gboolean     eel_gconf_monitor_add           (const char             *directory);
+gboolean     eel_gconf_monitor_remove        (const char             *directory);
+void         eel_gconf_preload_cache         (const char             *directory,
+					      GConfClientPreloadType  preload_type);
+void         eel_gconf_suggest_sync          (void);
+GConfValue*  eel_gconf_get_value             (const char             *key);
+GConfValue*  eel_gconf_get_default_value     (const char             *key);
+gboolean     eel_gconf_value_is_equal        (const GConfValue       *a,
+					      const GConfValue       *b);
+void         eel_gconf_value_free            (GConfValue             *value);
+guint        eel_gconf_notification_add      (const char             *key,
+					      GConfClientNotifyFunc   notification_callback,
+					      gpointer                callback_data);
+void         eel_gconf_notification_remove   (guint                   notification_id);
+GSList *     eel_gconf_value_get_string_list (const GConfValue       *value);
+void         eel_gconf_value_set_string_list (GConfValue             *value,
+					      const GSList           *string_list);
+
+/* These are ephy additions, not part of the eel code */
+
+void         eel_gconf_set_float             (const char             *key,
+			                      gfloat                  float_value);
+gfloat       eel_gconf_get_float             (const char             *key);
+
+G_END_DECLS
 
 #endif /* EEL_GCONF_EXTENSIONS_H */