[EGIT] [apps/terminology] master 01/01: fix dbus signatures

[Boris Faure - Enlightenment Git]

billiob pushed a commit to branch master.

commit 22be3b7609f4201373452bb2a3c92e1968bfc0e5
Author: Boris Faure <bill...@gmail.com>
Date:   Sat Jun 15 23:51:03 2013 +0200

    fix dbus signatures
---
 src/bin/dbus.c       | 12 +++++++-----
 src/bin/dbus.h       |  4 ++--
 src/bin/termio.c     | 11 +++++++++--
 src/bin/termiolink.c |  1 -
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/bin/dbus.c b/src/bin/dbus.c
index 7f06b1e..6736616 100644
--- a/src/bin/dbus.c
+++ b/src/bin/dbus.c
@@ -20,7 +20,8 @@ _cleanup_current_url(void)
                                         "org.enlightenment.wm.Teamwork",
                                         "LinkMouseOut");
 
-   eldbus_message_arguments_append(msg, "s", _current_url);
+   eldbus_message_arguments_append(msg, "suii",
+                                   _current_url, time(NULL), 0, 0);
    eldbus_object_send(ty_e_object, msg, NULL, NULL, -1);
 
    eina_stringshare_del(_current_url);
@@ -28,7 +29,7 @@ _cleanup_current_url(void)
 }
 
 void
-ty_dbus_link_mouseout(const char *url)
+ty_dbus_link_mouseout(const char *url, int x, int y)
 {
    Eldbus_Message *msg;
 
@@ -48,13 +49,13 @@ ty_dbus_link_mouseout(const char *url)
                                         "org.enlightenment.wm.Teamwork",
                                         "LinkMouseOut");
 
-   eldbus_message_arguments_append(msg, "s", url);
+   eldbus_message_arguments_append(msg, "suii", url, time(NULL), x, y);
    eldbus_object_send(ty_e_object, msg, NULL, NULL, -1);
 }
 
 
 void
-ty_dbus_link_mousein(const char *url)
+ty_dbus_link_mousein(const char *url, int x, int y)
 {
    Eldbus_Message *msg;
 
@@ -71,7 +72,8 @@ ty_dbus_link_mousein(const char *url)
 
    _current_url = eina_stringshare_add(url);
 
-   eldbus_message_arguments_append(msg, "s", _current_url);
+   eldbus_message_arguments_append(msg, "suii",
+                                   _current_url, time(NULL), 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 0583708..811163b 100644
--- a/src/bin/dbus.h
+++ b/src/bin/dbus.h
@@ -1,8 +1,8 @@
 #ifndef _DBUS_H__
 #define _DBUS_H__ 1
 
-void ty_dbus_link_mousein(const char *url);
-void ty_dbus_link_mouseout(const char *url);
+void ty_dbus_link_mousein(const char *url, int x, int y);
+void ty_dbus_link_mouseout(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 7657d9a..9e87515 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -13,6 +13,7 @@
 #include "config.h"
 #include "utils.h"
 #include "media.h"
+#include "dbus.h"
 
 typedef struct _Termio Termio;
 
@@ -530,7 +531,11 @@ _smart_mouseover_apply(Evas_Object *obj)
         if (sd->link.string)
           {
              if (link_is_url(sd->link.string))
-                ty_dbus_link_mouseout(sd->link.string);
+               {
+                  ty_dbus_link_mouseout(sd->link.string,
+                                        sd->mouse.cx,
+                                        sd->mouse.cy);
+               }
              free(sd->link.string);
              sd->link.string = NULL;
            }
@@ -549,7 +554,9 @@ _smart_mouseover_apply(Evas_Object *obj)
 
    if ((!same_link) && (link_is_url(s)))
      {
-        ty_dbus_link_mousein(s);
+        ty_dbus_link_mousein(s,
+                             sd->mouse.cx,
+                             sd->mouse.cy);
      }
 
    if ((x1 == sd->link.x1) && (y1 == sd->link.y1) &&
diff --git a/src/bin/termiolink.c b/src/bin/termiolink.c
index d624e06..a36ea28 100644
--- a/src/bin/termiolink.c
+++ b/src/bin/termiolink.c
@@ -2,7 +2,6 @@
 #include <Elementary.h>
 #include "termio.h"
 #include "utils.h"
-#include "dbus.h"
 
 static Eina_Bool
 coord_back(int *x, int *y, int w, int h __UNUSED__)

-- 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev