Refactor link/unlink operations

This cleans up how linking and unlinking is done, by using the methodes
provided by folks.

1 files changed, 12 insertions, 4 deletions

diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index 9e048ef..adaafeb 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -89,10 +89,12 @@ public class Contacts.ContactPane : Stack {
 
     this.suggestion_grid.suggestion_accepted.connect ( () => {
         var linked_contact = this.individual.display_name;
-        link_contacts.begin (this.individual, i, this.store, (obj, result) => {
-            var operation = link_contacts.end (result);
-            this.contacts_linked (null, linked_contact, operation);
-          });
+        var operation = new LinkOperation (this.store);
+        var to_link = new LinkedList<Individual> ();
+        to_link.add (this.individual);
+        to_link.add (i);
+        operation.do.begin (to_link);
+        this.contacts_linked (null, linked_contact, operation);
         remove_suggestion_grid ();
       });
 
@@ -260,6 +262,12 @@ public class Contacts.ContactPane : Stack {
         show_message (e.message);
       }
     }
+
+    /* unlink personas */
+    if (this.editor.get_unlink_personas ().size > 0) {
+      var operation = new UnLinkOperation (this.store);
+      operation.do.begin (this.individual, this.editor.get_unlink_personas ());
+    }
   }
 
   public void new_contact () {