From 4bfa81d2d6f196be14b8b7e227847efe89d5140f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 30 Dec 2013 18:41:45 -0500 Subject: [PATCH] retain compat with previous tw protocol when building with 1.8 elm --- src/bin/dbus.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/bin/dbus.c b/src/bin/dbus.c index a4720216..6c2ac6f7 100644 --- a/src/bin/dbus.c +++ b/src/bin/dbus.c @@ -37,8 +37,11 @@ ty_dbus_link_mouseout(uint64_t win, const char *url, int x, int y) "/org/enlightenment/wm/RemoteObject", "org.enlightenment.wm.Teamwork", "LinkMouseOut"); - +#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR > 8) // not a typo eldbus_message_arguments_append(msg, "sutii", url, time(NULL), win, x, y); +#else + eldbus_message_arguments_append(msg, "suxii", url, time(NULL), (int64_t)win, x, y); +#endif eldbus_object_send(ty_e_object, msg, NULL, NULL, -1); eina_stringshare_replace(&_current_url, NULL); } @@ -64,8 +67,11 @@ ty_dbus_link_mousein(uint64_t win, const char *url, int x, int y) "org.enlightenment.wm.Teamwork", "LinkMouseIn"); - eldbus_message_arguments_append(msg, "sutii", - _current_url, time(NULL), win, x, y); +#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR > 8) // not a typo + eldbus_message_arguments_append(msg, "sutii", _current_url, time(NULL), win, x, y); +#else + eldbus_message_arguments_append(msg, "suxii", _current_url, time(NULL), (int64_t)win, x, y); +#endif eldbus_object_send(ty_e_object, msg, NULL, NULL, -1); }