diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine-eds.cpp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index b6b4f5e..0e5bec6 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -47,16 +47,21 @@ class EdsEngine::Impl { public: - Impl(): - m_cancellable(g_cancellable_new()) + Impl() { - e_source_registry_new(m_cancellable, on_source_registry_ready, this); + auto cancellable_deleter = [](GCancellable * c) { + g_cancellable_cancel(c); + g_clear_object(&c); + }; + + m_cancellable = std::shared_ptr<GCancellable>(g_cancellable_new(), cancellable_deleter); + + e_source_registry_new(m_cancellable.get(), on_source_registry_ready, this); } ~Impl() { - g_cancellable_cancel(m_cancellable); - g_clear_object(&m_cancellable); + m_cancellable.reset(); while(!m_sources.empty()) remove_source(*m_sources.begin()); @@ -131,7 +136,7 @@ public: e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), on_alarm_component_list_ready, new ClientSubtask(main_task, client, color)); g_clear_pointer(&sexp, g_free); @@ -142,7 +147,7 @@ public: e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), on_event_component_list_ready, new ClientSubtask(main_task, client, color)); g_clear_pointer(&sexp, g_free); @@ -160,7 +165,7 @@ public: e_cal_client_get_object(kv.second, appointment.uid.c_str(), nullptr, - m_cancellable, + m_cancellable.get(), on_object_ready_for_disable, this); } @@ -271,7 +276,7 @@ private: g_debug("%s connecting a client to source %s", G_STRFUNC, source_uid); e_cal_client_connect(source, source_type, - self->m_cancellable, + self->m_cancellable.get(), on_client_connected, gself); } @@ -306,7 +311,7 @@ private: // now create a view for it so that we can listen for changes e_cal_client_get_view (ecc, "#t", // match all - self->m_cancellable, + self->m_cancellable.get(), on_client_view_ready, self); @@ -429,7 +434,7 @@ private: e_cal_client_get_object_list_as_comps( client, sexp, - m_cancellable, + m_cancellable.get(), ensure_client_alarms_have_triggers_async_cb, this); @@ -510,7 +515,7 @@ private: e_cal_client_modify_objects(client, modify_slist, E_CAL_OBJ_MOD_ALL, - m_cancellable, + m_cancellable.get(), ensure_canonical_alarms_have_triggers_async_cb, this); @@ -839,7 +844,7 @@ private: ClientSubtask * subtask, GTimeZone * gtz) { - // events with alarms are covered by add_alarm_to_subtask(), + // events with alarms are covered by add_alarms_to_subtask(), // so skip them here auto auids = e_cal_component_get_alarm_uids(component); const bool has_alarms = auids != nullptr; @@ -958,7 +963,7 @@ private: e_cal_client_modify_object(E_CAL_CLIENT(client), e_cal_component_get_icalcomponent(ecc), E_CAL_OBJ_MOD_THIS, - static_cast<Impl*>(gself)->m_cancellable, + static_cast<Impl*>(gself)->m_cancellable.get(), on_disable_done, nullptr); @@ -990,7 +995,7 @@ private: std::set<ESource*> m_sources; std::map<ESource*,ECalClient*> m_clients; std::map<ESource*,ECalClientView*> m_views; - GCancellable* m_cancellable {}; + std::shared_ptr<GCancellable> m_cancellable; ESourceRegistry* m_source_registry {}; guint m_rebuild_tag {}; time_t m_rebuild_deadline {}; |