Menu
▾
▴
[Opensync-commits] r5642 - in plugins/gpe: . src
|
From: <svn...@op...> - 2009-05-14 19:05:01
|
Author: Graham Cobb Date: Thu May 14 21:04:43 2009 New Revision: 5642 URL: http://www.opensync.org/changeset/5642 Log: gpe-sync: Bug 1086: Drop OSyncObjTypeSinkFunctions Modified: plugins/gpe/ChangeLog plugins/gpe/src/calendar.c plugins/gpe/src/contacts.c plugins/gpe/src/gpe_sync.c plugins/gpe/src/todo.c Modified: plugins/gpe/ChangeLog ============================================================================== --- plugins/gpe/ChangeLog Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/ChangeLog Thu May 14 21:04:43 2009 (r5642) @@ -1,3 +1,28 @@ +2009-05-14 Graham Cobb <g+...@co...> + + * src/calendar.c (gpe_calendar_setup): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new + osync_objtype_sink_set_*_func() calls + + * src/contacts.c (gpe_contacts_setup): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new + osync_objtype_sink_set_*_func() calls + + * src/todo.c (gpe_todo_setup): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new + osync_objtype_sink_set_*_func() calls + + * src/gpe_sync.c (initialize): Bug #1086: Drop OSyncObjTypeSinkFunctions and use new + osync_objtype_sink_set_*_func() calls + +2009-02-25 Graham Cobb <g+...@co...> + + * src/todo.c (gpe_todo_commit_change): Add assert to check we have been passed the correct userdata + (gpe_todo_get_changes): Add assert to check we have been passed the correct userdata + + * src/contacts.c (gpe_contacts_commit_change): Add assert to check we have been passed the correct userdata + (gpe_contacts_get_changes): Add assert to check we have been passed the correct userdata + + * src/calendar.c (gpe_calendar_commit_change): Add assert to check we have been passed the correct userdata + (gpe_calendar_get_changes): Add assert to check we have been passed the correct userdata + 2009-02-08 Graham Cobb <g+...@co...> * gpe-sync-basic.xml: Create file Modified: plugins/gpe/src/calendar.c ============================================================================== --- plugins/gpe/src/calendar.c Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/src/calendar.c Thu May 14 21:04:43 2009 (r5642) @@ -40,6 +40,8 @@ char *data_ptr; unsigned int data_size; + gpe_assert(sinkenv == &env->calendar_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -121,6 +123,8 @@ sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + gpe_assert(sinkenv == &env->calendar_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -220,7 +224,9 @@ */ osync_bool gpe_calendar_setup(sink_environment *sinkenv, gpe_environment *env, OSyncPluginInfo *info, OSyncError **error) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, functions, %p, %p, %p)", __func__, sinkenv, env, info, error); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sinkenv, env, info, error); + + gpe_assert(sinkenv == &env->calendar_sink); // Check sinkenv is being passed correctly char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); // Note: caller responsible for freeing hashtable on any error @@ -237,11 +243,9 @@ goto exit; // No event sink configured. Not an error. } - OSyncObjTypeSinkFunctions functions; - memset(&functions, 0, sizeof(functions)); - functions.get_changes = gpe_calendar_get_changes; - functions.commit = gpe_calendar_commit_change; - osync_objtype_sink_set_functions(sinkenv->sink, functions, sinkenv); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_calendar_get_changes); + osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_calendar_commit_change); + osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); sinkenv->gpe_env = env; Modified: plugins/gpe/src/contacts.c ============================================================================== --- plugins/gpe/src/contacts.c Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/src/contacts.c Thu May 14 21:04:43 2009 (r5642) @@ -40,6 +40,8 @@ char *data_ptr; unsigned int data_size; + gpe_assert(sinkenv == &env->contact_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -121,6 +123,8 @@ sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + gpe_assert(sinkenv == &env->contact_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -219,7 +223,7 @@ */ osync_bool gpe_contacts_setup(sink_environment *sinkenv, gpe_environment *env, OSyncPluginInfo *info, OSyncError **error) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, functions, %p, %p, %p)", __func__, sinkenv, env, info, error); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sinkenv, env, info, error); char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); // Note: caller responsible for freeing hashtable on any error @@ -236,11 +240,9 @@ goto exit; // No contact sink configured. Not an error. } - OSyncObjTypeSinkFunctions functions; - memset(&functions, 0, sizeof(functions)); - functions.get_changes = gpe_contacts_get_changes; - functions.commit = gpe_contacts_commit_change; - osync_objtype_sink_set_functions(sinkenv->sink, functions, sinkenv); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_contacts_get_changes); + osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_contacts_commit_change); + osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); sinkenv->gpe_env = env; Modified: plugins/gpe/src/gpe_sync.c ============================================================================== --- plugins/gpe/src/gpe_sync.c Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/src/gpe_sync.c Thu May 14 21:04:43 2009 (r5642) @@ -512,12 +512,10 @@ env->main_sink.sink = osync_objtype_main_sink_new(error); if (!env->main_sink.sink) goto error_free_env; - OSyncObjTypeSinkFunctions functions; - memset(&functions, 0, sizeof(functions)); - functions.connect = gpe_connect; - functions.disconnect = gpe_disconnect; - functions.sync_done = sync_done; - osync_objtype_sink_set_functions(env->main_sink.sink, functions, &env->main_sink); + osync_objtype_sink_set_connect_func(env->main_sink.sink, gpe_connect); + osync_objtype_sink_set_disconnect_func(env->main_sink.sink, gpe_disconnect); + osync_objtype_sink_set_sync_done_func(env->main_sink.sink, sync_done); + osync_objtype_sink_set_userdata(env->main_sink.sink, &env->main_sink); osync_plugin_info_set_main_sink(info, env->main_sink.sink); env->main_sink.gpe_env = env; Modified: plugins/gpe/src/todo.c ============================================================================== --- plugins/gpe/src/todo.c Sat May 9 20:49:48 2009 (r5641) +++ plugins/gpe/src/todo.c Thu May 14 21:04:43 2009 (r5642) @@ -40,6 +40,8 @@ char *data_ptr; unsigned int data_size; + gpe_assert(sinkenv == &env->todo_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -122,6 +124,8 @@ sink_environment *sinkenv = (sink_environment *)userdata; gpe_environment *env = sinkenv->gpe_env; + gpe_assert(sinkenv == &env->todo_sink); // Check userdata is being passed correctly + if (!gpe_assert(env->configured && env->discovered)) { osync_trace(TRACE_ERROR, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered ); osync_context_report_error (ctx, OSYNC_ERROR_GENERIC, "GPE plugin not initialised: configured = %d, discovered = %d", env->configured, env->discovered); @@ -219,7 +223,7 @@ */ osync_bool gpe_todo_setup(sink_environment *sinkenv, gpe_environment *env, OSyncPluginInfo *info, OSyncError **error) { - osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, functions, %p, %p, %p)", __func__, sinkenv, env, info, error); + osync_trace(TRACE_ENTRY, "GPE-SYNC %s(%p, %p, %p, %p)", __func__, sinkenv, env, info, error); char *tablepath = g_strdup_printf("%s/hashtable.db", osync_plugin_info_get_configdir(info)); // Note: caller responsible for freeing hashtable on any error @@ -236,11 +240,9 @@ goto exit; // No todo sink configured. Not an error. } - OSyncObjTypeSinkFunctions functions; - memset(&functions, 0, sizeof(functions)); - functions.get_changes = gpe_todo_get_changes; - functions.commit = gpe_todo_commit_change; - osync_objtype_sink_set_functions(sinkenv->sink, functions, sinkenv); + osync_objtype_sink_set_get_changes_func(sinkenv->sink, gpe_todo_get_changes); + osync_objtype_sink_set_commit_func(sinkenv->sink, gpe_todo_commit_change); + osync_objtype_sink_set_userdata(sinkenv->sink, sinkenv); sinkenv->gpe_env = env; |
