maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/for-master/tde' into nightly

This commit is contained in:
SyncEvolution Nightly Testing 2016-10-13 05:07:07 -07:00
parent 30d42f88ca 7d06fd2869
commit 46a81a3cb8
6 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends/tdepim/TDEPIMAddressBookSourceRegister.cpp
View File

@ -20,6 +20,11 @@
*
*/
#include "TDEPIMAddressBookSource.h"
#include <syncevo/util.h>
#include <syncevo/SyncSource.h>
SE_BEGIN_CXX
static SyncSource *createSource(const SyncSourceParams &params)
@ -105,6 +110,7 @@ protected:
// source.reset((TestingSyncSource *)SyncSource::createTestingSource("contacts", "kde-contacts", true, NULL));
// CPPUNIT_ASSERT_NO_THROW(source->open());
// }
};
SYNCEVOLUTION_TEST_SUITE_REGISTRATION(TDEAddressBookTest);

12
src/backends/tdepim/TDEPIMCalendarSourceRegister.cpp
View File

@ -1,3 +1,4 @@
/*
* Copyright (C) 2016 Emanoil Kotsev emanoil.kotsev@fincom.at
*
@ -25,7 +26,10 @@
// #include "TDEPIMNotesSource.h"
// #include "test.h"
#include "TDEPIMSyncSource.h"
#include "TDEPIMCalendarSource.h"
#include <syncevo/util.h>
#include <syncevo/SyncSource.h>
SE_BEGIN_CXX
@ -43,7 +47,7 @@ static SyncSource *createSource ( const SyncSourceParams &params )
bool isMe = sourceType.m_backend == "TDE PIM Calendar";
#ifndef ENABLE_TDEPIMCAL
if (isMe || sourceType.m_backend == "calendar" ) return RegisterSyncSource::InactiveSource(params);
if (isMe) return RegisterSyncSource::InactiveSource(params);
#else
if (isMe || sourceType.m_backend == "calendar" ) {
if ( sourceType.m_format == "" ||
@ -57,7 +61,7 @@ static SyncSource *createSource ( const SyncSourceParams &params )
isMe = sourceType.m_backend == "TDE PIM Task List";
#ifndef ENABLE_TDEPIMCAL
if (isMe || sourceType.m_backend == "todo") return RegisterSyncSource::InactiveSource(params);
if (isMe) return RegisterSyncSource::InactiveSource(params);
#else
if (isMe || sourceType.m_backend == "todo") {
if ( sourceType.m_format == "" ||
@ -71,7 +75,7 @@ static SyncSource *createSource ( const SyncSourceParams &params )
isMe = sourceType.m_backend == "TDE PIM Memos";
#ifndef ENABLE_TDEPIMCAL
if (isMe || sourceType.m_backend == "memo") return RegisterSyncSource::InactiveSource(params);
if (isMe) return RegisterSyncSource::InactiveSource(params);
#else
if (isMe || sourceType.m_backend == "memo") {
if ( sourceType.m_format == "" ||

6
src/backends/tdepim/TDEPIMNotesSource.h
View File

@ -26,14 +26,14 @@
#include "config.h"
#include "KNotesIface_stub.h"
#include <syncevo/TrackingSyncSource.h>
#include <syncevo/declarations.h>
SE_BEGIN_CXX
#ifdef ENABLE_TDEPIMNOTES
#include "KNotesIface_stub.h"
#include <syncevo/TrackingSyncSource.h>
/**
* Implements access to TDE memo lists (stored as knotes items),
* exporting/importing the memos in plain UTF-8 text.

3
src/backends/tdepim/TDEPIMNotesSourceRegister.cpp
View File

@ -27,6 +27,9 @@
#include "TDEPIMSyncSource.h"
#include <syncevo/util.h>
#include <syncevo/SyncSource.h>
SE_BEGIN_CXX
static SyncSource *createSource ( const SyncSourceParams &params )

6
src/backends/tdepim/TDEPIMSyncSource.h
View File

@ -23,9 +23,9 @@
#ifndef TDEPIMSYNCSOURCE_H
#define TDEPIMSYNCSOURCE_H
// #include "config.h"
#include "config.h"
//#ifdef ENABLE_TDEPIM
#ifdef ENABLE_TDEPIM
#include <tdeapplication.h>
#include <syncevo/util.h>
@ -52,5 +52,5 @@ private:
};
SE_END_CXX
//#endif // ENABLE_TDEPIM
#endif // ENABLE_TDEPIM
#endif // TDEPIMSYNCSOURCE_H

16
src/backends/tdepim/tdepim.am
View File

@ -13,26 +13,36 @@ else
noinst_LTLIBRARIES += $(src_backends_tdepim_lib)
endif
src_backends_tdepim_synctdepimcal_src = \
src_backends_tdepim_synctdepimcal_src =
if ENABLE_TDEPIMCAL
src_backends_tdepim_synctdepimcal_src += \
src/backends/tdepim/TDEPIMSyncSource.h \
src/backends/tdepim/TDEPIMSyncSource.cpp \
src/backends/tdepim/TDEPIMCalendarSource.h \
src/backends/tdepim/TDEPIMCalendarSource.cpp \
$(NOP)
endif
src_backends_tdepim_synctdepimabc_src = \
src_backends_tdepim_synctdepimabc_src =
if ENABLE_TDEPIMABC
src_backends_tdepim_synctdepimabc_src += \
src/backends/tdepim/TDEPIMSyncSource.h \
src/backends/tdepim/TDEPIMSyncSource.cpp \
src/backends/tdepim/TDEPIMAddressBookSource.h \
src/backends/tdepim/TDEPIMAddressBookSource.cpp
endif
src_backends_tdepim_synctdepimnotes_src = \
src_backends_tdepim_synctdepimnotes_src =
if ENABLE_TDEPIMNOTES
src_backends_tdepim_synctdepimnotes_src += \
src/backends/tdepim/TDEPIMSyncSource.h \
src/backends/tdepim/TDEPIMSyncSource.cpp \
src/backends/tdepim/KNotesIface_stub.h \
src/backends/tdepim/KNotesIface_stub.cpp \
src/backends/tdepim/TDEPIMNotesSource.h \
src/backends/tdepim/TDEPIMNotesSource.cpp
endif
src_backends_tdepim_cppflags = \
$(SYNCEVOLUTION_CFLAGS) \