[folks/648811-dummy-backend-rebase1] fixup! Used 'changed_*' function to change the details.

[Philip Withnall <pwithnall src gnome org>]

commit a70920221ad57f8606bca01bf792c204432e0890
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Thu Nov 7 12:27:51 2013 +0000

    fixup! Used 'changed_*' function to change the details.

 backends/dummy/lib/dummy-persona-store.vala |  315 ++++++++++++++-------------
 1 files changed, 166 insertions(+), 149 deletions(-)
---
diff --git a/backends/dummy/lib/dummy-persona-store.vala b/backends/dummy/lib/dummy-persona-store.vala
index 42a660c..61f6abe 100644
--- a/backends/dummy/lib/dummy-persona-store.vala
+++ b/backends/dummy/lib/dummy-persona-store.vala
@@ -320,220 +320,237 @@ public class FolksDummy.PersonaStore : Folks.PersonaStore
       unowned string k;
       unowned Value? _v;
 
-      while (iter.next (out k, out _v) == true)
+      try
         {
-          if (_v == null)
+          while (iter.next (out k, out _v) == true)
             {
-              continue;
-            }
-          unowned Value v = (!) _v;
+              if (_v == null)
+                {
+                  continue;
+                }
+              unowned Value v = (!) _v;
 
-          if (k == Folks.PersonaStore.detail_key (
-                PersonaDetail.FULL_NAME))
-            {
-              var _persona = persona as NameDetails;
-              if (_persona != null) 
+              if (k == Folks.PersonaStore.detail_key (
+                    PersonaDetail.FULL_NAME))
                 {
-                  string? full_name = v.get_string ();
-                  string _full_name = "";
-                  if (full_name != null)
+                  var _persona = persona as NameDetails;
+                  if (_persona != null) 
                     {
-                      _full_name = (!) full_name;
+                      string? full_name = v.get_string ();
+                      string _full_name = "";
+                      if (full_name != null)
+                        {
+                          _full_name = (!) full_name;
+                        }
+                      yield _persona.change_full_name (_full_name);
                     }
-                  yield _persona.change_full_name (_full_name);
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (
-                PersonaDetail.EMAIL_ADDRESSES))
-            {
-              var _persona = persona as EmailDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                    PersonaDetail.EMAIL_ADDRESSES))
                 {
-                  Set<EmailFieldDetails> email_addresses =
-                      (Set<EmailFieldDetails>) v.get_object ();
-                  if (email_addresses != null)
+                  var _persona = persona as EmailDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_email_addresses (email_addresses);
+                      Set<EmailFieldDetails> email_addresses =
+                          (Set<EmailFieldDetails>) v.get_object ();
+                      if (email_addresses != null)
+                        {
+                          yield _persona.change_email_addresses (
+                              email_addresses);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (PersonaDetail.AVATAR))
-            {
-              var _persona = persona as AvatarDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                  PersonaDetail.AVATAR))
                 {
-                  var avatar = (LoadableIcon?) v.get_object ();
-                  if (avatar != null)
+                  var _persona = persona as AvatarDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_avatar (avatar);
+                      var avatar = (LoadableIcon?) v.get_object ();
+                      if (avatar != null)
+                        {
+                          yield _persona.change_avatar (avatar);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (
-                PersonaDetail.IM_ADDRESSES))
-            {
-              var _persona = persona as ImDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                    PersonaDetail.IM_ADDRESSES))
                 {
-                  MultiMap<string,ImFieldDetails> im_addresses =
-                    (MultiMap<string,ImFieldDetails>) v.get_object ();
-                  if (im_addresses != null)
+                  var _persona = persona as ImDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_im_addresses (im_addresses);
+                      MultiMap<string,ImFieldDetails> im_addresses =
+                        (MultiMap<string,ImFieldDetails>) v.get_object ();
+                      if (im_addresses != null)
+                        {
+                          yield _persona.change_im_addresses (im_addresses);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (
-                PersonaDetail.PHONE_NUMBERS))
-            {
-              var _persona = persona as PhoneDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                    PersonaDetail.PHONE_NUMBERS))
                 {
-                  Set<PhoneFieldDetails> phone_numbers =
-                    (Set<PhoneFieldDetails>) v.get_object ();
-                  if (phone_numbers != null)
+                  var _persona = persona as PhoneDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_phone_numbers (phone_numbers);
+                      Set<PhoneFieldDetails> phone_numbers =
+                        (Set<PhoneFieldDetails>) v.get_object ();
+                      if (phone_numbers != null)
+                        {
+                          yield _persona.change_phone_numbers (phone_numbers);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (
-                PersonaDetail.POSTAL_ADDRESSES))
-            {
-              var _persona = persona as PostalAddressDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                    PersonaDetail.POSTAL_ADDRESSES))
                 {
-                  Set<PostalAddressFieldDetails> postal_fds =
-                    (Set<PostalAddressFieldDetails>) v.get_object ();
-                  if (postal_fds != null)
+                  var _persona = persona as PostalAddressDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_postal_addresses (postal_fds);
+                      Set<PostalAddressFieldDetails> postal_fds =
+                        (Set<PostalAddressFieldDetails>) v.get_object ();
+                      if (postal_fds != null)
+                        {
+                          yield _persona.change_postal_addresses (postal_fds);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (
-                PersonaDetail.STRUCTURED_NAME))
-            {
-              var _persona = persona as NameDetails;
-              if (_persona != null) 
+              else if (k == Folks.PersonaStore.detail_key (
+                    PersonaDetail.STRUCTURED_NAME))
                 {
-                  StructuredName sname = (StructuredName) v.get_object ();
-                  if (sname != null)
+                  var _persona = persona as NameDetails;
+                  if (_persona != null) 
                     {
-                      yield _persona.change_structured_name (sname);
+                      StructuredName sname = (StructuredName) v.get_object ();
+                      if (sname != null)
+                        {
+                          yield _persona.change_structured_name (sname);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (PersonaDetail.LOCAL_IDS))
-            {
-              var _persona = persona as LocalIdDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                  PersonaDetail.LOCAL_IDS))
                 {
-                  Set<string> local_ids = (Set<string>) v.get_object ();
-                  if (local_ids != null)
+                  var _persona = persona as LocalIdDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_local_ids (local_ids);
+                      Set<string> local_ids = (Set<string>) v.get_object ();
+                      if (local_ids != null)
+                        {
+                          yield _persona.change_local_ids (local_ids);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key
-              (PersonaDetail.WEB_SERVICE_ADDRESSES))
-            {
-              var _persona = persona as WebServiceDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key
+                  (PersonaDetail.WEB_SERVICE_ADDRESSES))
                 {
-                  var web_service_addresses =
-                      (HashMultiMap<string, WebServiceFieldDetails>) v.get_object ();
-                  if (web_service_addresses != null)
+                  var _persona = persona as WebServiceDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_web_service_addresses (web_service_addresses);
+                      var web_service_addresses =
+                          (HashMultiMap<string, WebServiceFieldDetails>)
+                              v.get_object ();
+                      if (web_service_addresses != null)
+                        {
+                          yield _persona.change_web_service_addresses (
+                              web_service_addresses);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (PersonaDetail.NOTES))
-            {
-              var _persona = persona as NoteDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (PersonaDetail.NOTES))
                 {
-                  var notes = (Gee.HashSet<NoteFieldDetails>) v.get_object ();
-                  if (notes != null)
+                  var _persona = persona as NoteDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_notes (notes);
+                      var notes =
+                          (Gee.HashSet<NoteFieldDetails>) v.get_object ();
+                      if (notes != null)
+                        {
+                          yield _persona.change_notes (notes);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (PersonaDetail.GENDER))
-            {
-              var _persona = persona as GenderDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                  PersonaDetail.GENDER))
                 {
-                  var gender = (Gender) v.get_enum ();
-                  yield _persona.change_gender (gender);
+                  var _persona = persona as GenderDetails;
+                  if (_persona != null)
+                    {
+                      var gender = (Gender) v.get_enum ();
+                      yield _persona.change_gender (gender);
+                    }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (PersonaDetail.URLS))
-            {
-              var _persona = persona as UrlDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (PersonaDetail.URLS))
                 {
-                  Set<UrlFieldDetails> urls = (Set<UrlFieldDetails>) v.get_object ();
-                  if (urls != null)
+                  var _persona = persona as UrlDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_urls (urls);
+                      Set<UrlFieldDetails> urls =
+                          (Set<UrlFieldDetails>) v.get_object ();
+                      if (urls != null)
+                        {
+                          yield _persona.change_urls (urls);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (PersonaDetail.BIRTHDAY))
-            {
-              var _persona = persona as BirthdayDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                  PersonaDetail.BIRTHDAY))
                 {
-                  var birthday = (DateTime?) v.get_boxed ();
-                  if (birthday != null)
+                  var _persona = persona as BirthdayDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_birthday (birthday);
+                      var birthday = (DateTime?) v.get_boxed ();
+                      if (birthday != null)
+                        {
+                          yield _persona.change_birthday (birthday);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (PersonaDetail.ROLES))
-            {
-              var _persona = persona as RoleDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (PersonaDetail.ROLES))
                 {
-                  Set<RoleFieldDetails> roles =
-                      (Set<RoleFieldDetails>) v.get_object ();
-                  if (roles != null)
+                  var _persona = persona as RoleDetails;
+                  if (_persona != null)
                     {
-                      yield _persona.change_roles (roles);
+                      Set<RoleFieldDetails> roles =
+                          (Set<RoleFieldDetails>) v.get_object ();
+                      if (roles != null)
+                        {
+                          yield _persona.change_roles (roles);
+                        }
                     }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (
-                  PersonaDetail.IS_FAVOURITE))
-            {
-              var _persona = persona as FavouriteDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                      PersonaDetail.IS_FAVOURITE))
                 {
-                  bool is_fav = v.get_boolean ();
-                  yield _persona.change_is_favourite (is_fav);
+                  var _persona = persona as FavouriteDetails;
+                  if (_persona != null)
+                    {
+                      bool is_fav = v.get_boolean ();
+                      yield _persona.change_is_favourite (is_fav);
+                    }
                 }
-            }
-          else if (k == Folks.PersonaStore.detail_key (
-                   PersonaDetail.NICKNAME))
-            {
-              var _persona = persona as NameDetails;
-              if (_persona != null)
+              else if (k == Folks.PersonaStore.detail_key (
+                       PersonaDetail.NICKNAME))
                 {
-                  string? nickname = v.get_string ();
-                  string _nickname = "";
-                  if (nickname != null)
+                  var _persona = persona as NameDetails;
+                  if (_persona != null)
                     {
-                      _nickname = (!) nickname;
+                      string? nickname = v.get_string ();
+                      string _nickname = "";
+                      if (nickname != null)
+                        {
+                          _nickname = (!) nickname;
+                        }
+                      yield _persona.change_nickname (_nickname);
                     }
-                  yield _persona.change_nickname (_nickname);
                 }
             }
         }
+      catch (PropertyError e1)
+        {
+          throw new PersonaStoreError.CREATE_FAILED (
+              "Setting a property on the new persona failed: %s", e1.message);
+        }
 
       /* Allow the caller to inject failures and delays into
        * add_persona_from_details() by providing a mock function. */