diff options
Diffstat (limited to 'src/dbus/server/pim')
| -rw-r--r-- | src/dbus/server/pim/edsf-view.cpp | 8 | ||||
| -rw-r--r-- | src/dbus/server/pim/folks.cpp | 18 | ||||
| -rw-r--r-- | src/dbus/server/pim/full-view.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/server/pim/individual-traits.cpp | 38 | ||||
| -rw-r--r-- | src/dbus/server/pim/locale-factory-boost.cpp | 4 |
5 files changed, 35 insertions, 35 deletions
diff --git a/src/dbus/server/pim/edsf-view.cpp b/src/dbus/server/pim/edsf-view.cpp index e0c1c531..8bc2a418 100644 --- a/src/dbus/server/pim/edsf-view.cpp +++ b/src/dbus/server/pim/edsf-view.cpp @@ -51,7 +51,7 @@ void EDSFView::doStart() { // This function may get entered again, see retry code in opened() below. - ESourceCXX source(e_source_registry_ref_source(m_registry, m_uuid.c_str()), false); + ESourceCXX source(e_source_registry_ref_source(m_registry, m_uuid.c_str()), TRANSFER_REF); if (!source) { SE_LOG_DEBUG(NULL, "edsf %s: address book not found", m_uuid.c_str()); return; @@ -139,10 +139,10 @@ void EDSFView::read(gboolean success, GSList *contactslist, const GError *gerror } BOOST_FOREACH (EContact *contact, contacts) { - EdsfPersonaCXX persona(edsf_persona_new(m_store, contact), false); - GeeHashSetCXX personas(gee_hash_set_new(G_TYPE_OBJECT, g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL), false); + EdsfPersonaCXX persona(edsf_persona_new(m_store, contact), TRANSFER_REF); + GeeHashSetCXX personas(gee_hash_set_new(G_TYPE_OBJECT, g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL), TRANSFER_REF); gee_collection_add(GEE_COLLECTION(personas.get()), persona.get()); - FolksIndividualCXX individual(folks_individual_new(GEE_SET(personas.get())), false); + FolksIndividualCXX individual(folks_individual_new(GEE_SET(personas.get())), TRANSFER_REF); m_addedSignal(individual); } m_isQuiescent = true; diff --git a/src/dbus/server/pim/folks.cpp b/src/dbus/server/pim/folks.cpp index 7997b2db..1a409dd1 100644 --- a/src/dbus/server/pim/folks.cpp +++ b/src/dbus/server/pim/folks.cpp @@ -94,7 +94,7 @@ void IndividualData::init(const IndividualCompare *compare, const LocaleFactory *locale, FolksIndividual *individual) { - m_individual = individual; + m_individual = FolksIndividualCXX(individual, ADD_REF); if (compare) { m_criteria.clear(); compare->createCriteria(individual, m_criteria); @@ -135,7 +135,7 @@ bool IndividualCompare::compare(const Criteria_t &a, const Criteria_t &b) const IndividualAggregator::IndividualAggregator(const boost::shared_ptr<LocaleFactory> &locale) : m_locale(locale), - m_databases(gee_hash_set_new(G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL), false) + m_databases(gee_hash_set_new(G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL), TRANSFER_REF) { } @@ -215,7 +215,7 @@ void IndividualAggregator::storePrepared() void IndividualAggregator::backendsLoaded() { SE_LOG_DEBUG(NULL, "backend store has loaded backends"); - GeeCollectionCXX coll(folks_backend_store_list_backends(m_backendStore)); + GeeCollectionCXX coll(folks_backend_store_list_backends(m_backendStore), TRANSFER_REF); BOOST_FOREACH (FolksBackend *backend, GeeCollCXX<FolksBackend *>(coll.get())) { SE_LOG_DEBUG(NULL, "folks backend: %s", folks_backend_get_name(backend)); } @@ -225,7 +225,7 @@ void IndividualAggregator::backendsLoaded() // Remember system store, for writing contacts. GeeMap *stores = folks_backend_get_persona_stores(m_eds); FolksPersonaStore *systemStore = static_cast<FolksPersonaStore *>(gee_map_get(stores, "system-address-book")); - m_systemStore = systemStore; + m_systemStore = FolksPersonaStoreCXX(systemStore, TRANSFER_REF); // Tell the backend which databases we want. SE_LOG_DEBUG(NULL, "backends loaded: setting EDS persona stores: [%s]", @@ -541,7 +541,7 @@ private: } void open() { - FolksIndividualAggregatorCXX aggregator(folks_individual_aggregator_new(), false); + FolksIndividualAggregatorCXX aggregator(folks_individual_aggregator_new(), TRANSFER_REF); bool done = false, failed = false; SYNCEVO_GLIB_CALL_ASYNC(folks_individual_aggregator_prepare, boost::bind(asyncCB, _1, @@ -561,11 +561,11 @@ private: GeeMap *individuals = folks_individual_aggregator_get_individuals(aggregator); SE_LOG_DEBUG(NULL, "%d individuals", gee_map_get_size(individuals)); - GeeMapIteratorCXX it(gee_map_map_iterator(individuals), false); + GeeMapIteratorCXX it(gee_map_map_iterator(individuals), TRANSFER_REF); while (gee_map_iterator_next(it)) { PlainGStr id(reinterpret_cast<gchar *>(gee_map_iterator_get_key(it))); FolksIndividualCXX individual(reinterpret_cast<FolksIndividual *>(gee_map_iterator_get_value(it)), - false); + TRANSFER_REF); GValueStringCXX fullname; g_object_get_property(G_OBJECT(individual.get()), "full-name", &fullname); SE_LOG_DEBUG(NULL, "map: id %s name %s = %s", @@ -574,9 +574,9 @@ private: fullname.get()); } - GeeIteratorCXX it2(gee_iterable_iterator(GEE_ITERABLE(individuals)), false); + GeeIteratorCXX it2(gee_iterable_iterator(GEE_ITERABLE(individuals)), TRANSFER_REF); while (gee_iterator_next(it2)) { - GeeMapEntryCXX entry(reinterpret_cast<GeeMapEntry *>(gee_iterator_get(it2)), false); + GeeMapEntryCXX entry(reinterpret_cast<GeeMapEntry *>(gee_iterator_get(it2)), TRANSFER_REF); gchar *id(reinterpret_cast<gchar *>(const_cast<gpointer>(gee_map_entry_get_key(entry)))); FolksIndividual *individual(reinterpret_cast<FolksIndividual *>(const_cast<gpointer>(gee_map_entry_get_value(entry)))); GValueStringCXX fullname; diff --git a/src/dbus/server/pim/full-view.cpp b/src/dbus/server/pim/full-view.cpp index fb86c77d..b154a171 100644 --- a/src/dbus/server/pim/full-view.cpp +++ b/src/dbus/server/pim/full-view.cpp @@ -144,7 +144,7 @@ void FullView::individualModified(gpointer gobject, // // See https://bugzilla.gnome.org/show_bug.cgi?id=684764 // "too many FolksIndividual modification signals" - m_pendingModifications.insert(individual); + m_pendingModifications.insert(FolksIndividualCXX(individual, ADD_REF)); waitForIdle(); } diff --git a/src/dbus/server/pim/individual-traits.cpp b/src/dbus/server/pim/individual-traits.cpp index 7c054e52..9f0e6c83 100644 --- a/src/dbus/server/pim/individual-traits.cpp +++ b/src/dbus/server/pim/individual-traits.cpp @@ -344,7 +344,7 @@ template <> struct dbus_traits<GDateTime *> { // GTimeZone local = g_time_zone_new_local() // and use that throughout the runtime of the process, like // folks-eds does. - GDateTimeCXX local(g_date_time_to_local(value), false); + GDateTimeCXX local(g_date_time_to_local(value), TRANSFER_REF); gint year, month, day; g_date_time_get_ymd(local.get(), &year, &month, &day); g_variant_builder_open(&builder, G_VARIANT_TYPE("(iii)")); // tuple with year, month, day @@ -399,11 +399,11 @@ static void DBus2AbstractField(GDBusCXX::ExtractArgs &context, g_object_unref, FolksAbstractFieldDetailsHash, NULL, NULL, FolksAbstractFieldDetailsEqual, NULL, NULL), - false); + TRANSFER_REF); BOOST_FOREACH (const Details_t::value_type &entry, value) { const Details_t::value_type::first_type &val = entry.first; const Details_t::value_type::second_type &flags = entry.second; - FolksAbstractFieldDetailsCXX field(fieldNew(val.c_str(), NULL), false); + FolksAbstractFieldDetailsCXX field(fieldNew(val.c_str(), NULL), TRANSFER_REF); BOOST_FOREACH (const std::string &type, flags) { folks_abstract_field_details_add_parameter(field.get(), FOLKS_ABSTRACT_FIELD_DETAILS_PARAM_TYPE, @@ -438,9 +438,9 @@ static void DBus2SimpleAbstractField(GDBusCXX::ExtractArgs &context, g_object_unref, FolksAbstractFieldDetailsHash, NULL, NULL, FolksAbstractFieldDetailsEqual, NULL, NULL), - false); + TRANSFER_REF); BOOST_FOREACH (const std::string &val, value) { - FolksAbstractFieldDetailsCXX field(fieldNew(val.c_str(), NULL), false); + FolksAbstractFieldDetailsCXX field(fieldNew(val.c_str(), NULL), TRANSFER_REF); gee_collection_add(GEE_COLLECTION(set.get()), field.get()); } @@ -466,10 +466,10 @@ static void DBus2Role(GDBusCXX::ExtractArgs &context, g_object_unref, FolksAbstractFieldDetailsHash, NULL, NULL, FolksAbstractFieldDetailsEqual, NULL, NULL), - false); + TRANSFER_REF); BOOST_FOREACH (const StringMap &entry, value) { FolksRoleCXX role(folks_role_new(NULL, NULL, NULL), - false); + TRANSFER_REF); BOOST_FOREACH (const StringPair &aspect, entry) { const std::string &k = aspect.first; const std::string &v = aspect.second; @@ -482,7 +482,7 @@ static void DBus2Role(GDBusCXX::ExtractArgs &context, } } FolksRoleFieldDetailsCXX field(folks_role_field_details_new(role.get(), NULL), - false); + TRANSFER_REF); gee_collection_add(GEE_COLLECTION(set.get()), field.get()); } @@ -500,7 +500,7 @@ static void DBus2Groups(GDBusCXX::ExtractArgs &context, { std::list<std::string> value; GDBusCXX::dbus_traits<typeof(value)>::get(context, valueIter, value); - GeeHashSetCXX set(gee_hash_set_new(G_TYPE_STRING, (GBoxedCopyFunc)g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL), false); + GeeHashSetCXX set(gee_hash_set_new(G_TYPE_STRING, (GBoxedCopyFunc)g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL), TRANSFER_REF); BOOST_FOREACH(const std::string &entry, value) { gee_collection_add(GEE_COLLECTION(set.get()), entry.c_str()); @@ -527,7 +527,7 @@ static void DBus2Addr(GDBusCXX::ExtractArgs &context, g_object_unref, FolksAbstractFieldDetailsHash, NULL, NULL, FolksAbstractFieldDetailsEqual, NULL, NULL), - false); + TRANSFER_REF); BOOST_FOREACH (const Details_t::value_type &entry, value) { const StringMap &fields = entry.first; const std::vector<std::string> &flags = entry.second; @@ -540,9 +540,9 @@ static void DBus2Addr(GDBusCXX::ExtractArgs &context, GetWithDef(fields, CONTACT_HASH_ADDRESSES_COUNTRY).c_str(), NULL /* address format */, NULL /* uid */), - false); + TRANSFER_REF); FolksAbstractFieldDetailsCXX field(FOLKS_ABSTRACT_FIELD_DETAILS(folks_postal_address_field_details_new(address.get(), NULL)), - false); + TRANSFER_REF); BOOST_FOREACH (const std::string &type, flags) { folks_abstract_field_details_add_parameter(field.get(), FOLKS_ABSTRACT_FIELD_DETAILS_PARAM_TYPE, @@ -596,15 +596,15 @@ void DBus2PersonaDetails(GDBusCXX::ExtractArgs &context, GetWithDef(value, CONTACT_HASH_STRUCTURED_NAME_ADDITIONAL).c_str(), GetWithDef(value, CONTACT_HASH_STRUCTURED_NAME_PREFIXES).c_str(), GetWithDef(value, CONTACT_HASH_STRUCTURED_NAME_SUFFIXES).c_str()), - false)); + TRANSFER_REF)); } else if (key == CONTACT_HASH_PHOTO) { std::string value; GDBusCXX::dbus_traits<std::string>::get(context, valueIter, value); GFileCXX file(g_file_new_for_uri(value.c_str()), - false); + TRANSFER_REF); g_hash_table_insert(details.get(), const_cast<gchar *>(folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_AVATAR)), - new GValueObjectCXX(g_file_icon_new(file.get()), false)); + new GValueObjectCXX(g_file_icon_new(file.get()), TRANSFER_REF)); } else if (key == CONTACT_HASH_BIRTHDAY) { boost::tuple<int, int, int> value; GDBusCXX::dbus_traits<typeof(value)>::get(context, valueIter, value); @@ -612,16 +612,16 @@ void DBus2PersonaDetails(GDBusCXX::ExtractArgs &context, value.get<1>(), value.get<2>(), 0, 0, 0), - false); + TRANSFER_REF); g_hash_table_insert(details.get(), const_cast<gchar *>(folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_BIRTHDAY)), - new GValueDateTimeCXX(g_date_time_to_utc(local.get()), false)); + new GValueDateTimeCXX(g_date_time_to_utc(local.get()), TRANSFER_REF)); } else if (key == CONTACT_HASH_LOCATION) { boost::tuple<double, double> value; GDBusCXX::dbus_traits<typeof(value)>::get(context, valueIter, value); FolksLocationCXX location(folks_location_new(value.get<0>(), value.get<1>()), - false); + TRANSFER_REF); g_hash_table_insert(details.get(), const_cast<gchar *>(folks_persona_store_detail_key(FOLKS_PERSONA_DETAIL_LOCATION)), new GValueObjectCXX(location.get())); @@ -660,7 +660,7 @@ struct Pending Pending(const Result<void ()> &result, FolksPersona *persona) : m_result(result), - m_persona(persona), + m_persona(persona, ADD_REF), m_current(0) {} diff --git a/src/dbus/server/pim/locale-factory-boost.cpp b/src/dbus/server/pim/locale-factory-boost.cpp index b266b19b..accf142d 100644 --- a/src/dbus/server/pim/locale-factory-boost.cpp +++ b/src/dbus/server/pim/locale-factory-boost.cpp @@ -370,7 +370,7 @@ public: // to the search term. e_book_query_field_test(E_CONTACT_TEL, E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER, m_tel.c_str()), - false); + TRANSFER_REF); PlainGStr filter(e_book_query_to_string(query.get())); return filter.get(); } @@ -554,7 +554,7 @@ public: // // We restore the right order by sorting, which puts the // country code first, and then joining. - GeeCollectionCXX coll(folks_abstract_field_details_get_parameter_values(phone, "x-evolution-e164"), false); + GeeCollectionCXX coll(folks_abstract_field_details_get_parameter_values(phone, "x-evolution-e164"), TRANSFER_REF); if (coll) { std::vector<std::string> components; components.reserve(2); |