I splitted both (tde and tdepim)
tde.patch is to prevent the wallet backend from crashing syncevolution when
enabled. Again tdewallet backend is not tested by any means as I am not
using it.
tdepim.patch is to make the notes backend build.
Unfortunately I was still not able to perform an e2e test with this version.
I am looking forward to do it next. Again I do not expect any functional
issues as I am using the code from the previous version on daily bases.
I hope this helps
regards
diff --git a/tmp/syncevolution-1.5.1+20161014+SE+46a81a3+SYSYNC+7c9a4bf/src/backends/tde/TDEPlatform.cpp b/syncevolution-1.5.1+20161014+SE+46a81a3+SYSYNC+7c9a4bf/src/backends/tde/TDEPlatform.cpp
index d262f57..bf459b1 100644
--- a/tmp/syncevolution-1.5.1+20161014+SE+46a81a3+SYSYNC+7c9a4bf/src/backends/tde/TDEPlatform.cpp
+++ b/syncevolution-1.5.1+20161014+SE+46a81a3+SYSYNC+7c9a4bf/src/backends/tde/TDEPlatform.cpp
@@ -37,12 +37,13 @@
#include <syncevo/UserInterface.h>
#include <syncevo/SyncConfig.h>
+
+#include <tdewallet.h>
+#include <dcopclient.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <tdewallet.h>
-
#include <syncevo/declarations.h>
SE_BEGIN_CXX
@@ -51,22 +52,18 @@ SE_BEGIN_CXX
void TDEInitMainSlot(const char *appname)
{
-
- int argc = 1;
- static char *argv[] = { const_cast<char *>(appname), NULL };
- TDEAboutData aboutData( "syncevotdewlt", // internal program name
- "SyncEvolution-TDEPIM-plugin", // displayable program name.
- "0.1", // version string
- "SyncEvolution TDEPIM plugin", // short porgram description
- TDEAboutData::License_GPL, // license type
- "(c) 2016, [email protected]" // copyright statement
- );
+ //connect to dcop
+ DCOPClient *kn_dcop = TDEApplication::kApplication()->dcopClient();
+ if (!kn_dcop)
+ Exception::throwError(SE_HERE, "internal init error, unable to make new dcop instance for tdenotes");
- TDECmdLineArgs::init(argc, argv, &aboutData);
-
- TDEApplication syncevotdewallet( "syncevolution-tdewallet" );
- syncevotdewlt.dcopClient()->registerAs(syncevotdewallet.name());
+ TQString appId = kn_dcop->registerAs("syncevolution-tdewallet");
+
+/* SyncSourceLogging::init(InitList<std::string>("SUMMARY") + "LOCATION",
+ " ",
+ m_operations);
+*/
}
@@ -125,7 +122,8 @@ bool TDEWalletLoadPasswordSlot(const InitStateTri &keyring,
TQString(key.authtype.c_str())+','+
TQString::number(key.port);
- TQString wallet_name = TDEWallet::Wallet::NetworkWallet();
+// TQString wallet_name = TDEWallet::Wallet::NetworkWallet();
+ TQString wallet_name = TDEWallet::Wallet::LocalWallet();
const TQString folder("Syncevolution");
diff --git a/tmp/syncevolution-1.5.1+20161014+SE+46a81a3+SYSYNC+7c9a4bf/src/backends/tdepim/TDEPIMNotesSource.h b/syncevolution-1.5.1+20161014+SE+46a81a3+SYSYNC+7c9a4bf/src/backends/tdepim/TDEPIMNotesSource.h
index 3276924..632a89d 100644
--- a/tmp/syncevolution-1.5.1+20161014+SE+46a81a3+SYSYNC+7c9a4bf/src/backends/tdepim/TDEPIMNotesSource.h
+++ b/syncevolution-1.5.1+20161014+SE+46a81a3+SYSYNC+7c9a4bf/src/backends/tdepim/TDEPIMNotesSource.h
@@ -27,13 +27,13 @@
#include "config.h"
#include <syncevo/declarations.h>
-SE_BEGIN_CXX
#ifdef ENABLE_TDEPIMNOTES
#include "KNotesIface_stub.h"
#include <syncevo/TrackingSyncSource.h>
+SE_BEGIN_CXX
/**
* Implements access to TDE memo lists (stored as knotes items),
* exporting/importing the memos in plain UTF-8 text.
_______________________________________________
SyncEvolution mailing list
[email protected]
https://lists.syncevolution.org/mailman/listinfo/syncevolution
