summaryrefslogtreecommitdiff
path: root/gconf/gconf-client.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2000-10-17 05:18:20 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-10-17 05:18:20 +0000
commit074a696e8bbdbb9a72300a655ae0248000d5b7c2 (patch)
tree7309f130bea882e7dea49540e72d74291aaa7755 /gconf/gconf-client.h
parent1330890f3074897b6c705cc5f1716ebbed3861fa (diff)
downloadgconf-074a696e8bbdbb9a72300a655ae0248000d5b7c2.tar.gz
implement default error handler that prints to stderr
2000-10-16 Havoc Pennington <hp@pobox.com> * wrappers/gtk/gconf-client.c (gconf_client_real_unreturned_error): implement default error handler that prints to stderr (gconf_client_key_is_writable): hmm, this function didn't compile very cleanly * wrappers/gtk/gconf-client.h: Remove the ParentWindowFunc concept. Two reasons: a) it was really hard for users to implement such a thing, and if they did then implementing an error dialog function was pretty trivial also b) decided to make the default error handler use fprintf(stderr) since GConfClient is going to move into the main GConf library and thus not depend on GTK. So, this is mild API breakage (but hopefully no one was using the feature anyway).
Diffstat (limited to 'gconf/gconf-client.h')
-rw-r--r--gconf/gconf-client.h18
1 files changed, 2 insertions, 16 deletions
diff --git a/gconf/gconf-client.h b/gconf/gconf-client.h
index 5504b359..435bee2b 100644
--- a/gconf/gconf-client.h
+++ b/gconf/gconf-client.h
@@ -79,17 +79,8 @@ typedef void (*GConfClientNotifyFunc)(GConfClient* client,
GConfEntry *entry,
gpointer user_data);
-/*
- * Return the parent window error dialogs should be associated with,
- * or NULL for none.
- */
-
-typedef GtkWidget* (*GConfClientParentWindowFunc) (GConfClient* client,
- gpointer user_data);
-
typedef void (*GConfClientErrorHandlerFunc) (GConfClient* client,
- GConfClientParentWindowFunc parent_func,
- gpointer parent_user_data, GError* error);
+ GError* error);
#define GCONF_TYPE_CLIENT (gconf_client_get_type ())
#define GCONF_CLIENT(obj) (GTK_CHECK_CAST ((obj), GCONF_TYPE_CLIENT, GConfClient))
@@ -105,8 +96,6 @@ struct _GConfClient
GConfEngine* engine;
GConfClientErrorHandlingMode error_mode;
- GConfClientParentWindowFunc parent_func;
- gpointer parent_user_data;
GHashTable* dir_hash;
GHashTable* cache_hash;
GConfListeners* listeners;
@@ -204,10 +193,7 @@ void gconf_client_notify_remove (GConfClient* client,
*/
void gconf_client_set_error_handling(GConfClient* client,
- GConfClientErrorHandlingMode mode,
- /* func can be NULL for none or N/A */
- GConfClientParentWindowFunc func,
- gpointer user_data);
+ GConfClientErrorHandlingMode mode);
/* Intended for use by gnome-libs */