[folks] eds: Yield for longer in Edsf.Persona.change_extended_field()

[Philip Withnall <pwithnall src gnome org>]

commit e397d869d8f84641825252657aa34ae8487dd526
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Tue Mar 17 14:40:41 2015 +0000

    eds: Yield for longer in Edsf.Persona.change_extended_field()
    
    …and .remove_extended_field(). Previously these two functions yielded
    until the updated vCard had been submitted to EDS, but not until EDS had
    sent back a change notification to folks. All other properties correctly
    yield until the latter, meaning that code like:
        yield persona.change_some_property ("new-value");
        assert (persona.get_some_property () == "new-value");
    is guaranteed not to race. This was not the case for EDS extended
    fields, which would return stale values until the updated vCard finished
    its round trip through EDS and reached folks again.
    
    This also adds the timeout machinery from
    Edsf.PersonaStore._commit_modified_property() to extended fields, so if
    the modification times out, the client will not yield forever.

 backends/eds/lib/edsf-persona-store.vala |   79 +++++++++++++++++++----------
 1 files changed, 52 insertions(+), 27 deletions(-)
---
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 93aa4c5..83cdb14 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -1221,9 +1221,13 @@ public class Edsf.PersonaStore : Folks.PersonaStore
 
   /* Commit modified properties to the address book. This assumes you've already
    * modified the persona's contact appropriately. It guarantees to only return
-   * once the modified property has been notified. */
+   * once the modified property has been notified.
+   *
+   * If @property_name is null, this yields until the persona as a whole is
+   * updated by EDS. This is intended _only_ for changes which are not tied to
+   * a specific Edsf.Persona property, such as change_extended_field(). */
   private async void _commit_modified_property (Edsf.Persona persona,
-      string property_name) throws PropertyError
+      string? property_name) throws PropertyError
     {
       /* We require _addressbook to be non-null. This should be the case
        * because we're only called from property setters, and they check whether
@@ -1251,16 +1255,48 @@ public class Edsf.PersonaStore : Folks.PersonaStore
           var received_notification = false;
           var has_yielded = false;
 
-          signal_id = persona.notify[property_name].connect ((obj, pspec) =>
+          if (property_name != null)
             {
-              /* Success! Return to _commit_modified_property(). */
-              received_notification = true;
+              signal_id = persona.notify[property_name].connect ((obj, pspec) =>
+                {
+                  /* Success! Return to _commit_modified_property(). */
+                  received_notification = true;
 
-              if (has_yielded == true)
+                  if (has_yielded == true)
+                    {
+                      this._commit_modified_property.callback ();
+                    }
+                });
+            }
+          else
+            {
+              signal_id = ((!) this._ebookview).objects_modified.connect (
+                  (_contacts) =>
                 {
-                  this._commit_modified_property.callback ();
-                }
-            });
+                  unowned GLib.List<E.Contact> contacts =
+                      (GLib.List<E.Contact>) _contacts;
+
+                  /* Ignore other personas. */
+                  foreach (E.Contact c in contacts)
+                    {
+                      var iid = Edsf.Persona.build_iid_from_contact (this.id, c);
+                      if (iid != persona.iid)
+                        {
+                          continue;
+                        }
+
+                      /* Success! Return to _commit_modified_property(). */
+                      received_notification = true;
+
+                      if (has_yielded == true)
+                        {
+                          this._commit_modified_property.callback ();
+                        }
+
+                      return;
+                    }
+                });
+            }
 
           /* Commit the modification. _addressbook is asserted as being non-null
            * above. */
@@ -1314,10 +1350,14 @@ public class Edsf.PersonaStore : Folks.PersonaStore
       finally
         {
           /* Remove the callbacks. */
-          if (signal_id != 0)
+          if (signal_id != 0 && property_name != null)
             {
               persona.disconnect (signal_id);
             }
+          else if (signal_id != 0)
+            {
+              ((!) this._ebookview).disconnect (signal_id);
+            }
 
           if (timeout_id != 0)
             {
@@ -1636,29 +1676,14 @@ public class Edsf.PersonaStore : Folks.PersonaStore
 
       vcard.add_attribute (new_attr);
 
-      try
-        {
-          yield ((!) this._addressbook).modify_contact (persona.contact, null);
-        }
-      catch (GLib.Error e)
-        {
-          throw this.e_client_error_to_property_error (name, e);
-        }
+      yield this._commit_modified_property (persona, null);
     }
 
   internal async void _remove_extended_field (Edsf.Persona persona,
       string name) throws PropertyError
     {
       persona.contact.remove_attributes ("", name);
-
-      try
-        {
-          yield ((!) this._addressbook).modify_contact (persona.contact, null);
-        }
-      catch (GLib.Error e)
-        {
-          throw this.e_client_error_to_property_error (name, e);
-        }
+      yield this._commit_modified_property (persona, null);
     }
 
   internal async void _set_phones (Edsf.Persona persona,