Hi,
On Tue, 2013-08-27 at 14:59 +0200, Peter Meerwald wrote:
> 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;
> --
> 1.8.4
The vpn part is still attached to this patch, which means ConnMan cannot
be compiled after applying this one. That's bad as the code should be
compilable after every patch; especially git bisect stops working at
this point.
And then also patch 9/10 will be affected.
Patrik
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
