---
vpn/vpn-config.c | 4 ++--
vpn/vpn-provider.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/vpn/vpn-config.c b/vpn/vpn-config.c
index 657fbfc..8dcbbdd 100644
--- a/vpn/vpn-config.c
+++ b/vpn/vpn-config.c
@@ -332,13 +332,13 @@ static int load_config(struct vpn_config *config, char
*path, enum what action)
/* Verify keys validity of the global section */
check_keys(keyfile, "global", config_possible_keys);
- str = __connman_config_get_string(keyfile, "global", CONFIG_KEY_NAME,
NULL);
+ str = __vpn_config_get_string(keyfile, "global", CONFIG_KEY_NAME, NULL);
if (str) {
g_free(config->name);
config->name = str;
}
- str = __connman_config_get_string(keyfile, "global", CONFIG_KEY_DESC,
NULL);
+ str = __vpn_config_get_string(keyfile, "global", CONFIG_KEY_DESC, NULL);
if (str) {
g_free(config->description);
config->description = str;
diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index af9c660..7b53f71 100644
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -743,7 +743,7 @@ static int provider_load_from_keyfile(struct vpn_provider
*provider,
key = settings[idx];
if (key) {
if (g_str_equal(key, "Networks")) {
- networks =
__connman_config_get_string_list(keyfile,
+ networks = __vpn_config_get_string_list(keyfile,
provider->identifier,
key,
&num_user_networks,
@@ -751,7 +751,7 @@ static int provider_load_from_keyfile(struct vpn_provider
*provider,
provider->user_networks = get_routes(networks);
} else {
- value = __connman_config_get_string(keyfile,
+ value = __vpn_config_get_string(keyfile,
provider->identifier,
key, NULL);
vpn_provider_set_string(provider, key,
@@ -1735,7 +1735,7 @@ static void provider_create_all_from_type(const char
*provider_type)
if (!keyfile)
continue;
- type = __connman_config_get_string(keyfile, id, "Type", NULL);
+ type = __vpn_config_get_string(keyfile, id, "Type", NULL);
DBG("keyfile %p id %s type %s", keyfile, id, type);
@@ -2577,12 +2577,12 @@ static void remove_unprovisioned_providers()
if (!keyfile)
continue;
- file = __connman_config_get_string(keyfile, group,
+ file = __vpn_config_get_string(keyfile, group,
"Config.file", NULL);
if (!file)
goto next;
- section = __connman_config_get_string(keyfile, group,
+ section = __vpn_config_get_string(keyfile, group,
"Config.ident", NULL);
if (!section)
goto next;
--
1.8.4
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
