refactor: replace code to use E_APIs to access the E_Client structure

Change-Id: I5d0e49f847cee7253a1c739e13cd84f80c40419f

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index adcd4f69e50bda5c688e7f57781d9848d310313b..141dec549d28a52a19d8dec3082b54be20918267 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -241,9 +241,9 @@ int _e_mod_atspi_dbus_broadcast(Gesture_Info *gi)
     }
 //
 
-   E_Client *client = e_client_under_position_input_get(desk, gi->x_beg, gi->y_beg);
-   if (!client) return -1;
-   uint32_t resID = e_pixmap_res_id_get(client->pixmap);
+   E_Client *ec = e_client_under_position_input_get(desk, gi->x_beg, gi->y_beg);
+   if (!ec) return -1;
+   uint32_t resID = e_pixmap_res_id_get(e_client_pixmap_get(ec));
 
    // Ensure that there is at least one 'ongoing' signal before 'end' in two-finger hover
    if (gi->state == 2 && last_state != 1 && gi->type == TWO_FINGERS_HOVER)

diff --git a/src/e_screen_reader_gestures.c b/src/e_screen_reader_gestures.c
index 1b36e217ac46fe9ca159d5d408ad471ece3e2df7..40683e6b432e7c56482c840038c2de75a6507b5f 100644 (file)
--- a/src/e_screen_reader_gestures.c
+++ b/src/e_screen_reader_gestures.c
@@ -198,7 +198,7 @@ _rotation_cb_change_end(void *data, int type, void *event)
    E_Event_Client *ev = event;
    E_Client *ec = ev->ec;
    Cover *cov = data;
-   cov->angle = ec->e.state.rot.ang.curr;
+   cov->angle = e_client_e_state_rot_angle_current_get(ec);
 
    return ECORE_CALLBACK_PASS_ON;
 }