Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Indent for mej :)
===================================================================
RCS file: /cvs/e/e_modules/weather/e_mod_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_config.c 19 May 2006 18:40:16 -0000 1.8
+++ e_mod_config.c 22 May 2006 02:10:55 -0000 1.9
@@ -21,7 +21,7 @@
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
E_Container *con;
-
+
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
@@ -53,6 +53,7 @@
ci = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
_fill_data(ci, cfdata);
return cfdata;
}
@@ -61,8 +62,8 @@
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (!weather_config)
- return;
-
+ return;
+
weather_config->config_dialog = NULL;
free(cfdata);
}
@@ -132,8 +133,8 @@
evas_stringshare_del(ci->code);
ci->code = evas_stringshare_add((char *)toupper(cfdata->code));
- e_config_save_queue();
-
+ e_config_save_queue();
+
printf("Updating Config: %s\n", ci->id);
_weather_config_updated(ci->id);
return 1;
===================================================================
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_mod_main.c 21 May 2006 15:34:51 -0000 1.25
+++ e_mod_main.c 22 May 2006 02:10:55 -0000 1.26
@@ -14,20 +14,18 @@
Config *weather_config = NULL;
/* Define Gadcon Class */
-static const E_Gadcon_Client_Class _gadcon_class =
-{
+static const E_Gadcon_Client_Class _gadcon_class = {
GADCON_CLIENT_CLASS_VERSION,
- "weather",
- {
- _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon
- }
+ "weather",
+ {
+ _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}
};
/* Module specifics */
typedef struct _Instance Instance;
typedef struct _Weather Weather;
-struct _Instance
+struct _Instance
{
E_Gadcon_Client *gcc;
Evas_Object *weather_obj;
@@ -41,7 +39,7 @@
char icon[256];
};
-struct _Weather
+struct _Weather
{
Instance *inst;
Evas_Object *weather_obj;
@@ -55,7 +53,7 @@
static int _weather_cb_check(void *data);
static Config_Item *_weather_config_item_get(const char *id);
static Weather *_weather_new(Evas *evas);
-static void _weather_free(Weather *w) ;
+static void _weather_free(Weather *w);
static void _weather_get_proxy(Config_Item *ci);
static int _weather_server_add(void *data, int type, void *event);
static int _weather_server_del(void *data, int type, void *event);
@@ -65,7 +63,7 @@
/* Gadcon Functions */
static E_Gadcon_Client *
-_gc_init(E_Gadcon *gc, char *name, char *id, char *style)
+_gc_init(E_Gadcon *gc, char *name, char *id, char *style)
{
Evas_Object *o;
E_Gadcon_Client *gcc;
@@ -74,37 +72,37 @@
Config_Item *ci;
inst = E_NEW(Instance, 1);
+
ci = _weather_config_item_get(id);
-
+
w = _weather_new(gc->evas);
w->inst = inst;
inst->weather = w;
-
- o = w->weather_obj;
+
+ o = w->weather_obj;
gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc->data = inst;
inst->gcc = gcc;
inst->weather_obj = o;
if (!weather_config->add_handler)
- weather_config->add_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, _weather_server_add, inst);
+ weather_config->add_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, _weather_server_add, inst);
if (!weather_config->del_handler)
- weather_config->del_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, _weather_server_del, inst);
+ weather_config->del_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, _weather_server_del, inst);
if (!weather_config->data_handler)
- weather_config->data_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, _weather_server_data,
inst);
-
- evas_object_event_callback_add(w->weather_obj, EVAS_CALLBACK_MOUSE_DOWN,
- _weather_cb_mouse_down, inst);
+ weather_config->data_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, _weather_server_data,
inst);
+
+ evas_object_event_callback_add(w->weather_obj, EVAS_CALLBACK_MOUSE_DOWN,
_weather_cb_mouse_down, inst);
weather_config->instances = evas_list_append(weather_config->instances,
inst);
- switch (ci->display)
+ 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;
+ 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;
}
inst->check_timer = ecore_timer_add((double)ci->poll_time,
_weather_cb_check, inst);
@@ -112,113 +110,111 @@
}
static void
-_gc_shutdown(E_Gadcon_Client *gcc)
+_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
inst = gcc->data;
if (inst->check_timer)
- ecore_timer_del(inst->check_timer);
+ ecore_timer_del(inst->check_timer);
weather_config->instances = evas_list_remove(weather_config->instances,
inst);
_weather_free(inst->weather);
free(inst);
}
-static void
-_gc_orient(E_Gadcon_Client *gcc)
+static void
+_gc_orient(E_Gadcon_Client *gcc)
{
Instance *inst;
-
+
inst = gcc->data;
e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
static char *
-_gc_label(void)
+_gc_label(void)
{
return D_("Weather");
}
static Evas_Object *
-_gc_icon(Evas *evas)
+_gc_icon(Evas *evas)
{
Evas_Object *o;
char buf[4096];
-
+
o = edje_object_add(evas);
- snprintf(buf, sizeof(buf), "%s/module.eap",
- e_module_dir_get(weather_config->module));
+ snprintf(buf, sizeof(buf), "%s/module.eap",
e_module_dir_get(weather_config->module));
edje_object_file_set(o, buf, "icon");
return o;
}
static void
-_weather_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+_weather_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Instance *inst;
Evas_Event_Mouse_Down *ev;
-
+
inst = data;
ev = event_info;
- if ((ev->button == 3) && (!weather_config->menu))
+ if ((ev->button == 3) && (!weather_config->menu))
{
- E_Menu *mn;
- E_Menu_Item *mi;
- int x, y, w, h;
-
- mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _weather_menu_cb_post, inst);
- weather_config->menu = mn;
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, D_("Configuration"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
- e_menu_item_callback_set(mi, _weather_menu_cb_configure, inst);
-
- e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
- e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h);
- e_menu_activate_mouse(mn,
e_util_zone_current_get(e_manager_current_get()),
- x + ev->output.x, y + ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
- EVAS_BUTTON_NONE, ev->timestamp, NULL);
+ E_Menu *mn;
+ E_Menu_Item *mi;
+ int x, y, w, h;
+
+ mn = e_menu_new();
+ e_menu_post_deactivate_callback_set(mn, _weather_menu_cb_post, inst);
+ weather_config->menu = mn;
+
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, D_("Configuration"));
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+ e_menu_item_callback_set(mi, _weather_menu_cb_configure, inst);
+
+ e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
+ e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h);
+ e_menu_activate_mouse(mn,
e_util_zone_current_get(e_manager_current_get()),
+ x + ev->output.x, y + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+ evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
}
static void
-_weather_menu_cb_post(void *data, E_Menu *m)
+_weather_menu_cb_post(void *data, E_Menu *m)
{
- if (!weather_config->menu)
- return;
+ if (!weather_config->menu)
+ return;
e_object_del(E_OBJECT(weather_config->menu));
weather_config->menu = NULL;
}
-static void
-_weather_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+static void
+_weather_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Instance *inst;
Config_Item *ci;
-
+
inst = data;
- ci = _weather_config_item_get(inst->gcc->id);
+ ci = _weather_config_item_get(inst->gcc->id);
_config_weather_module(ci);
}
static Config_Item *
-_weather_config_item_get(const char *id)
+_weather_config_item_get(const char *id)
{
Evas_List *l;
Config_Item *ci;
- for (l = weather_config->items; l; l = l->next)
+ for (l = weather_config->items; l; l = l->next)
{
- ci = l->data;
- if (!ci->id) continue;
- if (!strcmp(ci->id, id))
- return ci;
+ ci = l->data;
+ if (!ci->id)
+ continue;
+ if (!strcmp(ci->id, id))
+ return ci;
}
ci = E_NEW(Config_Item, 1);
@@ -228,62 +224,64 @@
ci->degrees = DEGREES_F;
ci->host = evas_stringshare_add("www.rssweather.com");
ci->code = evas_stringshare_add("KJFK");
-
+
_weather_get_proxy(ci);
-
+
weather_config->items = evas_list_append(weather_config->items, ci);
return ci;
}
/* Gadman Module Setup */
-EAPI E_Module_Api e_modapi =
-{
+EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
- "Weather"
+ "Weather"
};
EAPI void *
-e_modapi_init(E_Module *m)
-{
+e_modapi_init(E_Module *m)
+{
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, "UTF-8");
conf_item_edd = E_CONFIG_DD_NEW("Weather_Config_Item", Config_Item);
- #undef T
- #undef D
- #define T Config_Item
- #define D conf_item_edd
+
+#undef T
+#undef D
+#define T Config_Item
+#define D conf_item_edd
E_CONFIG_VAL(D, T, id, STR);
E_CONFIG_VAL(D, T, poll_time, DOUBLE);
E_CONFIG_VAL(D, T, display, INT);
E_CONFIG_VAL(D, T, degrees, INT);
E_CONFIG_VAL(D, T, host, STR);
E_CONFIG_VAL(D, T, code, STR);
-
+
conf_edd = E_CONFIG_DD_NEW("Weather_Config", Config);
- #undef T
- #undef D
- #define T Config
- #define D conf_edd
+
+#undef T
+#undef D
+#define T Config
+#define D conf_edd
E_CONFIG_LIST(D, T, items, conf_item_edd);
-
+
weather_config = e_config_domain_load("module.weather", conf_edd);
- if (!weather_config)
+ if (!weather_config)
{
- Config_Item *ci;
+ Config_Item *ci;
+
+ weather_config = E_NEW(Config, 1);
- weather_config = E_NEW(Config, 1);
+ ci = E_NEW(Config_Item, 1);
- ci = E_NEW(Config_Item, 1);
- ci->poll_time = 900.0;
- ci->display = 0;
- ci->degrees = DEGREES_F;
- ci->host = evas_stringshare_add("www.rssweather.com");
- ci->code = evas_stringshare_add("KJFK");
- ci->id = evas_stringshare_add("0");
- _weather_get_proxy(ci);
-
- weather_config->items = evas_list_append(weather_config->items, ci);
+ ci->poll_time = 900.0;
+ ci->display = 0;
+ ci->degrees = DEGREES_F;
+ ci->host = evas_stringshare_add("www.rssweather.com");
+ ci->code = evas_stringshare_add("KJFK");
+ ci->id = evas_stringshare_add("0");
+ _weather_get_proxy(ci);
+
+ weather_config->items = evas_list_append(weather_config->items, ci);
}
weather_config->module = m;
@@ -292,40 +290,44 @@
}
EAPI int
-e_modapi_shutdown(E_Module *m)
-{
+e_modapi_shutdown(E_Module *m)
+{
weather_config->module = NULL;
e_gadcon_provider_unregister(&_gadcon_class);
-
+
if (weather_config->config_dialog)
- e_object_del(E_OBJECT(weather_config->config_dialog));
+ e_object_del(E_OBJECT(weather_config->config_dialog));
if (weather_config->menu)
{
- e_menu_post_deactivate_callback_set(weather_config->menu, NULL, NULL);
- e_object_del(E_OBJECT(weather_config->menu));
- weather_config->menu = NULL;
+ e_menu_post_deactivate_callback_set(weather_config->menu, NULL, NULL);
+ e_object_del(E_OBJECT(weather_config->menu));
+ weather_config->menu = NULL;
}
if (weather_config->add_handler)
- ecore_event_handler_del(weather_config->add_handler);
+ ecore_event_handler_del(weather_config->add_handler);
if (weather_config->del_handler)
- ecore_event_handler_del(weather_config->del_handler);
+ ecore_event_handler_del(weather_config->del_handler);
if (weather_config->data_handler)
- ecore_event_handler_del(weather_config->data_handler);
+ ecore_event_handler_del(weather_config->data_handler);
- while (weather_config->items)
+ while (weather_config->items)
{
- Config_Item *ci;
-
- ci = weather_config->items->data;
- if (ci->id) evas_stringshare_del(ci->id);
- if (ci->host) evas_stringshare_del(ci->host);
- if (ci->code) evas_stringshare_del(ci->code);
- if (ci->proxy.host) evas_stringshare_del(ci->proxy.host);
- weather_config->items = evas_list_remove_list(weather_config->items,
weather_config->items);
- free(ci);
+ Config_Item *ci;
+
+ ci = weather_config->items->data;
+ if (ci->id)
+ evas_stringshare_del(ci->id);
+ if (ci->host)
+ evas_stringshare_del(ci->host);
+ if (ci->code)
+ evas_stringshare_del(ci->code);
+ if (ci->proxy.host)
+ evas_stringshare_del(ci->proxy.host);
+ weather_config->items = evas_list_remove_list(weather_config->items,
weather_config->items);
+ free(ci);
}
-
+
free(weather_config);
weather_config = NULL;
E_CONFIG_DD_FREE(conf_item_edd);
@@ -334,56 +336,57 @@
}
EAPI int
-e_modapi_info(E_Module *m)
+e_modapi_info(E_Module *m)
{
char buf[4096];
-
+
snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
m->icon_file = strdup(buf);
return 1;
}
EAPI int
-e_modapi_save(E_Module *m)
+e_modapi_save(E_Module *m)
{
Evas_List *l;
- for (l = weather_config->instances; l; l = l->next)
+ for (l = weather_config->instances; l; l = l->next)
{
- Instance *inst;
- Config_Item *ci;
-
- inst = l->data;
- ci = _weather_config_item_get(inst->gcc->id);
-
- if (ci->id) evas_stringshare_del(ci->id);
- ci->id = evas_stringshare_add(inst->gcc->id);
+ Instance *inst;
+ Config_Item *ci;
+
+ inst = l->data;
+ ci = _weather_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.weather", conf_edd, weather_config);
return 1;
}
EAPI int
-e_modapi_about(E_Module *m)
+e_modapi_about(E_Module *m)
{
- e_module_dialog_show(D_("Enlightenment Weather Module"),
- D_("A weather forecast module for Enlightenment"));
+ e_module_dialog_show(D_("Enlightenment Weather Module"), D_("A weather
forecast module for Enlightenment"));
return 1;
}
static Weather *
-_weather_new(Evas *evas)
+_weather_new(Evas *evas)
{
Weather *w;
char buf[4096];
-
+
w = E_NEW(Weather, 1);
+
w->weather_obj = edje_object_add(evas);
-
+
snprintf(buf, sizeof(buf), "%s/weather.edj",
e_module_dir_get(weather_config->module));
if (!e_theme_edje_object_set(w->weather_obj, "base/theme/modules/weather",
"modules/weather/main"))
- edje_object_file_set(w->weather_obj, buf, "modules/weather/main");
+ edje_object_file_set(w->weather_obj, buf, "modules/weather/main");
evas_object_show(w->weather_obj);
edje_object_part_text_set(w->weather_obj, "location", "");
@@ -391,24 +394,25 @@
snprintf(buf, sizeof(buf), "%s/images/unknown.png",
e_module_dir_get(weather_config->module));
e_icon_file_set(w->icon_obj, buf);
edje_object_part_swallow(w->weather_obj, "icon", w->icon_obj);
-
+
return w;
}
-static void
-_weather_free(Weather *w)
+static void
+_weather_free(Weather *w)
{
evas_object_del(w->weather_obj);
evas_object_del(w->icon_obj);
free(w);
}
-static void
-_weather_get_proxy(Config_Item *ci)
+static void
+_weather_get_proxy(Config_Item *ci)
{
char *env;
-
- if (!ci) return;
+
+ if (!ci)
+ return;
env = getenv("http_proxy");
if (!env)
@@ -439,51 +443,48 @@
}
static int
-_weather_cb_check(void *data)
+_weather_cb_check(void *data)
{
Instance *inst;
Config_Item *ci;
inst = data;
ci = _weather_config_item_get(inst->gcc->id);
-
+
if (!weather_config->server)
- {
- if (ci->proxy.port != 0)
- {
- weather_config->server =
ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM,
- ci->proxy.host,
ci->proxy.port, inst);
- }
- else
- {
- weather_config->server =
ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM,
- ci->host, 80,
inst);
- }
+ {
+ if (ci->proxy.port != 0)
+ {
+ weather_config->server =
ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, ci->proxy.host,
ci->proxy.port, inst);
+ }
+ else
+ {
+ weather_config->server =
ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, ci->host, 80, inst);
+ }
}
return 1;
}
static int
-_weather_server_add(void *data, int type, void *event)
+_weather_server_add(void *data, int type, void *event)
{
Instance *inst;
Config_Item *ci;
Ecore_Con_Event_Server_Add *ev;
char buf[1024];
char icao[1024];
-
+
inst = data;
if (!inst)
- return 1;
+ return 1;
- ci = _weather_config_item_get(inst->gcc->id);
+ ci = _weather_config_item_get(inst->gcc->id);
ev = event;
if ((!weather_config->server) || (weather_config->server != ev->server))
- return 1;
+ return 1;
snprintf(icao, sizeof(icao), "/icao/%s/rss.php", ci->code);
- snprintf(buf, sizeof(buf), "GET http://%s%s HTTP/1.1\r\nHost: %s\r\n\r\n",
- ci->host, icao, ci->host);
+ snprintf(buf, sizeof(buf), "GET http://%s%s HTTP/1.1\r\nHost: %s\r\n\r\n",
ci->host, icao, ci->host);
ecore_con_server_send(weather_config->server, buf, strlen(buf));
return 0;
}
@@ -494,24 +495,24 @@
Instance *inst;
Ecore_Con_Event_Server_Del *ev;
int ret;
-
+
inst = data;
ev = event;
if ((!weather_config->server) || (weather_config->server != ev->server))
- return 1;
+ return 1;
ecore_con_server_del(weather_config->server);
weather_config->server = NULL;
-
+
ret = _weather_parse(inst);
_weather_convert_degrees(inst);
_weather_display_set(inst, ret);
-
+
inst->bufsize = 0;
inst->cursize = 0;
free(inst->buffer);
inst->buffer = NULL;
-
+
return 0;
}
@@ -520,19 +521,19 @@
{
Instance *inst;
Ecore_Con_Event_Server_Data *ev;
-
+
inst = data;
ev = event;
-
+
if ((!weather_config->server) || (weather_config->server != ev->server))
- return 1;
-
- while ((inst->cursize + ev->size) >= inst->bufsize)
+ return 1;
+
+ while ((inst->cursize + ev->size) >= inst->bufsize)
{
- inst->bufsize += 4096;
- inst->buffer = realloc(inst->buffer, inst->bufsize);
+ inst->bufsize += 4096;
+ inst->buffer = realloc(inst->buffer, inst->bufsize);
}
-
+
memcpy(inst->buffer + inst->cursize, ev->data, ev->size);
inst->cursize += ev->size;
inst->buffer[inst->cursize] = 0;
@@ -544,10 +545,10 @@
{
char *needle, *ext;
char location[256];
-
+
needle = strstr(inst->buffer, "<title");
if (!needle)
- goto error;
+ goto error;
needle = strstr(needle, ">");
sscanf(needle, ">%[^<]<", location);
@@ -564,37 +565,37 @@
needle = strstr(inst->buffer, "<content:encoded>");
if (!needle)
- goto error;
+ goto error;
needle = strstr(needle, "<img");
if (!needle)
- goto error;
+ goto error;
needle = strstr(needle, "id=");
if (!needle)
- goto error;
+ goto error;
sscanf(needle, "id=\"%[^\"]\"", inst->icon);
ext = strstr(inst->icon, ".");
if (!strcmp(ext, ".gif"))
- strcpy(ext, ".png");
+ strcpy(ext, ".png");
needle = strstr(needle, "class=\"sky\"");
if (!needle)
- goto error;
+ goto error;
needle = strstr(needle, ">");
if (!needle)
- goto error;
+ goto error;
sscanf(needle, ">%[^<]<", inst->conditions);
needle = strstr(needle, "class=\"temp\"");
if (!needle)
- goto error;
+ goto error;
needle = strstr(needle, ">");
if (!needle)
- goto error;
+ goto error;
sscanf(needle, ">%d", &inst->temp);
needle = strstr(needle, "<");
if (!needle)
- goto error;
+ goto error;
needle--;
inst->degrees = needle[0];
@@ -609,10 +610,10 @@
{
Instance *inst;
Config_Item *ci;
-
+
inst = data;
ci = _weather_config_item_get(inst->gcc->id);
-
+
if ((inst->degrees == 'F') && (ci->degrees == DEGREES_C))
{
inst->temp = (inst->temp - 32) * 5.0 / 9.0;
@@ -630,13 +631,13 @@
{
char buf[4096];
char m[4096];
-
- if (!inst)
- return;
+
+ if (!inst)
+ return;
snprintf(m, sizeof(m), "%s", e_module_dir_get(weather_config->module));
if (!ok)
- {
+ {
snprintf(buf, sizeof(buf), "%s/images/unknown.png", m);
e_icon_file_set(inst->weather->icon_obj, buf);
edje_object_part_swallow(inst->weather->weather_obj, "icon",
inst->weather->icon_obj);
@@ -651,52 +652,52 @@
edje_object_part_swallow(inst->weather->weather_obj, "icon",
inst->weather->icon_obj);
edje_object_part_text_set(inst->weather->weather_obj, "location",
inst->location);
snprintf(buf, sizeof(buf), "%d°%c", inst->temp, inst->degrees);
- edje_object_part_text_set(inst->weather->weather_obj, "temp", buf);
+ edje_object_part_text_set(inst->weather->weather_obj, "temp", buf);
edje_object_part_text_set(inst->weather->weather_obj, "conditions",
inst->conditions);
}
}
-void
-_weather_config_updated(const char *id)
+void
+_weather_config_updated(const char *id)
{
Evas_List *l;
Config_Item *ci;
char buf[4096];
-
- if (!weather_config)
- return;
-
- ci = _weather_config_item_get(id);
- for (l = weather_config->instances; l; l = l->next)
- {
- Instance *inst;
-
- inst = l->data;
- if (!inst->gcc->id)
- 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;
- }
-
- _weather_convert_degrees(inst);
-
- snprintf(buf, sizeof(buf), "%d°%c", inst->temp, inst->degrees);
- edje_object_part_text_set(inst->weather->weather_obj, "temp", buf);
-
- if (!inst->check_timer)
- inst->check_timer = ecore_timer_add((double)ci->poll_time,
_weather_cb_check, inst);
- else
- ecore_timer_interval_set(inst->check_timer,
(double)ci->poll_time);
-
- break;
- }
+
+ if (!weather_config)
+ return;
+
+ ci = _weather_config_item_get(id);
+ for (l = weather_config->instances; l; l = l->next)
+ {
+ Instance *inst;
+
+ inst = l->data;
+ if (!inst->gcc->id)
+ 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;
+ }
+
+ _weather_convert_degrees(inst);
+
+ snprintf(buf, sizeof(buf), "%d°%c", inst->temp, inst->degrees);
+ edje_object_part_text_set(inst->weather->weather_obj, "temp",
buf);
+
+ if (!inst->check_timer)
+ inst->check_timer = ecore_timer_add((double)ci->poll_time,
_weather_cb_check, inst);
+ else
+ ecore_timer_interval_set(inst->check_timer,
(double)ci->poll_time);
+
+ break;
+ }
}
}
===================================================================
RCS file: /cvs/e/e_modules/weather/e_mod_main.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_main.h 18 May 2006 20:47:38 -0000 1.11
+++ e_mod_main.h 22 May 2006 02:10:55 -0000 1.12
@@ -12,7 +12,7 @@
typedef struct _Config_Item Config_Item;
struct _Config
-{
+{
E_Module *module;
E_Config_Dialog *config_dialog;
Evas_List *instances;
@@ -25,10 +25,10 @@
Ecore_Event_Handler *data_handler;
};
-struct _Config_Item
+struct _Config_Item
{
const char *id;
-
+
double poll_time;
int display, degrees;
const char *host, *code;
@@ -36,7 +36,7 @@
{
const char *host;
int port;
- } proxy;
+ } proxy;
};
EAPI extern E_Module_Api e_modapi;
-------------------------------------------------------
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
