configure.ac: actually look for elm_win_teamwork_show() to know if available

devs/bu5hm4n/next
Boris Faure 6 years ago
parent f1e1a6edd8
commit bd769a926b
  1. 22
      configure.ac
  2. 6
      src/bin/termio.c
  3. 2
      src/bin/win.c

@ -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])

@ -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))

@ -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)

Loading…
Cancel
Save