[Opensync-commits] r5723 - in plugins/evolution2: . src

[<svn...@op...>]

Author: dgollub
Date: Tue Sep  1 13:43:30 2009
New Revision: 5723
URL: http://www.opensync.org/changeset/5723

Log:
Merge evo2-sync branch for ticket #1084

Modified:
   plugins/evolution2/   (props changed)
   plugins/evolution2/src/evolution2_capabilities.c
   plugins/evolution2/src/evolution2_sync.c

Modified: plugins/evolution2/src/evolution2_capabilities.c
==============================================================================
--- plugins/evolution2/src/evolution2_capabilities.c	Tue Sep  1 13:42:37 2009	(r5722)
+++ plugins/evolution2/src/evolution2_capabilities.c	Tue Sep  1 13:43:30 2009	(r5723)
@@ -100,8 +100,11 @@
 	osync_assert(fields);
 	osync_assert(objtype);
 
+	OSyncCapabilitiesObjType *capsobjtype = osync_capabilities_objtype_new(caps, objtype, error);
+
 	for(; fields; fields = g_list_next(fields)) {
 
+#if 0
 		const char *value = g_hash_table_lookup(hash, fields->data);
 		if (value == NULL) {
 			osync_trace(TRACE_INTERNAL, "%s: ebook capability '%s' could not be translated", __func__, fields->data);
@@ -113,6 +116,12 @@
 				goto error;
 			}
 		}
+#endif
+		OSyncCapability *cap = osync_capability_new(capsobjtype, error);
+		if (!cap)
+			goto error;
+
+		osync_capability_set_name(cap, (const char *) fields->data);
 	}
 
 	osync_trace(TRACE_EXIT, "%s", __func__);

Modified: plugins/evolution2/src/evolution2_sync.c
==============================================================================
--- plugins/evolution2/src/evolution2_sync.c	Tue Sep  1 13:42:37 2009	(r5722)
+++ plugins/evolution2/src/evolution2_sync.c	Tue Sep  1 13:43:30 2009	(r5723)
@@ -183,7 +183,7 @@
 	osync_version_unref(version);
 
 	OSyncCapabilities *capabilities;
-	capabilities = osync_capabilities_new(error);
+	capabilities = osync_capabilities_new("evo2-caps", error);
 	if (!evo2_ebook_discover(env, capabilities, error)) {
 		goto error_free_capabilties;
 	}