e_mod_effect: Apply e_view

Change ec->frame usage to ec->view_client.

Change-Id: I465c9bc4c2b1cb977ccb09f21e8da085eeaca36c
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>

diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c
index 9818b1a44655076f60a4d7a0d429cc94ff243887..7a60fe546f948ba9cae67c58c8620829f815057e 100644 (file)
--- a/src/e_mod_effect.c
+++ b/src/e_mod_effect.c
@@ -1,4 +1,6 @@
 #include "e_mod_effect.h"
+#include "e_view.h"
+#include "e_view_client.h"
 #include <tdm.h>
 
 static E_Effect *_eff = NULL;
@@ -235,9 +237,9 @@ _eff_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type)
              if (ec->first_mapped)
                {
                   ELOGF("LAUNCH", "SHOW real win", ec);
-                  e_comp_object_signal_emit(ec->frame, "e,action,launch_real,done", "e");
+                  e_view_client_signal_emit(e_client_view_get(ec), "e,action,launch_real,done", "e");
                }
-             e_comp_object_signal_emit(ec->frame, "e,action,launch,done", "e");
+             e_view_client_signal_emit(e_client_view_get(ec), "e,action,launch,done", "e");
           }
      }
 }
@@ -335,9 +337,9 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group)
    if (!ec) return;
 
    if (group == E_EFFECT_GROUP_KEYBOARD)
-     e_comp_object_effect_set(ec->frame, cfg->kbd_effect_style);
+     e_view_client_effect_set(e_client_view_get(ec), cfg->kbd_effect_style);
    else if (group == E_EFFECT_GROUP_BACKGROUND)
-     e_comp_object_effect_set(ec->frame, cfg->bg_effect_style);
+     e_view_client_effect_set(e_client_view_get(ec), cfg->bg_effect_style);
    else
      {
         E_Effect_Client *efc = NULL;
@@ -349,15 +351,15 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group)
           parent_ec = parent_ec->parent;
 
         if ((parent_ec != ec) && (parent_ec->launching)) // Launchig case with parent at same time
-          e_comp_object_effect_set(ec->frame, "no-effect");
+          e_view_client_effect_set(e_client_view_get(ec), "no-effect");
         else if ((efc) && (e_policy_client_is_home_screen(efc->reverse_ec))) // Home key effect senario
-          e_comp_object_effect_set(ec->frame, cfg->effect_style);
+          e_view_client_effect_set(e_client_view_get(ec), cfg->effect_style);
         else if ((cfg) && (cfg->depth_in_style) && (ec->effect_type)) //depth-in senario
-          e_comp_object_effect_set(ec->frame, cfg->depth_in_style);
+          e_view_client_effect_set(e_client_view_get(ec), cfg->depth_in_style);
         else if ((cfg) && (cfg->effect_style))  // normal launching case
-          e_comp_object_effect_set(ec->frame, cfg->effect_style);
+          e_view_client_effect_set(e_client_view_get(ec), cfg->effect_style);
         else
-          e_comp_object_effect_set(ec->frame, "no-effect");
+          e_view_client_effect_set(e_client_view_get(ec), "no-effect");
 
         EFFINF("eff Setup efc(%p) home(%d) type(%d) parent(%d)",
                ec, efc,
@@ -503,7 +505,7 @@ _eff_object_background_below_clients_get(E_Client *ec, E_Effect_Type type, Eina_
         if (e_object_is_del(E_OBJECT(below))) continue;
         if (zone != below_ec_zone) continue;
         if (e_client_util_ignored_get(below) ||
-            (!evas_object_visible_get(below->frame))) continue;
+            (!e_view_client_visible_get(e_client_view_get(below)))) continue;
 
         if (below->vkbd.vkbd)
           continue;
@@ -521,7 +523,7 @@ _eff_object_background_below_clients_get(E_Client *ec, E_Effect_Type type, Eina_
 }
 
 static void
-_eff_object_background_cb_zoom_in_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_view_background_cb_zoom_in_done(void *data, E_View_Client *view_client, const char *sig, const char *src)
 {
    E_Client *bg_ec;
    E_Effect_Client *bg_efc;
@@ -537,7 +539,7 @@ _eff_object_background_cb_zoom_in_done(void *data, Evas_Object *obj, const char
 }
 
 static void
-_eff_object_background_cb_zoom_out_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_view_object_background_cb_zoom_out_done(void *data, E_View_Client *view_client, const char *sig, const char *src)
 {
    E_Client *bg_ec;
    E_Effect_Client *bg_efc;
@@ -580,8 +582,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque)
               e_object_ref(E_OBJECT(bg_ec));
               _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND);
               ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND);
