Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : wlan
Dir : e_modules/wlan
Modified Files:
e_mod_main.h e_mod_main.c e_mod_config.c
Log Message:
Some cleanup. Remove unused Display Mode option. Big thanks to ch4os for
providing the /proc/net/wireless file
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/wlan/e_mod_main.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.h 21 Feb 2006 12:12:51 -0000 1.2
+++ e_mod_main.h 21 Feb 2006 12:23:37 -0000 1.3
@@ -5,12 +5,6 @@
typedef struct _Config_Face Config_Face;
typedef struct _Wlan Wlan;
typedef struct _Wlan_Face Wlan_Face;
-typedef enum _Display_Mode
-{
- NET_DISPLAY_BYTES,
- NET_DISPLAY_KBYTES,
- NET_DISPLAY_MBYTES
-} Display_Mode;
struct _Config
{
@@ -22,7 +16,6 @@
unsigned char enabled;
char *device;
int check_interval;
- int display_mode;
};
struct _Wlan
@@ -44,7 +37,7 @@
Evas_Object *wlan_obj;
Evas_Object *event_obj;
- Evas_Object *chart_obj;
+/* Evas_Object *chart_obj; */
Ecore_Timer *monitor;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/wlan/e_mod_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.c 21 Feb 2006 12:12:51 -0000 1.5
+++ e_mod_main.c 21 Feb 2006 12:23:37 -0000 1.6
@@ -142,7 +142,6 @@
E_CONFIG_VAL(D, T, enabled, UCHAR);
E_CONFIG_VAL(D, T, device, STR);
E_CONFIG_VAL(D, T, check_interval, INT);
- E_CONFIG_VAL(D, T, display_mode, INT);
conf_edd = E_CONFIG_DD_NEW("Wlan_Config", Config);
#undef T
@@ -179,7 +178,6 @@
nf->conf->enabled = 1;
nf->conf->device = (char *)evas_stringshare_add("wlan0");
nf->conf->check_interval = 30;
- nf->conf->display_mode = NET_DISPLAY_MBYTES;
n->conf->faces = evas_list_append(n->conf->faces,
nf->conf);
}
else
@@ -188,7 +186,6 @@
fl = fl->next;
}
E_CONFIG_LIMIT(nf->conf->check_interval, 0, 60);
- E_CONFIG_LIMIT(nf->conf->display_mode, NET_DISPLAY_BYTES,
NET_DISPLAY_MBYTES);
nf->monitor =
ecore_timer_add((double)nf->conf->check_interval, _wlan_face_update_values,
nf);
@@ -339,7 +336,6 @@
_wlan_face_free(Wlan_Face *nf)
{
e_object_unref(E_OBJECT(nf->con));
- e_object_del(E_OBJECT(nf->menu));
if (nf->monitor)
ecore_timer_del(nf->monitor);
@@ -349,12 +345,6 @@
evas_object_del(nf->event_obj);
if (nf->wlan_obj)
evas_object_del(nf->wlan_obj);
-
- /*
- if (nf->chart_obj)
- evas_object_del(nf->chart_obj);
- */
-
if (nf->gmc)
{
e_gadman_client_save(nf->gmc);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/wlan/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 21 Feb 2006 12:12:51 -0000 1.2
+++ e_mod_config.c 21 Feb 2006 12:23:37 -0000 1.3
@@ -7,7 +7,6 @@
{
char *device;
int check_interval;
- int display_mode;
Ecore_List *devs;
int dev_num;
@@ -51,8 +50,6 @@
cfdata->device = strdup(nf->conf->device);
else
cfdata->device = NULL;
-
- cfdata->display_mode = nf->conf->display_mode;
if (!cfdata->device)
return;
@@ -106,19 +103,7 @@
char *tmp;
int i;
- o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Display Settings"), 0);
- ot = e_widget_table_add(evas, 0);
- rg = e_widget_radio_group_new(&(cfdata->display_mode));
- ob = e_widget_radio_add(evas, _("Show In Bytes"), NET_DISPLAY_BYTES, rg);
- e_widget_table_object_append (ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_radio_add(evas, _("Show In KBytes"), NET_DISPLAY_KBYTES, rg);
- e_widget_table_object_append (ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_radio_add(evas, _("Show In MBytes"), NET_DISPLAY_MBYTES, rg);
- e_widget_table_object_append (ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
- e_widget_framelist_object_append(of, ot);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+ o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Device Settings"), 0);
ot = e_widget_table_add(evas, 0);
rg = e_widget_radio_group_new(&(cfdata->dev_num));
@@ -153,7 +138,6 @@
if (tmp != NULL)
nf->conf->device = (char *)evas_stringshare_add(strdup(tmp));
nf->conf->check_interval = cfdata->check_interval;
- nf->conf->display_mode = cfdata->display_mode;
e_config_save_queue ();
if (nf->monitor)
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
