static unsigned int init_count = 0;
static char *unique_name = NULL;
-static const char bus_name[] = "org.moblin.connman";
-static const char fdo_bus_name[] = "org.freedesktop.DBus";
-static const char fdo_interface[] = "org.freedesktop.DBus";
-static const char fdo_path[] = "/org/freedesktop/DBus";
+static const char bus_name[] = "net.connman";
E_DBus_Connection *e_connman_conn = NULL;
EAPI int E_CONNMAN_EVENT_ELEMENT_UPDATED = 0;
const char *e_connman_iface_manager = NULL;
-const char *e_connman_iface_network = NULL;
const char *e_connman_iface_profile = NULL;
const char *e_connman_iface_service = NULL;
-const char *e_connman_iface_device = NULL;
const char *e_connman_iface_connection = NULL;
+const char *e_connman_iface_technology = NULL;
const char *e_connman_prop_available = NULL;
-const char *e_connman_prop_connected = NULL;
const char *e_connman_prop_connections = NULL;
const char *e_connman_prop_default = NULL;
-const char *e_connman_prop_device = NULL;
-const char *e_connman_prop_devices = NULL;
+const char *e_connman_prop_ipv4 = NULL;
+const char *e_connman_prop_ipv4_configuration = NULL;
+const char *e_connman_prop_ethernet = NULL;
const char *e_connman_prop_interface = NULL;
-const char *e_connman_prop_ipv4_address = NULL;
-const char *e_connman_prop_ipv4_method = NULL;
+const char *e_connman_prop_speed = NULL;
+const char *e_connman_prop_duplex = NULL;
+const char *e_connman_prop_method = NULL;
+const char *e_connman_prop_address = NULL;
+const char *e_connman_prop_gateway = NULL;
+const char *e_connman_prop_netmask = NULL;
+const char *e_connman_prop_mtu = NULL;
const char *e_connman_prop_name = NULL;
-const char *e_connman_prop_network = NULL;
-const char *e_connman_prop_networks = NULL;
const char *e_connman_prop_offline_mode = NULL;
const char *e_connman_prop_policy = NULL;
-const char *e_connman_prop_powered = NULL;
const char *e_connman_prop_priority = NULL;
const char *e_connman_prop_profiles = NULL;
+const char *e_connman_prop_profile_active = NULL;
const char *e_connman_prop_services = NULL;
+const char *e_connman_prop_technologies = NULL;
const char *e_connman_prop_remember = NULL;
-const char *e_connman_prop_scan_interval = NULL;
-const char *e_connman_prop_scanning = NULL;
const char *e_connman_prop_state = NULL;
-const char *e_connman_prop_strengh = NULL;
+const char *e_connman_prop_strength = NULL;
const char *e_connman_prop_type = NULL;
-const char *e_connman_prop_wifi_mode = NULL;
-const char *e_connman_prop_wifi_passphrase = NULL;
-const char *e_connman_prop_wifi_security = NULL;
-const char *e_connman_prop_wifi_ssid = NULL;
const char *e_connman_prop_error = NULL;
-const char *e_connman_prop_mode = NULL;
const char *e_connman_prop_security = NULL;
const char *e_connman_prop_passphrase = NULL;
const char *e_connman_prop_passphrase_required = NULL;
+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;
+const char *e_connman_prop_technologies_enabled = NULL;
+const char *e_connman_prop_technologies_connected = NULL;
+const char *e_connman_prop_nameservers = NULL;
+const char *e_connman_prop_nameservers_configuration = NULL;
+const char *e_connman_prop_domains = NULL;
+const char *e_connman_prop_domains_configuration = NULL;
+const char *e_connman_prop_proxy = NULL;
+const char *e_connman_prop_proxy_configuration = NULL;
+const char *e_connman_prop_url = NULL;
+const char *e_connman_prop_servers = NULL;
+const char *e_connman_prop_excludes = NULL;
int _e_dbus_connman_log_dom = -1;
return unique_name ? unique_name : bus_name;
}
-
/***********************************************************************
- * Manager
- ***********************************************************************/
+* Manager
+***********************************************************************/
/**
* Synchronize elements with server.
*
* This will not remove stale elements.
*
- * @return 1 on success, 0 otherwise.
+ * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise.
*/
-bool
+Eina_Bool
e_connman_manager_sync_elements(void)
{
E_Connman_Element *manager;
if (!unique_name)
- return FALSE;
+ return EINA_FALSE;
+
manager = e_connman_element_register(manager_path, e_connman_iface_manager);
if (manager)
- e_connman_element_properties_sync(manager);
+ e_connman_element_properties_sync(manager);
else
- return FALSE;
+ return EINA_FALSE;
DBG("sync_manager: %s (%s)", unique_name, bus_name);
- return TRUE;
+ return EINA_TRUE;
}
static void
DBG("enter connman at %s (old was %s)", uid, unique_name);
if (unique_name && strcmp(unique_name, uid) == 0)
{
- DBG("same unique_name for connman, ignore.");
- return;
+ DBG("same unique_name for connman, ignore.");
+ return;
}
if (unique_name)
- _e_connman_system_name_owner_exit();
+ _e_connman_system_name_owner_exit();
unique_name = strdup(uid);
dbus_error_init(&err);
if (!dbus_message_get_args(msg, &err,
- DBUS_TYPE_STRING, &name,
- DBUS_TYPE_STRING, &from,
- DBUS_TYPE_STRING, &to,
- DBUS_TYPE_INVALID))
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_STRING, &from,
+ DBUS_TYPE_STRING, &to,
+ DBUS_TYPE_INVALID))
{
- ERR("could not get NameOwnerChanged arguments: %s: %s",
- err.name, err.message);
- dbus_error_free(&err);
- return;
+ ERR("could not get NameOwnerChanged arguments: %s: %s",
+ err.name, err.message);
+ dbus_error_free(&err);
+ return;
}
if (strcmp(name, bus_name) != 0)
- return;
+ return;
DBG("NameOwnerChanged from=[%s] to=[%s]", from, to);
if (from[0] == '\0' && to[0] != '\0')
- _e_connman_system_name_owner_enter(to);
+ {
+ _e_connman_system_name_owner_enter(to);
+ }
else if (from[0] != '\0' && to[0] == '\0')
{
- DBG("exit connman at %s", from);
- if (strcmp(unique_name, from) != 0)
- DBG("%s was not the known name %s, ignored.", from, unique_name);
- else
- _e_connman_system_name_owner_exit();
+ DBG("exit connman at %s", from);
+ if (strcmp(unique_name, from) != 0)
+ DBG("%s was not the known name %s, ignored.", from, unique_name);
+ else
+ _e_connman_system_name_owner_exit();
}
else
- DBG("unknow change from %s to %s", from, to);
+ {
+ DBG("unknow change from %s to %s", from, to);
+ }
}
static void
pending_get_name_owner = NULL;
if (!_dbus_callback_check_and_init(msg, &itr, err))
- return;
+ return;
t = dbus_message_iter_get_arg_type(&itr);
if (!_dbus_iter_type_check(t, DBUS_TYPE_STRING))
- return;
+ return;
dbus_message_iter_get_basic(&itr, &uid);
if (!uid)
{
- ERR("no name owner!");
- return;
+ ERR("no name owner!");
+ return;
}
_e_connman_system_name_owner_enter(uid);
/**
* Initialize E Connection Manager (E_Connman) system.
*
- * This will connect and watch org.moblin.connman.Manager and Element
+ * This will connect and watch net.connman.Manager and Element
* events and translate to Ecore main loop events, also provide a
* proxy for method invocation on server.
*
init_count++;
if (init_count > 1)
- return init_count;
+ return init_count;
_e_dbus_connman_log_dom = eina_log_domain_register
- ("e_dbus_connman", EINA_LOG_DEFAULT_COLOR);
+ ("e_dbus_connman", EINA_LOG_DEFAULT_COLOR);
- if(_e_dbus_connman_log_dom < 0)
+ if (_e_dbus_connman_log_dom < 0)
{
- EINA_LOG_ERR
- ("impossible to create a log domain for edbus_connman module");
- return -1;
+ EINA_LOG_ERR
+ ("impossible to create a log domain for edbus_connman module");
+ return -1;
}
if (E_CONNMAN_EVENT_MANAGER_IN == 0)
- E_CONNMAN_EVENT_MANAGER_IN = ecore_event_type_new();
+ E_CONNMAN_EVENT_MANAGER_IN = ecore_event_type_new();
+
if (E_CONNMAN_EVENT_MANAGER_OUT == 0)
- E_CONNMAN_EVENT_MANAGER_OUT = ecore_event_type_new();
+ E_CONNMAN_EVENT_MANAGER_OUT = ecore_event_type_new();
+
if (E_CONNMAN_EVENT_ELEMENT_ADD == 0)
- E_CONNMAN_EVENT_ELEMENT_ADD = ecore_event_type_new();
+ E_CONNMAN_EVENT_ELEMENT_ADD = ecore_event_type_new();
+
if (E_CONNMAN_EVENT_ELEMENT_DEL == 0)
- E_CONNMAN_EVENT_ELEMENT_DEL = ecore_event_type_new();
+ E_CONNMAN_EVENT_ELEMENT_DEL = ecore_event_type_new();
+
if (E_CONNMAN_EVENT_ELEMENT_UPDATED == 0)
- E_CONNMAN_EVENT_ELEMENT_UPDATED = ecore_event_type_new();
-
- if (e_connman_iface_manager == NULL)
- e_connman_iface_manager = eina_stringshare_add("org.moblin.connman.Manager");
- if (e_connman_iface_network == NULL)
- e_connman_iface_network = eina_stringshare_add("org.moblin.connman.Network");
- if (e_connman_iface_profile == NULL)
- e_connman_iface_profile = eina_stringshare_add("org.moblin.connman.Profile");
- if (e_connman_iface_service == NULL)
- e_connman_iface_service = eina_stringshare_add("org.moblin.connman.Service");
- if (e_connman_iface_device == NULL)
- e_connman_iface_device = eina_stringshare_add("org.moblin.connman.Device");
- if (e_connman_iface_connection == NULL)
- e_connman_iface_connection = eina_stringshare_add("org.moblin.connman.Connection");
-
- if (e_connman_prop_available == NULL)
- e_connman_prop_available = eina_stringshare_add("Available");
- if (e_connman_prop_connected == NULL)
- e_connman_prop_connected = eina_stringshare_add("Connected");
- if (e_connman_prop_connections == NULL)
- e_connman_prop_connections = eina_stringshare_add("Connections");
- if (e_connman_prop_default == NULL)
- e_connman_prop_default = eina_stringshare_add("Default");
- if (e_connman_prop_device == NULL)
- e_connman_prop_device = eina_stringshare_add("Device");
- if (e_connman_prop_devices == NULL)
- e_connman_prop_devices = eina_stringshare_add("Devices");
- if (e_connman_prop_interface == NULL)
- e_connman_prop_interface = eina_stringshare_add("Interface");
- if (e_connman_prop_ipv4_address == NULL)
- e_connman_prop_ipv4_address = eina_stringshare_add("IPv4.Address");
- if (e_connman_prop_ipv4_method == NULL)
- e_connman_prop_ipv4_method = eina_stringshare_add("IPv4.Method");
- if (e_connman_prop_name == NULL)
- e_connman_prop_name = eina_stringshare_add("Name");
- if (e_connman_prop_network == NULL)
- e_connman_prop_network = eina_stringshare_add("Network");
- if (e_connman_prop_networks == NULL)
- e_connman_prop_networks = eina_stringshare_add("Networks");
- if (e_connman_prop_offline_mode == NULL)
- e_connman_prop_offline_mode = eina_stringshare_add("OfflineMode");
- if (e_connman_prop_policy == NULL)
- e_connman_prop_policy = eina_stringshare_add("Policy");
- if (e_connman_prop_powered == NULL)
- e_connman_prop_powered = eina_stringshare_add("Powered");
- if (e_connman_prop_priority == NULL)
- e_connman_prop_priority = eina_stringshare_add("Priority");
- if (e_connman_prop_profiles == NULL)
- e_connman_prop_profiles = eina_stringshare_add("Profiles");
- if (e_connman_prop_services == NULL)
- e_connman_prop_services = eina_stringshare_add("Services");
- if (e_connman_prop_remember == NULL)
- e_connman_prop_remember = eina_stringshare_add("Remember");
- if (e_connman_prop_scan_interval == NULL)
- e_connman_prop_scan_interval = eina_stringshare_add("ScanInterval");
- if (e_connman_prop_scanning == NULL)
- e_connman_prop_scanning = eina_stringshare_add("Scanning");
- if (e_connman_prop_state == NULL)
- e_connman_prop_state = eina_stringshare_add("State");
- if (e_connman_prop_strengh == NULL)
- e_connman_prop_strengh = eina_stringshare_add("Strength");
- if (e_connman_prop_type == NULL)
- e_connman_prop_type = eina_stringshare_add("Type");
- if (e_connman_prop_wifi_mode == NULL)
- e_connman_prop_wifi_mode = eina_stringshare_add("WiFi.Mode");
- if (e_connman_prop_wifi_passphrase == NULL)
- e_connman_prop_wifi_passphrase = eina_stringshare_add("WiFi.Passphrase");
- if (e_connman_prop_wifi_security == NULL)
- e_connman_prop_wifi_security = eina_stringshare_add("WiFi.Security");
- if (e_connman_prop_wifi_ssid == NULL)
- e_connman_prop_wifi_ssid = eina_stringshare_add("WiFi.SSID");
- if (e_connman_prop_error == NULL)
- e_connman_prop_error = eina_stringshare_add("Error");
- if (e_connman_prop_mode == NULL)
- e_connman_prop_mode = eina_stringshare_add("Mode");
- if (e_connman_prop_security == NULL)
- e_connman_prop_security = eina_stringshare_add("Security");
- if (e_connman_prop_passphrase == NULL)
- e_connman_prop_passphrase = eina_stringshare_add("Passphrase");
- if (e_connman_prop_passphrase_required == NULL)
- e_connman_prop_passphrase_required = eina_stringshare_add("PassphraseRequired");
- if (e_connman_prop_favorite == NULL)
- e_connman_prop_favorite = eina_stringshare_add("Favorite");
- if (e_connman_prop_immutable == NULL)
- e_connman_prop_immutable = eina_stringshare_add("Immutable");
- if (e_connman_prop_auto_connect == NULL)
- e_connman_prop_auto_connect = eina_stringshare_add("AutoConnect");
- if (e_connman_prop_setup_required == NULL)
- e_connman_prop_setup_required = eina_stringshare_add("SetupRequired");
- if (e_connman_prop_apn == NULL)
- e_connman_prop_apn = eina_stringshare_add("APN");
- if (e_connman_prop_mcc == NULL)
- e_connman_prop_mcc = eina_stringshare_add("MCC");
- if (e_connman_prop_mnc == NULL)
- e_connman_prop_mnc = eina_stringshare_add("MCN");
- if (e_connman_prop_roaming == NULL)
- e_connman_prop_roaming = eina_stringshare_add("Roaming");
+ E_CONNMAN_EVENT_ELEMENT_UPDATED = ecore_event_type_new();
+
+#define ADD_STRINGSHARE(name, s) \
+ if (!name) \
+ name = eina_stringshare_add(s)
+
+ ADD_STRINGSHARE(e_connman_iface_manager, "net.connman.Manager");
+ ADD_STRINGSHARE(e_connman_iface_profile, "net.connman.Profile");
+ ADD_STRINGSHARE(e_connman_iface_service, "net.connman.Service");
+ ADD_STRINGSHARE(e_connman_iface_connection, "net.connman.Connection");
+ ADD_STRINGSHARE(e_connman_iface_technology, "net.connman.Technology");
+ ADD_STRINGSHARE(e_connman_prop_available, "Available");
+ ADD_STRINGSHARE(e_connman_prop_connections, "Connections");
+ ADD_STRINGSHARE(e_connman_prop_default, "Default");
+ ADD_STRINGSHARE(e_connman_prop_ipv4, "IPv4");
+ ADD_STRINGSHARE(e_connman_prop_ipv4_configuration, "IPv4.Configuration");
+ ADD_STRINGSHARE(e_connman_prop_ethernet, "Ethernet");
+ ADD_STRINGSHARE(e_connman_prop_interface, "Interface");
+ ADD_STRINGSHARE(e_connman_prop_speed, "Speed");
+ ADD_STRINGSHARE(e_connman_prop_duplex, "Duplex");
+ ADD_STRINGSHARE(e_connman_prop_method, "Method");
+ ADD_STRINGSHARE(e_connman_prop_address, "Address");
+ ADD_STRINGSHARE(e_connman_prop_gateway, "Gateway");
+ ADD_STRINGSHARE(e_connman_prop_netmask, "Netmask");
+ ADD_STRINGSHARE(e_connman_prop_mtu, "MTU");
+ ADD_STRINGSHARE(e_connman_prop_name, "Name");
+ ADD_STRINGSHARE(e_connman_prop_offline_mode, "OfflineMode");
+ ADD_STRINGSHARE(e_connman_prop_policy, "Policy");
+ ADD_STRINGSHARE(e_connman_prop_priority, "Priority");
+ ADD_STRINGSHARE(e_connman_prop_profiles, "Profiles");
+ ADD_STRINGSHARE(e_connman_prop_profile_active, "ActiveProfile");
+ ADD_STRINGSHARE(e_connman_prop_services, "Services");
+ ADD_STRINGSHARE(e_connman_prop_technologies, "Technologies");
+ ADD_STRINGSHARE(e_connman_prop_remember, "Remember");
+ ADD_STRINGSHARE(e_connman_prop_state, "State");
+ ADD_STRINGSHARE(e_connman_prop_strength, "Strength");
+ ADD_STRINGSHARE(e_connman_prop_type, "Type");
+ ADD_STRINGSHARE(e_connman_prop_error, "Error");
+ ADD_STRINGSHARE(e_connman_prop_security, "Security");
+ ADD_STRINGSHARE(e_connman_prop_passphrase, "Passphrase");
+ ADD_STRINGSHARE(e_connman_prop_passphrase_required, "PassphraseRequired");
+ ADD_STRINGSHARE(e_connman_prop_login_required, "LoginRequired");
+ 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_roaming, "Roaming");
+ ADD_STRINGSHARE(e_connman_prop_technology_default, "DefaultTechnology");
+ ADD_STRINGSHARE(e_connman_prop_technologies_available,
+ "AvailableTechnologies");
+ ADD_STRINGSHARE(e_connman_prop_technologies_enabled, "EnabledTechnologies");
+ ADD_STRINGSHARE(e_connman_prop_technologies_connected,
+ "ConnectedTechnologies");
+ ADD_STRINGSHARE(e_connman_prop_nameservers, "Nameservers");
+ ADD_STRINGSHARE(e_connman_prop_nameservers_configuration,
+ "Nameservers.Configuration");
+ ADD_STRINGSHARE(e_connman_prop_domains, "Domains");
+ ADD_STRINGSHARE(e_connman_prop_domains_configuration,
+ "Domains.Configuration");
+ ADD_STRINGSHARE(e_connman_prop_proxy, "Proxy");
+ ADD_STRINGSHARE(e_connman_prop_proxy_configuration, "Proxy.Configuration");
+ ADD_STRINGSHARE(e_connman_prop_url, "URL");
+ ADD_STRINGSHARE(e_connman_prop_servers, "Servers");
+ ADD_STRINGSHARE(e_connman_prop_excludes, "Excludes");
+
+#undef ADD_STRINGSHARE
e_connman_conn = edbus_conn;
cb_name_owner_changed = e_dbus_signal_handler_add
- (e_connman_conn, fdo_bus_name, fdo_path, fdo_interface, "NameOwnerChanged",
- _e_connman_system_name_owner_changed, NULL);
+ (e_connman_conn, E_DBUS_FDO_BUS, E_DBUS_FDO_PATH, E_DBUS_FDO_INTERFACE, "NameOwnerChanged",
+ _e_connman_system_name_owner_changed, NULL);
if (pending_get_name_owner)
- dbus_pending_call_cancel(pending_get_name_owner);
+ dbus_pending_call_cancel(pending_get_name_owner);
pending_get_name_owner = e_dbus_get_name_owner
- (e_connman_conn, bus_name, _e_connman_get_name_owner, NULL);
+ (e_connman_conn, bus_name, _e_connman_get_name_owner, NULL);
e_connman_elements_init();
_stringshare_del(const char **str)
{
if (!*str)
- return;
+ return;
+
eina_stringshare_del(*str);
*str = NULL;
}
{
if (init_count == 0)
{
- ERR("connman system already shut down.");
- return 0;
+ ERR("connman system already shut down.");
+ return 0;
}
+
init_count--;
if (init_count > 0)
- return init_count;
+ return init_count;
_stringshare_del(&e_connman_iface_manager);
- _stringshare_del(&e_connman_iface_network);
_stringshare_del(&e_connman_iface_profile);
_stringshare_del(&e_connman_iface_service);
- _stringshare_del(&e_connman_iface_device);
_stringshare_del(&e_connman_iface_connection);
+ _stringshare_del(&e_connman_iface_technology);
_stringshare_del(&e_connman_prop_available);
- _stringshare_del(&e_connman_prop_connected);
_stringshare_del(&e_connman_prop_connections);
_stringshare_del(&e_connman_prop_default);
- _stringshare_del(&e_connman_prop_device);
- _stringshare_del(&e_connman_prop_devices);
+ _stringshare_del(&e_connman_prop_ipv4);
+ _stringshare_del(&e_connman_prop_ipv4_configuration);
+ _stringshare_del(&e_connman_prop_ethernet);
_stringshare_del(&e_connman_prop_interface);
- _stringshare_del(&e_connman_prop_ipv4_address);
- _stringshare_del(&e_connman_prop_ipv4_method);
+ _stringshare_del(&e_connman_prop_speed);
+ _stringshare_del(&e_connman_prop_duplex);
+ _stringshare_del(&e_connman_prop_method);
+ _stringshare_del(&e_connman_prop_address);
+ _stringshare_del(&e_connman_prop_gateway);
+ _stringshare_del(&e_connman_prop_netmask);
+ _stringshare_del(&e_connman_prop_mtu);
_stringshare_del(&e_connman_prop_name);
- _stringshare_del(&e_connman_prop_network);
- _stringshare_del(&e_connman_prop_networks);
_stringshare_del(&e_connman_prop_offline_mode);
_stringshare_del(&e_connman_prop_policy);
- _stringshare_del(&e_connman_prop_powered);
_stringshare_del(&e_connman_prop_priority);
_stringshare_del(&e_connman_prop_profiles);
+ _stringshare_del(&e_connman_prop_profile_active);
_stringshare_del(&e_connman_prop_services);
+ _stringshare_del(&e_connman_prop_technologies);
_stringshare_del(&e_connman_prop_remember);
- _stringshare_del(&e_connman_prop_scan_interval);
- _stringshare_del(&e_connman_prop_scanning);
_stringshare_del(&e_connman_prop_state);
- _stringshare_del(&e_connman_prop_strengh);
+ _stringshare_del(&e_connman_prop_strength);
_stringshare_del(&e_connman_prop_type);
- _stringshare_del(&e_connman_prop_wifi_mode);
- _stringshare_del(&e_connman_prop_wifi_passphrase);
- _stringshare_del(&e_connman_prop_wifi_security);
- _stringshare_del(&e_connman_prop_wifi_ssid);
_stringshare_del(&e_connman_prop_error);
- _stringshare_del(&e_connman_prop_mode);
_stringshare_del(&e_connman_prop_security);
_stringshare_del(&e_connman_prop_passphrase);
_stringshare_del(&e_connman_prop_passphrase_required);
+ _stringshare_del(&e_connman_prop_login_required);
_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);
+ _stringshare_del(&e_connman_prop_technologies_enabled);
+ _stringshare_del(&e_connman_prop_technologies_connected);
+ _stringshare_del(&e_connman_prop_nameservers);
+ _stringshare_del(&e_connman_prop_nameservers_configuration);
+ _stringshare_del(&e_connman_prop_domains);
+ _stringshare_del(&e_connman_prop_domains_configuration);
+ _stringshare_del(&e_connman_prop_proxy);
+ _stringshare_del(&e_connman_prop_proxy_configuration);
+ _stringshare_del(&e_connman_prop_url);
+ _stringshare_del(&e_connman_prop_servers);
+ _stringshare_del(&e_connman_prop_excludes);
if (pending_get_name_owner)
{
- dbus_pending_call_cancel(pending_get_name_owner);
- pending_get_name_owner = NULL;
+ dbus_pending_call_cancel(pending_get_name_owner);
+ pending_get_name_owner = NULL;
}
if (cb_name_owner_changed)
{
- e_dbus_signal_handler_del(e_connman_conn, cb_name_owner_changed);
- cb_name_owner_changed = NULL;
+ e_dbus_signal_handler_del(e_connman_conn, cb_name_owner_changed);
+ cb_name_owner_changed = NULL;
}
if (unique_name)
- _e_connman_system_name_owner_exit();
+ _e_connman_system_name_owner_exit();
e_connman_elements_shutdown();
eina_log_domain_unregister(_e_dbus_connman_log_dom);
return init_count;
}
+
projects / framework / uifw / edbus.git / blobdiff