raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=a1d9dba1d057e9fce817389b61e849cad3b61232
commit a1d9dba1d057e9fce817389b61e849cad3b61232
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue Feb 13 15:12:18 2018 +0900
terminology efl version bump 1.8 to 1.20
efl 1.8 is ancient by now (december 2013 ... like over 4 years ago).
time to bump to 1.20, so any future releases of terminology will need
a bump in efl version too whicn IMHO is sensible.
---
meson.build | 2 +-
src/bin/main.c | 30 ++++--------------------------
src/bin/options_background.c | 2 --
src/bin/options_font.c | 2 --
src/bin/options_keys.c | 5 -----
src/bin/tycat.c | 2 --
src/bin/tyls.c | 2 --
7 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/meson.build b/meson.build
index 537b23b..bf7df38 100644
--- a/meson.build
+++ b/meson.build
@@ -39,7 +39,7 @@ if host_os == 'linux'
config_data.set('_POSIX_1_SOURCE', 1)
endif
-efl_version = '1.8.0'
+efl_version = '1.20.0'
efl_deps = ['edje',
'elementary',
'eina',
diff --git a/src/bin/main.c b/src/bin/main.c
index 99e9a05..74f2e4c 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -329,11 +329,7 @@ static Ecore_Getopt options = {
gettext_noop("Terminal emulator written with Enlightenment Foundation
Libraries."),
EINA_TRUE,
{
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
ECORE_GETOPT_BREAK_STR ('e', "exec",
-#else
- ECORE_GETOPT_STORE_STR ('e', "exec",
-#endif
gettext_noop("Command to execute. Defaults to
$SHELL (or passwd shell or /bin/sh)")),
ECORE_GETOPT_STORE_STR ('d', "current-directory",
gettext_noop("Change to directory for execution
of terminal command.")),
@@ -406,11 +402,8 @@ _translate_options(void)
2018);
Ecore_Getopt_Desc *desc = (Ecore_Getopt_Desc *) options.descs;
- while ((desc->shortname != '\0') || (desc->longname)
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 9)
- || (desc->action == ECORE_GETOPT_ACTION_CATEGORY)
-#endif
- )
+ while ((desc->shortname != '\0') || (desc->longname) ||
+ (desc->action == ECORE_GETOPT_ACTION_CATEGORY))
{
if (desc->help)
{
@@ -502,16 +495,10 @@ elm_main(int argc, char **argv)
Eina_Bool quit_option = EINA_FALSE;
Eina_Bool hold = EINA_FALSE;
Eina_Bool single = EINA_FALSE;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
Eina_Bool cmd_options = EINA_FALSE;
-#endif
Eina_Bool xterm_256color = EINA_FALSE;
Ecore_Getopt_Value values[] = {
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
ECORE_GETOPT_VALUE_BOOL(cmd_options),
-#else
- ECORE_GETOPT_VALUE_STR(cmd),
-#endif
ECORE_GETOPT_VALUE_STR(cd),
ECORE_GETOPT_VALUE_STR(theme),
ECORE_GETOPT_VALUE_STR(background),
@@ -555,9 +542,7 @@ elm_main(int argc, char **argv)
int pos_set = 0, size_set = 0;
int pos_x = 0, pos_y = 0;
int size_w = 1, size_h = 1;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
Eina_List *cmds_list = NULL;
-#endif
terminology_starting_up = EINA_TRUE;
@@ -615,7 +600,6 @@ elm_main(int argc, char **argv)
if (quit_option) goto end;
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
if (cmd_options)
{
int i;
@@ -647,8 +631,7 @@ elm_main(int argc, char **argv)
eina_strbuf_free(strb);
}
}
-#endif
-
+
if (theme)
{
char path[PATH_MAX];
@@ -929,7 +912,6 @@ remote:
evas_object_show(win);
if (startup_split)
{
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
unsigned int i = 0;
Term *next = term;
@@ -960,7 +942,6 @@ remote:
}
if (cmds_list)
eina_list_free(cmds_list);
-#endif
}
if (pos_set)
{
@@ -988,10 +969,7 @@ remote:
config = NULL;
end:
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
- if (!startup_split)
- free(cmd);
-#endif
+ if (!startup_split) free(cmd);
if (config)
{
config_del(config);
diff --git a/src/bin/options_background.c b/src/bin/options_background.c
index 71b4c1b..a7d836e 100644
--- a/src/bin/options_background.c
+++ b/src/bin/options_background.c
@@ -592,9 +592,7 @@ options_background(Evas_Object *opbox, Evas_Object *term)
elm_slider_unit_format_set(o, "%1.0f");
elm_slider_indicator_format_set(o, "%1.0f");
elm_slider_min_max_set(o, 0, 255);
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
elm_slider_step_set(o, 1);
-#endif
elm_slider_value_set(o, config->shine);
elm_box_pack_end(bx, o);
evas_object_show(o);
diff --git a/src/bin/options_font.c b/src/bin/options_font.c
index b329b8d..407694a 100644
--- a/src/bin/options_font.c
+++ b/src/bin/options_font.c
@@ -452,9 +452,7 @@ options_font(Evas_Object *opbox, Evas_Object *term)
elm_slider_unit_format_set(o, "%1.0f");
elm_slider_indicator_format_set(o, "%1.0f");
elm_slider_min_max_set(o, FONT_MIN, FONT_MAX);
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
elm_slider_step_set(o, FONT_STEP);
-#endif
elm_slider_value_set(o, config->font.size);
elm_box_pack_end(bx, o);
evas_object_show(o);
diff --git a/src/bin/options_keys.c b/src/bin/options_keys.c
index 01a64df..5e9bec3 100644
--- a/src/bin/options_keys.c
+++ b/src/bin/options_keys.c
@@ -178,12 +178,7 @@ _hover_sizing_eval(Keys_Ctx *ctx)
Evas_Coord x = 0, y = 0, w = 0, h = 0;
evas_object_geometry_get(ctx->frame, &x, &y, &w, &h);
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
evas_object_geometry_set(ctx->layout, x, y, w, h);
-#else
- evas_object_move(ctx->layout, x, y);
- evas_object_resize(ctx->layout, w, h);
-#endif
}
static void
diff --git a/src/bin/tycat.c b/src/bin/tycat.c
index aa0b38b..4344427 100644
--- a/src/bin/tycat.c
+++ b/src/bin/tycat.c
@@ -320,9 +320,7 @@ main(int argc, char **argv)
}
eina_init();
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
ecore_app_no_system_modules();
-#endif
ecore_init();
ecore_file_init();
evas_init();
diff --git a/src/bin/tyls.c b/src/bin/tyls.c
index 80f21d8..86331c3 100644
--- a/src/bin/tyls.c
+++ b/src/bin/tyls.c
@@ -745,9 +745,7 @@ main(int argc, char **argv)
ARGUMENT_ENTRY_CHECK(argc, argv, print_usage);
eina_init();
-#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
ecore_app_no_system_modules();
-#endif
ecore_init();
ecore_file_init();
evas_init();
--
