From fd984e41a07fad843644a52cfe594dfe57e9dd4a Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Mon, 14 Nov 2011 17:29:32 +0000 Subject: [PATCH] e/connman: update to new api. SVN revision: 65193 --- src/modules/connman/e_mod_main.c | 20 +++++--------------- src/modules/connman/e_mod_main.h | 1 + 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c index 69cb65db4..b248b4e56 100644 --- a/src/modules/connman/e_mod_main.c +++ b/src/modules/connman/e_mod_main.c @@ -334,24 +334,14 @@ _connman_service_free(E_Connman_Service *service) static const char * _connman_service_security_find(const E_Connman_Element *element) { - const E_Connman_Array *security; + const char **security; + unsigned int count; - if (!e_connman_service_security_get(element, &security)) + if (!e_connman_service_security_get(element, &count, &security)) return NULL; - if (!security) + if ((!security) || (count < 1)) return NULL; - - if (security->type != DBUS_TYPE_STRING) - { - ERR("security array expected to have type '%c' but got '%c'", - DBUS_TYPE_STRING, security->type); - return NULL; - } - - if (eina_array_count_get(security->array) < 1) - return NULL; - - return security->array->data[0]; + return security[0]; } static void diff --git a/src/modules/connman/e_mod_main.h b/src/modules/connman/e_mod_main.h index 0731471a9..f14c66d09 100644 --- a/src/modules/connman/e_mod_main.h +++ b/src/modules/connman/e_mod_main.h @@ -3,6 +3,7 @@ #include "config.h" #include +#define E_CONNMAN_I_KNOW_THIS_API_IS_SUBJECT_TO_CHANGE 1 #include #include