Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : net
Dir : e_modules/net/src
Modified Files:
e_mod_config.c e_mod_config.h e_mod_configure.c e_mod_gadcon.c
e_mod_main.c e_mod_net.c
Log Message:
Remove option to set the poll time. Use a hard-coded time that should be
plenty fast enough to get activity changes.
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.c 12 Feb 2007 15:55:25 -0000 1.3
+++ e_mod_config.c 12 Feb 2007 21:23:07 -0000 1.4
@@ -18,7 +18,6 @@
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 @@
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;
}
}
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.h 12 Feb 2007 15:55:25 -0000 1.3
+++ e_mod_config.h 12 Feb 2007 21:23:07 -0000 1.4
@@ -17,7 +17,6 @@
{
const char *id;
const char *device;
- double poll_time;
int limit;
};
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_configure.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_configure.c 12 Feb 2007 15:55:25 -0000 1.3
+++ e_mod_configure.c 12 Feb 2007 21:23:07 -0000 1.4
@@ -6,7 +6,6 @@
struct _E_Config_Dialog_Data
{
char *device;
- double poll_time;
int limit;
Ecore_List *devs;
@@ -72,7 +71,6 @@
char *tmp;
int i = 0;
- cfdata->poll_time = ci->poll_time;
if (ci->device)
cfdata->device = strdup(ci->device);
else
@@ -102,11 +100,13 @@
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);
@@ -123,17 +123,6 @@
}
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 @@
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();
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_gadcon.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_gadcon.c 11 Feb 2007 15:28:53 -0000 1.1
+++ e_mod_gadcon.c 12 Feb 2007 21:23:07 -0000 1.2
@@ -34,7 +34,7 @@
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);
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.c 12 Feb 2007 15:55:25 -0000 1.2
+++ e_mod_main.c 12 Feb 2007 21:23:07 -0000 1.3
@@ -18,7 +18,6 @@
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);
===================================================================
RCS file: /cvs/e/e_modules/net/src/e_mod_net.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_net.c 12 Feb 2007 19:05:03 -0000 1.4
+++ e_mod_net.c 12 Feb 2007 21:23:07 -0000 1.5
@@ -45,8 +45,8 @@
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;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
