From 1914cac59c365254e56c1260af4ab2f17ca16d7d Mon Sep 17 00:00:00 2001
From: sebastid <sebastid>
Date: Tue, 10 May 2005 18:15:16 +0000
Subject: [PATCH] Update dnd event structs to match E style.

SVN revision: 14697
---
 src/bin/e_dnd.c                | 16 ++++++++--------
 src/bin/e_dnd.h                | 20 ++++++++++----------
 src/modules/ibar/e_mod_main.c  |  8 ++++----
 src/modules/pager/e_mod_main.c |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 4340739b8..6a093c158 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -195,9 +195,9 @@ void
 e_drag_update(int x, int y)
 {
    Evas_List *l;
-   E_Enter_Event *enter_ev;
-   E_Move_Event *move_ev;
-   E_Leave_Event *leave_ev;
+   E_Event_Dnd_Enter *enter_ev;
+   E_Event_Dnd_Move *move_ev;
+   E_Event_Dnd_Leave *leave_ev;
    int w, h;
 
    if (!drag_current->visible)
@@ -211,15 +211,15 @@ e_drag_update(int x, int y)
    evas_object_geometry_get(drag_current->object, NULL, NULL, &w, &h);
    ecore_evas_move(drag_current->ee, x - (w / 2), y - (h / 2));
 
-   enter_ev = E_NEW(E_Enter_Event, 1);
+   enter_ev = E_NEW(E_Event_Dnd_Enter, 1);
    enter_ev->x = x;
    enter_ev->y = y;
    
-   move_ev = E_NEW(E_Move_Event, 1);
+   move_ev = E_NEW(E_Event_Dnd_Move, 1);
    move_ev->x = x;
    move_ev->y = y;
 
-   leave_ev = E_NEW(E_Leave_Event, 1);
+   leave_ev = E_NEW(E_Event_Dnd_Leave, 1);
    leave_ev->x = x;
    leave_ev->y = y;
 
@@ -263,7 +263,7 @@ void
 e_drag_end(int x, int y)
 {
    Evas_List *l;
-   E_Drop_Event *ev;
+   E_Event_Dnd_Drop *ev;
    int dropped;
 
    if (drag_current->ee)
@@ -275,7 +275,7 @@ e_drag_end(int x, int y)
    ecore_x_window_del(drag_win);
    drag_win = 0;
 
-   ev = E_NEW(E_Drop_Event, 1);
+   ev = E_NEW(E_Event_Dnd_Drop, 1);
    ev->data = drag_current->data;
    ev->x = x;
    ev->y = y;
diff --git a/src/bin/e_dnd.h b/src/bin/e_dnd.h
index a66166cfd..5e8380079 100644
--- a/src/bin/e_dnd.h
+++ b/src/bin/e_dnd.h
@@ -4,12 +4,12 @@
 
 #ifdef E_TYPEDEFS
 
-typedef struct _E_Drag         E_Drag;
-typedef struct _E_Drop_Handler E_Drop_Handler;
-typedef struct _E_Enter_Event  E_Enter_Event;
-typedef struct _E_Move_Event   E_Move_Event;
-typedef struct _E_Leave_Event  E_Leave_Event;
-typedef struct _E_Drop_Event   E_Drop_Event;
+typedef struct _E_Drag             E_Drag;
+typedef struct _E_Drop_Handler     E_Drop_Handler;
+typedef struct _E_Event_Dnd_Enter  E_Event_Dnd_Enter;
+typedef struct _E_Event_Dnd_Move   E_Event_Dnd_Move;
+typedef struct _E_Event_Dnd_Leave  E_Event_Dnd_Leave;
+typedef struct _E_Event_Dnd_Drop   E_Event_Dnd_Drop;
 
 #else
 #ifndef E_DND_H
@@ -43,22 +43,22 @@ struct _E_Drop_Handler
    unsigned char entered : 1;
 };
 
-struct _E_Enter_Event
+struct _E_Event_Dnd_Enter
 {
    int x, y;
 };
 
-struct _E_Move_Event
+struct _E_Event_Dnd_Move
 {
    int x, y;
 };
 
-struct _E_Leave_Event
+struct _E_Event_Dnd_Leave
 {
    int x, y;
 };
 
-struct _E_Drop_Event
+struct _E_Event_Dnd_Drop
 {
    void *data;
    int x, y;
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 2401d837c..f0eb57359 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -1390,7 +1390,7 @@ _ibar_bar_cb_animator(void *data)
 static void
 _ibar_bar_cb_enter(void *data, const char *type, void *event)
 {
-   E_Enter_Event *ev;
+   E_Event_Dnd_Enter *ev;
    Evas_Object *o;
    IBar_Bar *ibb;
 
@@ -1406,7 +1406,7 @@ _ibar_bar_cb_enter(void *data, const char *type, void *event)
 static void
 _ibar_bar_cb_move(void *data, const char *type, void *event)
 {
-   E_Move_Event *ev;
+   E_Event_Dnd_Move *ev;
    IBar_Bar *ibb;
    IBar_Icon *ic;
    Evas_Coord x, y, w, h;
@@ -1464,7 +1464,7 @@ _ibar_bar_cb_move(void *data, const char *type, void *event)
 static void
 _ibar_bar_cb_leave(void *data, const char *type, void *event)
 {
-   E_Leave_Event *ev;
+   E_Event_Dnd_Leave *ev;
    IBar_Bar *ibb;
 
    ev = event;
@@ -1481,7 +1481,7 @@ _ibar_bar_cb_leave(void *data, const char *type, void *event)
 static void
 _ibar_bar_cb_drop(void *data, const char *type, void *event)
 {
-   E_Drop_Event *ev;
+   E_Event_Dnd_Drop *ev;
    E_App *app;
    IBar_Bar *ibb;
    IBar_Icon *ic;
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index d3388c2a6..e18992ae6 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -1367,7 +1367,7 @@ _pager_desk_cb_intercept_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_C
 static void
 _pager_drop_cb(void *data, const char *type, void *event_info)
 {
-   E_Drop_Event *ev;
+   E_Event_Dnd_Drop *ev;
    Pager_Face *face;
    E_Desk *desk;
    E_Border *bd;