use new elm_win_window_id_get to return wayland-compatible surface id: terminology is now wayland-teamwork compatible

This commit is contained in:
Mike Blumenkrantz 2013-09-10 13:57:01 +01:00
parent 6bfac4be48
commit 70d71d21a0
1 changed files with 10 additions and 2 deletions

View File

@ -470,11 +470,15 @@ _update_link(Evas_Object *obj, Termio *sd,
if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string))) if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string)))
{ {
Evas_Coord _x = ox, _y = oy; Evas_Coord _x = ox, _y = oy;
Ecore_X_Window xwin; Ecore_Window xwin;
_x += sd->mouse.cx * sd->font.chw; _x += sd->mouse.cx * sd->font.chw;
_y += sd->mouse.cy * sd->font.chh; _y += sd->mouse.cy * sd->font.chh;
#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
xwin = elm_win_window_id_get(sd->win);
#else
xwin = elm_win_xwindow_get(sd->win); xwin = elm_win_xwindow_get(sd->win);
#endif
ty_dbus_link_mousein(xwin, sd->link.string, _x, _y); ty_dbus_link_mousein(xwin, sd->link.string, _x, _y);
} }
for (y = sd->link.y1; y <= sd->link.y2; y++) for (y = sd->link.y1; y <= sd->link.y2; y++)
@ -540,7 +544,11 @@ _remove_links(Termio *sd, Evas_Object *obj)
ox += sd->mouse.cx * sd->font.chw; ox += sd->mouse.cx * sd->font.chw;
oy += sd->mouse.cy * sd->font.chh; oy += sd->mouse.cy * sd->font.chh;
xwin = elm_win_xwindow_get(sd->win); #if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
xwin = elm_win_window_id_get(sd->win);
#else
xwin = elm_win_xwindow_get(sd->win);
#endif
ty_dbus_link_mouseout(xwin, sd->link.string, ox, oy); ty_dbus_link_mouseout(xwin, sd->link.string, ox, oy);
} }
free(sd->link.string); free(sd->link.string);