[Opensync-commits] r5488 - in plugins/tomboy-sync: . src

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

Author: bellmich
Date: Tue Mar 31 16:37:20 2009
New Revision: 5488
URL: http://www.opensync.org/changeset/5488

Log:
- migrated from OSyncAnchor to OSyncSinkStateDB
- fixed generation of config.h

Modified:
   plugins/tomboy-sync/CMakeLists.txt
   plugins/tomboy-sync/src/tomboy_sync.c
   plugins/tomboy-sync/src/tomboy_sync_dbus.c
   plugins/tomboy-sync/src/tomboy_sync_file.c

Modified: plugins/tomboy-sync/CMakeLists.txt
==============================================================================
--- plugins/tomboy-sync/CMakeLists.txt	Tue Mar 31 15:48:26 2009	(r5487)
+++ plugins/tomboy-sync/CMakeLists.txt	Tue Mar 31 16:37:20 2009	(r5488)
@@ -22,7 +22,7 @@
 	OPTION( ENABLE_DBUS "Enable DBus" ON )
 ENDIF ( LIBDBUSGLIB_FOUND AND LIBDBUS_FOUND )
 
-CONFIGURE_FILE( "config.h.cmake" "config.h" )
+CONFIGURE_FILE( "config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h" )
 
 # add uninstall target
 CONFIGURE_FILE(	"${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)

Modified: plugins/tomboy-sync/src/tomboy_sync.c
==============================================================================
--- plugins/tomboy-sync/src/tomboy_sync.c	Tue Mar 31 15:48:26 2009	(r5487)
+++ plugins/tomboy-sync/src/tomboy_sync.c	Tue Mar 31 16:37:20 2009	(r5488)
@@ -36,15 +36,15 @@
 	g_free(dir);
 }
 
-osync_bool osync_tomboysync_compare_anchor(OSyncAnchor *anchor, OSyncContext *ctx, const char *new_anchor, OSyncError **error) {
+osync_bool osync_tomboysync_homedir_equal(OSyncSinkStateDB *state_db, OSyncContext *ctx, const char *new_path, OSyncError **error) {
 	
-	osync_bool anchormatch;
+	osync_bool match;
 	
-	if ( !osync_anchor_compare(anchor, "anchor_key1", new_anchor, &anchormatch, error) ) {
-		/* anchor couldn't be compared */
+	if ( !osync_sink_state_equal(state_db, "homedir", new_path, &match, error) ) {
+		/* state value couldn't be compared */
 		goto error;
 	}
-	if ( !anchormatch ) {
+	if ( !match ) {
 		/* request slow sync */
 		osync_context_report_slowsync(ctx);
 	}
@@ -228,7 +228,7 @@
 		osync_objtype_sink_enable_hashtable(dir->sink, TRUE);
 
 		/* Enable Anchors */
-		osync_objtype_sink_enable_anchor(dir->sink, TRUE);
+		osync_objtype_sink_enable_state_db(dir->sink, TRUE);
 		
 		if ( !usedbus ) {
 			if (!osync_tomboysync_file_initalize(tomboyenv, error)) {

Modified: plugins/tomboy-sync/src/tomboy_sync_dbus.c
==============================================================================
--- plugins/tomboy-sync/src/tomboy_sync_dbus.c	Tue Mar 31 15:48:26 2009	(r5487)
+++ plugins/tomboy-sync/src/tomboy_sync_dbus.c	Tue Mar 31 16:37:20 2009	(r5488)
@@ -226,8 +226,8 @@
 	OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata;
 	OSyncTomboyEnv *tomboyenv = dir->env;
 
-	OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink);
-	if ( !osync_anchor_update(anchor, "anchor_key1", tomboyenv->homedir_path, &error) ) {
+	OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(sink);
+	if ( !osync_sink_state_set(state_db, "homedir", tomboyenv->homedir_path, &error) ) {
 		goto error;
 	}
 
@@ -438,9 +438,9 @@
 	
 	tomboyenv->proxy = dbus_g_proxy_new_for_name(tomboyenv->connection, TOMBOY_DBUS_NAME, TOMBOY_DBUS_PATH, TOMBOY_DBUS_INTERFACE);
 	
-	OSyncAnchor *anchor = osync_objtype_sink_get_anchor(dir->sink);
+	OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(dir->sink);
 	
-	if (!osync_tomboysync_compare_anchor(anchor, ctx, tomboyenv->homedir_path, &error) ) {
+	if (!osync_tomboysync_homedir_equal(state_db, ctx, tomboyenv->homedir_path, &error) ) {
 		goto error;
 	}
 	

Modified: plugins/tomboy-sync/src/tomboy_sync_file.c
==============================================================================
--- plugins/tomboy-sync/src/tomboy_sync_file.c	Tue Mar 31 15:48:26 2009	(r5487)
+++ plugins/tomboy-sync/src/tomboy_sync_file.c	Tue Mar 31 16:37:20 2009	(r5488)
@@ -261,9 +261,9 @@
 	OSyncTomboyDir *dir = (OSyncTomboyDir*)userdata;
 	OSyncTomboyEnv *tomboyenv = dir->env;
 
-	OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink);
+	OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(sink);
 
-	if( !osync_anchor_update(anchor, "anchor_key1", tomboyenv->homedir_path, &error) ) {
+	if( !osync_sink_state_set(state_db, "homedir", tomboyenv->homedir_path, &error) ) {
 		goto error;
 	}
 
@@ -415,9 +415,9 @@
 	OSyncError *error = NULL;
 	OSyncTomboyDir *dir = (OSyncTomboyDir*)data;
 	OSyncTomboyEnv *tomboyenv = dir->env;
-	OSyncAnchor *anchor = osync_objtype_sink_get_anchor(dir->sink);
+	OSyncSinkStateDB *state_db = osync_objtype_sink_get_state_db(dir->sink);
 	
-	if (!osync_tomboysync_compare_anchor(anchor, ctx, tomboyenv->homedir_path, &error) ) {
+	if (!osync_tomboysync_homedir_equal(state_db, ctx, tomboyenv->homedir_path, &error) ) {
 		goto error;
 	}