conduit r1489 - in trunk: . conduit/modules

[johncarr svn gnome org]

Author: johncarr
Date: Mon Jun  2 22:25:38 2008
New Revision: 1489
URL: http://svn.gnome.org/viewvc/conduit?rev=1489&view=rev

Log:
2008-06-02  John Carr  <john carr unrouted co uk>

        * conduit/modules/SynceModule.py:
        Keep self.objects around longer, so that conflict handling copes
        better.



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

Modified: trunk/conduit/modules/SynceModule.py
==============================================================================
--- trunk/conduit/modules/SynceModule.py	(original)
+++ trunk/conduit/modules/SynceModule.py	Mon Jun  2 22:25:38 2008
@@ -124,15 +124,16 @@
         self.engine = SyncEngineWrapper()    
         self.engine.Connect()
         self.engine.Synchronize()
+
+    def get_all(self):
+        DataProvider.TwoWay.get_all(self)
+        self.objects = {}
         self.engine.Prefill([TYPETONAMES[self._type_id_]])
         chgs = self.engine.GetRemoteChanges([self._type_id_])
         for guid, chgtype, data in chgs[self._type_id_]:
             uid = array.array('B', guid).tostring()
             blob = array.array('B', data).tostring()
             self.objects[uid] = self._blob_to_data(uid, blob)
- 
-    def get_all(self):
-        DataProvider.TwoWay.get_all(self)
         return [x for x in self.objects.iterkeys()]
 
     def get(self, LUID):
@@ -189,7 +190,6 @@
         #self.engine.AcknowledgeRemoteChanges
         self.engine.Synchronize()
         self.engine.FlushItemDB()
-        self.objects = {}
 
     def _blob_to_data(self, uid, blob):
         #raise NotImplementedError