diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/EvolutionContactSource.cpp | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 7cc0e37c..b5ae5125 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +syncevolution (1:0.7+0.8-beta1a) unstable; urgency=low + + * Disabled support for X-OSSO-CONTACT-STATE on Maemo: + it caused crashes because garbage strings were returned + by the Evolution libraries (SF #1947050) + + -- Patrick Ohly <patrick.ohly@gmx.de> Tue, 15 Jul 2008 22:15:00 +0200 + syncevolution (1:0.7+0.8-beta1) unstable; urgency=low * first beta of SyncEvolution 0.8 diff --git a/src/EvolutionContactSource.cpp b/src/EvolutionContactSource.cpp index 60b8aa20..ad6dfa3c 100644 --- a/src/EvolutionContactSource.cpp +++ b/src/EvolutionContactSource.cpp @@ -204,7 +204,7 @@ void EvolutionContactSource::beginSyncThrow(bool needAll, if (deleteLocal) { deleteItemsQuery.set( e_book_query_any_field_contains(""), "query" ); } -#ifdef ENABLE_MAEMO +#ifdef ENABLE_MAEMO_OSSO_CONTACT_STATE else { deleteItemsQuery.set( e_book_query_vcard_field_exists("X-OSSO-CONTACT-STATE"), "query" ); } @@ -220,7 +220,7 @@ void EvolutionContactSource::beginSyncThrow(bool needAll, for (;nextItem; nextItem = nextItem->next) { const char *uid = (const char *)e_contact_get_const(E_CONTACT(nextItem->data), E_CONTACT_UID); -#ifdef ENABLE_MAEMO +#ifdef ENABLE_MAEMO_OSSO_CONTACT_STATE if (!deleteLocal) { GList *nextState = (GList *)e_contact_get(E_CONTACT(nextItem->data), E_CONTACT_OSSO_CONTACT_STATE); |