Merge lp:~xapantu/granite/fix-1481865 into lp:~elementary-pantheon/granite/granite

[xapantu]

Fix bug #1481865. It looks like that disconnecting/connecting too many times sometimes does not work as expected.

Fix bug #1481865. It looks like that disconnecting/connecting too many times sometimes does not work as expected.

Please keep in mind that the fact that this is undefined means that the old code could perfectly work in most cases. The disconnecting/connecting can be triggered up to the number of the keys in the same iteration in normal apps. Using handler uid does not help.

I specifically encountered problem with gala notifications problem, but it is one of the only schema that is frequently modified by two different apps at the same time. So, this is very specific, and I am not aware of any other use case where it would have been detected.

[Djax (parnold-x)]

Works good here. No regression noticed.

review: Approve

[xapantu (xapantu)]

So, I am going to self-approve that because no one is available to review it (I don't want to waste time fixing conflicts in 6 months when it will start bothering me again).

=== modified file 'lib/Services/Settings.vala'
--- lib/Services/Settings.vala	2014-09-04 12:39:00 +0000
+++ lib/Services/Settings.vala	2015-08-05 20:50:59 +0000
@@ -94,6 +94,11 @@
     public abstract class Settings : GLib.Object {
     
         /**
+         * Used internally to avoid mutual signal calls.
+         */
+        bool saving_key;
+        
+        /**
          * This signal is to be used in place of the standard {@link GLib.Object.notify} signal.
          *
          * This signal ''only'' emits after a property's value was verified.
@@ -161,7 +166,7 @@
             var properties = obj_class.list_properties ();
             foreach (var prop in properties)
                 load_key (prop.name);
-            
+
             start_monitor ();
         }
         
@@ -263,7 +268,7 @@
         }
         
         void save_key (string key) {
-            if (key == "schema")
+            if (key == "schema" || saving_key)
                 return;
 
             var obj_class = (ObjectClass) get_type ().class_ref ();
@@ -275,7 +280,7 @@
 
             bool success = true;
 
-            stop_monitor ();
+            saving_key = true;
             notify.disconnect (handle_notify);
 
             var type = prop.value_type;
@@ -324,7 +329,7 @@
                 warning ("Key '%s' could not be written to.", key);
             
             notify.connect (handle_notify);
-            start_monitor ();
+            saving_key = false;
         }
         
     }