Navigation

← Previous Changeset
Next Changeset →

Changeset 2333

Timestamp:

07/14/07 16:10:23 (1 year ago)

Author:

jerryyu

Message:

Replace xml-contact with xmlformat-contact because xmlformat-contact instead of xml-contact is defined in the Vformat plugin.
Replace palm-format with palm-contact because this is for palm contact initialization and palm-format isn't defined.
Currently only palm contact is ported to 0.30 API. And contact sink, event sink and todo sink should be registerd respectively with the connect, disconnect function.

Files:

plugins/palm/src/palm_contact.c (modified) (4 diffs)
plugins/palm/src/palm_format.c (modified) (2 diffs)
plugins/palm/src/palm_sync.c (modified) (4 diffs)
plugins/palm/src/palm_sync.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

plugins/palm/src/palm_contact.c

r1266	r2333
35	35	if (!change)
36	36	goto error;
37
	37
38	38	OSyncData *data = osync_data_new(NULL, 0, env->contact_format, error);
39	39	if (!data)
…	…
306	306
307	307	osync_context_report_success(ctx);
	308
	309	psyncSyncDone(data, info, ctx);
308	310	osync_trace(TRACE_EXIT, "%s", __func__);
309	311	return;
…	…
313	315	{
314	316	OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info);
315		env->contact_format = osync_format_env_find_objformat(formatenv, "palm-~~forma~~t");
	317	env->contact_format = osync_format_env_find_objformat(formatenv, "palm-contact");
316	318
317	319	env->contact_sink = osync_objtype_sink_new("contact", error);
…	…
319	321	return FALSE;
320	322
321		osync_objtype_sink_add_objformat(env->contact_sink, "palm-~~forma~~t");
	323	osync_objtype_sink_add_objformat(env->contact_sink, "palm-contact");
322	324
323	325	OSyncObjTypeSinkFunctions functions;
324	326	memset(&functions, 0, sizeof(functions));
	327	functions.connect= psyncConnect;
	328	functions.disconnect= psyncDisconnect;
325	329	functions.get_changes = psyncContactGetChanges;
326	330	functions.commit = psyncContactCommit;

plugins/palm/src/palm_format.c

r1477	r2333
2157	2157	}
2158	2158
2159		OSyncObjFormat *xmlContact = osync_format_env_find_objformat(env, "xml-contact");
	2159	OSyncObjFormat *xmlContact = osync_format_env_find_objformat(env, "xmlformat-contact");
2160	2160	if (!xmlContact) {
2161		osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to find xml-contact format");
	2161	osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to find xmlformat-contact format");
2162	2162	return FALSE;
2163	2163	}
…	…
2197	2197	osync_env_format_set_demarshall_func(env, "palm-contact", demarshall_palm_contact);
2198	2198
2199		osync_env_register_converter(env, CONVERTER_CONV, "palm-contact", "xml-contact", conv_palm_contact_to_xml);
2200		osync_env_register_converter(env, CONVERTER_CONV, "xml-contact", "palm-contact", conv_xml_to_palm_contact);
	2199	osync_env_register_converter(env, CONVERTER_CONV, "palm-contact", "xmlformat-contact", conv_palm_contact_to_xml);
	2200	osync_env_register_converter(env, CONVERTER_CONV, "xmlformat-contact", "palm-contact", conv_xml_to_palm_contact);
2201	2201
2202	2202	osync_env_register_objtype(env, "todo");

plugins/palm/src/palm_sync.c

r1755	r2333
661	661	}
662	662
663		~~static~~ void psyncConnect(void data, OSyncPluginInfo info, OSyncContext *ctx)
	663	void psyncConnect(void data, OSyncPluginInfo info, OSyncContext *ctx)
664	664	{
665	665	OSyncError *error = NULL;
…	…
732	732	}
733	733
734		~~static~~ void psyncSyncDone(void data, OSyncPluginInfo info, OSyncContext *ctx)
	734	void psyncSyncDone(void data, OSyncPluginInfo info, OSyncContext *ctx)
735	735	{
736	736	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
…	…
754	754	}
755	755
756		~~static~~ void psyncDisconnect(void data, OSyncPluginInfo info, OSyncContext *ctx)
	756	void psyncDisconnect(void data, OSyncPluginInfo info, OSyncContext *ctx)
757	757	{
758	758	osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx);
…	…
790	790
791	791	/* Add the main sink */
792		OSyncObjTypeSink *sink = osync_objtype_sink_new(NULL, error);
793		if (!sink)
794		goto error_free_env;
	792	//OSyncObjTypeSink *sink = osync_objtype_sink_new(NULL, error);
	793	//if (!sink)
	794	// goto error_free_env;
795	795
796	796	/* All sinks have the same functions of course */
797		OSyncObjTypeSinkFunctions functions;
798		memset(&functions, 0, sizeof(functions));
799		functions.connect = psyncConnect;
800		functions.disconnect = psyncDisconnect;
801		functions.sync_done = psyncSyncDone;
802
803		osync_objtype_sink_set_functions(sink, functions, NULL);
804		osync_plugin_info_add_objtype(info, sink);
	797	//OSyncObjTypeSinkFunctions functions;
	798	//memset(&functions, 0, sizeof(functions));
	799	//functions.connect = psyncConnect;
	800	//functions.disconnect = psyncDisconnect;
	801	//functions.sync_done = psyncSyncDone;
	802
	803	//osync_objtype_sink_set_functions(sink, functions, NULL);
	804	//osync_plugin_info_add_objtype(info, sink);
805	805
806	806	psyncThreadStart(env, info);

plugins/palm/src/palm_sync.h

r1266	r2333
124	124	PSyncEntry psyncDBGetEntryByID(PSyncDatabase db, unsigned long id, OSyncError **error);
125	125
	126	void psyncConnect(void data, OSyncPluginInfo info, OSyncContext *ctx);
	127	void psyncDisconnect(void data, OSyncPluginInfo info, OSyncContext *ctx);
	128	void psyncSyncDone(void data, OSyncPluginInfo info, OSyncContext *ctx);
	129
126	130	#endif //_PALM_SYNC_H