enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e: add new connman error message naming. 

SVN revision: 61394
This commit is contained in:
Cedric BAIL 2011-07-15 09:06:38 +00:00
parent d4cb9148af
commit 313ef3a6d5
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/connman/e_mod_main.c
View File

@ -554,8 +554,10 @@ _connman_service_disconnect_cb(void *data,
if (error && dbus_error_is_set(error))
{
if (strcmp(error->name,
"org.moblin.connman.Error.NotConnected") != 0)
if ((strcmp(error->name,
"org.moblin.connman.Error.NotConnected") != 0) ||
(strcmp(error->name,
"net.connman.Error.NotConnected") != 0))
_connman_dbus_error_show(_("Disconnect from network service."),
error);
dbus_error_free(error);
@ -593,7 +595,11 @@ _connman_service_connect_cb(void *data,
if ((strcmp(error->name,
"org.moblin.connman.Error.PassphraseRequired") == 0) ||
(strcmp(error->name,
"org.moblin.connman.Error.Failed") == 0))
"org.moblin.connman.Error.Failed") == 0) ||
(strcmp(error->name,
"net.connman.Error.PassphraseRequired") == 0) ||
(strcmp(error->name,
"net.connman.Error.Failed") == 0))
{
E_Connman_Service *service;
@ -612,8 +618,10 @@ _connman_service_connect_cb(void *data,
_connman_dbus_error_show(_("Connect to network service."),
error);
}
else if (strcmp(error->name,
"org.moblin.connman.Error.AlreadyConnected") != 0)
else if ((strcmp(error->name,
"org.moblin.connman.Error.AlreadyConnected") != 0) ||
(strcmp(error->name,
"net.connman.Error.AlreadyConnected") != 0))
_connman_dbus_error_show(_("Connect to network service."), error);
dbus_error_free(error);