diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-02-01 13:15:40 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-02-01 13:26:04 +0100 |
| commit | 5d4d0fd7e6bfec98c3f52f604b9411e68e73ed8e (patch) | |
| tree | a484574c325c26fec4c235e90be70fe23fc15a78 | |
| parent | cb54c14cd54cc8f6b33dcafcc8a7b983177cb6df (diff) | |
| download | NetworkManager-5d4d0fd7e6bfec98c3f52f604b9411e68e73ed8e.tar.gz | |
connectivity: fix calling parent dispose()
(cherry picked from commit 2bf4960ec127cf5ab7fd00d93be8743e4116a408)
| -rw-r--r-- | src/nm-connectivity.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index e7e52caec0..348e071c6a 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -144,7 +144,7 @@ nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_ if (msg->status_code == 511) { _LOGD ("check for uri '%s' returned status '%d %s'; captive portal present.", - uri, msg->status_code, msg->reason_phrase); + uri, msg->status_code, msg->reason_phrase); new_state = NM_CONNECTIVITY_PORTAL; } else { /* Check headers; if we find the NM-specific one we're done */ @@ -164,7 +164,7 @@ nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_ } } else { _LOGI ("check for uri '%s' returned status '%d %s'; assuming captive portal.", - uri, msg->status_code, msg->reason_phrase); + uri, msg->status_code, msg->reason_phrase); new_state = NM_CONNECTIVITY_PORTAL; } } @@ -471,11 +471,10 @@ dispose (GObject *object) g_clear_object (&priv->soup_session); } - if (priv->check_id > 0) { - g_source_remove (priv->check_id); - priv->check_id = 0; - } + nm_clear_g_source (&priv->check_id); #endif + + G_OBJECT_CLASS (nm_connectivity_parent_class)->dispose (object); } |