aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2016-05-21 22:29:38 +0200
committerBoris Faure <billiob@gmail.com>2016-05-21 22:29:38 +0200
commitbd769a926b4dfe86cea68f9dbe3bf48992ed8d11 (patch)
tree940144cac5fc5fc6d703ea622baa3f051bec4bd8
parentupgrade to teamwork v2, remove dbus (v1) usage (diff)
downloadterminology-bd769a926b4dfe86cea68f9dbe3bf48992ed8d11.tar.gz
configure.ac: actually look for elm_win_teamwork_show() to know if available
-rw-r--r--configure.ac22
-rw-r--r--src/bin/termio.c6
-rw-r--r--src/bin/win.c2
3 files changed, 25 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index b97ab3d..0c86801 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,10 +89,10 @@ PKG_CHECK_MODULES([TERMINOLOGY], [${requirements}])
AC_CHECK_FUNCS(mkstemps)
-AC_MSG_CHECKING([for ecore_con_url_head])
orig_cflags=$CFLAGS
CFLAGS+=" $TERMINOLOGY_CFLAGS "
LDFLAGS+=" $TERMINOLOGY_LDFLAGS $TERMINOLOGY_LIBS "
+AC_MSG_CHECKING([for ecore_con_url_head])
AC_LINK_IFELSE(
[
AC_LANG_PROGRAM(
@@ -111,6 +111,26 @@ AC_LINK_IFELSE(
AC_MSG_RESULT([no])
]
)
+AC_MSG_CHECKING([for elm_win_teamwork])
+AC_LINK_IFELSE(
+ [
+ AC_LANG_PROGRAM(
+ [[
+ #include <Elementary.h>
+ ]],
+ [[
+ elm_win_teamwork_uri_show(NULL);
+ ]])
+ ],
+ [
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_ELM_WIN_TEAMWORK], [1], [define to 1 if
+ elm_win_teamwork_uri_show is available])
+ ],
+ [
+ AC_MSG_RESULT([no])
+ ]
+)
CFLAGS=$orig_cflags
EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 0d77a03..307a9f5 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1137,7 +1137,7 @@ _update_link(Evas_Object *obj, Termio *sd,
if ((!popup_exists) &&
((sd->link.string[0] == '/') || (link_is_url(sd->link.string))))
{
-#ifdef EFL_VERSION_1_18
+#ifdef HAVE_ELM_WIN_TEAMWORK
elm_win_teamwork_uri_show(win_evas_object_get(term_win_get(sd->term)), sd->link.string);
#endif
}
@@ -1197,7 +1197,7 @@ _remove_links(Termio *sd, Evas_Object *obj)
if (sd->link.string)
{
-#ifdef EFL_VERSION_1_18
+#ifdef HAVE_ELM_WIN_TEAMWORK
elm_win_teamwork_uri_hide(win_evas_object_get(term_win_get(sd->term)));
#endif
free(sd->link.string);
@@ -4409,7 +4409,7 @@ _smart_cb_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
if (sd->ctxpopup) return; /* ctxp triggers mouse out we should ignore */
termio_mouseover_suspend_pushpop(data, 1);
-#ifdef EFL_VERSION_1_18
+#ifdef HAVE_ELM_WIN_TEAMWORK
elm_win_teamwork_uri_hide(win_evas_object_get(term_win_get(sd->term)));
#endif
if ((ev->canvas.x == 0) || (ev->canvas.y == 0))
diff --git a/src/bin/win.c b/src/bin/win.c
index 3cdea68..ce22153 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -2980,7 +2980,7 @@ _popmedia_show(Term *term, const char *src, Media_Type type)
Config *config = termio_config_get(term->termio);
EINA_SAFETY_ON_NULL_RETURN(config);
-#ifdef EFL_VERSION_1_18
+#ifdef HAVE_ELM_WIN_TEAMWORK
elm_win_teamwork_uri_hide(term->wn->win);
#endif
if (term->popmedia)