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

e/connman: support more service types and states 

Also fix manager_update_inst function.



SVN revision: 76058
This commit is contained in:
Bruno Dilly 2012-09-03 22:01:24 +00:00
parent 3e4cc4ca2e
commit 35007e200a
6 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/themes/default.edc
View File

@ -7890,8 +7890,8 @@ collections {
} \
}
CONNMAN_ICON(3g)
CONNMAN_ICON(bluetooth)
CONNMAN_ICON(cellular)
CONNMAN_ICON(ethernet)
#undef CONNMAN_ICON

2
data/themes/images/Makefile.am
View File

@ -74,9 +74,9 @@ ch-m2-3.png \
ch-s1-3.png \
ch-s2-3.png \
clock_base.png \
connman_3g.png \
connman_almost_secure.png \
connman_bluetooth.png \
connman_cellular.png \
connman_ethernet.png \
connman_online.png \
connman_ready.png \

0
data/themes/images/connman_3g.png → data/themes/images/connman_cellular.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

6
src/modules/connman/E_Connman.h
View File

@ -16,8 +16,12 @@ enum Connman_State
CONNMAN_STATE_NONE = -1, /* All unknown states */
CONNMAN_STATE_OFFLINE,
CONNMAN_STATE_IDLE,
CONNMAN_STATE_ASSOCIATION,
CONNMAN_STATE_CONFIGURATION,
CONNMAN_STATE_READY,
CONNMAN_STATE_ONLINE,
CONNMAN_STATE_DISCONNECT,
CONNMAN_STATE_FAILURE,
};
enum Connman_Service_Type
@ -25,6 +29,8 @@ enum Connman_Service_Type
CONNMAN_SERVICE_TYPE_NONE = -1, /* All non-supported types */
CONNMAN_SERVICE_TYPE_ETHERNET,
CONNMAN_SERVICE_TYPE_WIFI,
CONNMAN_SERVICE_TYPE_BLUETOOTH,
CONNMAN_SERVICE_TYPE_CELLULAR,
};
struct Connman_Object

36
src/modules/connman/e_connman.c
View File

@ -91,14 +91,22 @@ static void _dbus_str_array_to_eina(DBusMessageIter *value, Eina_Array **old,
static enum Connman_State str_to_state(const char *s)
{
if (strcmp(s, "offline") == 0)
if (!strcmp(s, "offline"))
return CONNMAN_STATE_OFFLINE;
if (strcmp(s, "idle") == 0)
if (!strcmp(s, "idle"))
return CONNMAN_STATE_IDLE;
if (strcmp(s, "ready") == 0)
if (!strcmp(s, "association"))
return CONNMAN_STATE_ASSOCIATION;
if (!strcmp(s, "configuration"))
return CONNMAN_STATE_CONFIGURATION;
if (!strcmp(s, "ready"))
return CONNMAN_STATE_READY;
if (strcmp(s, "online") == 0)
if (!strcmp(s, "online"))
return CONNMAN_STATE_ONLINE;
if (!strcmp(s, "disconnect"))
return CONNMAN_STATE_DISCONNECT;
if (!strcmp(s, "failure"))
return CONNMAN_STATE_FAILURE;
ERR("Unknown state %s", s);
return CONNMAN_STATE_NONE;
@ -112,10 +120,18 @@ const char *econnman_state_to_str(enum Connman_State state)
return "offline";
case CONNMAN_STATE_IDLE:
return "idle";
case CONNMAN_STATE_ASSOCIATION:
return "association";
case CONNMAN_STATE_CONFIGURATION:
return "configuration";
case CONNMAN_STATE_READY:
return "ready";
case CONNMAN_STATE_ONLINE:
return "online";
case CONNMAN_STATE_DISCONNECT:
return "disconnect";
case CONNMAN_STATE_FAILURE:
return "failure";
case CONNMAN_STATE_NONE:
break;
}
@ -125,10 +141,14 @@ const char *econnman_state_to_str(enum Connman_State state)
static enum Connman_Service_Type str_to_type(const char *s)
{
if (strcmp(s, "ethernet") == 0)
if (!strcmp(s, "ethernet"))
return CONNMAN_SERVICE_TYPE_ETHERNET;
else if (strcmp(s, "wifi") == 0)
else if (!strcmp(s, "wifi"))
return CONNMAN_SERVICE_TYPE_WIFI;
else if (!strcmp(s, "bluetooth"))
return CONNMAN_SERVICE_TYPE_BLUETOOTH;
else if (!strcmp(s, "cellular"))
return CONNMAN_SERVICE_TYPE_CELLULAR;
DBG("Unknown type %s", s);
return CONNMAN_SERVICE_TYPE_NONE;
@ -142,6 +162,10 @@ const char *econnman_service_type_to_str(enum Connman_Service_Type type)
return "ethernet";
case CONNMAN_SERVICE_TYPE_WIFI:
return "wifi";
case CONNMAN_SERVICE_TYPE_BLUETOOTH:
return "bluetooth";
case CONNMAN_SERVICE_TYPE_CELLULAR:
return "cellular";
case CONNMAN_SERVICE_TYPE_NONE:
break;
}

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

@ -268,41 +268,22 @@ static void _econnman_mod_manager_update_inst(E_Connman_Module_Context *ctxt,
enum Connman_State state,
enum Connman_Service_Type type)
{
char buf[128];
Evas_Object *o = inst->ui.gadget;
const char *statestr;
const char *statestr, *typestr;
char buf[128];
switch (state)
{
case CONNMAN_STATE_ONLINE:
edje_object_signal_emit(o, "e,changed,connected,yes", "e");
break;
case CONNMAN_STATE_READY:
edje_object_signal_emit(o, "e,changed,connected,yes", "e");
break;
case CONNMAN_STATE_IDLE:
case CONNMAN_STATE_OFFLINE:
case CONNMAN_STATE_NONE:
edje_object_signal_emit(o, "e,changed,connected,no", "e");
break;
}
if ((state == CONNMAN_STATE_ONLINE) || (state == CONNMAN_STATE_READY))
edje_object_signal_emit(o, "e,changed,connected,yes", "e");
else
edje_object_signal_emit(o, "e,changed,connected,no", "e");
statestr = econnman_state_to_str(state);
snprintf(buf, sizeof(buf), "e,changed,state,%s", statestr);
edje_object_signal_emit(o, statestr, "e");
edje_object_signal_emit(o, buf, "e");
switch (type)
{
case CONNMAN_SERVICE_TYPE_ETHERNET:
edje_object_signal_emit(o, "e,changed,technology,ethernet", "e");
break;
case CONNMAN_SERVICE_TYPE_WIFI:
edje_object_signal_emit(o, "e,changed,technology,wifi", "e");
break;
case CONNMAN_SERVICE_TYPE_NONE:
edje_object_signal_emit(o, "e,changed,technology,none", "e");
break;
}
typestr = econnman_service_type_to_str(type);
snprintf(buf, sizeof(buf), "e,changed,technology,%s", typestr);
edje_object_signal_emit(o, buf, "e");
DBG("state=%d type=%d", state, type);
}