summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2015-02-14 12:08:50 +0100
committerBoris Faure <billiob@gmail.com>2015-02-14 12:08:50 +0100
commit296cdcd1028d7d66a4598c5f8d6975f05e1b08bc (patch)
tree2e57dda8f8daa9aa519fc9d44684dad8422605d1 /src
parentcf1c8f7c02eea315b2a1a3a13ccfc847685fb93a (diff)
usual round of fixes to make it compile with efl 1.7
Diffstat (limited to 'src')
-rw-r--r--src/bin/main.c2
-rw-r--r--src/bin/options_theme.c1
-rw-r--r--src/bin/termio.c17
-rw-r--r--src/bin/termptyesc.c6
-rw-r--r--src/bin/utils.c1
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)
520 int pos_set = 0, size_set = 0; 520 int pos_set = 0, size_set = 0;
521 int pos_x = 0, pos_y = 0; 521 int pos_x = 0, pos_y = 0;
522 int size_w = 1, size_h = 1; 522 int size_w = 1, size_h = 1;
523#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
523 Eina_List *cmds_list = NULL; 524 Eina_List *cmds_list = NULL;
525#endif
524 526
525 elm_language_set(""); 527 elm_language_set("");
526 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); 528 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 @@
1#include "private.h" 1#include "private.h"
2 2
3#include <Elementary.h> 3#include <Elementary.h>
4#include <Efreet.h>
4#include "config.h" 5#include "config.h"
5#include "termio.h" 6#include "termio.h"
6#include "options.h" 7#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
1059#endif 1059#endif
1060 1060
1061static void 1061static void
1062_cb_link_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event) 1062_cb_link_move(void *data, Evas *e EINA_UNUSED,
1063 Evas_Object *obj
1064#if ((ELM_VERSION_MAJOR == 1) && (ELM_VERSION_MINOR < 8))
1065 EINA_UNUSED
1066#endif
1067 , void *event)
1063{ 1068{
1064 Evas_Event_Mouse_Move *ev = event; 1069 Evas_Event_Mouse_Move *ev = event;
1065 Termio *sd = evas_object_smart_data_get(data); 1070 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
4804 free(preedit_string); 4809 free(preedit_string);
4805} 4810}
4806 4811
4807static void
4808_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event)
4809{
4810 Termio *sd = data;
4811 Ecore_IMF_Event_Selection *ev = event;
4812 DBG("IMF selection set %p %i %i", sd, ev->start, ev->end);
4813}
4814
4815 4812
4816static void 4813static void
4817_smart_add(Evas_Object *obj) 4814_smart_add(Evas_Object *obj)
@@ -4926,8 +4923,6 @@ _smart_add(Evas_Object *obj)
4926 (sd->khdl.imf, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, _imf_event_delete_surrounding_cb, sd); 4923 (sd->khdl.imf, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, _imf_event_delete_surrounding_cb, sd);
4927 ecore_imf_context_event_callback_add 4924 ecore_imf_context_event_callback_add
4928 (sd->khdl.imf, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, _imf_event_preedit_changed_cb, sd); 4925 (sd->khdl.imf, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, _imf_event_preedit_changed_cb, sd);
4929 ecore_imf_context_event_callback_add
4930 (sd->khdl.imf, ECORE_IMF_CALLBACK_SELECTION_SET, _imf_event_selection_set_cb, sd);
4931 /* make IMF usable by a terminal - no preedit, prediction... */ 4926 /* make IMF usable by a terminal - no preedit, prediction... */
4932 ecore_imf_context_prediction_allow_set 4927 ecore_imf_context_prediction_allow_set
4933 (sd->khdl.imf, EINA_FALSE); 4928 (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:
1142 1142
1143static void 1143static void
1144_handle_xterm_777_command(Termpty *ty EINA_UNUSED, 1144_handle_xterm_777_command(Termpty *ty EINA_UNUSED,
1145 char *s, int len EINA_UNUSED) 1145 char *s
1146#if ((ELM_VERSION_MAJOR == 1) && (ELM_VERSION_MINOR < 8))
1147 EINA_UNUSED
1148#endif
1149 , int len EINA_UNUSED)
1146{ 1150{
1147#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8) 1151#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
1148 char *cmd_end = NULL, 1152 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 @@
4#include <pwd.h> 4#include <pwd.h>
5 5
6#include <Edje.h> 6#include <Edje.h>
7#include <Efreet.h>
7#include <Elementary.h> 8#include <Elementary.h>
8 9
9const char * 10const char *