Tray module cause error g_bus_unwatch_name()
Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>pull/2217/head
parent
d638610db1
commit
3af1853260
|
@ -22,10 +22,6 @@ Host::~Host() {
|
||||||
Gio::DBus::unwatch_name(bus_name_id_);
|
Gio::DBus::unwatch_name(bus_name_id_);
|
||||||
bus_name_id_ = 0;
|
bus_name_id_ = 0;
|
||||||
}
|
}
|
||||||
if (watcher_id_ > 0) {
|
|
||||||
Gio::DBus::unwatch_name(watcher_id_);
|
|
||||||
watcher_id_ = 0;
|
|
||||||
}
|
|
||||||
g_cancellable_cancel(cancellable_);
|
g_cancellable_cancel(cancellable_);
|
||||||
g_clear_object(&cancellable_);
|
g_clear_object(&cancellable_);
|
||||||
g_clear_object(&watcher_);
|
g_clear_object(&watcher_);
|
||||||
|
|
|
@ -14,12 +14,7 @@ Watcher::Watcher()
|
||||||
watcher_(sn_watcher_skeleton_new()) {}
|
watcher_(sn_watcher_skeleton_new()) {}
|
||||||
|
|
||||||
Watcher::~Watcher() {
|
Watcher::~Watcher() {
|
||||||
if (hosts_ != nullptr) {
|
if (items_ != nullptr) {
|
||||||
g_slist_free_full(hosts_, gfWatchFree);
|
|
||||||
hosts_ = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (items_ != nullptr) {
|
|
||||||
g_slist_free_full(items_, gfWatchFree);
|
g_slist_free_full(items_, gfWatchFree);
|
||||||
items_ = nullptr;
|
items_ = nullptr;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue