diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-06-07 16:28:18 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-06-09 16:16:39 +0200 |
| commit | 5e656b5872e6399d6536e3fb043ca9c63e298774 (patch) | |
| tree | 58fac4b7a5aa035a292f7e2a1a009c467e79f175 | |
| parent | 2aa4239cba745c67c6b4fa165c5c366d51c961a9 (diff) | |
| download | NetworkManager-5e656b5872e6399d6536e3fb043ca9c63e298774.tar.gz | |
ppp: unexport NMPPPManager instance on dispose()
Let's explicitly unexports on dispose(). Probably that already
happened, because NMExportedObject asserts that it is unexported
during !quitting.
During quitting, we probably don't tear down the manager.
Anyway, we should always unexport.
(cherry picked from commit f07dca941dc327e11c4252688020d5fd0b9b3567)
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index 37d7a464a0..fd0b991490 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -1234,8 +1234,12 @@ static void dispose (GObject *object) { NMPPPManager *self = (NMPPPManager *) object; + NMExportedObject *exported = NM_EXPORTED_OBJECT (self); NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (self); + if (nm_exported_object_is_exported (exported)) + nm_exported_object_unexport (exported); + _ppp_cleanup (self); _ppp_kill (self); |