-              e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){0, ang, bg_opaque}, 3);
-              e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_in_done, bg_ec);
+              e_view_client_effect_params_set(e_client_view_get(bg_ec), 0, (int[]){0, ang, bg_opaque}, 3);
+              e_view_client_effect_start(e_client_view_get(bg_ec), _eff_view_background_cb_zoom_in_done, bg_ec);
               bg_efc->bg_animating = 1;
            }
          break;
@@ -590,8 +592,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque)
          e_object_ref(E_OBJECT(bg_ec));
          _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND);
          ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND);
-         e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, ang, bg_opaque}, 3);
-         e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_out_done, bg_ec);
+         e_view_client_effect_params_set(e_client_view_get(bg_ec), 0, (int[]){1, ang, bg_opaque}, 3);
+         e_view_client_effect_start(e_client_view_get(bg_ec), _eff_view_object_background_cb_zoom_out_done, bg_ec);
          bg_efc->bg_animating = 1;
          break;
 
@@ -601,8 +603,8 @@ _eff_object_background_start(E_Client *bg_ec, E_Effect_Type type, int bg_opaque)
               e_object_ref(E_OBJECT(bg_ec));
               _eff_object_setup(bg_ec, E_EFFECT_GROUP_BACKGROUND);
               ang = _eff_group_angle_get(bg_ec, E_EFFECT_GROUP_BACKGROUND);
-              e_comp_object_effect_params_set(bg_ec->frame, 0, (int[]){1, ang, bg_opaque}, 3);
-              e_comp_object_effect_start(bg_ec->frame, _eff_object_background_cb_zoom_out_done, bg_ec);
+              e_view_client_effect_params_set(e_client_view_get(bg_ec), 0, (int[]){1, ang, bg_opaque}, 3);
+              e_view_client_effect_start(e_client_view_get(bg_ec), _eff_view_object_background_cb_zoom_out_done, bg_ec);
               bg_efc->bg_animating = 1;
            }
          break;
@@ -693,7 +695,7 @@ _eff_pending_effect_start(void)
    if (_eff->next_done.cb)
      {
         _eff_event_send(ec, EINA_TRUE, _eff->next_done.type);
-        e_comp_object_effect_start(ec->frame,
+        e_view_client_effect_start(e_client_view_get(ec),
                                    _eff->next_done.cb,
                                    _eff->next_done.data);
      }
@@ -702,7 +704,7 @@ _eff_pending_effect_start(void)
 }
 
 static void
