diff options
Diffstat (limited to 'src/backends/evolution')
4 files changed, 12 insertions, 12 deletions
diff --git a/src/backends/evolution/EvolutionCalendarSource.cpp b/src/backends/evolution/EvolutionCalendarSource.cpp index f9cdf1f3..cb01eb44 100644 --- a/src/backends/evolution/EvolutionCalendarSource.cpp +++ b/src/backends/evolution/EvolutionCalendarSource.cpp @@ -156,7 +156,7 @@ SyncSource::Databases EvolutionCalendarSource::getDatabases() throwError("unable to access backend databases", gerror); } } - ESourceListCXX sources(tmp, false); + ESourceListCXX sources(tmp, TRANSFER_REF); bool first = true; for (GSList *g = sources ? e_source_list_peek_groups (sources) : NULL; g; @@ -240,7 +240,7 @@ void EvolutionCalendarSource::open() if (!e_cal_get_sources(&tmp, sourceType(), gerror)) { throwError("unable to access backend databases", gerror); } - ESourceListCXX sources(tmp, false); + ESourceListCXX sources(tmp, TRANSFER_REF); string id = getDatabaseID(); ESource *source = findSource(sources, id); @@ -430,7 +430,7 @@ void EvolutionCalendarSource::listAllItems(RevisionMap_t &revisions) void EvolutionCalendarSource::close() { - m_calendar = NULL; + m_calendar.reset(); } void EvolutionCalendarSource::readItem(const string &luid, std::string &item, bool raw) @@ -858,7 +858,7 @@ void EvolutionCalendarSource::removeItem(const string &luid) * remove all items with the given uid and if we only wanted to * delete the parent, then recreate the children. */ - ICalComps_t children = removeEvents(id.m_uid, true, false); + ICalComps_t children = removeEvents(id.m_uid, true, TRANSFER_REF); // recreate children bool first = true; diff --git a/src/backends/evolution/EvolutionContactSource.cpp b/src/backends/evolution/EvolutionContactSource.cpp index 05821055..ea23d615 100644 --- a/src/backends/evolution/EvolutionContactSource.cpp +++ b/src/backends/evolution/EvolutionContactSource.cpp @@ -177,7 +177,7 @@ void EvolutionContactSource::open() if (!e_book_get_addressbooks(&tmp, gerror)) { throwError("unable to access address books", gerror); } - ESourceListCXX sources(tmp, false); + ESourceListCXX sources(tmp, TRANSFER_REF); string id = getDatabaseID(); ESource *source = findSource(sources, id); @@ -347,7 +347,7 @@ void EvolutionContactSource::listAllItems(RevisionMap_t &revisions) GErrorCXX gerror; EBookClientView *view; - EBookQueryCXX allItemsQuery(e_book_query_any_field_contains(""), false); + EBookQueryCXX allItemsQuery(e_book_query_any_field_contains(""), TRANSFER_REF); PlainGStr sexp(e_book_query_to_string (allItemsQuery.get())); if (!e_book_client_get_view_sync(m_addressbook, sexp, &view, NULL, gerror)) { @@ -403,7 +403,7 @@ void EvolutionContactSource::listAllItems(RevisionMap_t &revisions) void EvolutionContactSource::close() { - m_addressbook = NULL; + m_addressbook.reset(); } string EvolutionContactSource::getRevision(const string &luid) diff --git a/src/backends/evolution/EvolutionSyncSource.cpp b/src/backends/evolution/EvolutionSyncSource.cpp index e39a5302..f569082b 100644 --- a/src/backends/evolution/EvolutionSyncSource.cpp +++ b/src/backends/evolution/EvolutionSyncSource.cpp @@ -36,7 +36,7 @@ void EvolutionSyncSource::getDatabasesFromRegistry(SyncSource::Databases &result ESourceRegistryCXX registry = EDSRegistryLoader::getESourceRegistry(); ESourceListCXX sources(e_source_registry_list_sources(registry, extension)); ESourceCXX def(refDef ? refDef(registry) : NULL, - false); + TRANSFER_REF); BOOST_FOREACH (ESource *source, sources) { result.push_back(Database(e_source_get_display_name(source), e_source_get_uid(source), @@ -64,7 +64,7 @@ EClientCXX EvolutionSyncSource::openESource(const char *extension, if (!source) { if (refBuiltin && (id.empty() || id == "<<system>>")) { - ESourceCXX builtin(refBuiltin(registry), false); + ESourceCXX builtin(refBuiltin(registry), TRANSFER_REF); client = EClientCXX::steal(newClient(builtin, gerror)); // } else if (!id.compare(0, 7, "file://")) { // TODO: create source @@ -129,7 +129,7 @@ SyncSource::Database EvolutionSyncSource::createDatabase(const Database &databas e_source_new(NULL, NULL, gerror) : e_source_new_with_uid(database.m_uri.c_str(), NULL, gerror), - false); + TRANSFER_REF); if (!source) { gerror.throwError("e_source_new()"); } @@ -179,7 +179,7 @@ SyncSource::Database EvolutionSyncSource::createDatabase(const Database &databas void EvolutionSyncSource::deleteDatabase(const std::string &uri) { ESourceRegistryCXX registry = EDSRegistryLoader::getESourceRegistry(); - ESourceCXX source(e_source_registry_ref_source(registry, uri.c_str()), false); + ESourceCXX source(e_source_registry_ref_source(registry, uri.c_str()), TRANSFER_REF); if (!source) { throwError(StringPrintf("EDS database with URI '%s' cannot be deleted, does not exist", uri.c_str())); diff --git a/src/backends/evolution/EvolutionSyncSource.h b/src/backends/evolution/EvolutionSyncSource.h index dfaa67c2..9e1ca618 100644 --- a/src/backends/evolution/EvolutionSyncSource.h +++ b/src/backends/evolution/EvolutionSyncSource.h @@ -120,7 +120,7 @@ class EvolutionAsync { public: EvolutionAsync() { - m_loop = GMainLoopCXX(g_main_loop_new(NULL, TRUE), false); + m_loop = GMainLoopStealCXX(g_main_loop_new(NULL, TRUE)); } /** start processing events */ |