From cfae0b79ba12231cb354c62c627607e40825fe5d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 3 Jun 2012 19:40:58 -0500 Subject: [PATCH] core: use nm_device_get_connection() in a few more places --- src/nm-policy.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/nm-policy.c b/src/nm-policy.c index 5420bdf3f8..5e42cacea0 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -990,15 +990,6 @@ reset_connections_retries (gpointer user_data) return FALSE; } -static NMConnection * -get_device_connection (NMDevice *device) -{ - NMActRequest *req = NULL; - - req = nm_device_get_act_request (device); - return req ? nm_act_request_get_connection (req) : NULL; -} - static void schedule_activate_all (NMPolicy *policy); static void @@ -1039,7 +1030,7 @@ device_state_changed (NMDevice *device, gpointer user_data) { NMPolicy *policy = (NMPolicy *) user_data; - NMConnection *connection = get_device_connection (device); + NMConnection *connection = nm_device_get_connection (device); if (connection) g_object_set_data (G_OBJECT (connection), FAILURE_REASON_TAG, GUINT_TO_POINTER (0)); @@ -1297,7 +1288,7 @@ firewall_update_zone (NMPolicy *policy, NMConnection *connection) for (iter = devices; iter; iter = g_slist_next (iter)) { NMDevice *dev = NM_DEVICE (iter->data); - if ( (get_device_connection (dev) == connection) + if ( (nm_device_get_connection (dev) == connection) && (nm_device_get_state (dev) == NM_DEVICE_STATE_ACTIVATED)) { nm_firewall_manager_add_or_change_zone (policy->fw_manager, nm_device_get_ip_iface (dev), @@ -1323,7 +1314,7 @@ firewall_started (NMFirewallManager *manager, for (iter = devices; iter; iter = g_slist_next (iter)) { NMDevice *dev = NM_DEVICE (iter->data); - connection = get_device_connection (dev); + connection = nm_device_get_connection (dev); s_con = nm_connection_get_setting_connection (connection); if (nm_device_get_state (dev) == NM_DEVICE_STATE_ACTIVATED) { nm_firewall_manager_add_or_change_zone (policy->fw_manager,