diff --git a/src/e_mod_config.c b/src/e_mod_config.c index d9932d8..ebc87be 100644 --- a/src/e_mod_config.c +++ b/src/e_mod_config.c @@ -18,7 +18,6 @@ _config_item_get(const char *id) ci = E_NEW(Config_Item, 1); ci->id = evas_stringshare_add(id); ci->device = evas_stringshare_add("eth0"); - ci->poll_time = 1.0; ci->limit = 0; cfg->items = evas_list_append(cfg->items, ci); return ci; @@ -74,9 +73,7 @@ _config_updated(const char *id) if (!inst->gcc->id) continue; if (strcmp(inst->gcc->id, id)) continue; if (!inst->timer) - inst->timer = ecore_timer_add(ci->poll_time, _cb_poll, inst); - else - ecore_timer_interval_set(inst->timer, ci->poll_time); + inst->timer = ecore_timer_add(0.5, _cb_poll, inst); break; } } diff --git a/src/e_mod_config.h b/src/e_mod_config.h index 90cd33f..369d2d6 100644 --- a/src/e_mod_config.h +++ b/src/e_mod_config.h @@ -17,7 +17,6 @@ struct _Config_Item { const char *id; const char *device; - double poll_time; int limit; }; diff --git a/src/e_mod_configure.c b/src/e_mod_configure.c index 87bf7fd..b399969 100644 --- a/src/e_mod_configure.c +++ b/src/e_mod_configure.c @@ -6,7 +6,6 @@ struct _E_Config_Dialog_Data { char *device; - double poll_time; int limit; Ecore_List *devs; @@ -72,7 +71,6 @@ _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) char *tmp; int i = 0; - cfdata->poll_time = ci->poll_time; if (ci->device) cfdata->device = strdup(ci->device); else @@ -102,11 +100,13 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) int i = 0; o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("General Settings"), 0); - ob = e_widget_label_add(evas, _("Check Interval")); + 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_slider_add(evas, 1, 0, _("%1.0f seconds"), 1, 60, 1, 0, - &(cfdata->poll_time), NULL, 150); + 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); @@ -122,17 +122,6 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 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); return o; } @@ -150,7 +139,6 @@ _apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) evas_stringshare_del(ci->device); ci->device = evas_stringshare_add(tmp); } - ci->poll_time = cfdata->poll_time; ci->limit = cfdata->limit; e_config_save_queue(); diff --git a/src/e_mod_gadcon.c b/src/e_mod_gadcon.c index 1a28912..62560e9 100644 --- a/src/e_mod_gadcon.c +++ b/src/e_mod_gadcon.c @@ -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->data = inst; 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, _cb_mouse_down, inst); diff --git a/src/e_mod_main.c b/src/e_mod_main.c index dbe4f8d..3c472e7 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -18,7 +18,6 @@ e_modapi_init(E_Module *m) 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, device, STR); - E_CONFIG_VAL(item_edd, Config_Item, poll_time, DOUBLE); E_CONFIG_VAL(item_edd, Config_Item, limit, INT); conf_edd = E_CONFIG_DD_NEW("Config", Config); diff --git a/src/e_mod_net.c b/src/e_mod_net.c index af89e9b..e89c6f4 100644 --- a/src/e_mod_net.c +++ b/src/e_mod_net.c @@ -45,8 +45,8 @@ _cb_poll(void *data) bin = in - inst->in; bout = out - inst->out; - bin = bin / ci->poll_time; - bout = bout / ci->poll_time; + bin = bin / 0.5; + bout = bout / 0.5; inst->in = in; inst->out = out;