[tomboy/autosync: 9/15] Merge branch 'lessnoisysync' into autosync

[Sanford Armstrong <sharm src gnome org>]

commit 0e60e8a6759cf7d8e7a1ac822c9777de58705761
Merge: d7adc1a e801324
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Sun Feb 7 17:48:02 2010 -0800

    Merge branch 'lessnoisysync' into autosync

 Tomboy/Note.cs                        |   40 ++++++++++++++++-------
 Tomboy/Synchronization/SyncManager.cs |   56 +++++++++++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 14 deletions(-)
---
diff --cc Tomboy/Synchronization/SyncManager.cs
index b623399,40b08f9..469a023
--- a/Tomboy/Synchronization/SyncManager.cs
+++ b/Tomboy/Synchronization/SyncManager.cs
@@@ -374,9 -321,10 +374,10 @@@ namespace Tomboy.Syn
  				{
  					if (FindNoteByUUID (noteUpdate.UUID) == null) {
  						Note existingNote = NoteMgr.Find (noteUpdate.Title);
- 						if (existingNote != null) {
+ 						if (existingNote != null && !noteUpdate.BasicallyEqualTo (existingNote)) {
+ //							Logger.Debug ("Sync: Early conflict detection for '{0}'", noteUpdate.Title);
 -							if (NoteConflictDetected != null) {
 -								NoteConflictDetected (NoteMgr, existingNote, noteUpdate, noteUpdateTitles);
 +							if (syncUI != null) {
 +								syncUI.NoteConflictDetected (NoteMgr, existingNote, noteUpdate, noteUpdateTitles);
  
  								// Suspend this thread while the GUI is presented to
  								// the user.