summaryrefslogtreecommitdiff
path: root/gconf/gconf-client.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2000-09-17 00:55:03 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-09-17 00:55:03 +0000
commitb780e8386cc3632992b70d6232bc8e63d64154f8 (patch)
treea8f9f1253a8c2db2c54545a1326c21283db1f4f4 /gconf/gconf-client.h
parent06f8e406e040119173f0bf919719c8ce402c0838 (diff)
downloadgconf-b780e8386cc3632992b70d6232bc8e63d64154f8.tar.gz
Update some docs
2000-09-16 Havoc Pennington <hp@pobox.com> * doc/gconf/tmpl/gconf-value.sgml: Update some docs * wrappers/gtk/gconf-client.c (notify_listeners_callback): Update to reflect new callback signature for GConfClientNotifyFunc * gconf/gconf-sources.c (gconf_sources_set_value): Make it an error to if we try to write a value for a non-writable source. This is new; it used to silently fail. * gconf/gconf-database.c (gconf_database_notify_listeners): Add is_writable here * gconf/GConf.idl: Add writable flag to notification * gconf/gconf.h: Update GConfNotifyFunc to have fewer args, and a GConfEntry is just passed in (since I was going to have to add an is_writable arg, and passing in a GConfEntry gives us future extensibility against this sort of thing) BREAKS USER CODE, many apologies. * wrappers/gtk/gconf-client.c (gconf_client_get_entry): Update to reflect GConfEngine changes * gconf/gconf.c (gconf_engine_all_entries): Get the writability stuff (gconf_engine_get_full): rename to gconf_value_get_entry and return an entry; drop the is_default argument. * gconf/gconf-sources.c (gconf_sources_query_value): Implement finding out if a value is writable (gconf_sources_all_entries): Implement setting is_writable flag on the entries * gconf/gconf-value.c (gconf_entry_new_nocopy): Default to the entry being writable * gconf/gconf-database.c: Change to match IDL changes * gconf/GConf.idl (lookup_with_locale): Add out param for writability (all_entries): Add out param for writability * gconf/gconf-value.h: Add is_writable field to GConfEntry (gconf_entry_get_is_writable): Add this * wrappers/gtk/gconf-client.c (gconf_client_key_is_writable): Add the matching stub here * gconf/gconf.c (gconf_engine_key_is_writable): Go ahead and add this function so we can implement it later, but it always returns TRUE at the moment. * gconf/gconf-changeset.c (gconf_change_set_set_user_data, gconf_change_set_get_user_data): Add user data for language bindings * gconf/gconf.c (gconf_engine_set_user_data, gconf_engine_get_user_data): Add user data for language bindings
Diffstat (limited to 'gconf/gconf-client.h')
-rw-r--r--gconf/gconf-client.h31
1 files changed, 20 insertions, 11 deletions
diff --git a/gconf/gconf-client.h b/gconf/gconf-client.h
index 2b527928..5504b359 100644
--- a/gconf/gconf-client.h
+++ b/gconf/gconf-client.h
@@ -74,16 +74,22 @@ typedef struct _GConfClient GConfClient;
typedef struct _GConfClientClass GConfClientClass;
-typedef void (*GConfClientNotifyFunc)(GConfClient* client, guint cnxn_id, const gchar* key, GConfValue* value, gboolean is_default, gpointer user_data);
+typedef void (*GConfClientNotifyFunc)(GConfClient* client,
+ guint cnxn_id,
+ GConfEntry *entry,
+ gpointer user_data);
/*
- * Return the parent window error dialogs should be associated with, or NULL for
- * none.
+ * Return the parent window error dialogs should be associated with,
+ * or NULL for none.
*/
-typedef GtkWidget* (*GConfClientParentWindowFunc) (GConfClient* client, gpointer user_data);
+typedef GtkWidget* (*GConfClientParentWindowFunc) (GConfClient* client,
+ gpointer user_data);
-typedef void (*GConfClientErrorHandlerFunc) (GConfClient* client, GConfClientParentWindowFunc parent_func, gpointer parent_user_data, GError* error);
+typedef void (*GConfClientErrorHandlerFunc) (GConfClient* client,
+ GConfClientParentWindowFunc parent_func,
+ gpointer parent_user_data, GError* error);
#define GCONF_TYPE_CLIENT (gconf_client_get_type ())
#define GCONF_CLIENT(obj) (GTK_CHECK_CAST ((obj), GCONF_TYPE_CLIENT, GConfClient))
@@ -244,12 +250,11 @@ GConfValue* gconf_client_get_without_default (GConfClient* client,
const gchar* key,
GError** err);
-/* Try not to use this function, it makes me nervous. */
-GConfValue* gconf_client_get_full (GConfClient* client,
- const gchar* key, const gchar* locale,
- gboolean use_schema_default,
- gboolean* value_is_default,
- GError** err);
+GConfEntry* gconf_client_get_entry (GConfClient* client,
+ const gchar* key,
+ const gchar* locale,
+ gboolean use_schema_default,
+ GError** err);
GConfValue* gconf_client_get_default_from_schema (GConfClient* client,
const gchar* key,
@@ -270,6 +275,10 @@ void gconf_client_suggest_sync (GConfClient* client,
gboolean gconf_client_dir_exists (GConfClient* client,
const gchar* dir, GError** err);
+gboolean gconf_client_key_is_writable(GConfClient* client,
+ const gchar* key,
+ GError** err);
+
/* Get/Set convenience wrappers */
gdouble gconf_client_get_float (GConfClient* client, const gchar* key,