[gnome-contacts] Make linking other-to-other actually work



commit 6c5e0456fea53a3776a36b746298aa219cd3b766
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Feb 27 11:19:09 2012 +0100

    Make linking other-to-other actually work
    
    Missed the !is_main case in the last commit

 src/contacts-contact.vala |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/contacts-contact.vala b/src/contacts-contact.vala
index a6cfa17..0a2ea80 100644
--- a/src/contacts-contact.vala
+++ b/src/contacts-contact.vala
@@ -1174,11 +1174,9 @@ public class Contacts.Contact : GLib.Object  {
     if (!App.app.contacts_store.may_suggest_link (this, other))
       return false;
 
-    /* Only connect main contacts with non-mainable contacts. */
-    if (this.is_main && !other.has_mainable_persona()) {
-      return true;
-    }
-    return false;
+    /* Only connect main contacts with non-mainable contacts.
+       non-main contacts can link to any other */
+    return !this.is_main || !other.has_mainable_persona();
   }
 
   private static bool persona_is_google (Persona persona) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]