[Opensync-commits] r4997 - trunk/opensync/engine

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

Author: dgollub
Date: Sun Jan  4 18:44:35 2009
New Revision: 4997
URL: http://www.opensync.org/changeset/4997

Log:
Only invoke demerge if member has capabilities defiened.

Modified:
   trunk/opensync/engine/opensync_obj_engine.c

Modified: trunk/opensync/engine/opensync_obj_engine.c
==============================================================================
--- trunk/opensync/engine/opensync_obj_engine.c	Sun Jan  4 18:36:21 2009	(r4996)
+++ trunk/opensync/engine/opensync_obj_engine.c	Sun Jan  4 18:44:35 2009	(r4997)
@@ -1110,6 +1110,7 @@
 
 				/* Merger - Save the entire data and demerge */
 				if (osync_group_get_merger_enabled(osync_engine_get_group(engine->parent)) &&
+						osync_member_get_capabilities(member) &&
 						osync_group_get_converter_enabled(osync_engine_get_group(engine->parent)) &&	
 						entry_engine->change &&
 						(osync_change_get_changetype(entry_engine->change) != OSYNC_CHANGE_TYPE_DELETED) &&
@@ -1122,7 +1123,6 @@
 						const char *objtype = NULL;
 						OSyncMapping *mapping = NULL;
 						OSyncCapabilities *caps;
-						OSyncMember *member = osync_client_proxy_get_member(sinkengine->proxy);
 						OSyncObjFormat *objformat = osync_change_get_objformat(entry_engine->change);
 
 						osync_trace(TRACE_INTERNAL, "Entry %s for member %lli: Dirty: %i", osync_change_get_uid(entry_engine->change), memberid, osync_entry_engine_is_dirty(entry_engine));