styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e/connman: Use cm pointer instead of additional bool 

SVN revision: 76041
This commit is contained in:
Lucas De Marchi 2012-09-03 21:59:06 +00:00
parent a46499fdcc
commit a5c9a890ef
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,6 @@ unsigned int e_connman_system_shutdown(void);
/* UI calls from econnman */
void econnman_mod_manager_update(struct Connman_Manager *cm);
void econnman_mod_manager_inout(struct Connman_Manager *cm, bool in);
void econnman_mod_manager_inout(struct Connman_Manager *cm);
#endif /* E_CONNMAN_H */

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

@ -501,7 +501,7 @@ static struct Connman_Manager *_manager_new(void)
static inline void _e_connman_system_name_owner_exit(void)
{
econnman_mod_manager_inout(connman_manager, false);
econnman_mod_manager_inout(NULL);
_manager_free(connman_manager);
connman_manager = NULL;
@ -516,7 +516,7 @@ static inline void _e_connman_system_name_owner_enter(const char *owner)
bus_owner = strdup(owner);
connman_manager = _manager_new();
ecore_event_add(E_CONNMAN_EVENT_MANAGER_IN, NULL, NULL, NULL);
econnman_mod_manager_inout(connman_manager, true);
econnman_mod_manager_inout(connman_manager);
}
static void _e_connman_system_name_owner_changed(void *data __UNUSED__,

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

@ -85,6 +85,8 @@ void econnman_mod_manager_update(struct Connman_Manager *cm)
E_Connman_Instance *inst;
Eina_List *l;
EINA_SAFETY_ON_NULL_RETURN(cm);
DBG("cm->services=%p", cm->services);
if (cm->services)
@ -105,9 +107,9 @@ static void _econnman_gadget_setup(E_Connman_Instance *inst)
E_Connman_Module_Context *ctxt = inst->ctxt;
Evas_Object *o = inst->ui.gadget;
DBG("has_manager=%d", ctxt->has_manager);
DBG("has_manager=%d", ctxt->cm != NULL);
if (!ctxt->has_manager)
if (!ctxt->cm)
{
edje_object_signal_emit(o, "e,unavailable", "e");
edje_object_part_text_set(o, "e.text.name", _("No ConnMan"));
@ -123,14 +125,14 @@ static void _econnman_gadget_setup(E_Connman_Instance *inst)
return;
}
void econnman_mod_manager_inout(struct Connman_Manager *cm, bool in)
void econnman_mod_manager_inout(struct Connman_Manager *cm)
{
E_Connman_Module_Context *ctxt = connman_mod->data;
const Eina_List *l;
E_Connman_Instance *inst;
DBG("Manager %s", in ? "in" : "out");
ctxt->has_manager = in;
DBG("Manager %s", cm ? "in" : "out");
ctxt->cm = cm;
EINA_LIST_FOREACH(ctxt->instances, l, inst)
_econnman_gadget_setup(inst);

2
src/modules/connman/e_mod_main.h
View File

@ -36,7 +36,7 @@ struct E_Connman_Module_Context
Ecore_Event_Handler *manager_out;
} event;
Eina_Bool has_manager;
struct Connman_Manager *cm;
Eina_Bool offline_mode;
};