f-spot r4044 - in trunk/extensions: . BeagleService GalleryExport

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Thu Jun  5 08:41:14 2008
New Revision: 4044
URL: http://svn.gnome.org/viewvc/f-spot?rev=4044&view=rev

Log:
2008-06-05  Stephane Delcroix  <sdelcroix novell com>

	* GalleryExport/*: Fixes 536661, handle more exceptions at login

	* BeagleService: reduce the debug verbosity.


Modified:
   trunk/extensions/BeagleService/BeagleService.addin.xml
   trunk/extensions/BeagleService/BeagleService.cs
   trunk/extensions/ChangeLog
   trunk/extensions/GalleryExport/GalleryExport.addin.xml
   trunk/extensions/GalleryExport/GalleryExport.cs

Modified: trunk/extensions/BeagleService/BeagleService.addin.xml
==============================================================================
--- trunk/extensions/BeagleService/BeagleService.addin.xml	(original)
+++ trunk/extensions/BeagleService/BeagleService.addin.xml	Thu Jun  5 08:41:14 2008
@@ -1,6 +1,6 @@
 <Addin namespace="FSpot"
 	id="BeagleService"
-	version="0.4.3.9"
+	version="0.4.4.0"
 	description="Notify Beagle on image changes"
 	author="Stephane Delcroix"
 	url="http://f-spot.org/Extensions";

Modified: trunk/extensions/BeagleService/BeagleService.cs
==============================================================================
--- trunk/extensions/BeagleService/BeagleService.cs	(original)
+++ trunk/extensions/BeagleService/BeagleService.cs	Thu Jun  5 08:41:14 2008
@@ -37,8 +37,8 @@
 
 		private void HandleDbItemsChanged (object sender, DbItemEventArgs args)
 		{
-			Log.Warning ("Notifying beagle");
 #if ENABLE_BEAGLE
+			Log.Debug ("Notifying beagle");
 			foreach (DbItem item in args.Items) {
 				if (item as Photo != null)
 					BeagleNotifier.SendUpdate (item as Photo);

Modified: trunk/extensions/GalleryExport/GalleryExport.addin.xml
==============================================================================
--- trunk/extensions/GalleryExport/GalleryExport.addin.xml	(original)
+++ trunk/extensions/GalleryExport/GalleryExport.addin.xml	Thu Jun  5 08:41:14 2008
@@ -1,5 +1,5 @@
 <Addin namespace="FSpot"
-	version="0.4.3.1"
+	version="0.4.4.0"
 	name="Gallery Export"
 	description="This extension allows you to export your photos to PHP Gallery (http://gallery.menalto.com)."
 	author="F-Spot team"

Modified: trunk/extensions/GalleryExport/GalleryExport.cs
==============================================================================
--- trunk/extensions/GalleryExport/GalleryExport.cs	(original)
+++ trunk/extensions/GalleryExport/GalleryExport.cs	Thu Jun  5 08:41:14 2008
@@ -366,6 +366,10 @@
 					    uri.Scheme != Uri.UriSchemeHttps)
 						throw new System.UriFormatException ();
 					
+					//Check for name uniqueness
+					foreach (GalleryAccount acc in GalleryAccountManager.GetInstance ().GetAccounts ())
+						if (acc.Name == name)
+							throw new ArgumentException ("name");
 					GalleryAccount created = new GalleryAccount (name, 
 										     url, 
 										     username,
@@ -401,6 +405,18 @@
 					md.Run ();
 					md.Destroy ();
 					return;
+				} catch (ArgumentException ae) {
+					HigMessageDialog md = 
+						new HigMessageDialog (add_dialog, 
+								      Gtk.DialogFlags.Modal |
+								      Gtk.DialogFlags.DestroyWithParent,
+								      Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
+								      Catalog.GetString ("A Gallery with this name already exists"),
+								      String.Format (Catalog.GetString ("There is already a Gallery with the same name in your registered Galleries. Please choose a unique name.")));
+					System.Console.WriteLine (ae);
+					md.Run ();
+					md.Destroy ();
+					return;
 				} catch (System.Net.WebException we) {
 					HigMessageDialog md = 
 						new HigMessageDialog (add_dialog, 
@@ -412,6 +428,18 @@
 					md.Run ();
 					md.Destroy ();
 					return;
+				} catch (System.Exception se) {
+					HigMessageDialog md = 
+						new HigMessageDialog (add_dialog, 
+								      Gtk.DialogFlags.Modal |
+								      Gtk.DialogFlags.DestroyWithParent,
+								      Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
+								      Catalog.GetString ("Error while connecting to Gallery"),
+								      String.Format (Catalog.GetString ("The following error was encountered while attempting to log in: {0}"), se.Message));
+					Console.WriteLine (se);
+					md.Run ();
+					md.Destroy ();
+					return;
 				}
 			}
 			add_dialog.Destroy ();