[gnome-contacts] Nicer name for non-My Contacts google persona stores

[Alexander Larsson <alexl src gnome org>]

commit 53e14d6dfcc6907d51ad935fe028267d4c892819
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Jan 23 09:53:36 2012 +0100

    Nicer name for non-My Contacts google persona stores

 src/contacts-contact-pane.vala |    2 +-
 src/contacts-contact.vala      |   11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index 2c645b8..9a8d85d 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -1310,7 +1310,7 @@ public class Contacts.PersonaSheet : Grid {
       Contact.persona_has_writable_property (persona, "postal-addresses");
 
     if (!persona.store.is_primary_store) {
-      header = new TitleFieldRow (this, Contact.format_persona_store_name_for_contact (persona.store));
+      header = new TitleFieldRow (this, Contact.format_persona_store_name_for_contact (persona));
       this.attach (header, 0, row_nr++, 1, 1);
 
       header.clicked.connect ( () => {
diff --git a/src/contacts-contact.vala b/src/contacts-contact.vala
index 6476b30..66c8203 100644
--- a/src/contacts-contact.vala
+++ b/src/contacts-contact.vala
@@ -1083,7 +1083,7 @@ public class Contacts.Contact : GLib.Object  {
     foreach (var p in individual.personas) {
       if (!first)
 	stores += ", ";
-      stores += format_persona_store_name_for_contact (p.store);
+      stores += format_persona_store_name_for_contact (p);
       first = false;
     }
     return stores;
@@ -1115,11 +1115,16 @@ public class Contacts.Contact : GLib.Object  {
     return store.display_name;
   }
 
-  public static string format_persona_store_name_for_contact (PersonaStore store) {
+  public static string format_persona_store_name_for_contact (Persona persona) {
+    var store = persona.store;
     if (store.type_id == "eds") {
       unowned string? eds_name = lookup_esource_name_by_uid_for_contact (store.id);
-      if (eds_name != null)
+      if (eds_name != null) {
+	var g = persona as GroupDetails;
+	if (g != null && !g.groups.contains (eds_personal_google_group_name ()))
+	  return _("Google Other Contact");
 	return eds_name;
+      }
     }
     if (store.type_id == "telepathy") {
       var account = (store as Tpf.PersonaStore).account;