2009-12-09 Michael Hutchinson <mhutchinson@novell.com>MonoDevelop.IPhone-2.2

	* Keychain.cs: More error logging for certificate/identity/key
	  enumeration.

	* gtk-gui/gui.stetic: Flush.


svn path=/branches/monodevelop/extras/MonoDevelop.IPhone/2.2/; revision=148190

3 files changed, 30 insertions, 5 deletions

diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog
index 49fe9770db..04e42512a5 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-09  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Keychain.cs: More error logging for certificate/identity/key
+	  enumeration.
+
+	* gtk-gui/gui.stetic: Flush.
+
 2009-12-07  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* MonoDevelop.IPhone.csproj: Updated.
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Keychain.cs b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Keychain.cs
index be9b15d8a7..13ee0822e6 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Keychain.cs
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/Keychain.cs
@@ -179,7 +179,8 @@ namespace MonoDevelop.IPhone
 			
 			var list = new List<string> ();
 			
-			while (SecKeychainSearchCopyNext (searchRef, out itemRef) == OSStatus.Ok) {
+			OSStatus searchStatus;
+			while ((searchStatus = SecKeychainSearchCopyNext (searchRef, out itemRef)) == OSStatus.Ok) {
 				IntPtr commonName;
 				if (SecCertificateCopyCommonName (itemRef, out commonName) == OSStatus.Ok) {
 					list.Add (FetchString (commonName));
@@ -187,6 +188,9 @@ namespace MonoDevelop.IPhone
 				}
 				CFRelease (itemRef);
 			}
+			if (searchStatus != OSStatus.ItemNotFound)
+				LoggingService.LogWarning ("Unexpected error retrieving certificates from keychain:\n" + GetError (searchStatus));
+			
 			CFRelease (searchRef);
 			return list;
 		}
@@ -202,7 +206,8 @@ namespace MonoDevelop.IPhone
 			
 			var list = new List<string> ();
 			
-			while (SecIdentitySearchCopyNext (searchRef, out itemRef) == OSStatus.Ok) {
+			OSStatus searchStatus;
+			while ((searchStatus = SecIdentitySearchCopyNext (searchRef, out itemRef)) == OSStatus.Ok) {
 				if (SecIdentityCopyCertificate (itemRef, out certRef) == OSStatus.Ok) {
 					if (SecCertificateCopyCommonName (certRef, out commonName) == OSStatus.Ok) {
 						string name = FetchString (commonName);
@@ -214,6 +219,9 @@ namespace MonoDevelop.IPhone
 				}
 				CFRelease (itemRef);
 			}
+			if (searchStatus != OSStatus.ItemNotFound)
+				LoggingService.LogWarning ("Unexpected error retrieving identities from keychain:\n" + GetError (searchStatus));
+			
 			CFRelease (searchRef);
 			return list;
 		}
@@ -237,14 +245,23 @@ namespace MonoDevelop.IPhone
 			
 			var list = new List<X509Certificate2> ();
 			
-			while (SecIdentitySearchCopyNext (searchRef, out itemRef) == OSStatus.Ok) {
+			OSStatus searchStatus;
+			while ((searchStatus = SecIdentitySearchCopyNext (searchRef, out itemRef)) == OSStatus.Ok) {
 				if (SecIdentityCopyCertificate (itemRef, out certRef) == OSStatus.Ok) {
 					CssmData data;
-					if (SecCertificateGetData (certRef, out data) == OSStatus.Ok)
-						list.Add (new X509Certificate2 (data.GetCopy ()));
+					if (SecCertificateGetData (certRef, out data) == OSStatus.Ok) {
+						try {
+							list.Add (new X509Certificate2 (data.GetCopy ()));
+						} catch (Exception ex) {
+							LoggingService.LogWarning ("Error loading signing certificate from keychain", ex);
+						}
+					}
 				}
 				CFRelease (itemRef);
 			}
+			if (searchStatus != OSStatus.ItemNotFound)
+				LoggingService.LogWarning ("Unexpected error code retrieving signing certificates from keychain:\n" + GetError (searchStatus));
+			
 			CFRelease (searchRef);
 			return list;
 		}
diff --git a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/gtk-gui/gui.stetic b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/gtk-gui/gui.stetic
index 88f26e6fe3..89996efa51 100644
--- a/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/gtk-gui/gui.stetic
+++ b/extras/MonoDevelop.IPhone/MonoDevelop.IPhone/gtk-gui/gui.stetic
@@ -10,6 +10,7 @@
     <widget-library name="MonoDevelop.Projects.Gui, Version=2.2.0.0, Culture=neutral" />
     <widget-library name="MonoDevelop.Components, Version=2.2.0.0, Culture=neutral" />
     <widget-library name="MonoDevelop.DesignerSupport, Version=2.2.0.0, Culture=neutral" />
+    <widget-library name="MonoDevelop.AspNet, Version=2.2.0.0, Culture=neutral" />
     <widget-library name="../../build/MonoDevelop.IPhone.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.IPhone.Gui.IPhoneOptionsPanelWidget" design-size="613 234">