enlightenment
/
enlightenment-module-net
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove option to set the poll time. Use a hard-coded time that should be 

plenty fast enough to get activity changes.


SVN revision: 28327
This commit is contained in:
Christopher Michael 2007-02-12 21:23:07 +00:00
parent b46d14e9a7
commit 2e3c6d180b
6 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/e_mod_config.c
View File

@ -18,7 +18,6 @@ _config_item_get(const char *id)
ci = E_NEW(Config_Item, 1); ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id); ci->id = evas_stringshare_add(id);
ci->device = evas_stringshare_add("eth0"); ci->device = evas_stringshare_add("eth0");
ci->poll_time = 1.0;
ci->limit = 0; ci->limit = 0;
cfg->items = evas_list_append(cfg->items, ci); cfg->items = evas_list_append(cfg->items, ci);
return ci; return ci;
@ -74,9 +73,7 @@ _config_updated(const char *id)
if (!inst->gcc->id) continue; if (!inst->gcc->id) continue;
if (strcmp(inst->gcc->id, id)) continue; if (strcmp(inst->gcc->id, id)) continue;
if (!inst->timer) if (!inst->timer)
inst->timer = ecore_timer_add(ci->poll_time, _cb_poll, inst); inst->timer = ecore_timer_add(0.5, _cb_poll, inst);
else
ecore_timer_interval_set(inst->timer, ci->poll_time);
break; break;
} }
} }

1
src/e_mod_config.h
View File

@ -17,7 +17,6 @@ struct _Config_Item
{ {
const char *id; const char *id;
const char *device; const char *device;
double poll_time;
int limit; int limit;
}; };

24
src/e_mod_configure.c
View File

@ -6,7 +6,6 @@
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
char *device; char *device;
double poll_time;
int limit; int limit;
Ecore_List *devs; Ecore_List *devs;
@ -72,7 +71,6 @@ _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
char *tmp; char *tmp;
int i = 0; int i = 0;
cfdata->poll_time = ci->poll_time;
if (ci->device) if (ci->device)
cfdata->device = strdup(ci->device); cfdata->device = strdup(ci->device);
else else
@ -102,11 +100,13 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
int i = 0; int i = 0;
o = e_widget_list_add(evas, 0, 0); o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0); of = e_widget_framelist_add(evas, _("Activity Notification Level"), 0);
ob = e_widget_label_add(evas, _("Check Interval")); rg = e_widget_radio_group_new(&(cfdata->limit));
ob = e_widget_radio_add(evas, "High (MB)", 1048575, rg);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1, 60, 1, 0, ob = e_widget_radio_add(evas, "Middle (KB)", 1023, rg);
&(cfdata->poll_time), NULL, 150); e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, "Low (B)", 0, rg);
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
@ -122,17 +122,6 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
i++; i++;
} }
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Activity Notification Level"), 0);
rg = e_widget_radio_group_new(&(cfdata->limit));
ob = e_widget_radio_add(evas, "High (MB)", 1048575, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, "Middle (KB)", 1023, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, "Low (B)", 0, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
return o; return o;
} }
@ -150,7 +139,6 @@ _apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
evas_stringshare_del(ci->device); evas_stringshare_del(ci->device);
ci->device = evas_stringshare_add(tmp); ci->device = evas_stringshare_add(tmp);
} }
ci->poll_time = cfdata->poll_time;
ci->limit = cfdata->limit; ci->limit = cfdata->limit;
e_config_save_queue(); e_config_save_queue();

2
src/e_mod_gadcon.c
View File

@ -34,7 +34,7 @@ _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 = e_gadcon_client_new(gc, name, id, style, inst->o_net);
gcc->data = inst; gcc->data = inst;
inst->gcc = gcc; inst->gcc = gcc;
inst->timer = ecore_timer_add(ci->poll_time, _cb_poll, inst); inst->timer = ecore_timer_add(0.5, _cb_poll, inst);
evas_object_event_callback_add(inst->o_net, EVAS_CALLBACK_MOUSE_DOWN, evas_object_event_callback_add(inst->o_net, EVAS_CALLBACK_MOUSE_DOWN,
_cb_mouse_down, inst); _cb_mouse_down, inst);

1
src/e_mod_main.c
View File

@ -18,7 +18,6 @@ e_modapi_init(E_Module *m)
item_edd = E_CONFIG_DD_NEW("Config_Item", Config_Item); item_edd = E_CONFIG_DD_NEW("Config_Item", Config_Item);
E_CONFIG_VAL(item_edd, Config_Item, id, STR); E_CONFIG_VAL(item_edd, Config_Item, id, STR);
E_CONFIG_VAL(item_edd, Config_Item, device, STR); E_CONFIG_VAL(item_edd, Config_Item, device, STR);
E_CONFIG_VAL(item_edd, Config_Item, poll_time, DOUBLE);
E_CONFIG_VAL(item_edd, Config_Item, limit, INT); E_CONFIG_VAL(item_edd, Config_Item, limit, INT);
conf_edd = E_CONFIG_DD_NEW("Config", Config); conf_edd = E_CONFIG_DD_NEW("Config", Config);

4
src/e_mod_net.c
View File

@ -45,8 +45,8 @@ _cb_poll(void *data)
bin = in - inst->in; bin = in - inst->in;
bout = out - inst->out; bout = out - inst->out;
bin = bin / ci->poll_time; bin = bin / 0.5;
bout = bout / ci->poll_time; bout = bout / 0.5;
inst->in = in; inst->in = in;
inst->out = out; inst->out = out;