Menu
▾
▴
[Opensync-commits] r6135 - in plugins/akonadi-sync/trunk: . src
|
From: <svn...@op...> - 2010-09-21 07:02:15
|
Author: deloptes Date: Tue Sep 21 09:02:06 2010 New Revision: 6135 URL: http://www.opensync.org/changeset/6135 Log: - overlooked logical & and | - set keyproperty Id Modified: plugins/akonadi-sync/trunk/CMakeLists.txt (props changed) plugins/akonadi-sync/trunk/src/CMakeLists.txt (contents, props changed) plugins/akonadi-sync/trunk/src/akonadi_opensync.cpp (contents, props changed) plugins/akonadi-sync/trunk/src/akonadisink.cpp (contents, props changed) plugins/akonadi-sync/trunk/src/akonadisink.h (contents, props changed) plugins/akonadi-sync/trunk/src/datasink.cpp (contents, props changed) plugins/akonadi-sync/trunk/src/datasink.h (contents, props changed) plugins/akonadi-sync/trunk/src/sinkbase.cpp (contents, props changed) plugins/akonadi-sync/trunk/src/sinkbase.h (contents, props changed) Modified: plugins/akonadi-sync/trunk/src/CMakeLists.txt ============================================================================== --- plugins/akonadi-sync/trunk/src/CMakeLists.txt Tue Sep 21 01:12:57 2010 (r6134) +++ plugins/akonadi-sync/trunk/src/CMakeLists.txt Tue Sep 21 09:02:06 2010 (r6135) @@ -1,4 +1,9 @@ + +# +# Copyright (c) 2010 Emanoil Kotsev <del...@ya...> +# $Id: deloptes$ + #INCLUDE_DIRECTORIES( ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ) # Modified: plugins/akonadi-sync/trunk/src/akonadi_opensync.cpp ============================================================================== --- plugins/akonadi-sync/trunk/src/akonadi_opensync.cpp Tue Sep 21 01:12:57 2010 (r6134) +++ plugins/akonadi-sync/trunk/src/akonadi_opensync.cpp Tue Sep 21 09:02:06 2010 (r6135) @@ -1,6 +1,6 @@ /* - Copyright (c) 2010 Emanoil Kotsev <del...@ya...> Copyright (c) 2008 Volker Krause <vk...@kd...> + Copyright (c) 2010 Emanoil Kotsev <del...@ya...> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by Modified: plugins/akonadi-sync/trunk/src/akonadisink.cpp ============================================================================== --- plugins/akonadi-sync/trunk/src/akonadisink.cpp Tue Sep 21 01:12:57 2010 (r6134) +++ plugins/akonadi-sync/trunk/src/akonadisink.cpp Tue Sep 21 09:02:06 2010 (r6135) @@ -1,5 +1,6 @@ /* Copyright (c) 2008 Volker Krause <vk...@kd...> + Copyright (c) 2010 Emanoil Kotsev <del...@ya...> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by @@ -41,8 +42,8 @@ kDebug() << "No sink "; return false; } -// wrapSink( sink ); osync_plugin_info_set_main_sink( info, sink ); + wrapSink( sink ); // osync_objtype_sink_unref(sink); return true; } @@ -57,7 +58,6 @@ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __PRETTY_FUNCTION__, "Could not start Akonadi."); return; } - connect(); success(); osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__); } Modified: plugins/akonadi-sync/trunk/src/akonadisink.h ============================================================================== --- plugins/akonadi-sync/trunk/src/akonadisink.h Tue Sep 21 01:12:57 2010 (r6134) +++ plugins/akonadi-sync/trunk/src/akonadisink.h Tue Sep 21 09:02:06 2010 (r6135) @@ -1,5 +1,7 @@ /* Copyright (c) 2008 Volker Krause <vk...@kd...> + Copyright (c) 2010 Emanoil Kotsev <del...@ya...> + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by Modified: plugins/akonadi-sync/trunk/src/datasink.cpp ============================================================================== --- plugins/akonadi-sync/trunk/src/datasink.cpp Tue Sep 21 01:12:57 2010 (r6134) +++ plugins/akonadi-sync/trunk/src/datasink.cpp Tue Sep 21 09:02:06 2010 (r6135) @@ -1,5 +1,8 @@ /* Copyright (c) 2008 Volker Krause <vk...@kd...> + Copyright (c) 2010 Emanoil Kotsev <del...@ya...> + + $Id$ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by Modified: plugins/akonadi-sync/trunk/src/datasink.h ============================================================================== --- plugins/akonadi-sync/trunk/src/datasink.h Tue Sep 21 01:12:57 2010 (r6134) +++ plugins/akonadi-sync/trunk/src/datasink.h Tue Sep 21 09:02:06 2010 (r6135) @@ -1,5 +1,8 @@ /* Copyright (c) 2008 Volker Krause <vk...@kd...> + Copyright (c) 2010 Emanoil Kotsev <del...@ya...> + + $Id$ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by Modified: plugins/akonadi-sync/trunk/src/sinkbase.cpp ============================================================================== --- plugins/akonadi-sync/trunk/src/sinkbase.cpp Tue Sep 21 01:12:57 2010 (r6134) +++ plugins/akonadi-sync/trunk/src/sinkbase.cpp Tue Sep 21 09:02:06 2010 (r6135) @@ -1,5 +1,8 @@ /* Copyright (c) 2008 Volker Krause <vk...@kd...> + Copyright (c) 2010 Emanoil Kotsev <del...@ya...> + + $Id$ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by @@ -172,21 +175,21 @@ Q_ASSERT( mSink == 0 ); mSink = sink; - if ( m_canConnect ) + if ( ! m_canConnect ) osync_objtype_sink_set_connect_func(sink, connect_wrapper); - if ( m_canDisconnect ) + if ( ! m_canDisconnect ) osync_objtype_sink_set_disconnect_func(sink, disconnect_wrapper); - if ( m_canGetChanges && m_hasContact ) + if ( ! m_canGetChanges && m_hasContact ) osync_objtype_sink_set_get_changes_func(sink, contact_get_changes_wrapper); - if ( m_canGetChanges && m_hasEvent ) + if ( ! m_canGetChanges && m_hasEvent ) osync_objtype_sink_set_get_changes_func(sink, event_get_changes_wrapper); - if ( m_canGetChanges && m_hasTodo ) + if ( ! m_canGetChanges && m_hasTodo ) osync_objtype_sink_set_get_changes_func(sink, todo_get_changes_wrapper); - if ( m_canGetChanges && m_hasNote ) + if ( ! m_canGetChanges && m_hasNote ) osync_objtype_sink_set_get_changes_func(sink, journal_get_changes_wrapper); - if ( m_canCommit ) + if ( ! m_canCommit ) osync_objtype_sink_set_commit_func(sink, commit_wrapper); // TODO: check if relevant for akonadi // if ( m_canWrite ) @@ -197,7 +200,7 @@ // osync_objtype_sink_set_commit_func(sink, 0); // if ( m_canBatchCommit ) // osync_objtype_sink_set_commit_func(sink, 0); - if ( m_canSyncDone ) + if ( ! m_canSyncDone ) osync_objtype_sink_set_sync_done_func(sink, sync_done_wrapper); } Modified: plugins/akonadi-sync/trunk/src/sinkbase.h ============================================================================== --- plugins/akonadi-sync/trunk/src/sinkbase.h Tue Sep 21 01:12:57 2010 (r6134) +++ plugins/akonadi-sync/trunk/src/sinkbase.h Tue Sep 21 09:02:06 2010 (r6135) @@ -1,5 +1,8 @@ /* Copyright (c) 2008 Volker Krause <vk...@kd...> + Copyright (c) 2010 Emanoil Kotsev <del...@ya...> + + $Id$ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by |
