[gnome-contacts] ContactDataRow: remove some unnecessary fields.

[Niels De Graef <nielsdg src gnome org>]

commit 44e7a4c583e4f48e6a8d569e1beff7e9befa6a6f
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Sat Dec 23 16:43:48 2017 +0100

    ContactDataRow: remove some unnecessary fields.

 src/contacts-view.vala |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/src/contacts-view.vala b/src/contacts-view.vala
index 249c9c0..ef48c6c 100644
--- a/src/contacts-view.vala
+++ b/src/contacts-view.vala
@@ -22,18 +22,16 @@ using Gee;
 public class Contacts.View : ListBox {
   private class ContactDataRow : ListBoxRow {
     public Contact contact;
-    public Grid grid;
     public Label label;
     public ContactFrame image_frame;
     public CheckButton selector_button;
     public int sort_prio;
-    public string display_name;
-    public unichar initial_letter;
     public bool filtered;
 
     public ContactDataRow(Contact c) {
       this.contact = c;
-      grid = new Grid ();
+
+      Grid grid = new Grid ();
       grid.margin = 6;
       grid.set_column_spacing (10);
       image_frame = new ContactFrame (Contact.LIST_AVATAR_SIZE);
@@ -58,12 +56,10 @@ public class Contacts.View : ListBox {
     }
 
     public void update_data (bool filtered) {
-      this.display_name = this.contact.display_name;
-      this.initial_letter = this.contact.initial_letter;
       this.filtered = filtered;
 
       // Update widgets
-      this.label.set_text (this.display_name);
+      this.label.set_text (this.contact.display_name);
       this.image_frame.set_image (this.contact.individual, this.contact);
     }
   }
@@ -132,13 +128,13 @@ public class Contacts.View : ListBox {
     if (a_prio < b_prio)
       return 1;
 
-    if (is_set (a_data.display_name) && is_set (b_data.display_name))
-      return a_data.display_name.collate (b_data.display_name);
+    if (is_set (a_data.contact.display_name) && is_set (b_data.contact.display_name))
+      return a_data.contact.display_name.collate (b_data.contact.display_name);
 
     // Sort empty names last
-    if (is_set (a_data.display_name))
+    if (is_set (a_data.contact.display_name))
       return -1;
-    if (is_set (b_data.display_name))
+    if (is_set (b_data.contact.display_name))
       return 1;
 
     return 0;