Menu
▾
▴
[Opensync-commits] r5805 - in plugins/tomboy-sync: . src
|
From: <svn...@op...> - 2009-09-18 08:44:42
|
Author: bricks Date: Fri Sep 18 10:44:28 2009 New Revision: 5805 URL: http://www.opensync.org/changeset/5805 Log: adapted tomboy-sync to latest api changes tomboy-sync requires now dbus Modified: plugins/tomboy-sync/CMakeLists.txt plugins/tomboy-sync/src/CMakeLists.txt plugins/tomboy-sync/src/tomboy-sync 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 Modified: plugins/tomboy-sync/CMakeLists.txt ============================================================================== --- plugins/tomboy-sync/CMakeLists.txt Fri Sep 18 10:18:41 2009 (r5804) +++ plugins/tomboy-sync/CMakeLists.txt Fri Sep 18 10:44:28 2009 (r5805) @@ -4,7 +4,7 @@ SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules" ) -SET( OPENSYNC_MIN_VERSION "0.37" ) +SET( OPENSYNC_MIN_VERSION "0.38" ) CMAKE_MINIMUM_REQUIRED( VERSION 2.4.4 ) @@ -12,8 +12,8 @@ FIND_PACKAGE( GLIB2 REQUIRED ) FIND_PACKAGE( LibXml2 REQUIRED ) FIND_PACKAGE( LibUuid REQUIRED ) -FIND_PACKAGE( LibDbus ) -FIND_PACKAGE( LibDbusGlib ) +FIND_PACKAGE( LibDbus REQUIRED ) +FIND_PACKAGE( LibDbusGlib REQUIRED ) INCLUDE( OpenSyncInternal ) INCLUDE( Testing ) @@ -22,8 +22,6 @@ OPTION( ENABLE_DBUS "Enable DBus" ON ) ENDIF ( LIBDBUSGLIB_FOUND AND LIBDBUS_FOUND ) -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/CMakeLists.txt ============================================================================== --- plugins/tomboy-sync/src/CMakeLists.txt Fri Sep 18 10:18:41 2009 (r5804) +++ plugins/tomboy-sync/src/CMakeLists.txt Fri Sep 18 10:44:28 2009 (r5805) @@ -1,11 +1,7 @@ LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} ${LIBUUID_LIBRARY_DIRS} ${LIBDBUS_LIBRARY_DIRS} ${LIBDBUSGLIB_LIBRARY_DIRS} ) INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS} ${LIBDBUS_INCLUDE_DIRS} ${LIBDBUSGLIB_INCLUDE_DIRS} ) -SET( TOMBOY_SYNC_SRC tomboy_sync.c tomboy_sync_file.c ) - -IF ( ENABLE_DBUS ) - SET ( TOMBOY_SYNC_SRC ${TOMBOY_SYNC_SRC} tomboy_sync_dbus.c ) -ENDIF( ENABLE_DBUS ) +SET( TOMBOY_SYNC_SRC tomboy_sync.c tomboy_sync_dbus.c ) OPENSYNC_PLUGIN_ADD( tomboy-sync ${TOMBOY_SYNC_SRC} ) Modified: plugins/tomboy-sync/src/tomboy-sync ============================================================================== --- plugins/tomboy-sync/src/tomboy-sync Fri Sep 18 10:18:41 2009 (r5804) +++ plugins/tomboy-sync/src/tomboy-sync Fri Sep 18 10:44:28 2009 (r5805) @@ -1,14 +1,5 @@ <?xml version="1.0"?> <config version="1.0"> - <AdvancedOptions> - <AdvancedOption> - <!-- Use Dbus for synchronisation of Tomboy. Set "true" to enable dbus --> - <DisplayName>Enable Dbus</DisplayName> - <Name>UseDbus</Name> - <Type>bool</Type> - <Value>true</Value> - </AdvancedOption> - </AdvancedOptions> <Resources> <Resource> <Enabled>1</Enabled> Modified: plugins/tomboy-sync/src/tomboy_sync.c ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync.c Fri Sep 18 10:18:41 2009 (r5804) +++ plugins/tomboy-sync/src/tomboy_sync.c Fri Sep 18 10:44:28 2009 (r5805) @@ -18,14 +18,11 @@ * */ -#include "config.h" - #include "tomboy_sync.h" #include <opensync/opensync-version.h> #include <uuid/uuid.h> -#include "tomboy_sync_file.h" #include "tomboy_sync_dbus.h" static void free_dir(OSyncTomboyDir *dir) @@ -140,8 +137,6 @@ { osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, error); - osync_bool usedbus = FALSE; - OSyncTomboyEnv *tomboyenv = osync_try_malloc0(sizeof(OSyncTomboyEnv), error); if (!tomboyenv) { goto error; @@ -150,20 +145,6 @@ OSyncPluginConfig *config = osync_plugin_info_get_config(info); osync_assert(config); - OSyncList *optslist = osync_plugin_config_get_advancedoptions(config); - for (; optslist; optslist = optslist->next) { - OSyncPluginAdvancedOption *option = optslist->data; - - const char *val = osync_plugin_advancedoption_get_value(option); - const char *name = osync_plugin_advancedoption_get_name(option); - osync_assert(name); - osync_assert(val); - if (!strcmp(name,"UseDbus")) { - if (!strcmp(val, "true")) { - usedbus = TRUE; - } - } - } OSyncList *objtypes = osync_plugin_info_get_objtype_sinks(info); OSyncList *o = NULL; for (o = objtypes; o; o = o->next) { @@ -199,26 +180,11 @@ } /* All sinks have the same functions of course */ -#ifdef ENABLE_DBUS - if ( usedbus ) { - osync_trace(TRACE_INTERNAL, "using dbus for sync."); - osync_objtype_sink_set_connect_func(dir->sink, osync_tomboysync_dbus_connect); - osync_objtype_sink_set_get_changes_func(dir->sink, osync_tomboysync_dbus_get_changes); - osync_objtype_sink_set_commit_func(dir->sink, osync_tomboysync_dbus_commit_change); - osync_objtype_sink_set_read_func(dir->sink, osync_tomboysync_dbus_read); - osync_objtype_sink_set_sync_done_func(dir->sink, osync_tomboysync_dbus_sync_done); - } - else { -#endif /* ENABLE_DBUS */ - osync_trace(TRACE_INTERNAL, "using file for sync."); - osync_objtype_sink_set_connect_func(dir->sink, osync_tomboysync_file_connect); - osync_objtype_sink_set_get_changes_func(dir->sink, osync_tomboysync_file_get_changes); - osync_objtype_sink_set_commit_func(dir->sink, osync_tomboysync_file_commit_change); - osync_objtype_sink_set_read_func(dir->sink, osync_tomboysync_file_read); - osync_objtype_sink_set_sync_done_func(dir->sink, osync_tomboysync_file_sync_done); -#ifdef ENABLE_DBUS - } -#endif /* ENABLE_DBUS */ + osync_objtype_sink_set_connect_func(dir->sink, osync_tomboysync_dbus_connect); + osync_objtype_sink_set_get_changes_func(dir->sink, osync_tomboysync_dbus_get_changes); + osync_objtype_sink_set_commit_func(dir->sink, osync_tomboysync_dbus_commit_change); + osync_objtype_sink_set_read_func(dir->sink, osync_tomboysync_dbus_read); + osync_objtype_sink_set_sync_done_func(dir->sink, osync_tomboysync_dbus_sync_done); /* We pass the OSyncTomboyDir object to the sink, so we dont have to look it up * again once the functions are called */ @@ -230,11 +196,6 @@ /* Enable Anchors */ osync_objtype_sink_enable_state_db(dir->sink, TRUE); - if ( !usedbus ) { - if (!osync_tomboysync_file_initalize(tomboyenv, error)) { - goto error; - } - } } osync_trace(TRACE_EXIT, "%s: %p", __func__); @@ -253,10 +214,9 @@ } OSyncTomboyEnv *tomboyenv; tomboyenv = (OSyncTomboyEnv*)data; -#ifdef ENABLE_DBUS + osync_free(tomboyenv->connection); osync_free(tomboyenv->proxy); -#endif } /* Here we actually tell opensync which sinks are available. For this plugin, we @@ -300,14 +260,13 @@ osync_plugin_set_finalize(plugin, osync_tomboysync_finalize); osync_plugin_set_discover(plugin, osync_tomboysync_discover); - osync_plugin_env_register_plugin(env, plugin); + osync_plugin_env_register_plugin(env, plugin, error); osync_plugin_unref(plugin); return TRUE; error: - osync_trace(TRACE_ERROR, "Unable to register: %s", osync_error_print(error)); - osync_error_unref(error); + osync_trace(TRACE_ERROR, "Unable to register tomboy-sync plugin: %s", osync_error_print(error)); return FALSE; } Modified: plugins/tomboy-sync/src/tomboy_sync.h ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync.h Fri Sep 18 10:18:41 2009 (r5804) +++ plugins/tomboy-sync/src/tomboy_sync.h Fri Sep 18 10:44:28 2009 (r5805) @@ -35,18 +35,13 @@ #include <libxml/xmlmemory.h> #include <libxml/parser.h> -#ifdef ENABLE_DBUS - #include <dbus/dbus.h> #include <dbus/dbus-glib.h> -#endif /* ENABLE_DBUS */ typedef struct OSyncTomboyEnv { -#ifdef ENABLE_DBUS DBusGConnection *connection; DBusGProxy *proxy; -#endif /* ENABLE_DBUS */ const char *homedir_path; } OSyncTomboyEnv; Modified: plugins/tomboy-sync/src/tomboy_sync_dbus.c ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync_dbus.c Fri Sep 18 10:18:41 2009 (r5804) +++ plugins/tomboy-sync/src/tomboy_sync_dbus.c Fri Sep 18 10:44:28 2009 (r5805) @@ -18,13 +18,9 @@ * */ -#include "config.h" - #include "tomboy_sync.h" #include "tomboy_sync_dbus.h" -#ifdef ENABLE_DBUS - char * osync_tomboysync_noteuri_to_uuid(char *noteuri) { GString *guid; char *uuid; @@ -452,6 +448,3 @@ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(&error)); osync_error_unref(&error); } - -#endif /* ENABLE_DBUS */ - Modified: plugins/tomboy-sync/src/tomboy_sync_dbus.h ============================================================================== --- plugins/tomboy-sync/src/tomboy_sync_dbus.h Fri Sep 18 10:18:41 2009 (r5804) +++ plugins/tomboy-sync/src/tomboy_sync_dbus.h Fri Sep 18 10:44:28 2009 (r5805) @@ -21,8 +21,6 @@ #ifndef TOMBOY_SYNC_DBUS_H_ #define TOMBOY_SYNC_DBUS_H_ -#ifdef ENABLE_DBUS - #define TOMBOY_DBUS_NAME "org.gnome.Tomboy" #define TOMBOY_DBUS_PATH "/org/gnome/Tomboy/RemoteControl" #define TOMBOY_DBUS_INTERFACE "org.gnome.Tomboy.RemoteControl" @@ -31,12 +29,10 @@ 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); +void osync_tomboysync_dbus_read(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *userdata); osync_bool osync_tomboysync_dbus_initalize(OSyncTomboyEnv *tomboyenv, OSyncError **error); void osync_tomboysync_dbus_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data); -#endif /* ENABLE_DBUS */ - #endif /* TOMBOY_SYNC_DBUS_H_ */ |
