summaryrefslogtreecommitdiff
path: root/src/backends/activesync/ActiveSyncSource.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/backends/activesync/ActiveSyncSource.cpp')
-rw-r--r--src/backends/activesync/ActiveSyncSource.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/backends/activesync/ActiveSyncSource.cpp b/src/backends/activesync/ActiveSyncSource.cpp
index b6971f74..73966e31 100644
--- a/src/backends/activesync/ActiveSyncSource.cpp
+++ b/src/backends/activesync/ActiveSyncSource.cpp
@@ -193,7 +193,7 @@ void ActiveSyncSource::open()
// extract account ID and throw error if missing
std::string username = m_context->getSyncUsername();
std::string folder = getDatabaseID();
- SE_LOG_DEBUG(NULL, NULL,
+ SE_LOG_DEBUG(NULL,
"using eas sync account %s from config %s with folder %s",
username.c_str(),
m_context->getConfigName().c_str(),
@@ -241,10 +241,10 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
m_startSyncKey = lastToken;
if (lastToken.empty()) {
// slow sync: wipe out cached list of IDs, will be filled anew below
- SE_LOG_DEBUG(NULL, getDisplayName(), "sync key empty, starting slow sync");
+ SE_LOG_DEBUG(getDisplayName(), "sync key empty, starting slow sync");
m_ids->clear();
} else {
- SE_LOG_DEBUG(NULL, getDisplayName(), "sync key %s for account '%s' folder '%s', starting incremental sync",
+ SE_LOG_DEBUG(getDisplayName(), "sync key %s for account '%s' folder '%s', starting incremental sync",
lastToken.c_str(),
m_account.c_str(),
m_folder.c_str());
@@ -305,7 +305,7 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
if (luid.empty()) {
throwError("empty server ID for new eas item");
}
- SE_LOG_DEBUG(NULL, getDisplayName(), "new item %s", luid.c_str());
+ SE_LOG_DEBUG(getDisplayName(), "new item %s", luid.c_str());
addItem(luid, NEW);
m_ids->setProperty(luid, "1");
if (!item->data) {
@@ -321,7 +321,7 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
if (luid.empty()) {
throwError("empty server ID for updated eas item");
}
- SE_LOG_DEBUG(NULL, getDisplayName(), "updated item %s", luid.c_str());
+ SE_LOG_DEBUG(getDisplayName(), "updated item %s", luid.c_str());
addItem(luid, UPDATED);
// m_ids.setProperty(luid, "1"); not necessary, should already exist (TODO: check?!)
if (!item->data) {
@@ -337,7 +337,7 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
if (luid.empty()) {
throwError("empty server ID for deleted eas item");
}
- SE_LOG_DEBUG(NULL, getDisplayName(), "deleted item %s", luid.c_str());
+ SE_LOG_DEBUG(getDisplayName(), "deleted item %s", luid.c_str());
addItem(luid, DELETED);
m_ids->removeProperty(luid);
}
@@ -363,7 +363,7 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
m_ids->readProperties(props);
BOOST_FOREACH(const StringPair &entry, props) {
const std::string &luid = entry.first;
- SE_LOG_DEBUG(NULL, getDisplayName(), "existing item %s", luid.c_str());
+ SE_LOG_DEBUG(getDisplayName(), "existing item %s", luid.c_str());
addItem(luid, ANY);
}
@@ -386,7 +386,7 @@ std::string ActiveSyncSource::endSync(bool success)
// let engine do incremental sync next time or start from scratch
// in case of failure
std::string newSyncKey = success ? m_currentSyncKey : "";
- SE_LOG_DEBUG(NULL, getDisplayName(), "next sync key %s", newSyncKey.empty() ? "empty" : newSyncKey.c_str());
+ SE_LOG_DEBUG(getDisplayName(), "next sync key %s", newSyncKey.empty() ? "empty" : newSyncKey.c_str());
return newSyncKey;
}