[glib] Revert "gsettings-tool: warn if setting a value fails"
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Revert "gsettings-tool: warn if setting a value fails"
- Date: Mon, 23 May 2011 17:40:31 +0000 (UTC)
commit eabad1923e7b0f133f8f38e57601a97521e38cfe
Author: Ray Strode <rstrode redhat com>
Date: Mon May 23 13:39:09 2011 -0400
Revert "gsettings-tool: warn if setting a value fails"
This reverts commit ea57feff96f13bbd4d03a76040a4ddfad2677310.
It makes the gsettings tool fail any time it tries to set a
key to a value, that the key already has.
https://bugzilla.gnome.org/show_bug.cgi?id=641768
gio/gsettings-tool.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/gio/gsettings-tool.c b/gio/gsettings-tool.c
index 5a8ab4d..04a1954 100644
--- a/gio/gsettings-tool.c
+++ b/gio/gsettings-tool.c
@@ -457,7 +457,6 @@ gsettings_set (GSettings *settings,
GError *error = NULL;
GVariant *existing;
GVariant *new;
- GVariant *stored;
gchar *freeme = NULL;
existing = g_settings_get_value (settings, key);
@@ -503,23 +502,16 @@ gsettings_set (GSettings *settings,
if (!g_settings_range_check (settings, key, new))
{
g_printerr (_("The provided value is outside of the valid range\n"));
+ g_variant_unref (new);
exit (1);
}
g_settings_set_value (settings, key, new);
- g_settings_sync ();
-
- stored = g_settings_get_value (settings, key);
- if (g_variant_equal (stored, existing))
- {
- g_printerr (_("Failed to set value\n"));
- exit (1);
- }
-
- g_variant_unref (stored);
g_variant_unref (existing);
g_variant_unref (new);
+ g_settings_sync ();
+
g_free (freeme);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]