From: Ray Strode <rstrode@redhat.com>
Date: Mon, 23 May 2011 17:39:09 +0000 (-0400)
Subject: Revert "gsettings-tool: warn if setting a value fails"
X-Git-Tag: 2.29.6~102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eabad1923e7b0f133f8f38e57601a97521e38cfe;p=platform%2Fupstream%2Fglib.git

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
---

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);
 }