This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment-module-forecasts.
View the commit online.
commit 5252f23c5db63739689d2a1b20aaef84534515ff
Author: Alastair Poole <[email protected]>
AuthorDate: Mon May 25 11:49:16 2026 +0100
forecasts: function naming.
Be consistent.
---
src/e_mod_main.c | 204 +++++++++++++++++++++++++++----------------------------
1 file changed, 102 insertions(+), 102 deletions(-)
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 936a5aa..a772a23 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -133,27 +133,27 @@ static void _forecasts_convert_pressures(float *value, int dir);
static void _forecasts_display_set(Instance *inst, int ok);
static void _forecasts_popup_content_create(Instance *inst);
static void _forecasts_popup_show(Instance *inst);
-static void _cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _forecasts_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
static Evas_Object *_forecasts_popup_icon_create(Evas *evas, const char *code);
static void _forecasts_popup_destroy(Instance *inst);
static void _forecasts_popup_del_cb(void *obj);
-static Eina_Bool _time_local_get(const char *timezone, time_t t, struct tm *tm_out);
-static time_t _time_mktime(const char *timezone, struct tm *tm_in);
-static void _location_time_text_get(Instance *inst, char *buf, size_t len,
+static Eina_Bool _forecasts_time_local_get(const char *timezone, time_t t, struct tm *tm_out);
+static time_t _forecasts_time_mktime(const char *timezone, struct tm *tm_in);
+static void _forecasts_location_time_text_get(Instance *inst, char *buf, size_t len,
Eina_Bool include_date);
-static time_t _timestamp_utc(const char *timestamp);
-static Eina_Bool _symbol_code_is_night(const char *code);
-static Eina_Bool _symbol_code_is_day(const char *code);
-static Eina_Bool _location_is_day(Instance *inst);
-static const char *_forecast_symbol_code_get(json_object *o_data, const char *period);
-static const char *_forecast_best_symbol_code_get(json_object *o_data);
-static int _forecast_icon_score(const char *code, const struct tm *tm_data);
-static void _condition_details_set(Instance *inst, json_object *o_data,
+static time_t _forecasts_timestamp_utc(const char *timestamp);
+static Eina_Bool _forecasts_symbol_code_is_night(const char *code);
+static Eina_Bool _forecasts_symbol_code_is_day(const char *code);
+static Eina_Bool _forecasts_location_is_day(Instance *inst);
+static const char *_forecasts_symbol_code_get(json_object *o_data, const char *period);
+static const char *_forecasts_best_symbol_code_get(json_object *o_data);
+static int _forecasts_icon_score(const char *code, const struct tm *tm_data);
+static void _forecasts_condition_details_set(Instance *inst, json_object *o_data,
json_object *o_details, double temp);
static void _forecasts_current_icon_update(Instance *inst);
static void _forecasts_clock_update(Instance *inst);
-static const char *_condition_display_icon_code(Instance *inst, char *buf, size_t len);
-static const char *_forecast_display_icon_code(Instance *inst, int idx, char *buf, size_t len);
+static const char *_forecasts_condition_display_icon_code(Instance *inst, char *buf, size_t len);
+static const char *_forecasts_forecast_display_icon_code(Instance *inst, int idx, char *buf, size_t len);
/* Gadcon Functions */
static E_Gadcon_Client *
@@ -182,7 +182,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
inst->popup_clock_label = NULL;
inst->forecasts_obj = o;
evas_object_event_callback_add(inst->forecasts_obj, EVAS_CALLBACK_MOUSE_UP,
- _cb_mouse_up, inst);
+ _forecasts_cb_mouse_up, inst);
if (!inst->url_data_handler)
inst->url_data_handler =
@@ -239,7 +239,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
evas_object_event_callback_del(w->forecasts_obj, EVAS_CALLBACK_MOUSE_DOWN,
_forecasts_cb_mouse_down);
evas_object_event_callback_del(w->forecasts_obj, EVAS_CALLBACK_MOUSE_UP,
- _cb_mouse_up);
+ _forecasts_cb_mouse_up);
_forecasts_free(w);
E_FREE(inst);
@@ -630,7 +630,7 @@ _forecasts_midnight_timer_reset(Instance *inst)
}
now = time(NULL);
- if (!_time_local_get(inst->ci->timezone, now, &tm_next)) return;
+ if (!_forecasts_time_local_get(inst->ci->timezone, now, &tm_next)) return;
tm_next.tm_mday += 1;
tm_next.tm_hour = 0;
@@ -638,7 +638,7 @@ _forecasts_midnight_timer_reset(Instance *inst)
tm_next.tm_sec = 5;
tm_next.tm_isdst = -1;
- next = _time_mktime(inst->ci->timezone, &tm_next);
+ next = _forecasts_time_mktime(inst->ci->timezone, &tm_next);
if (next == (time_t)-1) return;
delay = difftime(next, now);
@@ -727,7 +727,7 @@ _forecasts_url_complete(void *data, int type EINA_UNUSED, void *event)
}
static Eina_Bool
-_timezone_apply(const char *timezone, char **old_tz, Eina_Bool *had_old_tz)
+_forecasts_timezone_apply(const char *timezone, char **old_tz, Eina_Bool *had_old_tz)
{
const char *env_tz;
@@ -750,7 +750,7 @@ _timezone_apply(const char *timezone, char **old_tz, Eina_Bool *had_old_tz)
}
static void
-_timezone_restore(char *old_tz, Eina_Bool had_old_tz)
+_forecasts_timezone_restore(char *old_tz, Eina_Bool had_old_tz)
{
if (had_old_tz)
setenv("TZ", old_tz, 1);
@@ -761,7 +761,7 @@ _timezone_restore(char *old_tz, Eina_Bool had_old_tz)
}
static Eina_Bool
-_time_local_get(const char *timezone, time_t t, struct tm *tm_out)
+_forecasts_time_local_get(const char *timezone, time_t t, struct tm *tm_out)
{
char *old_tz = NULL;
Eina_Bool had_old_tz = EINA_FALSE;
@@ -770,15 +770,15 @@ _time_local_get(const char *timezone, time_t t, struct tm *tm_out)
if (!tm_out) return EINA_FALSE;
- changed = _timezone_apply(timezone, &old_tz, &had_old_tz);
+ changed = _forecasts_timezone_apply(timezone, &old_tz, &had_old_tz);
ok = !!localtime_r(&t, tm_out);
- if (changed) _timezone_restore(old_tz, had_old_tz);
+ if (changed) _forecasts_timezone_restore(old_tz, had_old_tz);
return ok;
}
static time_t
-_time_mktime(const char *timezone, struct tm *tm_in)
+_forecasts_time_mktime(const char *timezone, struct tm *tm_in)
{
char *old_tz = NULL;
Eina_Bool had_old_tz = EINA_FALSE;
@@ -787,15 +787,15 @@ _time_mktime(const char *timezone, struct tm *tm_in)
if (!tm_in) return (time_t)-1;
- changed = _timezone_apply(timezone, &old_tz, &had_old_tz);
+ changed = _forecasts_timezone_apply(timezone, &old_tz, &had_old_tz);
t = mktime(tm_in);
- if (changed) _timezone_restore(old_tz, had_old_tz);
+ if (changed) _forecasts_timezone_restore(old_tz, had_old_tz);
return t;
}
static void
-_location_time_text_get(Instance *inst, char *buf, size_t len,
+_forecasts_location_time_text_get(Instance *inst, char *buf, size_t len,
Eina_Bool include_date)
{
time_t now;
@@ -807,7 +807,7 @@ _location_time_text_get(Instance *inst, char *buf, size_t len,
if (!inst) return;
now = time(NULL);
- if (!_time_local_get(inst->ci->timezone, now, &tm_now)) return;
+ if (!_forecasts_time_local_get(inst->ci->timezone, now, &tm_now)) return;
if (include_date)
strftime(buf, len, "%a %d %b %H:%M", &tm_now);
@@ -816,19 +816,19 @@ _location_time_text_get(Instance *inst, char *buf, size_t len,
}
static void
-_timestamp_local(const char *timestamp, const char *timezone, char *buf, size_t len)
+_forecasts_timestamp_local(const char *timestamp, const char *timezone, char *buf, size_t len)
{
time_t t;
struct tm tm_out;
- t = _timestamp_utc(timestamp);
+ t = _forecasts_timestamp_utc(timestamp);
if (t == (time_t)-1) return;
- if (!_time_local_get(timezone, t, &tm_out)) return;
+ if (!_forecasts_time_local_get(timezone, t, &tm_out)) return;
strftime(buf, len - 1, "%Y-%m-%d %H:%M:%S", &tm_out);
}
static time_t
-_timestamp_utc(const char *timestamp)
+_forecasts_timestamp_utc(const char *timestamp)
{
struct tm tm_in;
@@ -841,7 +841,7 @@ _timestamp_utc(const char *timestamp)
}
static int
-_local_day_number(const struct tm *tm)
+_forecasts_local_day_number(const struct tm *tm)
{
/* Compute a stable local-calendar day number without using UTC day
* boundaries. The timeseries timestamps are UTC, but forecast rows are
@@ -850,7 +850,7 @@ _local_day_number(const struct tm *tm)
}
static const char *
-_forecast_symbol_code_get(json_object *o_data, const char *period)
+_forecasts_symbol_code_get(json_object *o_data, const char *period)
{
json_object *o_next, *o_summary;
const char *code;
@@ -870,21 +870,21 @@ _forecast_symbol_code_get(json_object *o_data, const char *period)
}
static const char *
-_forecast_best_symbol_code_get(json_object *o_data)
+_forecasts_best_symbol_code_get(json_object *o_data)
{
const char *code;
- code = _forecast_symbol_code_get(o_data, "next_12_hours");
+ code = _forecasts_symbol_code_get(o_data, "next_12_hours");
if (code) return code;
- code = _forecast_symbol_code_get(o_data, "next_6_hours");
+ code = _forecasts_symbol_code_get(o_data, "next_6_hours");
if (code) return code;
- return _forecast_symbol_code_get(o_data, "next_1_hours");
+ return _forecasts_symbol_code_get(o_data, "next_1_hours");
}
static int
-_forecast_icon_score(const char *code, const struct tm *tm_data)
+_forecasts_icon_score(const char *code, const struct tm *tm_data)
{
int hour, score = 0;
@@ -898,9 +898,9 @@ _forecast_icon_score(const char *code, const struct tm *tm_data)
else if ((hour >= 6) && (hour <= 20))
score += 40;
- if (_symbol_code_is_day(code))
+ if (_forecasts_symbol_code_is_day(code))
score += 30;
- else if (_symbol_code_is_night(code))
+ else if (_forecasts_symbol_code_is_night(code))
score -= 100;
else
score += 10;
@@ -909,7 +909,7 @@ _forecast_icon_score(const char *code, const struct tm *tm_data)
}
static void
-_condition_details_set(Instance *inst, json_object *o_data,
+_forecasts_condition_details_set(Instance *inst, json_object *o_data,
json_object *o_details, double temp)
{
double v;
@@ -942,26 +942,26 @@ _condition_details_set(Instance *inst, json_object *o_data,
inst->details.wind.can_chill = 1;
}
- code = _forecast_symbol_code_get(o_data, "next_1_hours");
- if (!code) code = _forecast_best_symbol_code_get(o_data);
+ code = _forecasts_symbol_code_get(o_data, "next_1_hours");
+ if (!code) code = _forecasts_best_symbol_code_get(o_data);
if (code)
snprintf(inst->condition.code, sizeof(inst->condition.code), "%s", code);
}
static Eina_Bool
-_symbol_code_is_night(const char *code)
+_forecasts_symbol_code_is_night(const char *code)
{
return code && strstr(code, "_night");
}
static Eina_Bool
-_symbol_code_is_day(const char *code)
+_forecasts_symbol_code_is_day(const char *code)
{
return code && strstr(code, "_day");
}
static Eina_Bool
-_location_is_day(Instance *inst)
+_forecasts_location_is_day(Instance *inst)
{
time_t now;
struct tm tm_now;
@@ -969,14 +969,14 @@ _location_is_day(Instance *inst)
if (!inst) return EINA_TRUE;
now = time(NULL);
- if (!_time_local_get(inst->ci->timezone, now, &tm_now))
+ if (!_forecasts_time_local_get(inst->ci->timezone, now, &tm_now))
return EINA_TRUE;
return ((tm_now.tm_hour >= 6) && (tm_now.tm_hour < 18));
}
static void
-_symbol_code_force_day(char *buf, size_t len, const char *code)
+_forecasts_symbol_code_force_day(char *buf, size_t len, const char *code)
{
char *suffix;
@@ -997,7 +997,7 @@ _symbol_code_force_day(char *buf, size_t len, const char *code)
}
static void
-_symbol_code_force_night(char *buf, size_t len, const char *code)
+_forecasts_symbol_code_force_night(char *buf, size_t len, const char *code)
{
char *suffix;
@@ -1018,13 +1018,13 @@ _symbol_code_force_night(char *buf, size_t len, const char *code)
}
static void
-_condition_code_force_night(char *buf, size_t len, const char *code)
+_forecasts_condition_code_force_night(char *buf, size_t len, const char *code)
{
if (!buf || len == 0) return;
- _symbol_code_force_night(buf, len, code);
+ _forecasts_symbol_code_force_night(buf, len, code);
- if (!buf[0] || _symbol_code_is_night(buf)) return;
+ if (!buf[0] || _forecasts_symbol_code_is_night(buf)) return;
/* Some condition symbols, such as fog and cloudy, have no dedicated
* night asset. For the current-condition icon prefer showing that it is
@@ -1034,24 +1034,24 @@ _condition_code_force_night(char *buf, size_t len, const char *code)
}
static void
-_forecast_code_set(char *dst, size_t len, const char *code, Eina_Bool force_day)
+_forecasts_forecast_code_set(char *dst, size_t len, const char *code, Eina_Bool force_day)
{
if (!code || code[0] == '\0') return;
if (force_day)
- _symbol_code_force_day(dst, len, code);
+ _forecasts_symbol_code_force_day(dst, len, code);
else
snprintf(dst, len, "%s", code);
}
static const char *
-_condition_display_icon_code(Instance *inst, char *buf, size_t len)
+_forecasts_condition_display_icon_code(Instance *inst, char *buf, size_t len)
{
if (!inst) return "";
- if (_location_is_day(inst))
- _symbol_code_force_day(buf, len, inst->condition.code);
+ if (_forecasts_location_is_day(inst))
+ _forecasts_symbol_code_force_day(buf, len, inst->condition.code);
else
- _condition_code_force_night(buf, len, inst->condition.code);
+ _forecasts_condition_code_force_night(buf, len, inst->condition.code);
return buf;
}
@@ -1068,7 +1068,7 @@ _forecasts_current_icon_update(Instance *inst)
snprintf(m, sizeof(m), "%s/forecasts.edj",
e_module_dir_get(forecasts_config->module));
snprintf(buf, sizeof(buf), "modules/forecasts/icons/%s",
- _condition_display_icon_code(inst, icon_code, sizeof(icon_code)));
+ _forecasts_condition_display_icon_code(inst, icon_code, sizeof(icon_code)));
if (!e_theme_edje_object_set(inst->forecasts->icon_obj,
"base/theme/modules/forecasts/icons", buf))
edje_object_file_set(inst->forecasts->icon_obj, m, buf);
@@ -1083,13 +1083,13 @@ _forecasts_clock_update(Instance *inst)
if (!inst || !inst->forecasts) return;
- _location_time_text_get(inst, buf, sizeof(buf), EINA_FALSE);
+ _forecasts_location_time_text_get(inst, buf, sizeof(buf), EINA_FALSE);
edje_object_part_text_set(inst->forecasts->forecasts_obj,
"e.text.local_time", buf);
if (inst->popup_clock_label)
{
- _location_time_text_get(inst, buf, sizeof(buf), EINA_TRUE);
+ _forecasts_location_time_text_get(inst, buf, sizeof(buf), EINA_TRUE);
elm_object_text_set(inst->popup_clock_label, buf);
}
@@ -1097,11 +1097,11 @@ _forecasts_clock_update(Instance *inst)
}
static const char *
-_forecast_display_icon_code(Instance *inst, int idx, char *buf, size_t len)
+_forecasts_forecast_display_icon_code(Instance *inst, int idx, char *buf, size_t len)
{
if (!inst || idx < 0 || idx >= FORECASTS) return "";
- _symbol_code_force_day(buf, len, inst->forecast[idx].code);
+ _forecasts_symbol_code_force_day(buf, len, inst->forecast[idx].code);
return buf;
}
@@ -1142,8 +1142,8 @@ _forecasts_parse(void *data)
icon_score[i] = INT_MIN;
}
now = time(NULL);
- if (!_time_local_get(inst->ci->timezone, now, &tm_now)) goto error;
- today_days = _local_day_number(&tm_now);
+ if (!_forecasts_time_local_get(inst->ci->timezone, now, &tm_now)) goto error;
+ today_days = _forecasts_local_day_number(&tm_now);
inst->condition.code[0] = '\0';
inst->condition.desc[0] = '\0';
inst->details.wind.can_chill = 0;
@@ -1185,11 +1185,11 @@ _forecasts_parse(void *data)
o_time = json_object_object_get(o_index, "time");
if (!o_time) continue;
timestamp = json_object_get_string(o_time);
- t_data = _timestamp_utc(timestamp);
+ t_data = _forecasts_timestamp_utc(timestamp);
if (t_data == (time_t)-1) continue;
- if (!_time_local_get(inst->ci->timezone, t_data, &tm_data)) continue;
+ if (!_forecasts_time_local_get(inst->ci->timezone, t_data, &tm_data)) continue;
- days = _local_day_number(&tm_data);
+ days = _forecasts_local_day_number(&tm_data);
if (days < today_days) continue;
if (days != last_days)
{
@@ -1220,21 +1220,21 @@ _forecasts_parse(void *data)
if (!condition_set &&
(!condition_fallback_set || (difftime(t_data, now) >= -7200.0)))
{
- _condition_details_set(inst, o_data, o_details, v);
+ _forecasts_condition_details_set(inst, o_data, o_details, v);
condition_fallback_set = EINA_TRUE;
if (difftime(t_data, now) >= -7200.0)
condition_set = EINA_TRUE;
}
- code = _forecast_best_symbol_code_get(o_data);
+ code = _forecasts_best_symbol_code_get(o_data);
if (code)
{
- int score = _forecast_icon_score(code, &tm_data);
+ int score = _forecasts_icon_score(code, &tm_data);
if (score > icon_score[idx])
{
icon_score[idx] = score;
- _forecast_code_set(inst->forecast[idx].code,
+ _forecasts_forecast_code_set(inst->forecast[idx].code,
sizeof(inst->forecast[idx].code),
code, EINA_TRUE);
}
@@ -1370,7 +1370,7 @@ _forecasts_display_set(Instance *inst, int ok EINA_UNUSED)
evas_object_del(swallow);
edje_object_part_swallow(inst->forecasts->forecasts_obj, name,
_forecasts_popup_icon_create(inst->gcc->gadcon->evas,
- _forecast_display_icon_code(inst, i, icon_code,
+ _forecasts_forecast_display_icon_code(inst, i, icon_code,
sizeof(icon_code))));
}
}
@@ -1428,7 +1428,7 @@ _forecasts_config_updated(Config_Item *ci)
}
static Evas_Object *
-_lb_add(Evas_Object *base, const char *txt)
+_forecasts_lb_add(Evas_Object *base, const char *txt)
{
Evas_Object *o = elm_label_add(base);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
@@ -1438,7 +1438,7 @@ _lb_add(Evas_Object *base, const char *txt)
}
static Evas_Object *
-_day_hi_lo_add(Evas_Object *base, const char *day, int lo, int hi, char unit, const char *code)
+_forecasts_day_hi_lo_add(Evas_Object *base, const char *day, int lo, int hi, char unit, const char *code)
{
Evas_Object *o, *tb;
char buf[256];
@@ -1448,7 +1448,7 @@ _day_hi_lo_add(Evas_Object *base, const char *day, int lo, int hi, char unit, co
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
snprintf(buf, sizeof(buf), "<b>%s</>", day);
- o = _lb_add(base, buf);
+ o = _forecasts_lb_add(base, buf);
evas_object_size_hint_weight_set(o, 0.0, 0.0);
evas_object_size_hint_align_set(o, 0.5, 0.5);
elm_table_pack(tb, o, 0, 0, 2, 1);
@@ -1466,7 +1466,7 @@ _day_hi_lo_add(Evas_Object *base, const char *day, int lo, int hi, char unit, co
snprintf(buf, sizeof(buf), "%i°%c", hi, unit);
else
snprintf(buf, sizeof(buf), D_("N/A"));
- o = _lb_add(base, buf);
+ o = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(o, 0.0, 0.5);
elm_table_pack(tb, o, 1, 1, 1, 1);
@@ -1474,7 +1474,7 @@ _day_hi_lo_add(Evas_Object *base, const char *day, int lo, int hi, char unit, co
snprintf(buf, sizeof(buf), "%i°%c", lo, unit);
else
snprintf(buf, sizeof(buf), D_("N/A"));
- o = _lb_add(base, buf);
+ o = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(o, 0.0, 0.5);
elm_table_pack(tb, o, 1, 2, 1, 1);
@@ -1528,7 +1528,7 @@ _forecasts_popup_content_create(Instance *inst)
elm_object_content_set(fr, tb);
ic = _forecasts_popup_icon_create(e_comp->evas,
- _condition_display_icon_code(inst, icon_code[0],
+ _forecasts_condition_display_icon_code(inst, icon_code[0],
sizeof(icon_code[0])));
edje_object_size_max_get(ic, &w, &h);
if (w > 160) w = 160;
@@ -1541,64 +1541,64 @@ _forecasts_popup_content_create(Instance *inst)
snprintf(tmp, sizeof(tmp), D_("N/A"));
if (inst->update_time)
- _timestamp_local(inst->update_time, inst->ci->timezone, tmp, sizeof(tmp));
+ _forecasts_timestamp_local(inst->update_time, inst->ci->timezone, tmp, sizeof(tmp));
snprintf(buf, sizeof(buf), D_("<small>Updated: %s</>"), tmp);
- lb = _lb_add(base, buf);
+ lb = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(lb, 1.0, 0.0);
elm_table_pack(tb, lb, 0, row++, 3, 1);
snprintf(buf, sizeof(buf), "<b>%s</>", inst->location);
- lb = _lb_add(base, buf);
+ lb = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(lb, 0.5, 0.5);
elm_table_pack(tb, lb, 0, row++, 3, 1);
- _location_time_text_get(inst, buf, sizeof(buf), EINA_TRUE);
- inst->popup_clock_label = _lb_add(base, buf);
+ _forecasts_location_time_text_get(inst, buf, sizeof(buf), EINA_TRUE);
+ inst->popup_clock_label = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(inst->popup_clock_label, 0.5, 0.5);
elm_table_pack(tb, inst->popup_clock_label, 0, row++, 3, 1);
row0 = row;
- lb = _lb_add(base, D_("Temperature"));
+ lb = _forecasts_lb_add(base, D_("Temperature"));
evas_object_size_hint_align_set(lb, 1.0, 0.5);
elm_table_pack(tb, lb, 0, row, 1, 1);
snprintf(buf, sizeof(buf), "%d°%c", inst->condition.temp, inst->units.temp);
- lb = _lb_add(base, buf);
+ lb = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(lb, 0.0, 0.5);
elm_table_pack(tb, lb, 2, row++, 1, 1);
- lb = _lb_add(base, D_("Wind Chill"));
+ lb = _forecasts_lb_add(base, D_("Wind Chill"));
evas_object_size_hint_align_set(lb, 1.0, 0.5);
elm_table_pack(tb, lb, 0, row, 1, 1);
if (inst->details.wind.can_chill)
snprintf(buf, sizeof(buf), "%d°%c", inst->details.wind.chill, inst->units.temp);
else
snprintf(buf, sizeof(buf), "N/A");
- lb = _lb_add(base, buf);
+ lb = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(lb, 0.0, 0.5);
elm_table_pack(tb, lb, 2, row++, 1, 1);
- lb = _lb_add(base, D_("Wind Speed"));
+ lb = _forecasts_lb_add(base, D_("Wind Speed"));
evas_object_size_hint_align_set(lb, 1.0, 0.5);
elm_table_pack(tb, lb, 0, row, 1, 1);
snprintf(buf, sizeof(buf), "%d %s", inst->details.wind.speed, inst->units.speed);
- lb = _lb_add(base, buf);
+ lb = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(lb, 0.0, 0.5);
elm_table_pack(tb, lb, 2, row++, 1, 1);
- lb = _lb_add(base, D_("Humidity"));
+ lb = _forecasts_lb_add(base, D_("Humidity"));
evas_object_size_hint_align_set(lb, 1.0, 0.5);
elm_table_pack(tb, lb, 0, row, 1, 1);
snprintf(buf, sizeof(buf), "%d %%", inst->details.atmosphere.humidity);
- lb = _lb_add(base, buf);
+ lb = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(lb, 0.0, 0.5);
elm_table_pack(tb, lb, 2, row++, 1, 1);
- lb = _lb_add(base, D_("Pressure"));
+ lb = _forecasts_lb_add(base, D_("Pressure"));
evas_object_size_hint_align_set(lb, 1.0, 0.5);
elm_table_pack(tb, lb, 0, row, 1, 1);
snprintf(buf, sizeof(buf), "%.2f %s", inst->details.atmosphere.pressure, inst->units.pressure);
- lb = _lb_add(base, buf);
+ lb = _forecasts_lb_add(base, buf);
evas_object_size_hint_align_set(lb, 0.0, 0.5);
elm_table_pack(tb, lb, 2, row++, 1, 1);
@@ -1618,19 +1618,19 @@ _forecasts_popup_content_create(Instance *inst)
elm_box_pack_end(bx, hbx);
evas_object_show(hbx);
- fr = _day_hi_lo_add(base, D_("Today"),
+ fr = _forecasts_day_hi_lo_add(base, D_("Today"),
inst->forecast[0].low,
inst->forecast[0].high,
inst->units.temp,
- _forecast_display_icon_code(inst, 0, icon_code[0], sizeof(icon_code[0])));
+ _forecasts_forecast_display_icon_code(inst, 0, icon_code[0], sizeof(icon_code[0])));
elm_box_pack_end(hbx, fr);
evas_object_show(fr);
- fr = _day_hi_lo_add(base, D_("Tomorrow"),
+ fr = _forecasts_day_hi_lo_add(base, D_("Tomorrow"),
inst->forecast[1].low,
inst->forecast[1].high,
inst->units.temp,
- _forecast_display_icon_code(inst, 1, icon_code[1], sizeof(icon_code[1])));
+ _forecasts_forecast_display_icon_code(inst, 1, icon_code[1], sizeof(icon_code[1])));
elm_box_pack_end(hbx, fr);
evas_object_show(fr);
@@ -1655,11 +1655,11 @@ _forecasts_popup_content_create(Instance *inst)
for (i = 2; i < FORECASTS; i++)
{
- fr = _day_hi_lo_add(base, inst->forecast[i].day,
+ fr = _forecasts_day_hi_lo_add(base, inst->forecast[i].day,
inst->forecast[i].low,
inst->forecast[i].high,
inst->units.temp,
- _forecast_display_icon_code(inst, i, icon_code[i], sizeof(icon_code[i])));
+ _forecasts_forecast_display_icon_code(inst, i, icon_code[i], sizeof(icon_code[i])));
elm_box_pack_end(hbx, fr);
evas_object_show(fr);
}
@@ -1724,7 +1724,7 @@ _forecasts_popup_del_cb(void *obj)
}
static void
-_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+_forecasts_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
{
Instance *inst = data;
Evas_Event_Mouse_Up *ev = event_info;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
