More 'make net module compile' changes.

SVN revision: 46982
This commit is contained in:
Christopher Michael 2010-03-08 06:36:02 +00:00
parent 4a7c33e669
commit 5a95840222
4 changed files with 20 additions and 20 deletions

View File

@ -105,7 +105,7 @@ _net_config_updated(Config_Item *ci)
inst = l->data;
if (inst->ci != ci) continue;
if (!inst->timer)
inst->timer = ecore_timer_add(0.5, _cb_poll, inst);
inst->timer = ecore_timer_add(0.5, _net_cb_poll, inst);
if (!ci->show_text)
edje_object_signal_emit(inst->o_net, "e,state,text,hide", "e");
else

View File

@ -35,9 +35,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
"modules/net/main"))
edje_object_file_set(inst->o_net, buf, "modules/net/main");
edje_object_signal_callback_add(inst->o_net, "e,action,mouse,in", "",
_cb_mouse_in, inst);
_net_cb_mouse_in, inst);
edje_object_signal_callback_add(inst->o_net, "e,action,mouse,out", "",
_cb_mouse_out, inst);
_net_cb_mouse_out, inst);
evas_object_show(inst->o_net);
if (!inst->ci->show_text)
@ -48,10 +48,10 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
gcc = e_gadcon_client_new(gc, name, id, style, inst->o_net);
gcc->data = inst;
inst->gcc = gcc;
inst->timer = ecore_timer_add(0.5, _cb_poll, inst);
inst->timer = ecore_timer_add(0.5, _net_cb_poll, inst);
evas_object_event_callback_add(inst->o_net, EVAS_CALLBACK_MOUSE_DOWN,
_cb_mouse_down, inst);
_net_cb_mouse_down, inst);
net_cfg->instances = eina_list_append(net_cfg->instances, inst);
return gcc;
@ -68,11 +68,11 @@ _gc_shutdown(E_Gadcon_Client *gcc)
if (inst->o_net)
{
evas_object_event_callback_del(inst->o_net, EVAS_CALLBACK_MOUSE_DOWN,
_cb_mouse_down);
_net_cb_mouse_down);
edje_object_signal_callback_del(inst->o_net, "e,action,mouse,in", "",
_cb_mouse_in);
_net_cb_mouse_in);
edje_object_signal_callback_del(inst->o_net, "e,action,mouse,out", "",
_cb_mouse_out);
_net_cb_mouse_out);
evas_object_del(inst->o_net);
}
E_FREE(inst);

View File

@ -39,8 +39,8 @@ get_ifmib_general(int row, struct ifmibdata *ifmd)
}
#endif
EINTERN int
_cb_poll(void *data)
int
_net_cb_poll(void *data)
{
Instance *inst;
char buf[256], popbuf[256], tmp[100];
@ -135,8 +135,8 @@ _cb_poll(void *data)
return 1;
}
EINTERN void
_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
void
_net_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
{
Instance *inst;
Ecore_Exe *x;
@ -182,8 +182,8 @@ _cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
}
}
EINTERN void
_cb_mouse_in(void *data, Evas_Object *obj, const char *emission, const char *source)
void
_net_cb_mouse_in(void *data, Evas_Object *obj, const char *emission, const char *source)
{
Instance *inst;
Evas_Object *bg;
@ -216,8 +216,8 @@ _cb_mouse_in(void *data, Evas_Object *obj, const char *emission, const char *sou
e_gadcon_popup_show(inst->popup);
}
EINTERN void
_cb_mouse_out(void *data, Evas_Object *obj, const char *emission, const char *source)
void
_net_cb_mouse_out(void *data, Evas_Object *obj, const char *emission, const char *source)
{
Instance *inst;

View File

@ -1,9 +1,9 @@
#ifndef E_MOD_NET_H
#define E_MOD_NET_H
EINTERN int _cb_poll(void *data);
EINTERN void _cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event);
EINTERN void _cb_mouse_in(void *data, Evas_Object *obj, const char *emission, const char *source);
EINTERN void _cb_mouse_out(void *data, Evas_Object *obj, const char *emission, const char *source);
int _net_cb_poll(void *data);
void _net_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event);
void _net_cb_mouse_in(void *data, Evas_Object *obj, const char *emission, const char *source);
void _net_cb_mouse_out(void *data, Evas_Object *obj, const char *emission, const char *source);
#endif