-_eff_pending_effect_set(E_Client *ec, void *data, E_Effect_Type type, Edje_Signal_Cb done_cb)
+_eff_pending_effect_set(E_Client *ec, void *data, E_Effect_Type type, E_View_Client_Signal_Cb done_cb)
 {
    _eff_pending_effect_start();
 
@@ -763,7 +765,7 @@ _eff_visibility_stack_check(E_Client *ec, Eina_List *stack)
      {
         if (_ec == ec) break;
         if (!_ec->visible) continue;
-        if (!evas_object_visible_get(_ec->frame))
+        if (!e_view_client_visible_get(e_client_view_get(_ec)))
           {
              if (!_ec->iconic) continue;
              if (_ec->iconic && _ec->exp_iconify.by_client) continue;
@@ -794,7 +796,7 @@ _eff_restack_effect_check(E_Client *ec)
    Eina_Bool v1, v2;
    E_Effect_Client *efc;
 
-   if (!evas_object_visible_get(ec->frame)) return NULL;
+   if (!e_view_client_visible_get(e_client_view_get(ec))) return NULL;
    if (ec->new_client) return NULL;
 
    v1 = _eff_visibility_stack_check(ec, _eff->stack.old);
@@ -853,8 +855,8 @@ _eff_ref(E_Client *ec)
      }
 
    if (!ec->pixmap) return EINA_FALSE;
-   if ((e_comp_object_content_type_get(ec->frame) == E_COMP_OBJECT_CONTENT_TYPE_INT_IMAGE) &&
-       (!e_comp_object_native_usable_get(ec->frame)))
+   if ((e_view_client_content_type_get(e_client_view_get(ec)) == E_COMP_OBJECT_CONTENT_TYPE_INT_IMAGE) &&
+       (!e_view_client_native_usable_get(e_client_view_get(ec))))
      return EINA_FALSE;
 
    if (e_object_is_del(E_OBJECT(ec)))
@@ -927,7 +929,7 @@ _eff_unref(E_Client *ec)
 }
 
 static void
-_eff_cb_visible_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
+_eff_view_cb_visible_done(void *data, E_View_Client *client, const char *sig, const char *src)
 {
    E_Client *ec = (E_Client *)data;
 
@@ -958,7 +960,7 @@ _eff_cb_visible(void *data, Evas_Object *obj, const char *signal)
    if ((group != E_EFFECT_GROUP_NORMAL) &&
        (group != E_EFFECT_GROUP_KEYBOARD))
      {
-        e_comp_object_effect_set(ec->frame, NULL);
+        e_view_client_effect_set(e_client_view_get(ec), NULL);
         return EINA_FALSE;
      }
 
@@ -981,19 +983,19 @@ _eff_cb_visible(void *data, Evas_Object *obj, const char *signal)
    _eff_object_under_setup(ec);
 
    ang = _eff_group_angle_get(ec, group);
-   e_comp_object_effect_params_set(ec->frame, 0, (int[]){0, ang}, 2);
+   e_view_client_effect_params_set(e_client_view_get(ec), 0, (int[]){0, ang}, 2);
    if (e_comp->nocomp)
      {
         _eff_pending_effect_set(ec,
                                 (void *)ec,
                                 E_EFFECT_TYPE_SHOW,
-                                _eff_cb_visible_done);
+                                _eff_view_cb_visible_done);
         return EINA_TRUE;
      }
 
    _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_SHOW);
 
-   e_comp_object_effect_start(ec->frame, _eff_cb_visible_done, ec);
+   e_view_client_effect_start(e_client_view_get(ec), _eff_view_cb_visible_done, ec);
 
    _eff_object_background_setup(ec, NULL, group, E_EFFECT_TYPE_SHOW);
 
@@ -1001,7 +1003,7 @@ _eff_cb_visible(void *data, Evas_Object *obj, const char *signal)
 }
 
 static void
-_eff_cb_hidden_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_view_cb_hidden_done(void *data, E_View_Client *client, const char *sig, const char *src)
 {
    E_Client *ec = (E_Client *)data;
 
@@ -1014,8 +1016,8 @@ _eff_cb_hidden_done(void *data, Evas_Object *obj, const char *sig, const char *s
              if (_eff_client_get(ec))
                {
                   _eff_object_layer_down(ec);
-                  evas_object_hide(ec->frame);
-                  e_comp_object_effect_hiding_set(ec->frame, 0);
+                  e_view_client_hide(e_client_view_get(ec));
+                  e_view_client_effect_hiding_set(e_client_view_get(ec), 0);
                }
           }
      }
@@ -1047,7 +1049,7 @@ _eff_cb_hidden(void *data, Evas_Object *obj, const char *signal)
    if ((group != E_EFFECT_GROUP_NORMAL) &&
        (group != E_EFFECT_GROUP_KEYBOARD))
      {
-        e_comp_object_effect_set(ec->frame, NULL);
+        e_view_client_effect_set(e_client_view_get(ec), NULL);
         return EINA_FALSE;
      }
 
@@ -1090,21 +1092,21 @@ _eff_cb_hidden(void *data, Evas_Object *obj, const char *signal)
    _eff_object_under_setup(ec);
 
    ang = _eff_group_angle_get(ec, group);
-   e_comp_object_effect_params_set(ec->frame, 0, (int[]){1, ang}, 2);
+   e_view_client_effect_params_set(e_client_view_get(ec), 0, (int[]){1, ang}, 2);
 
    if (e_comp->nocomp)
      {
         _eff_pending_effect_set(ec,
                                 (void *)ec,
                                 E_EFFECT_TYPE_HIDE,
-                                _eff_cb_hidden_done);
+                                _eff_view_cb_hidden_done);
         return EINA_TRUE;
      }
 
    _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_HIDE);
