conduit r1812 - in trunk: . conduit/modules

[jstowers svn gnome org]

Author: jstowers
Date: Tue Jan 20 01:16:04 2009
New Revision: 1812
URL: http://svn.gnome.org/viewvc/conduit?rev=1812&view=rev

Log:
2009-01-20  John Stowers  <john stowers gmail com>

	* conduit/modules/TomboyModule.py: Tomboy arguements
	to SyncException are reversed.
	Fixes #568363 (Brian Teague)



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/TomboyModule.py

Modified: trunk/conduit/modules/TomboyModule.py
==============================================================================
--- trunk/conduit/modules/TomboyModule.py	(original)
+++ trunk/conduit/modules/TomboyModule.py	Tue Jan 20 01:16:04 2009
@@ -237,7 +237,7 @@
                 log.info("Updating note")
                 self._update_note(LUID, note)
             else:
-                raise Exceptions.SynchronizeConflictError(comp, existingNote, note)
+                raise Exceptions.SynchronizeConflictError(comp, note, existingNote)
         else:                    
             log.info("Saving new Note")
             LUID = self._create_note(note)