diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-08-11 18:21:53 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-08-22 15:22:16 +0200 |
| commit | d299c425d4495453743e0bc3884dbeb0a7405108 (patch) | |
| tree | f24ad2ec56f2a3ee7e02761d740f668c0dd0d466 | |
| parent | 8fe1b790126f433e8b9d05b3385e7075b6af68ae (diff) | |
| download | NetworkManager-d299c425d4495453743e0bc3884dbeb0a7405108.tar.gz | |
libnm: move declaration of NM_SETTING_SECRET_FLAGS_ALL to nm-core-internal.h
As NM_SETTING_SECRET_FLAGS_ALL is used in libnm/nm-vpn-plugin-utils.c,
it is exposed as internal API and should be declared in
nm-core-internal.h.
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | libnm-core/nm-core-internal.h | 8 | ||||
| -rw-r--r-- | libnm-core/nm-setting-private.h | 6 | ||||
| -rw-r--r-- | libnm-core/nm-setting.h | 2 | ||||
| -rw-r--r-- | libnm/nm-vpn-plugin-utils.c | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 9437bbd3a3..fdf2397d6d 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -53,4 +53,12 @@ gboolean _nm_setting_ip4_config_add_address_with_label (NMSettingIP4Config *s #define NM_SETTING_COMPARE_FLAG_INFERRABLE 0x80000000 + +#define NM_SETTING_SECRET_FLAGS_ALL \ + (NM_SETTING_SECRET_FLAG_NONE | \ + NM_SETTING_SECRET_FLAG_AGENT_OWNED | \ + NM_SETTING_SECRET_FLAG_NOT_SAVED | \ + NM_SETTING_SECRET_FLAG_NOT_REQUIRED) + + #endif diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index 8fe798122a..913b8a739e 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -26,12 +26,6 @@ #include "nm-core-internal.h" -#define NM_SETTING_SECRET_FLAGS_ALL \ - (NM_SETTING_SECRET_FLAG_NONE | \ - NM_SETTING_SECRET_FLAG_AGENT_OWNED | \ - NM_SETTING_SECRET_FLAG_NOT_SAVED | \ - NM_SETTING_SECRET_FLAG_NOT_REQUIRED) - /** * NMSettingVerifyResult: * @NM_SETTING_VERIFY_SUCCESS: the setting verifies successfully diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h index 793d24ed5b..2420cb49a8 100644 --- a/libnm-core/nm-setting.h +++ b/libnm-core/nm-setting.h @@ -108,7 +108,7 @@ typedef enum { NM_SETTING_SECRET_FLAG_NOT_SAVED = 0x00000002, NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004 - /* NOTE: if adding flags, update nm-setting-private.h as well */ + /* NOTE: if adding flags, update nm-core-internal.h as well */ } NMSettingSecretFlags; /** diff --git a/libnm/nm-vpn-plugin-utils.c b/libnm/nm-vpn-plugin-utils.c index 0e800e9c16..bfa939a15f 100644 --- a/libnm/nm-vpn-plugin-utils.c +++ b/libnm/nm-vpn-plugin-utils.c @@ -25,7 +25,7 @@ #include "nm-vpn-plugin-utils.h" #include "nm-vpn-plugin.h" -#include "nm-setting-private.h" +#include "nm-core-internal.h" #include "nm-dbus-glib-types.h" #define DATA_KEY_TAG "DATA_KEY=" |