colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-core: declare NM_SETTING_COMPARE_FLAG_INFERRABLE flag in "nm-core-internal.h"

Browse Source 
As this flag is used by NM-core, move it to nm-core-internal.h
header file.

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-08-11 18:10:43 +02:00
parent ef32da01fa
commit 8fe1b79012
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libnm-core/nm-core-internal.h
View File

@@ -45,5 +45,12 @@ gboolean _nm_setting_ip4_config_add_address_with_label (NMSettingIP4Config *s
NMIP4Address *address, NMIP4Address *address,
const char *label); const char *label);
/* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
* connection can be replaced by a already-defined connection. This flag only
* takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE
* flag.
*/
#define NM_SETTING_COMPARE_FLAG_INFERRABLE 0x80000000
#endif #endif

9
libnm-core/nm-setting-private.h
View File

@@ -24,6 +24,8 @@
#include "nm-setting.h" #include "nm-setting.h"
#include "nm-glib-compat.h" #include "nm-glib-compat.h"
#include "nm-core-internal.h"
#define NM_SETTING_SECRET_FLAGS_ALL \ #define NM_SETTING_SECRET_FLAGS_ALL \
(NM_SETTING_SECRET_FLAG_NONE | \ (NM_SETTING_SECRET_FLAG_NONE | \
NM_SETTING_SECRET_FLAG_AGENT_OWNED | \ NM_SETTING_SECRET_FLAG_AGENT_OWNED | \
@@ -73,13 +75,6 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting,
gpointer user_data); gpointer user_data);
/* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
* connection can be replaced by a already-defined connection. This flag only
* takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE
* flag.
*/
#define NM_SETTING_COMPARE_FLAG_INFERRABLE 0x80000000
/* The property of the #NMSetting should be considered during comparisons that /* The property of the #NMSetting should be considered during comparisons that
* use the %NM_SETTING_COMPARE_FLAG_INFERRABLE flag. Properties that don't have * use the %NM_SETTING_COMPARE_FLAG_INFERRABLE flag. Properties that don't have
* this flag, are ignored when doing an infrerrable comparison. This flag should * this flag, are ignored when doing an infrerrable comparison. This flag should

2
src/NetworkManagerUtils.c
View File

@@ -33,7 +33,7 @@
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-setting-private.h" #include "nm-core-internal.h"
#include "nm-logging.h" #include "nm-logging.h"
#include "nm-device.h" #include "nm-device.h"
#include "nm-setting-connection.h" #include "nm-setting-connection.h"