diff options
| author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2012-06-05 11:24:15 +0300 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-06-11 13:04:34 +0300 |
| commit | 92ce554b89c6a343bf2a59f07a868fc7ca872634 (patch) | |
| tree | 35387cdd48f4bbb67c176e44b3ae42c0598776c7 | |
| parent | 217d80fa99e6d8f75c8fe142874cca49697a4368 (diff) | |
| download | connman-92ce554b89c6a343bf2a59f07a868fc7ca872634.tar.gz connman-92ce554b89c6a343bf2a59f07a868fc7ca872634.tar.bz2 connman-92ce554b89c6a343bf2a59f07a868fc7ca872634.zip | |
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.
| -rw-r--r-- | src/config.c | 2 | ||||
| -rw-r--r-- | src/connman.h | 2 | ||||
| -rw-r--r-- | src/service.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/config.c b/src/config.c index f3628fd4..c3024c6b 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 c8b560b7..930dd4e0 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 3decf0cc..f9fbe9d2 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) |