billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=296cdcd1028d7d66a4598c5f8d6975f05e1b08bc
commit 296cdcd1028d7d66a4598c5f8d6975f05e1b08bc
Author: Boris Faure <bill...@gmail.com>
Date: Sat Feb 14 12:08:50 2015 +0100
usual round of fixes to make it compile with efl 1.7
---
src/bin/main.c | 2 ++
src/bin/options_theme.c | 1 +
src/bin/termio.c | 17 ++++++-----------
src/bin/termptyesc.c | 6 +++++-
src/bin/utils.c | 1 +
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 891f1ae..fbfc855 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -520,7 +520,9 @@ 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
elm_language_set("");
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c
index 5e41955..d80c04f 100644
--- a/src/bin/options_theme.c
+++ b/src/bin/options_theme.c
@@ -1,6 +1,7 @@
#include "private.h"
#include <Elementary.h>
+#include <Efreet.h>
#include "config.h"
#include "termio.h"
#include "options.h"
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 3a3fb63..ac31f2b 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1059,7 +1059,12 @@ _cb_link_icon_new(void *data, Evas_Object *par,
Evas_Coord *xoff, Evas_Coord *yo
#endif
static void
-_cb_link_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event)
+_cb_link_move(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj
+#if ((ELM_VERSION_MAJOR == 1) && (ELM_VERSION_MINOR < 8))
+ EINA_UNUSED
+#endif
+ , void *event)
{
Evas_Event_Mouse_Move *ev = event;
Termio *sd = evas_object_smart_data_get(data);
@@ -4804,14 +4809,6 @@ _imf_event_preedit_changed_cb(void *data,
Ecore_IMF_Context *ctx, void *event EI
free(preedit_string);
}
-static void
-_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED,
void *event)
-{
- Termio *sd = data;
- Ecore_IMF_Event_Selection *ev = event;
- DBG("IMF selection set %p %i %i", sd, ev->start, ev->end);
-}
-
static void
_smart_add(Evas_Object *obj)
@@ -4926,8 +4923,6 @@ _smart_add(Evas_Object *obj)
(sd->khdl.imf, ECORE_IMF_CALLBACK_DELETE_SURROUNDING,
_imf_event_delete_surrounding_cb, sd);
ecore_imf_context_event_callback_add
(sd->khdl.imf, ECORE_IMF_CALLBACK_PREEDIT_CHANGED,
_imf_event_preedit_changed_cb, sd);
- ecore_imf_context_event_callback_add
- (sd->khdl.imf, ECORE_IMF_CALLBACK_SELECTION_SET,
_imf_event_selection_set_cb, sd);
/* make IMF usable by a terminal - no preedit, prediction... */
ecore_imf_context_prediction_allow_set
(sd->khdl.imf, EINA_FALSE);
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index 58d2418..7617d6e 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -1142,7 +1142,11 @@ err:
static void
_handle_xterm_777_command(Termpty *ty EINA_UNUSED,
- char *s, int len EINA_UNUSED)
+ char *s
+#if ((ELM_VERSION_MAJOR == 1) && (ELM_VERSION_MINOR < 8))
+ EINA_UNUSED
+#endif
+ , int len EINA_UNUSED)
{
#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
char *cmd_end = NULL,
diff --git a/src/bin/utils.c b/src/bin/utils.c
index c25c75c..e45a699 100644
--- a/src/bin/utils.c
+++ b/src/bin/utils.c
@@ -4,6 +4,7 @@
#include <pwd.h>
#include <Edje.h>
+#include <Efreet.h>
#include <Elementary.h>
const char *
--
