tomboy r1349 - in branches/tomboy-sync: . Tomboy

[sharm svn gnome org]

Author: sharm
Date: 2007-07-29 18:17:28 +0100 (Sun, 29 Jul 2007)
New Revision: 1349
ViewCVS link: http://svn.gnome.org/viewcvs/tomboy?rev=1349&view=rev

Modified:
   branches/tomboy-sync/ChangeLog
   branches/tomboy-sync/Tomboy/Note.cs
   branches/tomboy-sync/Tomboy/NoteManager.cs
   branches/tomboy-sync/Tomboy/Preferences.cs
   branches/tomboy-sync/Tomboy/RemoteControl.cs
   branches/tomboy-sync/Tomboy/SyncDialog.cs
   branches/tomboy-sync/Tomboy/SyncManager.cs
   branches/tomboy-sync/Tomboy/Watchers.cs
Log:
* Tomboy/SyncDialog.cs: Better conflict handling; also added "Always
  perform this action" check button.
* Tomboy/SyncManager.cs: Conflict handling and other fixes.
* Tomboy/Watchers.cs: In the NoteRenameWatcher, handle a rename when
  the editor widget loses focus.
* Tomboy/RemoteControl.cs: Implemented GetNoteCompleteXml.
* Tomboy/NoteManager.cs: Updated conflicting title exception messages
  to say what the title is.
* Tomboy/Preferences.cs: Added SYNC_CONFIGURED_CONFLICT_BEHAVIOR. 
  Still need to expose in preferences dialog.
* Tomboy/Note.cs: Added GetCompleteNoteXml and RenameWithoutLinkUpdate
  methods.  Ensuring that any time the note title is changed, a save
  is queued.