[vinagre] Handle GConf errors
- From: Matthias Clasen <matthiasc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [vinagre] Handle GConf errors
- Date: Mon, 7 Sep 2009 00:12:21 +0000 (UTC)
commit c9cbc31deded12b8d89a77af9b70773d7c7db20b
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Sep 6 20:09:48 2009 -0400
Handle GConf errors
Instead of checking writability in advance, handle errors returned
by GConfClient setters. Bug 594286.
vinagre/vinagre-prefs.c | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
---
diff --git a/vinagre/vinagre-prefs.c b/vinagre/vinagre-prefs.c
index 703c6c8..8ffc5b3 100644
--- a/vinagre/vinagre-prefs.c
+++ b/vinagre/vinagre-prefs.c
@@ -152,41 +152,51 @@ vinagre_prefs_get_list (VinagrePrefs *prefs, const gchar* key)
static void
vinagre_prefs_set_bool (VinagrePrefs *prefs, const gchar* key, gboolean value)
{
- g_return_if_fail (gconf_client_key_is_writable (
- prefs->priv->gconf_client, key, NULL));
+ GError *error = NULL;
- gconf_client_set_bool (prefs->priv->gconf_client, key, value, NULL);
+ if (!gconf_client_set_bool (prefs->priv->gconf_client, key, value, &error))
+ {
+ g_warning ("Setting key %s failed: %s", key, error->message);
+ g_error_free (error);
+ }
}
static void
vinagre_prefs_set_int (VinagrePrefs *prefs, const gchar* key, gint value)
{
- g_return_if_fail (gconf_client_key_is_writable (
- prefs->priv->gconf_client, key, NULL));
+ GError *error = NULL;
- gconf_client_set_int (prefs->priv->gconf_client, key, value, NULL);
+ if (!gconf_client_set_int (prefs->priv->gconf_client, key, value, &error))
+ {
+ g_warning ("Setting key %s failed: %s", key, error->message);
+ g_error_free (error);
+ }
}
static void
vinagre_prefs_set_string (VinagrePrefs *prefs, const gchar *key, const gchar *value)
{
- g_return_if_fail (gconf_client_key_is_writable (
- prefs->priv->gconf_client, key, NULL));
+ GError *error = NULL;
- gconf_client_set_string (prefs->priv->gconf_client, key, value, NULL);
+ if (!gconf_client_set_string (prefs->priv->gconf_client, key, value, &error))
+ {
+ g_warning ("Setting key %s failed: %s", key, error->message);
+ g_error_free (error);
+ }
}
static void
vinagre_prefs_set_list (VinagrePrefs *prefs, const gchar* key, GSList *list)
{
- g_return_if_fail (gconf_client_key_is_writable (
- prefs->priv->gconf_client, key, NULL));
-
- gconf_client_set_list (prefs->priv->gconf_client,
- key,
- GCONF_VALUE_STRING,
- list,
- NULL);
+ GError *error = NULL;
+
+ if (!gconf_client_set_list (prefs->priv->gconf_client, key,
+ GCONF_VALUE_STRING, list,
+ &error))
+ {
+ g_warning ("Setting key %s failed: %s", key, error->message);
+ g_error_free (error);
+ }
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]