discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1f6746cedb125e9137b537fd4f42a34993353131
commit 1f6746cedb125e9137b537fd4f42a34993353131
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Wed Apr 20 09:15:15 2016 -0400
ecore-wl2: correct the name and type of some function params
---
src/lib/ecore_wl2/ecore_wl2_dnd.c | 8 ++++----
src/lib/ecore_wl2/ecore_wl2_input.c | 8 ++++----
src/lib/ecore_wl2/ecore_wl2_private.h | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_dnd.c
b/src/lib/ecore_wl2/ecore_wl2_dnd.c
index 9357756..4aca1f0 100644
--- a/src/lib/ecore_wl2/ecore_wl2_dnd.c
+++ b/src/lib/ecore_wl2/ecore_wl2_dnd.c
@@ -306,7 +306,7 @@ _ecore_wl2_dnd_add(Ecore_Wl2_Input *input, struct
wl_data_offer *offer)
}
void
-_ecore_wl2_dnd_enter(Ecore_Wl2_Input *input, struct wl_data_offer *offer,
struct wl_surface *surface, int x, int y, unsigned int timestamp)
+_ecore_wl2_dnd_enter(Ecore_Wl2_Input *input, struct wl_data_offer *offer,
struct wl_surface *surface, int x, int y, uint32_t serial)
{
Ecore_Wl2_Window *window;
Ecore_Wl2_Event_Dnd_Enter *ev;
@@ -341,7 +341,7 @@ _ecore_wl2_dnd_enter(Ecore_Wl2_Input *input, struct
wl_data_offer *offer, struct
ev->x = x;
ev->y = y;
ev->offer = offer;
- ev->serial = timestamp;
+ ev->serial = serial;
ev->num_types = num;
ev->types = types;
@@ -367,7 +367,7 @@ _ecore_wl2_dnd_leave(Ecore_Wl2_Input *input)
}
void
-_ecore_wl2_dnd_motion(Ecore_Wl2_Input *input, int x, int y, unsigned int
timestamp)
+_ecore_wl2_dnd_motion(Ecore_Wl2_Input *input, int x, int y, uint32_t serial)
{
Ecore_Wl2_Event_Dnd_Motion *ev;
@@ -386,7 +386,7 @@ _ecore_wl2_dnd_motion(Ecore_Wl2_Input *input, int x, int y,
unsigned int timesta
ev->x = x;
ev->y = y;
- ev->serial = timestamp;
+ ev->serial = serial;
ecore_event_add(ECORE_WL2_EVENT_DND_MOTION, ev, NULL, NULL);
}
diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c
b/src/lib/ecore_wl2/ecore_wl2_input.c
index 14a7e82..65e64c8 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -1008,7 +1008,7 @@ _data_cb_offer(void *data, struct wl_data_device
*data_device EINA_UNUSED, struc
}
static void
-_data_cb_enter(void *data, struct wl_data_device *data_device EINA_UNUSED,
unsigned int timestamp, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y,
struct wl_data_offer *offer)
+_data_cb_enter(void *data, struct wl_data_device *data_device EINA_UNUSED,
uint32_t serial, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct
wl_data_offer *offer)
{
Ecore_Wl2_Input *input;
@@ -1016,7 +1016,7 @@ _data_cb_enter(void *data, struct wl_data_device
*data_device EINA_UNUSED, unsig
if (!input) return;
_ecore_wl2_dnd_enter(input, offer, surface,
- wl_fixed_to_int(x), wl_fixed_to_int(y), timestamp);
+ wl_fixed_to_int(x), wl_fixed_to_int(y), serial);
}
static void
@@ -1031,7 +1031,7 @@ _data_cb_leave(void *data, struct wl_data_device
*data_device EINA_UNUSED)
}
static void
-_data_cb_motion(void *data, struct wl_data_device *data_device EINA_UNUSED,
unsigned int timestamp, wl_fixed_t x, wl_fixed_t y)
+_data_cb_motion(void *data, struct wl_data_device *data_device EINA_UNUSED,
uint32_t serial, wl_fixed_t x, wl_fixed_t y)
{
Ecore_Wl2_Input *input;
@@ -1039,7 +1039,7 @@ _data_cb_motion(void *data, struct wl_data_device
*data_device EINA_UNUSED, unsi
if (!input) return;
_ecore_wl2_dnd_motion(input, wl_fixed_to_int(x),
- wl_fixed_to_int(y), timestamp);
+ wl_fixed_to_int(y), serial);
}
static void
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h
b/src/lib/ecore_wl2/ecore_wl2_private.h
index 91074a7..0de0190 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -427,9 +427,9 @@ void _ecore_wl2_input_cursor_set(Ecore_Wl2_Input *input,
const char *cursor);
void _ecore_wl2_input_cursor_update_stop(Ecore_Wl2_Input *input);
void _ecore_wl2_dnd_add(Ecore_Wl2_Input *input, struct wl_data_offer *offer);
-void _ecore_wl2_dnd_enter(Ecore_Wl2_Input *input, struct wl_data_offer *offer,
struct wl_surface *surface, int x, int y, unsigned int timestamp);
+void _ecore_wl2_dnd_enter(Ecore_Wl2_Input *input, struct wl_data_offer *offer,
struct wl_surface *surface, int x, int y, uint32_t serial);
void _ecore_wl2_dnd_leave(Ecore_Wl2_Input *input);
-void _ecore_wl2_dnd_motion(Ecore_Wl2_Input *input, int x, int y, unsigned int
timestamp);
+void _ecore_wl2_dnd_motion(Ecore_Wl2_Input *input, int x, int y, uint32_t
serial);
void _ecore_wl2_dnd_drop(Ecore_Wl2_Input *input);
void _ecore_wl2_dnd_selection(Ecore_Wl2_Input *input, struct wl_data_offer
*offer);
void _ecore_wl2_dnd_del(Ecore_Wl2_Dnd_Source *source);
--
