tomboy r2347 - in trunk: . Tomboy/Addins/WebDavSyncService data

[sharm svn gnome org]

Author: sharm
Date: Mon Feb 16 20:26:58 2009
New Revision: 2347
URL: http://svn.gnome.org/viewvc/tomboy?rev=2347&view=rev

Log:
* data/tomboy.schemas.in:
* Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs: Add
  hidden gconf preference to support passing "-ac" option to wdfs,
  accepting SSL certificates without prompting the user. Beginning of
  fix for bug #531364.

Modified:
   trunk/ChangeLog
   trunk/Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs
   trunk/data/tomboy.schemas.in

Modified: trunk/Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs
==============================================================================
--- trunk/Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs	(original)
+++ trunk/Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs	Mon Feb 16 20:26:58 2009
@@ -152,7 +152,7 @@
 			else
 				GetPrefWidgetSettings (out url, out username, out password);
 			
-			return GetFuseMountExeArgs (mountPath, url, username, password);
+			return GetFuseMountExeArgs (mountPath, url, username, password, AcceptSslCert);
 		}
 		
 		protected override string GetFuseMountExeArgsForDisplay (string mountPath, bool fromStoredValues)
@@ -164,16 +164,17 @@
 				GetPrefWidgetSettings (out url, out username, out password);
 			
 			// Mask password
-			return GetFuseMountExeArgs (mountPath, url, username, "*****");
+			return GetFuseMountExeArgs (mountPath, url, username, "*****", AcceptSslCert);
 		}
 		
-		private string GetFuseMountExeArgs (string mountPath, string url, string username, string password)
+		private string GetFuseMountExeArgs (string mountPath, string url, string username, string password, bool acceptSsl)
 		{
-			return string.Format ("{0} -a {1} -u {2} -p {3} -o fsname=tomboywdfs",
+			return string.Format ("{0} -a {1} -u {2} -p {3} {4} -o fsname=tomboywdfs",
 			                      mountPath,
 			                      url,
 			                      username,
-			                      password);
+			                      password,
+			                      acceptSsl ? "-ac" : string.Empty);
 		}
 
 		protected override string FuseMountExeName
@@ -282,6 +283,16 @@
 			       && !string.IsNullOrEmpty (username)
 			       && !string.IsNullOrEmpty (password);
 		}
+
+		private bool AcceptSslCert {
+			get {
+				try {
+					return (bool) Preferences.Get ("/apps/tomboy/sync/wdfs/accept_sslcert");
+				} catch {
+					return false;
+				}
+			}
+		}
 		#endregion // Private Methods
 	}
 }

Modified: trunk/data/tomboy.schemas.in
==============================================================================
--- trunk/data/tomboy.schemas.in	(original)
+++ trunk/data/tomboy.schemas.in	Mon Feb 16 20:26:58 2009
@@ -501,6 +501,20 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/tomboy/sync/wdfs/accept_sslcert</key>
+      <applyto>/apps/tomboy/sync/wdfs/accept_sslcert</applyto>
+      <owner>tomboy</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+         <short>Accept SSL Certificates</short>
+         <long>
+	   Use wdfs option "-ac" to accept SSL certificates without prompting the user.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/tomboy/sync/sync_conflict_behavior</key>
       <applyto>/apps/tomboy/sync/sync_conflict_behavior</applyto>
       <owner>tomboy</owner>