← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/tomboy/jaunty

« back to all changes in this revision

Viewing changes to Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2009-02-17 03:08:19 UTC
  • mfrom: (1.1.46 upstream)
  • Revision ID: james.westby@ubuntu.com-20090217030819-87k5mkna0w5tvvqf
Tags: 0.13.5-0ubuntu1
https://launchpad.net/bugs/314516
* New upstream release
  - Removed bundled Mono.Addins. Mono.Addins is
    now a hard dependency.
  - Update printing to use Gtk.Print (#512369, Benjamin Podszun)
    Still buggy.
  - Fix multi-page printing of exported note HTML (#548198)
  - Fix crash when clicking link and browser not set (#569639).
  - 64-bit Windows support (#558272, Jay R. Wren).
  - Search window position saved on Windows/Mac (#559663).
  - Fix lingering tray icon in Windows (#569709, Benjamin Podszun).
  - Fix bug with font settings (#559724, Benjamin Podszun).
  - Mac MonoDevelop solution now easier to build (Doug Johnston et al).
  - Other fixes: #562846 (James Westby) #570917, #570918.
  - Additional updates to note printing (#512369, #572024
    , Benjamin Podszun).
  - Windows installer now requires Novell's GTK# >= 2.12.8 (#569324).
  - Increase/Decrease Indent shortcuts now appear in menu
    (#570334, Benjamin Podszun).
  - No longer writes to disk every 40 seconds (#514434).
  - Fixes to note linking (#323845, Florian).
  - Add GConf preference for auto-accepting SSL Certs in 
    WebDAV sync (#531364).
  - After succcessfully configuring sync, offer to perform 
    first sync (#553079).
* debian/control:
  - Use libgconf2.24-cil and libgnome2.24-cil (LP: #314516)
  - Build-dep on libgnomepanel2.24-cil
  - Remove Build-dep on libgnomeprint and libgnomeprintui
  - Add Vcs headers
* .bzr-builddeb/default.conf: added
* debian/patches/02_configurable_compiler.patch:
  - Removed, merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs
152
152
                        else
153
153
                                GetPrefWidgetSettings (out url, out username, out password);
154
154
                        
155
 
                        return GetFuseMountExeArgs (mountPath, url, username, password);
 
155
                        return GetFuseMountExeArgs (mountPath, url, username, password, AcceptSslCert);
156
156
                }
157
157
                
158
158
                protected override string GetFuseMountExeArgsForDisplay (string mountPath, bool fromStoredValues)
164
164
                                GetPrefWidgetSettings (out url, out username, out password);
165
165
                        
166
166
                        // Mask password
167
 
                        return GetFuseMountExeArgs (mountPath, url, username, "*****");
 
167
                        return GetFuseMountExeArgs (mountPath, url, username, "*****", AcceptSslCert);
168
168
                }
169
169
                
170
 
                private string GetFuseMountExeArgs (string mountPath, string url, string username, string password)
 
170
                private string GetFuseMountExeArgs (string mountPath, string url, string username, string password, bool acceptSsl)
171
171
                {
172
 
                        return string.Format ("{0} -a {1} -u {2} -p {3} -o fsname=tomboywdfs",
 
172
                        return string.Format ("{0} -a {1} -u {2} -p {3} {4} -o fsname=tomboywdfs",
173
173
                                              mountPath,
174
174
                                              url,
175
175
                                              username,
176
 
                                              password);
 
176
                                              password,
 
177
                                              acceptSsl ? "-ac" : string.Empty);
177
178
                }
178
179
 
179
180
                protected override string FuseMountExeName
282
283
                               && !string.IsNullOrEmpty (username)
283
284
                               && !string.IsNullOrEmpty (password);
284
285
                }
 
286
 
 
287
                private bool AcceptSslCert {
 
288
                        get {
 
289
                                try {
 
290
                                        return (bool) Preferences.Get ("/apps/tomboy/sync/wdfs/accept_sslcert");
 
291
                                } catch {
 
292
                                        return false;
 
293
                                }
 
294
                        }
 
295
                }
285
296
                #endregion // Private Methods
286
297
        }
287
298
}