f-spot r3802 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Mar 31 12:15:59 2008
New Revision: 3802
URL: http://svn.gnome.org/viewvc/f-spot?rev=3802&view=rev

Log:
2008-03-31  Lorenzo Milesi <maxxer yetopen it>

	* src/SendEmail.cs: fix for bgo 503149: crash on exception in
	sending email.


Modified:
   trunk/ChangeLog
   trunk/src/SendEmail.cs

Modified: trunk/src/SendEmail.cs
==============================================================================
--- trunk/src/SendEmail.cs	(original)
+++ trunk/src/SendEmail.cs	Mon Mar 31 12:15:59 2008
@@ -290,16 +290,29 @@
 					if (UserCancelled)
 					 	break;
 					 	
-					// Prepare a tmp_mail file name
-					FilterRequest request = new FilterRequest (photo.DefaultVersionUri);
+					try {
+						// Prepare a tmp_mail file name
+						FilterRequest request = new FilterRequest (photo.DefaultVersionUri);
 
-					filters.Convert (request);
-					request.Preserve(request.Current);
+						filters.Convert (request);
+						request.Preserve(request.Current);
 
- 					mail_attach.Append(attach_arg.ToString() + request.Current.ToString ());
-					
-					// Mark the path for deletion
-					tmp_paths.Add (request.Current.LocalPath);
+						mail_attach.Append(attach_arg.ToString() + request.Current.ToString ());
+						
+						// Mark the path for deletion
+						tmp_paths.Add (request.Current.LocalPath);
+					} catch (Exception e) {
+						Console.WriteLine("Error preparing {0}: {1}", selection[photo_index].Name, e.Message);
+						HigMessageDialog md = new HigMessageDialog (parent_window, 
+											    DialogFlags.DestroyWithParent,
+											    MessageType.Error,
+											    ButtonsType.Close,
+											    Catalog.GetString("Error processing image"), 
+											    String.Format(Catalog.GetString("An error occured while processing \"{0}\": {1}"), selection[photo_index].Name, e.Message));
+						md.Run();
+						md.Destroy();
+						UserCancelled = true;
+					}
 				}
 			} // foreach