Bug 646847 — Rename _update () in Trf.Persona

…or just remove it entirely, since it was only called from one place.

Closes: bgo#646847

diff --git a/NEWS b/NEWS
index 1e4cf9b..70074fc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,8 @@ Bugs fixed:
 * Bug 658531 — Sometimes avatar caching doesn't work
 * Bug 658328 — Return PropertyError.NOT_WRITEABLE from Persona property setters
   as appropriate
+* Bug 646847 — We should rename _update () in Trf.Persona to something more less
+  misleading
 
 API changes:
 * Individual.avatar is now settable using Individual.change_avatar() (not new

diff --git a/backends/tracker/lib/trf-persona.vala b/backends/tracker/lib/trf-persona.vala
index a813f45..84a76be 100644 (file)
--- a/backends/tracker/lib/trf-persona.vala
+++ b/backends/tracker/lib/trf-persona.vala
@@ -576,10 +576,24 @@ public class Trf.Persona : Folks.Persona,
       this._local_ids = new HashSet<string> ();
       this._local_ids_ro = this._local_ids.read_only_view;
 
+      /* Set the initial property values if we have a results cursor. */
       if (cursor != null)
         {
           this._cursor = cursor;
-          this._update ();
+
+          this._update_names ();
+          this._update_avatar ();
+          this._update_im_addresses ();
+          this._update_phones ();
+          this._update_email_addresses ();
+          this._update_urls ();
+          this._update_favourite ();
+          this._update_roles ();
+          this._update_bday ();
+          this._update_note ();
+          this._update_gender ();
+          this._update_postal_addresses ();
+          this._update_local_ids ();
         }
     }
 
@@ -752,23 +766,6 @@ public class Trf.Persona : Folks.Persona,
         }
     }
 
-  internal void _update ()
-    {
-      this._update_names ();
-      this._update_avatar ();
-      this._update_im_addresses ();
-      this._update_phones ();
-      this._update_email_addresses ();
-      this._update_urls ();
-      this._update_favourite ();
-      this._update_roles ();
-      this._update_bday ();
-      this._update_note ();
-      this._update_gender ();
-      this._update_postal_addresses ();
-      this._update_local_ids ();
-    }
-
   private void _update_postal_addresses ()
     {
       string postal_field = this._cursor.get_string