e_dbus/connman: remove deprecated properties

MNC and MCC were remove in connman 0.67
APN was remove in connman 0.70

Now they are gone here, too.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@65181 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/e_dbus_connman_test.c b/src/bin/e_dbus_connman_test.c
index 8d6460c..5b5772a 100644 (file)
--- a/src/bin/e_dbus_connman_test.c
+++ b/src/bin/e_dbus_connman_test.c
@@ -1142,125 +1142,6 @@ _on_cmd_service_set_auto_connect(__UNUSED__ char *cmd, char *args)
 }
 
 static Eina_Bool
-_on_cmd_service_get_setup_required(__UNUSED__ char *cmd, char *args)
-{
-   const char *path;
-   Eina_Bool setup_required;
-   E_Connman_Element *e;
-
-   if (!args)
-     {
-       fputs("ERROR: missing the service path\n", stderr);
-       return ECORE_CALLBACK_RENEW;
-     }
-   _tok(args);
-   path = args;
-
-   e = e_connman_service_get(path);
-   if (e_connman_service_setup_required_get(e, &setup_required))
-     printf(":::Service %s Setup Required = %hhu\n", path, setup_required);
-   else
-     fputs("ERROR: can't get service setup required\n", stderr);
-   return ECORE_CALLBACK_RENEW;
-}
-
-static Eina_Bool
-_on_cmd_service_get_apn(__UNUSED__ char *cmd, char *args)
-{
-   const char *apn, *path;
-   E_Connman_Element *e;
-
-   if (!args)
-     {
-       fputs("ERROR: missing the service path\n", stderr);
-       return ECORE_CALLBACK_RENEW;
-     }
-   _tok(args);
-   path = args;
-
-   e = e_connman_service_get(path);
-   if (e_connman_service_apn_get(e, &apn))
-     printf(":::Service %s APN = \"%s\"\n", path, apn);
-   else
-     fputs("ERROR: can't get service APN\n", stderr);
-   return ECORE_CALLBACK_RENEW;
-}
-
-static Eina_Bool
-_on_cmd_service_set_apn(__UNUSED__ char *cmd, char *args)
-{
-   char *apn, *path;
-   E_Connman_Element *e;
-
-   if (!args)
-     {
-       fputs("ERROR: missing the service path\n", stderr);
-       return ECORE_CALLBACK_RENEW;
-     }
-   path = args;
-   apn = _tok(args);
-
-   if (!apn)
-     {
-       fputs("ERROR: missing the apn value\n", stderr);
-       return ECORE_CALLBACK_RENEW;
-     }
-   _tok(apn);
-
-   e = e_connman_service_get(path);
-   if (e_connman_service_apn_set
-       (e, apn, _method_success_check, "service_set_apn"))
-     printf(":::Service %s APN set to \"%s\"\n", path, apn);
-   else
-     fputs("ERROR: can't set service APN\n", stderr);
-   return ECORE_CALLBACK_RENEW;
-}
-
-static Eina_Bool
-_on_cmd_service_get_mcc(__UNUSED__ char *cmd, char *args)
-{
-   const char *mcc, *path;
-   E_Connman_Element *e;
-
-   if (!args)
-     {
-       fputs("ERROR: missing the service path\n", stderr);
-       return ECORE_CALLBACK_RENEW;
-     }
-   _tok(args);
-   path = args;
-
-   e = e_connman_service_get(path);
-   if (e_connman_service_mcc_get(e, &mcc))
-     printf(":::Service %s MCC = \"%s\"\n", path, mcc);
-   else
-     fputs("ERROR: can't get service MCC\n", stderr);
-   return ECORE_CALLBACK_RENEW;
-}
-
-static Eina_Bool
-_on_cmd_service_get_mnc(__UNUSED__ char *cmd, char *args)
-{
-   const char *mnc, *path;
-   E_Connman_Element *e;
-
-   if (!args)
-     {
-       fputs("ERROR: missing the service path\n", stderr);
-       return ECORE_CALLBACK_RENEW;
-     }
-   _tok(args);
-   path = args;
-
-   e = e_connman_service_get(path);
-   if (e_connman_service_mnc_get(e, &mnc))
-     printf(":::Service %s MNC = \"%s\"\n", path, mnc);
-   else
-     fputs("ERROR: can't get service MNC\n", stderr);
-   return ECORE_CALLBACK_RENEW;
-}
-
-static Eina_Bool
 _on_cmd_service_get_roaming(__UNUSED__ char *cmd, char *args)
 {
    const char *path;
@@ -1717,11 +1598,6 @@ _on_input(__UNUSED__ void *data, Ecore_Fd_Handler *fd_handler)
      {"service_get_immutable", _on_cmd_service_get_immutable},
      {"service_get_auto_connect", _on_cmd_service_get_auto_connect},
      {"service_set_auto_connect", _on_cmd_service_set_auto_connect},
-     {"service_get_setup_required", _on_cmd_service_get_setup_required},
-     {"service_get_apn", _on_cmd_service_get_apn},
-     {"service_set_apn", _on_cmd_service_set_apn},
-     {"service_get_mcc", _on_cmd_service_get_mcc},
-     {"service_get_mnc", _on_cmd_service_get_mnc},
      {"service_get_roaming", _on_cmd_service_get_roaming},
      {"service_get_ipv4_method", _on_cmd_service_get_ipv4_method},
      {"service_get_ipv4_address", _on_cmd_service_get_ipv4_address},

diff --git a/src/bin/e_dbus_connman_test_api.c b/src/bin/e_dbus_connman_test_api.c
index 82a8862..88d0c6e 100644 (file)
--- a/src/bin/e_dbus_connman_test_api.c
+++ b/src/bin/e_dbus_connman_test_api.c
@@ -428,11 +428,6 @@ static const struct test_desc test_desc_service[] = {
   TEST_DESC_BOOL_GET(e_connman_service_immutable_get, 0),
   TEST_DESC_BOOL_GET(e_connman_service_auto_connect_get, 0),
   //TEST_DESC_BOOL_SET(e_connman_service_auto_connect_set, 1),
-  TEST_DESC_BOOL_GET(e_connman_service_setup_required_get, 1),
-  TEST_DESC_STRING_GET(e_connman_service_apn_get, 1),
-  //TEST_DESC_STRING_SET(e_connman_service_apn_set, 1),
-  TEST_DESC_STRING_GET(e_connman_service_mcc_get, 1),
-  TEST_DESC_STRING_GET(e_connman_service_mnc_get, 1),
   TEST_DESC_BOOL_GET(e_connman_service_roaming_get, 1),
   TEST_DESC_STRING_GET(e_connman_service_ipv4_method_get, 1),
   TEST_DESC_STRING_GET(e_connman_service_ipv4_address_get, 1),

diff --git a/src/lib/connman/E_Connman.h b/src/lib/connman/E_Connman.h
index ac8c140..449c6c7 100644 (file)
--- a/src/lib/connman/E_Connman.h
+++ b/src/lib/connman/E_Connman.h
@@ -147,15 +147,9 @@ EAPI Eina_Bool              e_connman_service_immutable_get(const E_Connman_Elem
 EAPI Eina_Bool              e_connman_service_auto_connect_get(const E_Connman_Element *service, Eina_Bool *auto_connect) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
 EAPI Eina_Bool              e_connman_service_auto_connect_set(E_Connman_Element *service, Eina_Bool auto_connect, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
-EAPI Eina_Bool              e_connman_service_setup_required_get(const E_Connman_Element *service, Eina_Bool *setup_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
 EAPI Eina_Bool              e_connman_service_passphrase_required_get(const E_Connman_Element *service, Eina_Bool *passphrase_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
 EAPI Eina_Bool              e_connman_service_login_required_get(const E_Connman_Element *service, Eina_Bool *login_required) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
 
-EAPI Eina_Bool              e_connman_service_apn_get(const E_Connman_Element *service, const char **apn) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
-EAPI Eina_Bool              e_connman_service_apn_set(E_Connman_Element *service, const char *apn, E_DBus_Method_Return_Cb cb, const void *data) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
-
-EAPI Eina_Bool              e_connman_service_mcc_get(const E_Connman_Element *service, const char **mcc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
-EAPI Eina_Bool              e_connman_service_mnc_get(const E_Connman_Element *service, const char **mnc) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
 EAPI Eina_Bool              e_connman_service_roaming_get(const E_Connman_Element *service, Eina_Bool *roaming) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
 
 EAPI Eina_Bool              e_connman_service_ipv4_method_get(const E_Connman_Element *service, const char **method) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;

diff --git a/src/lib/connman/e_connman.c b/src/lib/connman/e_connman.c
index 7c7d94e..a7414e0 100644 (file)
--- a/src/lib/connman/e_connman.c
+++ b/src/lib/connman/e_connman.c
@@ -57,10 +57,6 @@ const char *e_connman_prop_login_required = NULL;
 const char *e_connman_prop_favorite = NULL;
 const char *e_connman_prop_immutable = NULL;
 const char *e_connman_prop_auto_connect = NULL;
-const char *e_connman_prop_setup_required = NULL;
-const char *e_connman_prop_apn = NULL;
-const char *e_connman_prop_mcc = NULL;
-const char *e_connman_prop_mnc = NULL;
 const char *e_connman_prop_roaming = NULL;
 const char *e_connman_prop_technology_default = NULL;
 const char *e_connman_prop_technologies_available = NULL;
@@ -307,10 +303,6 @@ e_connman_system_init(E_DBus_Connection *edbus_conn)
    ADD_STRINGSHARE(e_connman_prop_favorite, "Favorite");
    ADD_STRINGSHARE(e_connman_prop_immutable, "Immutable");
    ADD_STRINGSHARE(e_connman_prop_auto_connect, "AutoConnect");
-   ADD_STRINGSHARE(e_connman_prop_setup_required, "SetupRequired");
-   ADD_STRINGSHARE(e_connman_prop_apn, "APN");
-   ADD_STRINGSHARE(e_connman_prop_mcc, "MCC");
-   ADD_STRINGSHARE(e_connman_prop_mnc, "MNC");
    ADD_STRINGSHARE(e_connman_prop_roaming, "Roaming");
    ADD_STRINGSHARE(e_connman_prop_technology_default, "DefaultTechnology");
    ADD_STRINGSHARE(e_connman_prop_technologies_available,
@@ -406,10 +398,6 @@ e_connman_system_shutdown(void)
    _stringshare_del(&e_connman_prop_favorite);
    _stringshare_del(&e_connman_prop_immutable);
    _stringshare_del(&e_connman_prop_auto_connect);
-   _stringshare_del(&e_connman_prop_setup_required);
-   _stringshare_del(&e_connman_prop_apn);
-   _stringshare_del(&e_connman_prop_mcc);
-   _stringshare_del(&e_connman_prop_mnc);
    _stringshare_del(&e_connman_prop_roaming);
    _stringshare_del(&e_connman_prop_technology_default);
    _stringshare_del(&e_connman_prop_technologies_available);

diff --git a/src/lib/connman/e_connman_private.h b/src/lib/connman/e_connman_private.h
index 5c538f6..8f7e552 100644 (file)
--- a/src/lib/connman/e_connman_private.h
+++ b/src/lib/connman/e_connman_private.h
@@ -67,10 +67,6 @@ extern const char *e_connman_prop_passphrase_required;
 extern const char *e_connman_prop_favorite;
 extern const char *e_connman_prop_immutable;
 extern const char *e_connman_prop_auto_connect;
-extern const char *e_connman_prop_setup_required;
-extern const char *e_connman_prop_apn;
-extern const char *e_connman_prop_mcc;
-extern const char *e_connman_prop_mnc;
 extern const char *e_connman_prop_roaming;
 extern const char *e_connman_prop_technology_default;
 extern const char *e_connman_prop_technologies_available;

diff --git a/src/lib/connman/e_connman_service.c b/src/lib/connman/e_connman_service.c
index 0f1ddda..e196130 100644 (file)
--- a/src/lib/connman/e_connman_service.c
+++ b/src/lib/connman/e_connman_service.c
@@ -629,157 +629,6 @@ e_connman_service_auto_connect_set(E_Connman_Element *service, Eina_Bool auto_co
 }
 
 /**
- * Get property "SetupRequired" value.
- *
- * If this property isn't found then @c EINA_FALSE is returned.
- * If @c EINA_FALSE is returned, then this call failed and parameter-returned
- * values shall be considered invalid.
- *
- * If the service is Cellular, then this property
- * indicates that some extra setup steps are required.
- *
- * In most cases it is required to fill in the APN
- * details.
- *
- * @param service path to get property.
- * @param setup_required where to store the property value, must be a
- *        pointer to Eina_Bool (Eina_Bool *).
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise.
- */
-Eina_Bool
-e_connman_service_setup_required_get(const E_Connman_Element *service, Eina_Bool *setup_required)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(setup_required, EINA_FALSE);
-   return e_connman_element_property_get_stringshared
-             (service, e_connman_prop_setup_required, NULL, setup_required);
-}
-
-/**
- * Get property "APN" value.
- *
- * If this property isn't found then @c EINA_FALSE is returned.
- * If @c EINA_FALSE is returned, then this call failed and parameter-returned
- * values shall be considered invalid.
- *
- * If the service is Cellular, then this property
- * contains the APN details.
- *
- * The APN is network provider specific and even
- * sometimes data plan specific. Possible examples
- * are "isp.cingular" or "internet.t-mobile".
- *
- * This property might also not always be included
- * since it is protected by a different security policy.
- *
- * @param service path to get property.
- * @param apn where to store the property value, must be a pointer
- *        to string (const char **), it will not be allocated or
- *        copied and references will be valid until element changes,
- *        so copy it if you want to use it later.
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise.
- * @see e_connman_service_apn_set()
- */
-Eina_Bool
-e_connman_service_apn_get(const E_Connman_Element *service, const char **apn)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(apn, EINA_FALSE);
-   return e_connman_element_property_get_stringshared
-             (service, e_connman_prop_apn, NULL, apn);
-}
-
-/**
- * Set property "APN" value.
- *
- * If this property isn't found then @c EINA_FALSE is returned.
- * If @c EINA_FALSE is returned, then this call failed and parameter-returned
- * values shall be considered invalid.
- *
- * If the service is Cellular, then this property
- * contains the APN details.
- *
- * The APN is network provider specific and even
- * sometimes data plan specific. Possible examples
- * are "isp.cingular" or "internet.t-mobile".
- *
- * This property might also not always be included
- * since it is protected by a different security policy.
- *
- * @param service path to get property.
- * @param passphrase value to set.
- * @param cb function to call when server replies or some error happens.
- * @param data data to give to cb when it is called.
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise.
- * @see e_connman_service_apn_get()
- */
-Eina_Bool
-e_connman_service_apn_set(E_Connman_Element *service, const char *apn, E_DBus_Method_Return_Cb cb, const void *data)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE);
-   return e_connman_element_property_set_full
-             (service, e_connman_prop_apn, DBUS_TYPE_STRING,
-             apn, cb, data);
-}
-
-/**
- * Get property "MCC" value.
- *
- * If this property isn't found then @c EINA_FALSE is returned.
- * If @c EINA_FALSE is returned, then this call failed and parameter-returned
- * values shall be considered invalid.
- *
- * If the service is Cellular, then this property
- * contains the Mobile Country Code.
- *
- * @param service path to get property.
- * @param mcc where to store the property value, must be a pointer
- *        to string (const char **), it will not be allocated or
- *        copied and references will be valid until element changes,
- *        so copy it if you want to use it later.
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise.
- */
-Eina_Bool
-e_connman_service_mcc_get(const E_Connman_Element *service, const char **mcc)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(mcc, EINA_FALSE);
-   return e_connman_element_property_get_stringshared
-             (service, e_connman_prop_mcc, NULL, mcc);
-}
-
-/**
- * Get property "MNC" value.
- *
- * If this property isn't found then @c EINA_FALSE is returned.
- * If @c EINA_FALSE is returned, then this call failed and parameter-returned
- * values shall be considered invalid.
- *
- * If the service is Cellular, then this property
- * contains the Mobile Network Code.
- *
- * @param service path to get property.
- * @param mnc where to store the property value, must be a pointer
- *        to string (const char **), it will not be allocated or
- *        copied and references will be valid until element changes,
- *        so copy it if you want to use it later.
- *
- * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise.
- */
-Eina_Bool
-e_connman_service_mnc_get(const E_Connman_Element *service, const char **mnc)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(service, EINA_FALSE);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(mnc, EINA_FALSE);
-   return e_connman_element_property_get_stringshared
-             (service, e_connman_prop_mnc, NULL, mnc);
-}
-
-/**
  * Get property "Roaming" value.
  *
  * If this property isn't found then @c EINA_FALSE is returned.