diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-02-28 19:34:59 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-03-02 12:14:29 +0100 |
| commit | 8b1b6f3d1a2c45c4269dd456ea16de762f6b189e (patch) | |
| tree | b9fc68e8644e1fcd3752b7b8972cba2842836941 | |
| parent | 72bfe62a9add5fa78bbcbf8bf549605d22c43bcc (diff) | |
| download | NetworkManager-8b1b6f3d1a2c45c4269dd456ea16de762f6b189e.tar.gz | |
libnm-core: expose internal _nm_connection_verify() function
| -rw-r--r-- | libnm-core/nm-connection.c | 6 | ||||
| -rw-r--r-- | libnm-core/nm-core-internal.h | 18 | ||||
| -rw-r--r-- | libnm-core/nm-setting-private.h | 16 |
3 files changed, 19 insertions, 21 deletions
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 4a73e8537d..9c51bc0af4 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -73,10 +73,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - -static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error); - - /*****************************************************************************/ static void @@ -1029,7 +1025,7 @@ nm_connection_verify (NMConnection *connection, GError **error) return result == NM_SETTING_VERIFY_SUCCESS || result == NM_SETTING_VERIFY_NORMALIZABLE; } -static NMSettingVerifyResult +NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error) { NMConnectionPrivate *priv; diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 71e0ff893b..6d2170904b 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -118,6 +118,24 @@ gboolean _nm_connection_replace_settings (NMConnection *connection, NMSettingParseFlags parse_flags, GError **error); +/** + * NMSettingVerifyResult: + * @NM_SETTING_VERIFY_SUCCESS: the setting verifies successfully + * @NM_SETTING_VERIFY_ERROR: the setting has a serious misconfiguration + * @NM_SETTING_VERIFY_NORMALIZABLE: the setting is valid but has properties + * that should be normalized + * @NM_SETTING_VERIFY_NORMALIZABLE_ERROR: the setting is invalid but the + * errors can be fixed by nm_connection_normalize(). + */ +typedef enum { + NM_SETTING_VERIFY_SUCCESS = TRUE, + NM_SETTING_VERIFY_ERROR = FALSE, + NM_SETTING_VERIFY_NORMALIZABLE = 2, + NM_SETTING_VERIFY_NORMALIZABLE_ERROR = 3, +} NMSettingVerifyResult; + +NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error); + NMConnection *_nm_simple_connection_new_from_dbus (GVariant *dict, NMSettingParseFlags parse_flags, GError **error); diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index 8d09e3d759..79b6ac8712 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -27,22 +27,6 @@ #include "nm-core-internal.h" -/** - * NMSettingVerifyResult: - * @NM_SETTING_VERIFY_SUCCESS: the setting verifies successfully - * @NM_SETTING_VERIFY_ERROR: the setting has a serious misconfiguration - * @NM_SETTING_VERIFY_NORMALIZABLE: the setting is valid but has properties - * that should be normalized - * @NM_SETTING_VERIFY_NORMALIZABLE_ERROR: the setting is invalid but the - * errors can be fixed by nm_connection_normalize(). - */ -typedef enum { - NM_SETTING_VERIFY_SUCCESS = TRUE, - NM_SETTING_VERIFY_ERROR = FALSE, - NM_SETTING_VERIFY_NORMALIZABLE = 2, - NM_SETTING_VERIFY_NORMALIZABLE_ERROR = 3, -} NMSettingVerifyResult; - void _nm_register_setting (const char *name, const GType type, const guint32 priority); |