Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c
Log Message:
Make sure we delete the server on unload.
Replace a 2 case switch statement with an if block.
===================================================================
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_mod_main.c 29 May 2006 22:57:31 -0000 1.28
+++ e_mod_main.c 30 May 2006 00:38:03 -0000 1.29
@@ -110,6 +110,7 @@
break;
}
+ _weather_cb_check(inst);
inst->check_timer = ecore_timer_add((double)ci->poll_time,
_weather_cb_check, inst);
return gcc;
}
@@ -122,14 +123,16 @@
inst = gcc->data;
if (inst->check_timer)
ecore_timer_del(inst->check_timer);
-
if (inst->add_handler)
ecore_event_handler_del(inst->add_handler);
if (inst->data_handler)
ecore_event_handler_del(inst->data_handler);
if (inst->del_handler)
- ecore_event_handler_del(inst->del_handler);
-
+ ecore_event_handler_del(inst->del_handler);
+ if (inst->server)
+ ecore_con_server_del(inst->server);
+
+ inst->server = NULL;
weather_config->instances = evas_list_remove(weather_config->instances,
inst);
_weather_free(inst->weather);
free(inst);
@@ -459,13 +462,17 @@
inst = data;
ci = _weather_config_item_get(inst->gcc->id);
- if (!inst->server)
+ if (inst->server)
{
- if (ci->proxy.port != 0)
- inst->server = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM,
ci->proxy.host, ci->proxy.port, inst);
- else
- inst->server = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM,
ci->host, 80, inst);
+ ecore_con_server_del(inst->server);
+ inst->server = NULL;
}
+
+ if (ci->proxy.port != 0)
+ inst->server = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM,
ci->proxy.host, ci->proxy.port, inst);
+ else
+ inst->server = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM,
ci->host, 80, inst);
+
return 1;
}
@@ -681,15 +688,10 @@
continue;
if (!strcmp(inst->gcc->id, ci->id))
{
- switch (ci->display)
- {
- case 0:
- edje_object_signal_emit(inst->weather->weather_obj,
"set_style", "simple");
- break;
- case 1:
- edje_object_signal_emit(inst->weather->weather_obj,
"set_style", "detailed");
- break;
- }
+ if (ci->display == 0)
+ edje_object_signal_emit(inst->weather->weather_obj, "set_style",
"simple");
+ else if (ci->display == 1)
+ edje_object_signal_emit(inst->weather->weather_obj, "set_style",
"detailed");
_weather_convert_degrees(inst);
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
