[Opensync-commits] r5140 - in plugins/gpe: . src

[<dg...@su...>]

Author: Graham Cobb
Date: Wed Jan 14 12:18:16 2009
New Revision: 5140
URL: http://www.opensync.org/changeset/5140

Log:
gpe-sync: Fix change type handling

Modified:
   plugins/gpe/ChangeLog
   plugins/gpe/src/utils.c

Modified: plugins/gpe/ChangeLog
==============================================================================
--- plugins/gpe/ChangeLog	Wed Jan 14 11:00:59 2009	(r5139)
+++ plugins/gpe/ChangeLog	Wed Jan 14 12:18:16 2009	(r5140)
@@ -1,3 +1,8 @@
+2009-01-14  Graham Cobb  <g+...@co...>
+
+	* src/utils.c (report_change): Fix setting objtype of data in change.
+	Fix setting change type.
+
 2009-01-13  Graham Cobb  <g+...@co...>
 
 	* src/contacts.c (gpe_contacts_commit_change, gpe_contacts_get_changes): 

Modified: plugins/gpe/src/utils.c
==============================================================================
--- plugins/gpe/src/utils.c	Wed Jan 14 11:00:59 2009	(r5139)
+++ plugins/gpe/src/utils.c	Wed Jan 14 12:18:16 2009	(r5140)
@@ -89,6 +89,7 @@
 	  osync_error_unref(&error);
 	  return FALSE;
 	}
+	osync_data_set_objtype (data, type);
 
 	OSyncChange *change = osync_change_new (&error);
 	if (!change) {
@@ -105,16 +106,16 @@
 	sprintf (buf, "gpe-%s-%s", type, uid);
 	osync_change_set_uid (change, buf);
 
-	osync_change_set_objtype (change, type);
 	osync_change_set_hash (change, hash);
 	osync_change_set_data (change, data);
 	
 	OSyncChangeType changetype = osync_hashtable_get_changetype(sinkenv->hashtable, change);
+	osync_change_set_changetype(change, changetype);
+	osync_hashtable_update_change (sinkenv->hashtable, change);
+
 	if (changetype != OSYNC_CHANGE_TYPE_UNMODIFIED) {
-	  osync_change_set_changetype(change, changetype);
 	  osync_context_report_change (ctx, change);
 	}
-	osync_hashtable_update_change (sinkenv->hashtable, change);
 
 	osync_change_unref(change);