fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 14:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: core: fix build without connectivity check

Browse source
This commit is contained in:
Thomas Haller 2017-11-13 14:17:45 +01:00
commit dbe2f20aba
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nm-manager.c
View file

@ -6250,7 +6250,6 @@ get_property (GObject *object, guint prop_id,
NMConfigData *config_data;
const NMGlobalDnsConfig *dns_config;
const char *type;
NMConnectivity *connectivity;
switch (prop_id) {
case PROP_VERSION:
@ -6300,8 +6299,16 @@ get_property (GObject *object, guint prop_id,
g_value_set_boolean (value, nm_config_data_get_connectivity_uri (config_data) != NULL);
break;
case PROP_CONNECTIVITY_CHECK_ENABLED:
#if WITH_CONCHECK
{
NMConnectivity *connectivity;
connectivity = nm_connectivity_get ();
g_value_set_boolean (value, nm_connectivity_check_enabled (connectivity));
}
#else
g_value_set_boolean (value, FALSE);
#endif
break;
case PROP_PRIMARY_CONNECTION:
nm_utils_g_value_set_object_path (value, priv->primary_connection);

4
src/tests/config/test-config.c
View file

@ -318,6 +318,7 @@ test_config_global_dns (void)
g_object_unref (config);
}
#if WITH_CONCHECK
static void
test_config_connectivity_check (void)
{
@ -351,6 +352,7 @@ test_config_connectivity_check (void)
g_assert (remove (CONFIG_INTERN) == 0);
}
#endif
static void
test_config_no_auto_default (void)
@ -1053,7 +1055,9 @@ main (int argc, char **argv)
g_test_add_func ("/config/set-values", test_config_set_values);
g_test_add_func ("/config/global-dns", test_config_global_dns);
#if WITH_CONCHECK
g_test_add_func ("/config/connectivity-check", test_config_connectivity_check);
#endif
g_test_add_func ("/config/signal", test_config_signal);