[gnome-contacts] Fix a bunch of warnings about exceptions

[Alexander Larsson <alexl src gnome org>]

commit 674e169e599368454e27bf614a0cba476f39ab0d
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Mar 5 16:33:56 2012 +0100

    Fix a bunch of warnings about exceptions

 src/contacts-avatar-dialog.vala |   16 ++++++++--------
 src/contacts-contact.vala       |    2 +-
 src/contacts-utils.vala         |   14 +++++++++++---
 3 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/src/contacts-avatar-dialog.vala b/src/contacts-avatar-dialog.vala
index b1b3146..4a3f35b 100644
--- a/src/contacts-avatar-dialog.vala
+++ b/src/contacts-avatar-dialog.vala
@@ -93,13 +93,10 @@ public class Contacts.AvatarDialog : Dialog {
   }
 
   private void selected_pixbuf (Gdk.Pixbuf pixbuf) {
-    try {
-      var p = pixbuf.scale_simple (main_size, main_size, Gdk.InterpType.HYPER);
-      main_frame.set_pixbuf (p);
+    var p = pixbuf.scale_simple (main_size, main_size, Gdk.InterpType.HYPER);
+    main_frame.set_pixbuf (p);
 
-      new_pixbuf = pixbuf;
-    } catch {
-    }
+    new_pixbuf = pixbuf;
   }
 
   private void update_grid () {
@@ -340,8 +337,11 @@ public class Contacts.AvatarDialog : Dialog {
     response.connect ( (response_id) => {
 	if (response_id == ResponseType.CLOSE) {
 	  if (new_pixbuf != null) {
-	    var icon = new MemoryIcon.from_pixbuf (new_pixbuf);
-	    set_avatar (icon);
+	    try {
+	      var icon = new MemoryIcon.from_pixbuf (new_pixbuf);
+	      set_avatar (icon);
+	    } catch {
+	    }
 	  }
 	}
 	this.destroy ();
diff --git a/src/contacts-contact.vala b/src/contacts-contact.vala
index 14311f9..cfd4982 100644
--- a/src/contacts-contact.vala
+++ b/src/contacts-contact.vala
@@ -1036,7 +1036,7 @@ public class Contacts.Contact : GLib.Object  {
     return false;
   }
 
-  public async void remove_personas () {
+  public async void remove_personas () throws Folks.PersonaStoreError {
     var personas = new HashSet<Persona> ();
     foreach (var p in individual.personas) {
       if (p.store.can_remove_personas == MaybeBool.TRUE &&
diff --git a/src/contacts-utils.vala b/src/contacts-utils.vala
index 5ab27eb..6754d1f 100644
--- a/src/contacts-utils.vala
+++ b/src/contacts-utils.vala
@@ -206,7 +206,7 @@ public class Contacts.Utils : Object {
     entry.select_region (start, end);
   }
 
-  private static void spawn_app (GLib.Settings app_settings) {
+  private static void spawn_app (GLib.Settings app_settings) throws GLib.SpawnError {
     var needs_term = app_settings.get_boolean("needs-term");
     var exec = app_settings.get_string("exec");
     if (needs_term) {
@@ -237,9 +237,17 @@ public class Contacts.Utils : Object {
 	args[3] = "calendar:///?startdate=%.4d%.2d%.2d".printf (today.get_year (), d.get_month (), d.get_day_of_month ());
       }
 
-      Process.spawn_async (null, args, null, SpawnFlags.SEARCH_PATH, null, null);
+      try {
+	Process.spawn_async (null, args, null, SpawnFlags.SEARCH_PATH, null, null);
+      }
+      catch {
+      }
     } else {
-      spawn_app (calendar_settings);
+      try {
+	spawn_app (calendar_settings);
+      }
+      catch {
+      }
     }
   }