-   if (e_comp_object_effect_start(ec->frame, _eff_cb_hidden_done, ec))
+   if (e_view_client_effect_start(e_client_view_get(ec), _eff_view_cb_hidden_done, ec))
      {
-        e_comp_object_effect_hiding_set(ec->frame, 1);
+        e_view_client_effect_hiding_set(e_client_view_get(ec), 1);
      }
 
    _eff_object_background_setup(ec, NULL, group, E_EFFECT_TYPE_HIDE);
@@ -1113,7 +1115,7 @@ _eff_cb_hidden(void *data, Evas_Object *obj, const char *signal)
 }
 
 static void
-_eff_cb_uniconify_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_view_cb_uniconify_done(void *data, E_View_Client *view_client, const char *sig, const char *src)
 {
    E_Client *ec = (E_Client *)data;
 
@@ -1162,7 +1164,7 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
         below = e_client_below_get(ec);
         while (below)
           {
-             if ((evas_object_visible_get(below->frame)) &&
+             if ((e_view_client_visible_get(e_client_view_get(below))) &&
                  (below->layer == ec->layer) &&
                  ((below->visibility.obscured == E_VISIBILITY_UNOBSCURED) ||
                   (below->visibility.changed)))
@@ -1178,7 +1180,7 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
         EFFINF("Uniconify HOME group do hide eff of %p",
                ec, below);
 
-        e_comp_object_signal_emit(below->frame, "e,action,restack,hide", "e");
+        e_view_client_signal_emit(e_client_view_get(below), "e,action,restack,hide", "e");
         return EINA_TRUE;
      }
    /* for NORMAL and KEYBOARD group */
@@ -1208,31 +1210,31 @@ _eff_cb_uniconify(void *data, Evas_Object *obj, const char *signal)
         _eff_object_under_setup(ec);
 
         ang = _eff_group_angle_get(ec, group);
-        e_comp_object_effect_params_set(ec->frame, 0, (int[]){0, ang}, 2);
+        e_view_client_effect_params_set(e_client_view_get(ec), 0, (int[]){0, ang}, 2);
 
         if (e_comp->nocomp)
           {
              _eff_pending_effect_set(ec,
                                      (void *)ec,
                                      E_EFFECT_TYPE_SHOW,
-                                     _eff_cb_uniconify_done);
+                                     _eff_view_cb_uniconify_done);
              return EINA_TRUE;
           }
 
         _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_SHOW);
-        e_comp_object_effect_start(ec->frame, _eff_cb_uniconify_done, ec);
+        e_view_client_effect_start(e_client_view_get(ec), _eff_view_cb_uniconify_done, ec);
         return EINA_TRUE;
      }
    else
      {
-        e_comp_object_effect_set(ec->frame, NULL);
+        e_view_client_effect_set(e_client_view_get(ec), NULL);
      }
 
    return EINA_FALSE;
 }
 
 static void
-_eff_cb_iconify_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_view_cb_iconify_done(void *data, E_View_Client *view_client, const char *sig, const char *src)
 {
    E_Client *ec = (E_Client *)data;
 
@@ -1244,8 +1246,8 @@ _eff_cb_iconify_done(void *data, Evas_Object *obj, const char *sig, const char *
           {
              if (_eff_client_get(ec))
                {
-                  evas_object_hide(ec->frame);
-                  e_comp_object_effect_hiding_set(ec->frame, 0);
+                  e_view_client_hide(e_client_view_get(ec));
+                  e_view_client_effect_hiding_set(e_client_view_get(ec), 0);
                }
           }
      }
@@ -1269,7 +1271,7 @@ _eff_cb_iconify(void *data, Evas_Object *obj, const char *signal)
    if ((group != E_EFFECT_GROUP_NORMAL) &&
        (group != E_EFFECT_GROUP_KEYBOARD))
      {
-        e_comp_object_effect_set(ec->frame, NULL);
+        e_view_client_effect_set(e_client_view_get(ec), NULL);
         return EINA_FALSE;
      }
 
@@ -1298,28 +1300,28 @@ _eff_cb_iconify(void *data, Evas_Object *obj, const char *signal)
    _eff_object_under_setup(ec);
 
    ang = _eff_group_angle_get(ec, group);
-   e_comp_object_effect_params_set(ec->frame, 0, (int[]){1, ang}, 2);
+   e_view_client_effect_params_set(e_client_view_get(ec), 0, (int[]){1, ang}, 2);
 
    if (e_comp->nocomp)
      {
         _eff_pending_effect_set(ec,
                                 (void *)ec,
                                 E_EFFECT_TYPE_HIDE,
-                                _eff_cb_iconify_done);
+                                _eff_view_cb_iconify_done);
         return EINA_TRUE;
      }
 
    _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_HIDE);
