Menu
▾
▴
[Opensync-commits] r5285 - plugins/tomboy-sync/src
|
From: <svn...@op...> - 2009-03-09 10:20:35
|
Author: bricks Date: Mon Mar 9 11:20:29 2009 New Revision: 5285 URL: http://www.opensync.org/changeset/5285 Log: ported tomboy-sync to objtype sink functions changes Modified: plugins/tomboy-sync/src/tomboy_sync.c plugins/tomboy-sync/src/tomboy_sync.h plugins/tomboy-sync/src/tomboy_sync_dbus.c plugins/tomboy-sync/src/tomboy_sync_dbus.h plugins/tomboy-sync/src/tomboy_sync_file.c plugins/tomboy-sync/src/tomboy_sync_file.h Modified: plugins/tomboy-sync/src/tomboy_sync.c ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync.c Mon Mar 9 10:07:52 2009 (r5284) +++ plugins/tomboy-sync/src/tomboy_sync.c Mon Mar 9 11:20:29 2009 (r5285) @@ -22,7 +22,6 @@ #include "tomboy_sync.h" -#include <opensync/file.h> #include <opensync/opensync-version.h> #include <uuid/uuid.h> @@ -113,7 +112,7 @@ retval = g_malloc0(37); /* * The uuid_unparse function converts the supplied UUID uuid from the binary representation into a 36-byte string (plus tailing ’\0’) of the form 1b4e28ba-2fa1-11d2-883f-0016d3cca427 and stores this - * value in the character string pointed to by out. + * value in the character string pointed to by out. */ uuid_unparse(uuid, retval); @@ -156,22 +155,22 @@ if (!dir) { goto error; } - + dir->env = tomboyenv; dir->sink = osync_plugin_info_nth_objtype(info, i); osync_assert(dir->sink); const char *objtype = osync_objtype_sink_get_name(dir->sink); OSyncPluginResource *res = osync_plugin_config_find_active_resource(config, objtype); /* get homedir from config. if no dir is set read homedir from the environment */ - dir->homedir_path = osync_plugin_resource_get_path(res); - if (!dir->homedir_path) { + tomboyenv->homedir_path = osync_plugin_resource_get_path(res); + if (!tomboyenv->homedir_path) { osync_trace(TRACE_INTERNAL, "tomboy-sync home directory not set. Using default."); - dir->homedir_path = g_getenv ("HOME"); - if (!dir->homedir_path) { - dir->homedir_path = g_get_home_dir(); + tomboyenv->homedir_path = g_getenv ("HOME"); + if (!tomboyenv->homedir_path) { + tomboyenv->homedir_path = g_get_home_dir(); } } - osync_trace(TRACE_INTERNAL, "tomboy-sync home directory is \"%s\".", dir->homedir_path); + osync_trace(TRACE_INTERNAL, "tomboy-sync home directory is \"%s\".", tomboyenv->homedir_path); OSyncList *s = osync_plugin_resource_get_objformat_sinks(res); OSyncObjFormatSink *fsink = s->data; // there could be only one sink @@ -197,12 +196,12 @@ } else { #endif /* ENABLE_DBUS */ - osync_trace(TRACE_INTERNAL, "using file for sync."); - functions.get_changes = osync_tomboysync_file_get_changes; - functions.commit = osync_tomboysync_file_commit_change; - functions.read = osync_tomboysync_file_read; - functions.write = osync_tomboysync_file_write; - functions.sync_done = osync_tomboysync_file_sync_done; + osync_trace(TRACE_INTERNAL, "using file for sync."); + functions.get_changes = osync_tomboysync_file_get_changes; + functions.commit = osync_tomboysync_file_commit_change; + functions.read = osync_tomboysync_file_read; + functions.write = osync_tomboysync_file_write; + functions.sync_done = osync_tomboysync_file_sync_done; #ifdef ENABLE_DBUS } #endif /* ENABLE_DBUS */ @@ -222,16 +221,20 @@ if (!osync_hashtable_load(dir->hashtable, error)) goto error; - /* eventuell den anchor ändern ??? */ - char *anchorpath = g_strdup_printf("%s/anchor.db", osync_plugin_info_get_configdir(info)); char *path_field = g_strdup_printf("path_%s", osync_objtype_sink_get_name(dir->sink)); - if (!osync_anchor_compare(anchorpath, path_field, dir->homedir_path)) + OSyncAnchor *anchor = osync_objtype_sink_get_anchor(dir->sink); + osync_bool anchormatch; + + if ( !osync_anchor_compare(anchor, tomboyenv->homedir_path, &anchormatch, error) ) { + /* anchor couldn't be compared */ + goto error; + } + if ( !anchormatch ) { + /* request slow sync */ osync_objtype_sink_set_slowsync(dir->sink, TRUE); - g_free(anchorpath); + } g_free(path_field); - tomboyenv->dir = dir; - #ifdef ENABLE_DBUS if (usedbus) { if (!osync_tomboysync_dbus_initalize(tomboyenv,error)) { @@ -268,7 +271,6 @@ osync_free(tomboyenv->connection); osync_free(tomboyenv->proxy); #endif - osync_free(tomboyenv->dir); } /* Here we actually tell opensync which sinks are available. For this plugin, we Modified: plugins/tomboy-sync/src/tomboy_sync.h ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync.h Mon Mar 9 10:07:52 2009 (r5284) +++ plugins/tomboy-sync/src/tomboy_sync.h Mon Mar 9 11:20:29 2009 (r5285) @@ -43,22 +43,23 @@ #endif /* ENABLE_DBUS */ -typedef struct OSyncTomboyDir { - OSyncObjFormat *objformat; - const char *homedir_path; - GDir *dir; - OSyncHashTable *hashtable; - OSyncObjTypeSink *sink; -} OSyncTomboyDir; - typedef struct OSyncTomboyEnv { #ifdef ENABLE_DBUS DBusGConnection *connection; DBusGProxy *proxy; #endif /* ENABLE_DBUS */ - OSyncTomboyDir *dir; + const char *homedir_path; } OSyncTomboyEnv; +typedef struct OSyncTomboyDir { + OSyncObjFormat *objformat; +// GDir *dir; + OSyncHashTable *hashtable; + OSyncObjTypeSink *sink; + OSyncTomboyEnv *env; +} OSyncTomboyDir; + + char *osync_tomboysync_generate_hash(char *data, int size); char *osync_tomboysync_generate_uuid(); osync_bool osync_tomboysync_validate_uuid(char *uuid); Modified: plugins/tomboy-sync/src/tomboy_sync_dbus.c ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync_dbus.c Mon Mar 9 10:07:52 2009 (r5284) +++ plugins/tomboy-sync/src/tomboy_sync_dbus.c Mon Mar 9 11:20:29 2009 (r5285) @@ -35,11 +35,10 @@ return uuid; } -void osync_tomboysync_dbus_get_changes(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); - OSyncTomboyEnv *tomboyenv = (OSyncTomboyEnv*)userdata; +void osync_tomboysync_dbus_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *userdata) { + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, userdata); + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + OSyncTomboyEnv *tomboyenv = dir->env; OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info); OSyncError *error = NULL; OSyncData *odata = NULL; @@ -51,7 +50,7 @@ int size; /* is slowsync necessary */ - if (osync_objtype_sink_get_slowsync(dir->sink)) { + if ( slow_sync ) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); /* prepare hashtable for slowsync (flush entries) */ if (!osync_hashtable_slowsync(dir->hashtable, &error)) { @@ -188,19 +187,18 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_tomboysync_dbus_commit_change(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) { - osync_trace(TRACE_ENTRY, "%s", __func__); +void osync_tomboysync_dbus_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata) { + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyEnv *tomboyenv = (OSyncTomboyEnv*)userdata; - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + //OSyncTomboyEnv *tomboyenv = dir->env; OSyncData *odata = NULL; int size; char *hash = NULL; char *buffer = NULL; - if (!osync_tomboysync_dbus_write(userdata, info, ctx, change)) { + if (!osync_tomboysync_dbus_write(sink, info, ctx, change,userdata)) { /*TODO report error to context? */ osync_trace(TRACE_EXIT_ERROR, "%s", __func__); return; @@ -219,43 +217,40 @@ return; } -void osync_tomboysync_dbus_sync_done(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, userdata, info, ctx); +void osync_tomboysync_dbus_sync_done(OSyncObjTypeSink *sink , OSyncPluginInfo *info, OSyncContext *ctx, void* userdata) { + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, userdata); OSyncError *error = NULL; - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); - OSyncTomboyEnv *tomboyenv = (OSyncTomboyEnv*)userdata; - - char *anchorpath = g_strdup_printf("%s/anchor.db", osync_plugin_info_get_configdir(info)); - char *path_field = g_strdup_printf("path_%s", osync_objtype_sink_get_name(sink)); - osync_anchor_update(anchorpath, path_field, dir->homedir_path); - g_free(anchorpath); - g_free(path_field); + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + OSyncTomboyEnv *tomboyenv = dir->env; + + OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); + if ( !osync_anchor_update(anchor, tomboyenv->homedir_path, &error) ) { + goto error; + } if (!osync_hashtable_save(dir->hashtable, &error)) goto error; osync_context_report_success(ctx); - g_object_unref(tomboyenv->proxy); + g_object_unref(dir->env->proxy); osync_trace(TRACE_EXIT, "%s", __func__); return; error: - g_object_unref(tomboyenv->proxy); + g_object_unref(dir->env->proxy); osync_context_report_osyncerror(ctx, error); osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); osync_error_unref(&error); return; } -osync_bool osync_tomboysync_dbus_write(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) { +osync_bool osync_tomboysync_dbus_write(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, userdata, info, ctx, change); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); - OSyncTomboyEnv *tomboyenv = (OSyncTomboyEnv*)userdata; + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + OSyncTomboyEnv *tomboyenv = dir->env; OSyncError *error = NULL; OSyncData *odata = NULL; GError *gerror = NULL; @@ -338,11 +333,11 @@ /* called after ignore. * read a single entry and pass it to the engine */ -osync_bool osync_tomboysync_dbus_read(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, userdata, info, ctx, change); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); - OSyncTomboyEnv *tomboyenv = (OSyncTomboyEnv*)userdata; +osync_bool osync_tomboysync_dbus_read(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata) { + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); + + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + OSyncTomboyEnv *tomboyenv = dir->env; OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info); OSyncError *error = NULL; OSyncData *odata = NULL; Modified: plugins/tomboy-sync/src/tomboy_sync_dbus.h ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync_dbus.h Mon Mar 9 10:07:52 2009 (r5284) +++ plugins/tomboy-sync/src/tomboy_sync_dbus.h Mon Mar 9 11:20:29 2009 (r5285) @@ -27,11 +27,11 @@ #define TOMBOY_DBUS_PATH "/org/gnome/Tomboy/RemoteControl" #define TOMBOY_DBUS_INTERFACE "org.gnome.Tomboy.RemoteControl" -void osync_tomboysync_dbus_get_changes(void *data, OSyncPluginInfo *info, OSyncContext *ctx); -void osync_tomboysync_dbus_commit_change(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); -void osync_tomboysync_dbus_sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx); -osync_bool osync_tomboysync_dbus_write(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); -osync_bool osync_tomboysync_dbus_read(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); +void osync_tomboysync_dbus_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *userdata); +void osync_tomboysync_dbus_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata); +void osync_tomboysync_dbus_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *userdata); +osync_bool osync_tomboysync_dbus_write(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata); +osync_bool osync_tomboysync_dbus_read(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata); osync_bool osync_tomboysync_dbus_initalize(OSyncTomboyEnv *tomboyenv, OSyncError **error); Modified: plugins/tomboy-sync/src/tomboy_sync_file.c ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync_file.c Mon Mar 9 10:07:52 2009 (r5284) +++ plugins/tomboy-sync/src/tomboy_sync_file.c Mon Mar 9 11:20:29 2009 (r5285) @@ -36,8 +36,9 @@ osync_trace(TRACE_ENTRY, "%s(%p, %s, %p)", __func__, directory, subdir, ctx); OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info); - - path = g_build_filename(directory->homedir_path,".tomboy", NULL); + OSyncTomboyEnv *tomboyenv = directory->env; + const char *homedir = tomboyenv->homedir_path; + path = g_build_filename(homedir,".tomboy", NULL); osync_trace(TRACE_INTERNAL, "path %s", path); dir = g_dir_open(path, 0, &gerror); @@ -142,16 +143,15 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_tomboysync_file_get_changes(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +void osync_tomboysync_file_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *userdata) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %i, %p)", __func__, sink, info, ctx, slow_sync, userdata); + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info); OSyncError *error = NULL; /* is slowsync necessary */ - if (osync_objtype_sink_get_slowsync(dir->sink)) { + if ( slow_sync ) { osync_trace(TRACE_INTERNAL, "Slow sync requested"); /* prepare hashtable for slowsync (flush entries) */ if (!osync_hashtable_slowsync(dir->hashtable, &error)) @@ -211,21 +211,22 @@ /* * */ -void osync_tomboysync_file_commit_change(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +void osync_tomboysync_file_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void* userdata) { - osync_trace(TRACE_ENTRY, "%s", __func__); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); + + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + OSyncTomboyEnv *tomboyenv = dir->env; char *filename = NULL; char* tomboydir = NULL; - if (!osync_tomboysync_file_write(data, info, ctx, change)) { + if (!osync_tomboysync_file_write(sink, info, ctx, change, userdata)) { osync_trace(TRACE_EXIT_ERROR, "%s", __func__); return; } - tomboydir = g_build_filename(dir->homedir_path, ".tomboy", NULL); + tomboydir = g_build_filename(tomboyenv->homedir_path, ".tomboy", NULL); filename = g_strdup_printf("%s%s%s.%s", tomboydir, G_DIR_SEPARATOR_S, osync_change_get_uid(change), "note"); char *hash = NULL; @@ -248,20 +249,20 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -void osync_tomboysync_file_sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +void osync_tomboysync_file_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void* userdata) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, userdata); OSyncError *error = NULL; - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + OSyncTomboyEnv *tomboyenv = dir->env; + + OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); - char *anchorpath = g_strdup_printf("%s/anchor.db", osync_plugin_info_get_configdir(info)); - char *path_field = g_strdup_printf("path_%s", osync_objtype_sink_get_name(sink)); - osync_anchor_update(anchorpath, path_field, dir->homedir_path); - g_free(anchorpath); - g_free(path_field); + if( !osync_anchor_update(anchor, tomboyenv->homedir_path, &error) ) { + goto error; + } if (!osync_hashtable_save(dir->hashtable, &error)) goto error; @@ -279,12 +280,12 @@ } /* write a single entry */ -osync_bool osync_tomboysync_file_write(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +osync_bool osync_tomboysync_file_write(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void* userdata) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + OSyncTomboyEnv *tomboyenv = dir->env; OSyncError *error = NULL; OSyncData *odata = NULL; char *buffer = NULL; @@ -292,7 +293,7 @@ unsigned int size = 0; uuid = (char*)osync_change_get_uid(change); - char *tomboydir = g_build_filename(dir->homedir_path, ".tomboy", NULL); + char *tomboydir = g_build_filename(tomboyenv->homedir_path, ".tomboy", NULL); char *filename = g_strdup_printf("%s%s%s.%s", tomboydir, G_DIR_SEPARATOR_S, uuid, "note"); switch (osync_change_get_changetype(change)) { @@ -353,15 +354,15 @@ /* called after ignore. * read a single entry and pass it to the engine */ -osync_bool osync_tomboysync_file_read(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +osync_bool osync_tomboysync_file_read(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, userdata, info, ctx, change); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); - OSyncTomboyDir *dir = osync_objtype_sink_get_userdata(sink); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, userdata); + OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata; + OSyncTomboyEnv *tomboyenv = dir->env; OSyncFormatEnv *formatenv = osync_plugin_info_get_format_env(info); OSyncError *error = NULL; - char *tomboydir = g_build_filename(dir->homedir_path, ".tomboy", NULL); + char *tomboydir = g_build_filename(tomboyenv->homedir_path, ".tomboy", NULL); char *filename = g_strdup_printf("%s%s%s.%s", tomboydir, G_DIR_SEPARATOR_S, osync_change_get_uid(change), "note"); char *data; @@ -411,8 +412,8 @@ osync_bool osync_tomboysync_file_initalize(OSyncTomboyEnv *tomboyenv, OSyncError **error) { osync_assert(tomboyenv); - osync_assert(tomboyenv->dir) - char * tomboydir = g_strdup_printf("%s/.tomboy", tomboyenv->dir->homedir_path); + osync_assert(tomboyenv->homedir_path); + char * tomboydir = g_strdup_printf("%s/.tomboy", tomboyenv->homedir_path); if (!g_file_test(tomboydir, G_FILE_TEST_IS_DIR)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "%s is not a directory.", tomboydir); goto error; Modified: plugins/tomboy-sync/src/tomboy_sync_file.h ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync_file.h Mon Mar 9 10:07:52 2009 (r5284) +++ plugins/tomboy-sync/src/tomboy_sync_file.h Mon Mar 9 11:20:29 2009 (r5285) @@ -23,13 +23,13 @@ #include <opensync/opensync.h> -void osync_tomboysync_file_commit_change(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); -void osync_tomboysync_file_get_changes(void *data, OSyncPluginInfo *info, OSyncContext *ctx); +void osync_tomboysync_file_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata); +void osync_tomboysync_file_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *userdata); -osync_bool osync_tomboysync_file_read(void *userdata, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); -osync_bool osync_tomboysync_file_write(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); +osync_bool osync_tomboysync_file_read(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata); +osync_bool osync_tomboysync_file_write(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata); -void osync_tomboysync_file_sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx); +void osync_tomboysync_file_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *userdata); void osync_tomboysync_file_report_dir(OSyncTomboyDir *directory, OSyncPluginInfo *info, const char *subdir, OSyncContext *ctx); |
