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

ActiveSync: fixed handling of "deleted items" server information

Browse source 
The libeassync API was clarified to use plain strings for deleted
items instead of EasItem pointers. This commit adapts the
ActiveSyncSource::beginSync() method accordingly.

activesyncd commit ID:
2d09e206b50ea3f001da15f47fabfa339cbbd468
This commit is contained in:
Patrick Ohly 2011-07-08 13:08:25 +02:00
parent fd6c14c8aa
commit 08b410f423
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/backends/activesync/ActiveSyncSource.cpp
View file

@ -77,6 +77,11 @@ void EASItemUnref(EasItemInfo *info) { g_object_unref(&info->parent_instance); }
/** non-copyable list of EasItemInfo pointers, owned by list */
typedef GListCXX<EasItemInfo, GSList, EASItemUnref> EASItemsCXX;
void GStringUnref(char *str) { g_free(str); }
/** non-copyable list of strings, owned by list */
typedef GListCXX<char, GSList, GStringUnref> EASIdsCXX;
/** non-copyable smart pointer to an EasItemInfo, unrefs when going out of scope */
typedef eptr<EasItemInfo, GObject> EASItemPtr;
@ -91,7 +96,8 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
}
GErrorCXX gerror;
EASItemsCXX created, updated, deleted;
EASItemsCXX created, updated;
EASIdsCXX deleted;
gchar *buffer;
if (!eas_sync_handler_get_items(m_handler,
m_startSyncKey.c_str(),
@ -124,8 +130,8 @@ void ActiveSyncSource::beginSync(const std::string &lastToken, const std::string
// m_ids.setProperty(luid, "1"); not necessary, should already exist (TODO: check?!)
m_items[luid] = item->data;
}
BOOST_FOREACH(EasItemInfo *item, deleted) {
string luid(item->server_id);
BOOST_FOREACH(const char *serverID, deleted) {
string luid(serverID);
SE_LOG_DEBUG(this, NULL, "deleted item %s", luid.c_str());
addItem(luid, DELETED);
m_ids->removeProperty(luid);