fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 13:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

connectivity: fix calling parent dispose()

Browse source 
(cherry picked from commit 2bf4960ec1)
This commit is contained in:
Thomas Haller 2016-02-01 13:15:40 +01:00
parent cb54c14cd5
commit 5d4d0fd7e6
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nm-connectivity.c
View file

@ -144,7 +144,7 @@ nm_connectivity_check_cb (SoupSession *session, SoupMessage *msg, gpointer user_
if (msg->status_code == 511) { if (msg->status_code == 511) {
_LOGD ("check for uri '%s' returned status '%d %s'; captive portal present.", _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; new_state = NM_CONNECTIVITY_PORTAL;
} else { } else {
/* Check headers; if we find the NM-specific one we're done */ /* 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 { } else {
_LOGI ("check for uri '%s' returned status '%d %s'; assuming captive portal.", _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; new_state = NM_CONNECTIVITY_PORTAL;
} }
} }
@ -471,11 +471,10 @@ dispose (GObject *object)
g_clear_object (&priv->soup_session); g_clear_object (&priv->soup_session);
} }
if (priv->check_id > 0) { nm_clear_g_source (&priv->check_id);
g_source_remove (priv->check_id);
priv->check_id = 0;
}
#endif #endif
G_OBJECT_CLASS (nm_connectivity_parent_class)->dispose (object);
} }