-   if (e_comp_object_effect_start(ec->frame, _eff_cb_iconify_done, ec))
+   if (e_view_client_effect_start(e_client_view_get(ec), _eff_view_cb_iconify_done, ec))
      {
-        e_comp_object_effect_hiding_set(ec->frame, 1);
+        e_view_client_effect_hiding_set(e_client_view_get(ec), 1);
      }
 
    return EINA_TRUE;
 }
 
 static void
-_eff_cb_restack_show_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_view_cb_restack_show_done(void *data, E_View_Client *view_client, const char *sig, const char *src)
 {
    E_Client *ec = (E_Client *)data;
 
@@ -1334,7 +1336,7 @@ _eff_cb_restack_show_done(void *data, Evas_Object *obj, const char *sig, const c
 }
 
 static void
-_eff_cb_restack_hide_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_view_cb_restack_hide_done(void *data, E_View_Client *view_client, const char *sig, const char *src)
 {
    E_Client *ec = (E_Client *)data;
 
@@ -1346,10 +1348,10 @@ _eff_cb_restack_hide_done(void *data, Evas_Object *obj, const char *sig, const c
              if (_eff_client_get(ec))
                {
                   _eff_object_layer_down(ec);
-                  e_comp_object_signal_emit(ec->frame,
+                  e_view_client_signal_emit(e_client_view_get(ec),
                                             "e,action,restack,finish",
                                             "e");
-                  //e_comp_object_effect_hiding_set(ec->frame, 0);
+                  //e_view_client_effect_hiding_set(e_client_view_get(ec), 0);
                }
           }
      }
@@ -1358,7 +1360,7 @@ _eff_cb_restack_hide_done(void *data, Evas_Object *obj, const char *sig, const c
 }
 
 static void
-_eff_cb_restack_finish_done(void *data, Evas_Object *obj, const char *sig, const char *src)
+_eff_view_cb_restack_finish_done(void *data, E_View_Client *view_client, const char *sig, const char *src)
 {
    E_Client *ec = (E_Client *)data;
    E_Effect_Client *efc = NULL;
@@ -1380,10 +1382,10 @@ _eff_cb_restack_finish_done(void *data, Evas_Object *obj, const char *sig, const
                        if (ec_home->first_mapped)
                          {
                             ELOGF("LAUNCH", "SHOW real win", ec_home);
-                            e_comp_object_signal_emit(ec_home->frame, "e,action,launch_real,done", "e");
+                            e_view_client_signal_emit(e_client_view_get(ec_home), "e,action,launch_real,done", "e");
                          }
 
-                       e_comp_object_signal_emit(ec_home->frame, "e,action,launch,done", "e");
+                       e_view_client_signal_emit(e_client_view_get(ec_home), "e,action,launch,done", "e");
                     }
                   _eff_unref(ec_home);
                }
@@ -1422,7 +1424,7 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal)
         while (below)
           {
              if ((!e_object_is_del(E_OBJECT(below))) &&
-                 (evas_object_visible_get(below->frame)) &&
+                 (e_view_client_visible_get(e_client_view_get(below))) &&
                  (below->visibility.obscured == E_VISIBILITY_UNOBSCURED) &&
                  (below->layer == ec->layer))
                break;
@@ -1445,7 +1447,7 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal)
    if ((group != E_EFFECT_GROUP_NORMAL) &&
        (group != E_EFFECT_GROUP_KEYBOARD))
      {
-        e_comp_object_effect_set(ec->frame, NULL);
+        e_view_client_effect_set(e_client_view_get(ec), NULL);
         return EINA_FALSE;
      }
 
@@ -1474,19 +1476,19 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal)
         _eff_object_under_setup(ec);
 
         ang = _eff_group_angle_get(ec, group);
