Catch some unhandled errors and print warnings

It may be desirable to propagate these errors further (to the UI),
but printing warnings will do for now.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/contacts-linking.vala b/src/contacts-linking.vala
index 2a3f44e..e864c18 100644
--- a/src/contacts-linking.vala
+++ b/src/contacts-linking.vala
@@ -743,11 +743,19 @@ namespace Contacts {
 	}
       }
       if (ind != null) {
-	yield App.app.contacts_store.aggregator.unlink_individual (ind);
+        try {
+	  yield App.app.contacts_store.aggregator.unlink_individual (ind);
+	} catch (GLib.Error e1) {
+	  warning ("Error unlinking individual ‘%s’: %s", ind.id, e1.message);
+	}
       }
 
       foreach (var ps in old_personas_distribution) {
-	yield App.app.contacts_store.aggregator.link_personas (ps);
+        try {
+	  yield App.app.contacts_store.aggregator.link_personas (ps);
+	} catch (GLib.Error e1) {
+	  warning ("Error linking personas: %s", e1.message);
+	}
       }
     }
   }
@@ -762,7 +770,12 @@ namespace Contacts {
       operation.add_persona_set (ps);
     }
 
-    yield App.app.contacts_store.aggregator.link_personas (all_personas);
+    try {
+      yield App.app.contacts_store.aggregator.link_personas (all_personas);
+    } catch (GLib.Error e1) {
+      warning ("Error linking personas: %s", e1.message);
+    }
+
     return operation;
   }
 }