diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /src/nm-policy.h | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'src/nm-policy.h')
| -rw-r--r-- | src/nm-policy.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nm-policy.h b/src/nm-policy.h index 2c96e6d0..916ede00 100644 --- a/src/nm-policy.h +++ b/src/nm-policy.h @@ -31,10 +31,10 @@ #define NM_POLICY_MANAGER "manager" #define NM_POLICY_SETTINGS "settings" -#define NM_POLICY_DEFAULT_IP4_DEVICE "default-ip4-device" -#define NM_POLICY_DEFAULT_IP6_DEVICE "default-ip6-device" -#define NM_POLICY_ACTIVATING_IP4_DEVICE "activating-ip4-device" -#define NM_POLICY_ACTIVATING_IP6_DEVICE "activating-ip6-device" +#define NM_POLICY_DEFAULT_IP4_AC "default-ip4-ac" +#define NM_POLICY_DEFAULT_IP6_AC "default-ip6-ac" +#define NM_POLICY_ACTIVATING_IP4_AC "activating-ip4-ac" +#define NM_POLICY_ACTIVATING_IP6_AC "activating-ip6-ac" typedef struct _NMPolicyClass NMPolicyClass; @@ -42,10 +42,10 @@ GType nm_policy_get_type (void); NMPolicy *nm_policy_new (NMManager *manager, NMSettings *settings); -NMDevice *nm_policy_get_default_ip4_device (NMPolicy *policy); -NMDevice *nm_policy_get_default_ip6_device (NMPolicy *policy); -NMDevice *nm_policy_get_activating_ip4_device (NMPolicy *policy); -NMDevice *nm_policy_get_activating_ip6_device (NMPolicy *policy); +NMActiveConnection *nm_policy_get_default_ip4_ac (NMPolicy *policy); +NMActiveConnection *nm_policy_get_default_ip6_ac (NMPolicy *policy); +NMActiveConnection *nm_policy_get_activating_ip4_ac (NMPolicy *policy); +NMActiveConnection *nm_policy_get_activating_ip6_ac (NMPolicy *policy); /** * NMPolicyHostnameMode |