-        e_comp_object_effect_params_set(ec->frame, 0, (int[]){2, ang}, 2);
+        e_view_client_effect_params_set(e_client_view_get(ec), 0, (int[]){2, ang}, 2);
 
         if (e_comp->nocomp)
           {
              _eff_pending_effect_set(ec,
                                      (void *)ec,
                                      E_EFFECT_TYPE_SHOW,
-                                     _eff_cb_restack_show_done);
+                                     _eff_view_cb_restack_show_done);
              return EINA_TRUE;
           }
 
         _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_RESTACK_SHOW);
-        e_comp_object_effect_start(ec->frame, _eff_cb_restack_show_done, ec);
+        e_view_client_effect_start(e_client_view_get(ec), _eff_view_cb_restack_show_done, ec);
         _eff_object_background_setup(ec, NULL, group, E_EFFECT_TYPE_RESTACK_SHOW);
      }
    else if (!e_util_strcmp(emission, "e,action,restack,hide"))
@@ -1532,21 +1534,21 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal)
         _eff_object_under_setup(ec);
 
         ang = _eff_group_angle_get(ec, group);
-        e_comp_object_effect_params_set(ec->frame, 0, (int[]){3, ang}, 2);
+        e_view_client_effect_params_set(e_client_view_get(ec), 0, (int[]){3, ang}, 2);
 
         if (e_comp->nocomp)
           {
              _eff_pending_effect_set(ec,
                                      (void *)ec,
                                      E_EFFECT_TYPE_HIDE,
-                                     _eff_cb_restack_hide_done);
+                                     _eff_view_cb_restack_hide_done);
              return EINA_TRUE;
           }
 
         _eff_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_RESTACK_HIDE);
-        if (e_comp_object_effect_start(ec->frame, _eff_cb_restack_hide_done, ec))
+        if (e_view_client_effect_start(e_client_view_get(ec), _eff_view_cb_restack_hide_done, ec))
           {
-             //e_comp_object_effect_hiding_set(ec->frame, 1);
+             //e_view_client_effect_hiding_set(e_client_view_get(ec), 1);
           }
 
         _eff_object_background_setup(ec, ec_home, group, E_EFFECT_TYPE_RESTACK_HIDE);
@@ -1565,18 +1567,18 @@ _eff_cb_restack(void *data, Evas_Object *obj, const char *signal)
         _eff_object_under_setup(ec);
 
         ang = _eff_group_angle_get(ec, group);
-        e_comp_object_effect_params_set(ec->frame, 0, (int[]){4, ang}, 2);
+        e_view_client_effect_params_set(e_client_view_get(ec), 0, (int[]){4, ang}, 2);
 
         if (e_comp->nocomp)
           {
              _eff_pending_effect_set(ec,
                                      (void *)ec,
                                      E_EFFECT_TYPE_HIDE,
-                                     _eff_cb_restack_finish_done);
+                                     _eff_view_cb_restack_finish_done);
              return EINA_TRUE;
           }
 
-        e_comp_object_effect_start(ec->frame, _eff_cb_restack_finish_done, ec);
+        e_view_client_effect_start(e_client_view_get(ec), _eff_view_cb_restack_finish_done, ec);
      }
 
    return EINA_TRUE;
@@ -1675,7 +1677,7 @@ _eff_cb_client_restack(void *data, int type, void *event)
    if (!_eff_client_get(ec)) return ECORE_CALLBACK_PASS_ON;
 
    if ((emission = _eff_restack_effect_check(ec)))
-     e_comp_object_signal_emit(ec->frame, emission, "e");
+     e_view_client_signal_emit(e_client_view_get(ec), emission, "e");
 
    return ECORE_CALLBACK_PASS_ON;
 }

diff --git a/src/e_mod_effect.h b/src/e_mod_effect.h
index e7b881671360ad142beed8a8bbc79e2b940ef093..9d8629888ac3d7489af6f7c77383d35f69df70d3 100644 (file)
--- a/src/e_mod_effect.h
+++ b/src/e_mod_effect.h
@@ -68,7 +68,7 @@ struct _E_Effect
    } stack;
 
    struct {
-      Edje_Signal_Cb cb;
+      E_View_Client_Signal_Cb cb;
       E_Client *ec;
       void *data;
       E_Effect_Type type;