From 92ce554b89c6a343bf2a59f07a868fc7ca872634 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Tue, 5 Jun 2012 11:24:15 +0300 Subject: [PATCH] config: Use config file name and entry when deciding removal We need to know the config file and entry name in next patch in order to know if the service entry was removed from config file. --- src/config.c | 2 +- src/connman.h | 2 +- src/service.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/config.c b/src/config.c index f3628fd..c3024c6 100644 --- a/src/config.c +++ b/src/config.c @@ -860,7 +860,7 @@ int __connman_config_provision_service(struct connman_service *service) } int __connman_config_provision_service_ident(struct connman_service *service, - const char *ident) + const char *ident, const char *file, const char *entry) { enum connman_service_type type; struct connman_config *config; diff --git a/src/connman.h b/src/connman.h index c8b560b..930dd4e 100644 --- a/src/connman.h +++ b/src/connman.h @@ -525,7 +525,7 @@ void __connman_config_cleanup(void); int __connman_config_load_service(GKeyFile *keyfile, const char *group, connman_bool_t persistent); int __connman_config_provision_service(struct connman_service *service); int __connman_config_provision_service_ident(struct connman_service *service, - const char *ident); + const char *ident, const char *file, const char *entry); int __connman_tethering_init(void); void __connman_tethering_cleanup(void); diff --git a/src/service.c b/src/service.c index 3decf0c..f9fbe9d 100644 --- a/src/service.c +++ b/src/service.c @@ -5505,7 +5505,8 @@ static void provision_changed(gpointer value, gpointer user_data) struct connman_service *service = value; char *path = user_data; - __connman_config_provision_service_ident(service, path); + __connman_config_provision_service_ident(service, path, + service->config_file, service->config_entry); } void __connman_service_provision_changed(const char *ident) -- 2.7.4