Hi,
So far so good.
On Mon, 2013-08-26 at 12:58 +0200, Peter Meerwald wrote:
> diff --git a/vpn/vpn-config.c b/vpn/vpn-config.c
> index abb641b..f671db9 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 = g_key_file_get_string(keyfile, "global", CONFIG_KEY_NAME, NULL);
> + str = __connman_config_get_string(keyfile, "global", CONFIG_KEY_NAME,
> NULL);
> if (str) {
> g_free(config->name);
> config->name = str;
> }
>
> - str = g_key_file_get_string(keyfile, "global", CONFIG_KEY_DESC, NULL);
> + str = __connman_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 8d89a31..af9c660 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 = g_key_file_get_string_list(keyfile,
> + networks =
> __connman_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 = g_key_file_get_string(keyfile,
> + value = __connman_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 = g_key_file_get_string(keyfile, id, "Type", NULL);
> + type = __connman_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 = g_key_file_get_string(keyfile, group,
> + file = __connman_config_get_string(keyfile, group,
> "Config.file", NULL);
> if (!file)
> goto next;
>
> - section = g_key_file_get_string(keyfile, group,
> + section = __connman_config_get_string(keyfile, group,
> "Config.ident", NULL);
> if (!section)
> goto next;
This part chokes on gcc:
CCLD vpn/connman-vpnd
vpn/vpn_connman_vpnd-vpn-provider.o: In function
`provider_load_from_keyfile':
/home/pflykt/projects/connman/vpn/vpn-provider.c:746: undefined
reference to `__connman_config_get_string_list'
/home/pflykt/projects/connman/vpn/vpn-provider.c:754: undefined
reference to `__connman_config_get_string'
as src/config.c is not included for vpn/
Cheers,
Patrik
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
