discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=734b652cbfc178fa28498550926daff4faca95a1
commit 734b652cbfc178fa28498550926daff4faca95a1
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Mon Dec 30 12:54:15 2013 -0500
update teamwork usage for new version compat
---
src/bin/dbus.c | 8 ++++----
src/bin/dbus.h | 4 ++--
src/bin/termio.c | 10 ++++++++--
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/bin/dbus.c b/src/bin/dbus.c
index c1d060e..a472021 100644
--- a/src/bin/dbus.c
+++ b/src/bin/dbus.c
@@ -27,7 +27,7 @@ ty_dbus_link_hide(void)
}
void
-ty_dbus_link_mouseout(int64_t win, const char *url, int x, int y)
+ty_dbus_link_mouseout(uint64_t win, const char *url, int x, int y)
{
Eldbus_Message *msg;
@@ -38,14 +38,14 @@ ty_dbus_link_mouseout(int64_t win, const char *url, int x,
int y)
"org.enlightenment.wm.Teamwork",
"LinkMouseOut");
- eldbus_message_arguments_append(msg, "suxii", url, time(NULL), win, x, y);
+ eldbus_message_arguments_append(msg, "sutii", url, time(NULL), win, x, y);
eldbus_object_send(ty_e_object, msg, NULL, NULL, -1);
eina_stringshare_replace(&_current_url, NULL);
}
void
-ty_dbus_link_mousein(int64_t win, const char *url, int x, int y)
+ty_dbus_link_mousein(uint64_t win, const char *url, int x, int y)
{
Eldbus_Message *msg;
Eina_Stringshare *u;
@@ -64,7 +64,7 @@ ty_dbus_link_mousein(int64_t win, const char *url, int x, int
y)
"org.enlightenment.wm.Teamwork",
"LinkMouseIn");
- eldbus_message_arguments_append(msg, "suxii",
+ eldbus_message_arguments_append(msg, "sutii",
_current_url, time(NULL), win, x, y);
eldbus_object_send(ty_e_object, msg, NULL, NULL, -1);
}
diff --git a/src/bin/dbus.h b/src/bin/dbus.h
index 614c9b1..583539d 100644
--- a/src/bin/dbus.h
+++ b/src/bin/dbus.h
@@ -2,8 +2,8 @@
#define _DBUS_H__ 1
void ty_dbus_link_hide(void);
-void ty_dbus_link_mousein(int64_t win, const char *url, int x, int y);
-void ty_dbus_link_mouseout(int64_t win, const char *url, int x, int y);
+void ty_dbus_link_mousein(uint64_t win, const char *url, int x, int y);
+void ty_dbus_link_mouseout(uint64_t win, const char *url, int x, int y);
void ty_dbus_init(void);
void ty_dbus_shutdown(void);
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 7523aa2..5a4c416 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -554,12 +554,15 @@ _update_link(Evas_Object *obj, Termio *sd,
if ((sd->link.string[0] == '/') ||
(link_is_url(sd->link.string)))
{
Evas_Coord _x = ox, _y = oy;
- Ecore_Window xwin;
+ uint64_t xwin;
_x += sd->mouse.cx * sd->font.chw;
_y += sd->mouse.cy * sd->font.chh;
#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
xwin = elm_win_window_id_get(sd->win);
+# if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR > 8) // not a typo
+ xwin = ((uint64_t)xwin << 32) + (uint64_t)getpid();
+# endif
#else
xwin = elm_win_xwindow_get(sd->win);
#endif
@@ -622,7 +625,7 @@ _remove_links(Termio *sd, Evas_Object *obj)
if ((sd->link.string[0] == '/') || (link_is_url(sd->link.string)))
{
Evas_Coord ox, oy;
- Ecore_Window xwin;
+ uint64_t xwin;
evas_object_geometry_get(obj, &ox, &oy, NULL, NULL);
@@ -630,6 +633,9 @@ _remove_links(Termio *sd, Evas_Object *obj)
oy += sd->mouse.cy * sd->font.chh;
#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 8)
xwin = elm_win_window_id_get(sd->win);
+# if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR > 8) // not a typo
+ xwin = ((uint64_t)xwin << 32) + (uint64_t)getpid();
+# endif
#else
xwin = elm_win_xwindow_get(sd->win);
#endif
--
