Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : wlan
Dir : e_modules/wlan
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Fix for gadcon update. Not added new gadcon functions.
===================================================================
RCS file: /cvs/e/e_modules/wlan/e_mod_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_config.c 25 Jul 2007 17:06:42 -0000 1.21
+++ e_mod_config.c 16 Sep 2007 01:46:52 -0000 1.22
@@ -176,7 +176,7 @@
}
e_config_save_queue ();
- _wlan_config_updated (ci->id);
+ _wlan_config_updated (ci);
return 1;
}
===================================================================
RCS file: /cvs/e/e_modules/wlan/e_mod_main.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_mod_main.c 30 Mar 2007 21:09:31 -0000 1.38
+++ e_mod_main.c 16 Sep 2007 01:46:52 -0000 1.39
@@ -10,6 +10,7 @@
Evas_Object *wlan_obj;
Wlan *wlan;
Ecore_Timer *check_timer;
+ Config_Item *ci;
};
struct _Wlan
@@ -59,14 +60,13 @@
E_Gadcon_Client *gcc;
Evas_Object *o;
Instance *inst;
- Config_Item *ci;
Wlan *wlan;
inst = E_NEW (Instance, 1);
- ci = _wlan_config_item_get (id);
- if (!ci->id)
- ci->id = evas_stringshare_add (id);
+ inst->ci = _wlan_config_item_get (id);
+ if (!inst->ci->id)
+ inst->ci->id = evas_stringshare_add (id);
wlan = _wlan_new (gc->evas);
wlan->inst = inst;
@@ -85,12 +85,12 @@
evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_OUT,
_wlan_cb_mouse_out, inst);
- if (ci->always_text)
+ if (inst->ci->always_text)
edje_object_signal_emit (inst->wlan_obj, "label_active", "");
_wlan_cb_check (inst);
- inst->check_timer = ecore_timer_add (ci->poll_time, _wlan_cb_check, inst);
+ inst->check_timer = ecore_timer_add (inst->ci->poll_time, _wlan_cb_check,
inst);
wlan_config->instances = evas_list_append (wlan_config->instances, inst);
return gcc;
}
@@ -186,43 +186,33 @@
_wlan_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
- Config_Item *ci;
inst = data;
- ci = _wlan_config_item_get (inst->gcc->id);
- _config_wlan_module (ci);
+ _config_wlan_module (inst->ci);
}
void
-_wlan_config_updated (const char *id)
+_wlan_config_updated (Config_Item *ci)
{
Evas_List *l;
- Config_Item *ci;
if (!wlan_config)
return;
- ci = _wlan_config_item_get (id);
for (l = wlan_config->instances; l; l = l->next)
{
Instance *inst;
inst = l->data;
- if (!inst->gcc->id)
- continue;
-
- if (!strcmp (inst->gcc->id, ci->id))
- {
- if (inst->check_timer)
- ecore_timer_del (inst->check_timer);
- inst->check_timer =
- ecore_timer_add ((double) ci->poll_time, _wlan_cb_check, inst);
- if (ci->always_text)
- edje_object_signal_emit (inst->wlan_obj, "label_active", "");
- else
- edje_object_signal_emit (inst->wlan_obj, "label_passive", "");
+ if (inst->ci != ci) continue;
- break;
- }
+ if (inst->check_timer)
+ ecore_timer_del (inst->check_timer);
+ inst->check_timer =
+ ecore_timer_add (inst->ci->poll_time, _wlan_cb_check, inst);
+ if (inst->ci->always_text)
+ edje_object_signal_emit (inst->wlan_obj, "label_active", "");
+ else
+ edje_object_signal_emit (inst->wlan_obj, "label_passive", "");
}
}
@@ -343,19 +333,6 @@
EAPI int
e_modapi_save (E_Module * m)
{
- Evas_List *l;
-
- for (l = wlan_config->instances; l; l = l->next)
- {
- Instance *inst;
- Config_Item *ci;
-
- inst = l->data;
- ci = _wlan_config_item_get (inst->gcc->id);
- if (ci->id)
- evas_stringshare_del (ci->id);
- ci->id = evas_stringshare_add (inst->gcc->id);
- }
e_config_domain_save ("module.wlan", conf_edd, wlan_config);
return 1;
}
@@ -408,19 +385,16 @@
_wlan_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, void *event_info)
{
Instance *inst;
- Config_Item *ci;
inst = data;
- ci = _wlan_config_item_get (inst->gcc->id);
- if (!ci->always_text)
+ if (!inst->ci->always_text)
edje_object_signal_emit (inst->wlan_obj, "label_passive", "");
}
static int
_wlan_cb_check (void *data)
{
- Instance *inst;
- Config_Item *ci;
+ Instance *inst;
unsigned int dummy;
char iface[64];
@@ -439,8 +413,7 @@
if (!stat)
return 1;
- inst = data;
- ci = _wlan_config_item_get (inst->gcc->id);
+ inst = data;
while (fgets(buf, 256, stat))
{
@@ -455,10 +428,10 @@
iface, &wlan_status, &wlan_link, &wlan_level, &wlan_noise,
&dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 11)
continue;
- if (!ci->device)
+ if (!inst->ci->device)
continue;
- if (!strcmp (iface, ci->device))
+ if (!strcmp (iface, inst->ci->device))
{
found_dev = 1;
break;
===================================================================
RCS file: /cvs/e/e_modules/wlan/e_mod_main.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_main.h 2 Sep 2006 11:03:14 -0000 1.11
+++ e_mod_main.h 16 Sep 2007 01:46:52 -0000 1.12
@@ -34,7 +34,7 @@
EAPI int e_modapi_save(E_Module *m);
EAPI int e_modapi_about(E_Module *m);
-void _wlan_config_updated(const char *id);
+void _wlan_config_updated(Config_Item *ci);
void _config_wlan_module(Config_Item *ci);
void _wlan_get_values(Config_Item *ci, int *real, int *swap, int *total_real,
int *total_swap);
extern Config *wlan_config;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
