[gnome-contacts] Centralize secondary string on card handling

[Alexander Larsson <alexl src gnome org>]

commit c164789298247202475dd406f49d542c872e0649
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Sep 1 13:46:44 2011 +0200

    Centralize secondary string on card handling

 src/contacts-contact-pane.vala |   15 +++------------
 src/contacts-contact.vala      |   19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index a3b6109..d456b1c 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -1077,10 +1077,10 @@ public class Contacts.ContactPane : Grid {
     l.xalign = 0.0f;
     g.attach (l,  0, 0, 1, 1);
 
-    var nick = contact.individual.nickname;
-    if (nick != null && nick.length > 0) {
+    var secondary = contact.get_secondary_string ();
+    if (secondary != null) {
       l = new Label (null);
-      l.set_markup ("<span font='12px' rise='1000'>\xE2\x80\x9C" + nick + "\xE2\x80\x9D</span>");
+      l.set_markup ("<span font='12px' rise='1000'>"+secondary+"</span>");
       l.set_halign (Align.START);
       l.set_valign (Align.START);
       l.set_ellipsize (Pango.EllipsizeMode.END);
@@ -1088,15 +1088,6 @@ public class Contacts.ContactPane : Grid {
       g.attach (l,  0, 1, 1, 1);
     }
 
-    /* TODO:
-    l = new Label ("<title>, <Company>");
-    l.set_halign (Align.START);
-    l.set_valign (Align.START);
-    l.set_ellipsize (Pango.EllipsizeMode.END);
-    l.xalign = 0.0f;
-    g.attach (l,  0, 2, 1, 1);
-    */
-
     var merged_presence = contact.create_merged_presence_widget ();
     merged_presence.set_halign (Align.START);
     merged_presence.set_valign (Align.END);
diff --git a/src/contacts-contact.vala b/src/contacts-contact.vala
index 01a68b5..418ea11 100644
--- a/src/contacts-contact.vala
+++ b/src/contacts-contact.vala
@@ -155,6 +155,25 @@ public class Contacts.Contact : GLib.Object  {
     }
   }
 
+  // Synchronize with get_secondary_string ()
+  public string? get_secondary_string_source () {
+    var nick = individual.nickname;
+    if (nick != null && nick.length > 0)
+      return "nickname";
+    return null;
+  }
+
+  // Synchronize with get_secondary_string_source ()
+  public string? get_secondary_string () {
+    var nick = individual.nickname;
+    if (nick != null && nick.length > 0)
+      return "\xE2\x80\x9C" + nick + "\xE2\x80\x9D";
+
+    /* TODO: "<title>, <Company>" */
+
+    return null;
+  }
+
   public static bool persona_has_writable_property (Persona persona, string property) {
     // TODO: This should check the writibility on the FakePersona store,
     // but that is not availible in folks yet