remove E_Zone->comp member

diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index e48a891..d0f0804 100644 (file)
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1296,14 +1296,14 @@ ACT_FN_GO(window_zone_move_by, )
    /* bad */
    if (!ec->zone) return;
    /* only one screen */
-   if (eina_list_count(ec->zone->comp->zones) < 2) return;
+   if (eina_list_count(e_comp->zones) < 2) return;
    errno = 0;
    move = strtol(params, &end, 10);
    if ((!end) || end[0] || errno) return;
    move += ec->zone->num;
    if (move < 0)
-     move = eina_list_count(ec->zone->comp->zones) - 1;
-   else if ((unsigned int)move >= eina_list_count(ec->zone->comp->zones))
+     move = eina_list_count(e_comp->zones) - 1;
+   else if ((unsigned int)move >= eina_list_count(e_comp->zones))
      move = 0;
    zone = e_comp_zone_number_get(move);
    if (!zone) return;
@@ -1434,7 +1434,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
    if (!zone) return;
    wev = E_NEW(E_Event_Pointer_Warp, 1);
    if (!wev) return;
-   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
    wev->prev.x = x;
    wev->prev.y = y;
    if (params)
@@ -1448,7 +1448,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_LEFT(zone))
           {
              e_zone_desk_flip_by(zone, -1, 0);
-             ecore_evas_pointer_warp(zone->comp->ee, zone->x + zone->w - offset, y);
+             ecore_evas_pointer_warp(e_comp->ee, zone->x + zone->w - offset, y);
              wev->curr.y = y;
              wev->curr.x = zone->w - offset;
           }
@@ -1458,7 +1458,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_RIGHT(zone))
           {
              e_zone_desk_flip_by(zone, 1, 0);
-             ecore_evas_pointer_warp(zone->comp->ee, zone->x + offset, y);
+             ecore_evas_pointer_warp(e_comp->ee, zone->x + offset, y);
              wev->curr.y = y;
              wev->curr.x = offset;
           }
@@ -1468,7 +1468,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_UP(zone))
           {
              e_zone_desk_flip_by(zone, 0, -1);
-             ecore_evas_pointer_warp(zone->comp->ee, x, zone->y + zone->h - offset);
+             ecore_evas_pointer_warp(e_comp->ee, x, zone->y + zone->h - offset);
              wev->curr.x = x;
              wev->curr.y = zone->h - offset;
           }
@@ -1478,7 +1478,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_DOWN(zone))
           {
              e_zone_desk_flip_by(zone, 0, 1);
-             ecore_evas_pointer_warp(zone->comp->ee, x, zone->y + offset);
+             ecore_evas_pointer_warp(e_comp->ee, x, zone->y + offset);
              wev->curr.x = x;
              wev->curr.y = offset;
           }
@@ -1488,7 +1488,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_UP_LEFT(zone))
           {
              e_zone_desk_flip_by(zone, -1, -1);
-             ecore_evas_pointer_warp(zone->comp->ee, zone->x + zone->w - offset, zone->y + zone->h - offset);
+             ecore_evas_pointer_warp(e_comp->ee, zone->x + zone->w - offset, zone->y + zone->h - offset);
              wev->curr.x = zone->w - offset;
              wev->curr.y = zone->h - offset;
           }
@@ -1498,7 +1498,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_UP_RIGHT(zone))
           {
              e_zone_desk_flip_by(zone, 1, -1);
-             ecore_evas_pointer_warp(zone->comp->ee, zone->x + offset, zone->y + zone->h - offset);
+             ecore_evas_pointer_warp(e_comp->ee, zone->x + offset, zone->y + zone->h - offset);
              wev->curr.x = offset;
              wev->curr.y = zone->h - offset;
           }
@@ -1508,7 +1508,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_DOWN_LEFT(zone))
           {
              e_zone_desk_flip_by(zone, -1, 1);
-             ecore_evas_pointer_warp(zone->comp->ee, zone->x + zone->w - offset, zone->y + offset);
+             ecore_evas_pointer_warp(e_comp->ee, zone->x + zone->w - offset, zone->y + offset);
              wev->curr.y = offset;
              wev->curr.x = zone->w - offset;
           }
@@ -1518,7 +1518,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction, )
         if (ACT_FLIP_DOWN_RIGHT(zone))
           {
              e_zone_desk_flip_by(zone, 1, 1);
-             ecore_evas_pointer_warp(zone->comp->ee, zone->x + offset, zone->y + offset);
+             ecore_evas_pointer_warp(e_comp->ee, zone->x + offset, zone->y + offset);
              wev->curr.y = offset;
              wev->curr.x = offset;
           }
@@ -1660,13 +1660,13 @@ ACT_FN_GO(screen_send_to, )
    else
      {
         if (scr != -1)
-          scr = scr % eina_list_count(zone->comp->zones);
-        if (scr < 0) scr += eina_list_count(zone->comp->zones);
+          scr = scr % eina_list_count(e_comp->zones);
+        if (scr < 0) scr += eina_list_count(e_comp->zones);
         zone2 = e_comp_zone_number_get(scr);
      }
    if ((zone2) && (zone != zone2))
      {
-        ecore_evas_pointer_warp(zone2->comp->ee,
+        ecore_evas_pointer_warp(e_comp->ee,
                                 zone2->x + (zone2->w / 2),
                                 zone2->y + (zone2->h / 2));
         e_desk_last_focused_focus(e_desk_current_get(zone2));
@@ -1688,7 +1688,7 @@ ACT_FN_GO(screen_send_by, )
    if (errno) return;
    if (eina_list_count(e_manager_list()) > 1)
      {
-        scr += zone->comp->num;
+        scr += e_comp->num;
         if (scr != -1)
           scr = scr % eina_list_count(e_manager_list());
         if (scr < 0) scr += eina_list_count(e_manager_list());
@@ -1698,13 +1698,13 @@ ACT_FN_GO(screen_send_by, )
      {
         scr += zone->num;
         if (scr != -1)
-          scr = scr % eina_list_count(zone->comp->zones);
-        if (scr < 0) scr += eina_list_count(zone->comp->zones);
+          scr = scr % eina_list_count(e_comp->zones);
+        if (scr < 0) scr += eina_list_count(e_comp->zones);
         zone2 = e_comp_zone_number_get(scr);
      }
    if ((zone2) && (zone != zone2))
      {
-        ecore_evas_pointer_warp(zone2->comp->ee,
+        ecore_evas_pointer_warp(e_comp->ee,
                              zone2->x + (zone2->w / 2),
                              zone2->y + (zone2->h / 2));
         e_desk_last_focused_focus(e_desk_current_get(zone2));
@@ -1842,7 +1842,7 @@ ACT_FN_GO(menu_show, )
 
                   /* FIXME: this is a bit of a hack... setting m->c - bad hack */
                   m->zone = zone;
-                  ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+                  ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
                   e_menu_post_deactivate_callback_set(m, _e_actions_cb_menu_end, NULL);
                   e_menu_activate_mouse(m, zone, x, y, 1, 1,
                                         E_MENU_POP_DIRECTION_DOWN, 0);
@@ -1873,8 +1873,8 @@ ACT_FN_GO_MOUSE(menu_show, )
                   m->zone = zone;
                   x = ev->canvas.x;
                   y = ev->canvas.y;
-                  x -= zone->comp->man->x;
-                  y -= zone->comp->man->y;
+                  x -= e_comp->man->x;
+                  y -= e_comp->man->y;
                   e_menu_post_deactivate_callback_set(m, _e_actions_cb_menu_end, NULL);
                   e_menu_activate_mouse(m, zone, x, y, 1, 1,
                                         E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
@@ -1903,7 +1903,7 @@ ACT_FN_GO_KEY(menu_show, , __UNUSED__)
 
                   /* FIXME: this is a bit of a hack... setting m->con - bad hack */
                   m->zone = zone;
-                  ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+                  ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
                   e_menu_post_deactivate_callback_set(m, _e_actions_cb_menu_end, NULL);
                   e_menu_activate_key(m, zone, x, y, 1, 1,
                                       E_MENU_POP_DIRECTION_DOWN);

diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c
index 272c366..114abb0 100644 (file)
--- a/src/bin/e_backlight.c
+++ b/src/bin/e_backlight.c
@@ -18,8 +18,8 @@ static int sysmode = MODE_NONE;
 static Ecore_Animator *bl_anim = NULL;
 static Eina_List *bl_devs = NULL;
 
-static void      _e_backlight_update(E_Zone *zone);
-static void      _e_backlight_set(E_Zone *zone, double val);
+static void      _e_backlight_update(void);
+static void      _e_backlight_set(double val);
 static Eina_Bool _bl_anim(void *data, double pos);
 static Eina_Bool bl_avail = EINA_TRUE;
 #ifndef HAVE_WAYLAND_ONLY
@@ -100,13 +100,9 @@ e_backlight_exists(void)
 EAPI void
 e_backlight_update(void)
 {
-   const Eina_List *l;
-   E_Zone *zone;
-
    if (bl_avail == EINA_FALSE) return;
 
-   EINA_LIST_FOREACH(e_comp->zones, l, zone)
-     _e_backlight_update(zone);
+   _e_backlight_update();
 }
 
 EAPI void
@@ -130,7 +126,7 @@ e_backlight_level_set(E_Zone *zone, double val, double tim)
 
    if (fabs(tim) < DBL_EPSILON)
      {
-        _e_backlight_set(zone, val);
+        _e_backlight_set(val);
         e_backlight_update();
         return;
      }
@@ -198,7 +194,7 @@ e_backlight_devices_get(void)
 /* local subsystem functions */
 
 static void
-_e_backlight_update(E_Zone *zone)
+_e_backlight_update(void)
 {
 #ifndef HAVE_WAYLAND_ONLY
    double x_bl = -1.0;
@@ -206,7 +202,7 @@ _e_backlight_update(E_Zone *zone)
    Ecore_X_Randr_Output *out;
    int i, num = 0;
 
-   root = zone->comp->man->root;
+   root = e_comp->man->root;
    // try randr
    if (root && xbl_avail)
      {
@@ -243,8 +239,6 @@ _e_backlight_update(E_Zone *zone)
         sysmode = MODE_RANDR;
         return;
      }
-#else
-   (void)zone;
 #endif
 #ifdef HAVE_EEZE
    _bl_sys_find();
@@ -258,12 +252,11 @@ _e_backlight_update(E_Zone *zone)
 }
 
 static void
-_e_backlight_set(E_Zone *zone, double val)
+_e_backlight_set(double val)
 {
 #ifdef HAVE_WAYLAND_ONLY
    if (0)
      {
-        (void)zone;
         (void)val;
         return;
      }
@@ -276,7 +269,7 @@ _e_backlight_set(E_Zone *zone, double val)
         int num = 0, i;
         char *name;
 
-        root = zone->comp->man->root;
+        root = e_comp->man->root;
         out = ecore_x_randr_window_outputs_get(root, &num);
         if ((out) && (num > 0))
           {
@@ -318,15 +311,14 @@ _e_backlight_set(E_Zone *zone, double val)
 }
 
 static Eina_Bool
-_bl_anim(void *data, double pos)
+_bl_anim(void *data EINA_UNUSED, double pos)
 {
-   E_Zone *zone = data;
    double v;
 
    // FIXME: if zone is deleted while anim going... bad things.
    pos = ecore_animator_pos_map(pos, ECORE_POS_MAP_DECELERATE, 0.0, 0.0);
    v = (bl_animval * (1.0 - pos)) + (bl_anim_toval * pos);
-   _e_backlight_set(zone, v);
+   _e_backlight_set(v);
    if (pos >= 1.0)
      {
         bl_anim = NULL;

diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 28fe7d2..2c72f4a 100644 (file)
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -208,9 +208,9 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
 
    desk = e_desk_current_get(zone);
    if (desk)
-     bgfile = e_bg_file_get(zone->comp->num, zone->num, desk->x, desk->y);
+     bgfile = e_bg_file_get(e_comp->num, zone->num, desk->x, desk->y);
    else
-     bgfile = e_bg_file_get(zone->comp->num, zone->num, -1, -1);
+     bgfile = e_bg_file_get(e_comp->num, zone->num, -1, -1);
 
    if (zone->bg_object)
      {
@@ -233,7 +233,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
              zone->bg_object = NULL;
              E_FREE_FUNC(zone->transition_object, evas_object_del);
           }
-        o = edje_object_add(zone->comp->evas);
+        o = edje_object_add(e_comp->evas);
         evas_object_repeat_events_set(o, 1);
         zone->transition_object = o;
         evas_object_name_set(zone->transition_object, "zone->transition_object");
@@ -250,14 +250,14 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
      }
    if (eina_str_has_extension(bgfile, ".edj"))
      {
-        o = edje_object_add(zone->comp->evas);
+        o = edje_object_add(e_comp->evas);
         edje_object_file_set(o, bgfile, "e/desktop/background");
         if (edje_object_data_get(o, "noanimation"))
           edje_object_animation_set(o, EINA_FALSE);
      }
    else
      {
-        o = e_icon_add(zone->comp->evas);
+        o = e_icon_add(e_comp->evas);
         e_icon_file_key_set(o, bgfile, NULL);
         e_icon_fill_inside_set(o, 0);
      }

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index b26a0b1..a90e89e 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -304,7 +304,7 @@ e_comp_canvas_zone_update(E_Zone *zone)
      }
    E_FREE_FUNC(zone->base, evas_object_del);
    E_FREE_FUNC(zone->over, evas_object_del);
-   zone->base = o = edje_object_add(zone->comp->evas);
+   zone->base = o = edje_object_add(e_comp->evas);
    evas_object_repeat_events_set(o, 1);
    evas_object_name_set(zone->base, "zone->base");
    e_theme_edje_object_set(o, "base/theme/comp", under_styles[conf->disable_screen_effects]);
@@ -314,7 +314,7 @@ e_comp_canvas_zone_update(E_Zone *zone)
    evas_object_layer_set(o, E_LAYER_BG);
    evas_object_show(o);
 
-   zone->over = o = edje_object_add(zone->comp->evas);
+   zone->over = o = edje_object_add(e_comp->evas);
    edje_object_signal_callback_add(o, "e,state,screensaver,active", "e", _e_comp_canvas_screensaver_active, NULL);
    evas_object_layer_set(o, E_LAYER_MAX);
    evas_object_raise(o);

diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 9afbe4b..9eb8d4a 100644 (file)
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -110,14 +110,7 @@ e_config_dialog_find(const char *name, const char *class)
              ec = e_win_client_get(cfd->dia->win);
              e_client_uniconify(ec);
              elm_win_raise(cfd->dia->win);
-             if (z->comp == ec->zone->comp)
-               e_client_desk_set(ec, e_desk_current_get(z));
-             else
-               {
-                  if (!ec->sticky)
-                    e_desk_show(ec->desk);
-                  e_util_pointer_center(ec);
-               }
+             e_client_desk_set(ec, e_desk_current_get(z));
              if (ec->shaded || ec->shading)
                e_client_unshade(ec, ec->shade_dir);
              if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 5cc8329..e5ffcdc 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -68,7 +68,7 @@ e_desk_new(E_Zone *zone, int x, int y)
    EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
      {
         if ((cfname->manager >= 0) &&
-            ((int)zone->comp->num != cfname->manager)) continue;
+            ((int)e_comp->num != cfname->manager)) continue;
         if ((cfname->zone >= 0) &&
             ((int)zone->num != cfname->zone)) continue;
         if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y))
@@ -88,7 +88,7 @@ e_desk_new(E_Zone *zone, int x, int y)
    EINA_LIST_FOREACH(e_config->desktop_window_profiles, l, cfprof)
      {
         if ((cfprof->manager >= 0) &&
-            ((int)zone->comp->num != cfprof->manager)) continue;
+            ((int)e_comp->num != cfprof->manager)) continue;
         if ((cfprof->zone >= 0) &&
             ((int)zone->num != cfprof->zone)) continue;
         if ((cfprof->desk_x != desk->x) || (cfprof->desk_y != desk->y))

diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 5278c83..43011c0 100644 (file)
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -105,7 +105,7 @@ e_desklock_user_wallpaper_get(E_Zone *zone)
    desk = e_desk_current_get(zone);
    EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cdbg)
      {
-        if ((cdbg->manager > -1) && (cdbg->manager != (int)zone->comp->num)) continue;
+        if ((cdbg->manager > -1) && (cdbg->manager != (int)e_comp->num)) continue;
         if ((cdbg->zone > -1) && (cdbg->zone != (int)zone->num)) continue;
         if ((cdbg->desk_x > -1) && (cdbg->desk_x != desk->x)) continue;
         if ((cdbg->desk_y > -1) && (cdbg->desk_y != desk->y)) continue;

diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index 09e8526..83e7139 100644 (file)
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -436,7 +436,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
         int head_length;
         int penv_display_length;
 
-        head = launch->zone->comp->num;
+        head = e_comp->num;
 
         penv_display_length = strlen(penv_display);
         /* Check for insane length for DISPLAY env */

diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 2d3b031..8b3efe6 100644 (file)
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -2290,7 +2290,7 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
    if (!e_drop_inside(gcc->gadcon->drop_handler, x, y))
      e_gadcon_client_hide(gcc);
 
-   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
 
    gcc->drag.drag = drag = e_drag_new(x, y,
                                       drag_types, 1, gcc, -1, NULL,
@@ -2481,7 +2481,7 @@ _e_gadcon_cb_client_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *o
           }
 
         if (gcc->gadcon->toolbar)
-          ecore_evas_pointer_xy_get(zone->comp->ee, &cx, &cy);
+          ecore_evas_pointer_xy_get(e_comp->ee, &cx, &cy);
         else
           {
              e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, NULL, NULL);

diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c
index bdf0d81..2a425b1 100644 (file)
--- a/src/bin/e_int_client_menu.c
+++ b/src/bin/e_int_client_menu.c
@@ -602,12 +602,12 @@ _e_client_menu_cb_resistance(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi _
 }
 
 static void
-_e_client_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
+_e_client_menu_cb_icon_edit(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__)
 {
    E_Client *ec;
 
    ec = data;
-   e_desktop_border_edit(m->zone->comp, ec);
+   e_desktop_border_edit(e_comp, ec);
 }
 
 static void
@@ -944,7 +944,7 @@ _e_client_menu_cb_sendto_icon_pre(void *data, E_Menu *m, E_Menu_Item *mi)
 
    tw = 50;
    th = (tw * desk->zone->h) / desk->zone->w;
-   bgfile = e_bg_file_get(desk->zone->comp->num, desk->zone->num,
+   bgfile = e_bg_file_get(e_comp->num, desk->zone->num,
                           desk->x, desk->y);
    o = e_thumb_icon_add(m->evas);
    e_thumb_icon_file_set(o, bgfile, "e/desktop/background");
@@ -1195,7 +1195,7 @@ _e_client_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
    int zones, i;
 
    ec = data;
-   zones = eina_list_count(ec->zone->comp->zones);
+   zones = eina_list_count(e_comp->zones);
 
    subm = e_menu_new();
    e_object_data_set(E_OBJECT(subm), ec);

diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 8ce7277..d20ad84 100644 (file)
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -109,7 +109,7 @@ _TEST(void *d __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
    Evas_Object *o_list;
    Evas *e;
 
-   dia = e_dialog_normal_win_new(m->zone->comp, "E", "_widget_playground_dialog");
+   dia = e_dialog_normal_win_new(e_comp, "E", "_widget_playground_dialog");
    e = evas_object_evas_get(dia->win);
    o_list = e_widget_ilist_add(e, 32, 32, NULL);
    e_dialog_button_add(dia, "Add", NULL, _TEST_ADD, o_list);
@@ -604,7 +604,7 @@ _e_int_menus_themes_about(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_It
    static void
    _e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
    {
-   e_fwin_new(m->zone->comp, "favorites", "/");
+   e_fwin_new(e_comp, "favorites", "/");
    }
  */
 
@@ -1102,7 +1102,7 @@ _e_int_menus_virtuals_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi)
    tw = 50;
    th = (tw * desk->zone->h) / desk->zone->w;
 
-   bgfile = e_bg_file_get(desk->zone->comp->num, desk->zone->num, desk->x, desk->y);
+   bgfile = e_bg_file_get(e_comp->num, desk->zone->num, desk->x, desk->y);
    o = e_thumb_icon_add(m->evas);
    e_thumb_icon_file_set(o, bgfile, "e/desktop/background");
    eina_stringshare_del(bgfile);
@@ -1420,7 +1420,7 @@ _e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
    if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_MOST_RECENT)
      l = e_client_focus_stack_get();
    else
-     l = zone->comp->clients;
+     l = e_comp->clients;
    EINA_LIST_FOREACH(l, l, ec)
      {
         if (ec->user_skip_winlist || e_client_util_ignored_get(ec)) continue;

diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 94c9768..bd0ea23 100644 (file)
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1886,14 +1886,14 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
    m->pending_new_submenu = 0;
    if (!_e_menu_win)
      {
-        _e_menu_win = zone->comp->ee_win;
+        _e_menu_win = e_comp->ee_win;
         if (!e_comp_grab_input(1, 1))
           {
              _e_menu_win = 0;
              return;
           }
      }
-   if ((m->zone) && (m->zone->comp != zone->comp))
+   if ((m->zone) && (e_comp != e_comp))
      {
         return;
      }

diff --git a/src/bin/e_place.c b/src/bin/e_place.c
index 9d2123b..2e12bf8 100644 (file)
--- a/src/bin/e_place.c
+++ b/src/bin/e_place.c
@@ -448,7 +448,7 @@ e_place_zone_cursor(E_Zone *zone, int x __UNUSED__, int y __UNUSED__, int w, int
 
    E_OBJECT_CHECK_RETURN(zone, 0);
 
-   ecore_evas_pointer_xy_get(zone->comp->ee, &cursor_x, &cursor_y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &cursor_x, &cursor_y);
    *rx = cursor_x - (w >> 1);
    *ry = cursor_y - (it >> 1);
 
@@ -477,7 +477,7 @@ e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry)
 
    E_OBJECT_CHECK_RETURN(zone, 0);
 
-   ecore_evas_pointer_xy_get(zone->comp->ee, &cursor_x, &cursor_y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &cursor_x, &cursor_y);
    if (rx) *rx = cursor_x - (w >> 1);
    if (ry) *ry = cursor_y - (h >> 1);
 

diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index c9b7277..61076d9 100644 (file)
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -451,7 +451,7 @@ _e_remember_update(E_Client *ec, E_Remember *rem)
    if (rem->apply & E_REMEMBER_APPLY_ZONE)
      {
         rem->prop.zone = ec->zone->num;
-        rem->prop.head = ec->zone->comp->num;
+        rem->prop.head = e_comp->num;
      }
    if (rem->apply & E_REMEMBER_APPLY_SKIP_WINLIST)
      rem->prop.skip_winlist = ec->user_skip_winlist;

diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 8eb2789..4496a0e 100644 (file)
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -213,8 +213,8 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, E_Layer laye
    e_zone_useful_geometry_dirty(zone);
 
 
-   es->ee = zone->comp->ee;
-   es->evas = zone->comp->evas;
+   es->ee = e_comp->ee;
+   es->evas = e_comp->evas;
    es->fit_along = 1;
    es->layer = layer;
 
@@ -518,7 +518,7 @@ e_shelf_save(E_Shelf *es)
 
         cf_es = E_NEW(E_Config_Shelf, 1);
         cf_es->name = eina_stringshare_add(es->name);
-        cf_es->manager = es->zone->comp->num;
+        cf_es->manager = e_comp->num;
         cf_es->zone = es->zone->num;
         cf_es->layer = es->layer;
         e_config->shelves = eina_list_append(e_config->shelves, cf_es);
@@ -997,7 +997,7 @@ _e_shelf_new_dialog_ok(void *data, char *text)
 
    cfg = E_NEW(E_Config_Shelf, 1);
    cfg->name = eina_stringshare_add(text);
-   cfg->manager = zone->comp->num;
+   cfg->manager = e_comp->num;
    cfg->zone = zone->num;
    cfg->layer = E_LAYER_CLIENT_ABOVE;
    EINA_LIST_FOREACH(e_config->shelves, l, es_cf)
@@ -1668,7 +1668,7 @@ _e_shelf_cb_mouse_move_autohide_fuck_systray(E_Shelf *es)
    Ecore_Event_Mouse_Move ev;
 
    memset(&ev, 0, sizeof(Ecore_Event_Mouse_Move));
-   ecore_evas_pointer_xy_get(es->zone->comp->ee, &x, &y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
    ev.root.x = e_comp_canvas_x_root_unadjust(x);
    ev.root.y = e_comp_canvas_y_root_unadjust(y);
    _e_shelf_cb_mouse_in(es, ECORE_EVENT_MOUSE_MOVE, &ev);

diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index f519290..a267684 100644 (file)
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -314,7 +314,7 @@ _e_toolbar_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U
    tbar->menu = mn;
    _e_toolbar_menu_append(tbar, mn);
    zone = e_util_zone_current_get(e_manager_current_get());
-   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
    e_menu_activate_mouse(mn, zone, x, y, 1, 1,
                          E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
 }

diff --git a/src/bin/e_widget_bgpreview.c b/src/bin/e_widget_bgpreview.c
index fc5100f..95fa930 100644 (file)
--- a/src/bin/e_widget_bgpreview.c
+++ b/src/bin/e_widget_bgpreview.c
@@ -71,10 +71,10 @@ e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y)
    E_Widget_Desk_Data *dd;
    const char *bgfile;
 
-   bgfile = e_bg_file_get(zone->comp->num, zone->num, x, y);
+   bgfile = e_bg_file_get(e_comp->num, zone->num, x, y);
 
    dd = E_NEW(E_Widget_Desk_Data, 1);
-   dd->manager = zone->comp->num;
+   dd->manager = e_comp->num;
    dd->zone = zone->num;
    dd->x = x;
    dd->y = y;

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 17d052d..f461c3a 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -511,13 +511,13 @@ e_zone_flip_coords_handle(E_Zone *zone,
 
    if (!e_config->edge_flip_dragging) return;
    /* if we have only 1 row we can flip up/down even if we have xinerama */
-   if (eina_list_count(zone->comp->zones) > 1)
+   if (eina_list_count(e_comp->zones) > 1)
      {
         Eina_List *zones;
         E_Zone *next_zone;
         int cx, cy;
 
-        zones = zone->comp->zones;
+        zones = e_comp->zones;
         next_zone = (E_Zone *)eina_list_data_get(zones);
         cx = next_zone->x;
         cy = next_zone->y;
@@ -939,7 +939,7 @@ e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge)
    Eina_List *l;
    E_Zone *z2;
 
-   EINA_LIST_FOREACH(zone->comp->zones, l, z2)
+   EINA_LIST_FOREACH(e_comp->zones, l, z2)
      {
         if (zone == z2) continue;
 
@@ -1165,7 +1165,7 @@ e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer)
    if (zone->EDGE) \
      { \
        evas_object_layer_set(zone->EDGE, layer); \
-       evas_object_stack_below(zone->EDGE, zone->comp->layers[e_comp_canvas_layer_map(layer)].obj); \
+       evas_object_stack_below(zone->EDGE, e_comp->layers[e_comp_canvas_layer_map(layer)].obj); \
      } \
    } while (0)
 
@@ -1462,7 +1462,7 @@ _e_zone_free(E_Zone *zone)
    E_FREE_LIST(zone->handlers, ecore_event_handler_del);
 
    if (zone->name) eina_stringshare_del(zone->name);
-   zone->comp->zones = eina_list_remove(zone->comp->zones, zone);
+   e_comp->zones = eina_list_remove(e_comp->zones, zone);
    evas_object_del(zone->bg_event_object);
    evas_object_del(zone->bg_clip_object);
    evas_object_del(zone->bg_object);

diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 2aa4bae..537cc02 100644 (file)
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -40,7 +40,6 @@ struct _E_Zone
    /* num matches the id of the xinerama screen
     * this zone belongs to. */
    unsigned int num;
-   E_Comp *comp;
    int          fullscreen;
 
    Evas_Object *bg_object;

diff --git a/src/modules/access/e_mod_main.c b/src/modules/access/e_mod_main.c
index c557904..5964e01 100644 (file)
--- a/src/modules/access/e_mod_main.c
+++ b/src/modules/access/e_mod_main.c
@@ -88,7 +88,7 @@ _mouse_in_win_get(Cover *cov, int x, int y)
       then previous target window which has the highlight object
       should get the message. how? */
    target_win = ecore_x_window_shadow_tree_at_xy_with_skip_get
-     (cov->zone->comp->man->root, x, y, skip, i);
+     (cov->e_comp->man->root, x, y, skip, i);
 }
 
 static unsigned int
@@ -756,9 +756,9 @@ _cover_new(E_Zone *zone)
    evas_object_show(cov->text);
 
 #else
-   cov->win = ecore_x_window_input_new(zone->comp->manager->root,
-                                       zone->comp->x + zone->x,
-                                       zone->comp->y + zone->y,
+   cov->win = ecore_x_window_input_new(e_comp->manager->root,
+                                       e_comp->x + zone->x,
+                                       e_comp->y + zone->y,
                                        zone->w, zone->h);
 #endif
 
@@ -772,7 +772,7 @@ _cover_new(E_Zone *zone)
                             ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING |
                             ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
                             0, 0, 0, 0, 0,
-                            zone->comp->layers[8].win,
+                            e_comp->layers[8].win,
                             ECORE_X_WINDOW_STACK_ABOVE);
    ecore_x_window_show(cov->win);
    ecore_x_window_raise(cov->win);

diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index a85901b..86446fc 100644 (file)
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -82,13 +82,13 @@ e_configure_show(E_Comp *comp, const char *params)
         z2 = ec->zone;
         evas_object_show(eco->win);
         elm_win_raise(eco->win);
-        if (z->comp == z2->comp)
+        if (e_comp == e_comp)
           e_client_desk_set(ec, e_desk_current_get(z));
         else
           {
              if (!ec->sticky)
                e_desk_show(ec->desk);
-             ecore_evas_pointer_warp(z2->comp->ee,
+             ecore_evas_pointer_warp(e_comp->ee,
                                   z2->x + (z2->w / 2), z2->y + (z2->h / 2));
           }
         e_client_unshade(ec, ec->shade_dir);

diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index 31c3399..d72a612 100644 (file)
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -198,10 +198,10 @@ _config_pre_activate_cb(void *data, E_Menu *m)
 }
 
 static void
-_config_item_activate_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
+_config_item_activate_cb(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__)
 {
    E_Configure_Cat *ecat = data;
-   e_configure_show(m->zone->comp, ecat ? ecat->cat : NULL);
+   e_configure_show(e_comp, ecat ? ecat->cat : NULL);
 }
 
 static void
@@ -383,14 +383,14 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params)
    if ((zone) && (params))
      e_configure_registry_call(params, NULL, params);
    else if (zone)
-     e_configure_show(zone->comp, params);
+     e_configure_show(e_comp, params);
 }
 
 /* menu item callback(s) */
 static void
-_e_mod_conf_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
+_e_mod_conf_cb(void *data __UNUSED__, E_Menu *m EINA_UNUSED, E_Menu_Item *mi __UNUSED__)
 {
-   e_configure_show(m->zone->comp, NULL);
+   e_configure_show(e_comp, NULL);
 }
 
 static void

diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c b/src/modules/conf_theme/e_int_config_wallpaper.c
index 8b4dca5..ccfc880 100644 (file)
--- a/src/modules/conf_theme/e_int_config_wallpaper.c
+++ b/src/modules/conf_theme/e_int_config_wallpaper.c
@@ -683,11 +683,11 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
           }
         else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_DESK)
           {
-             e_bg_del(z->comp->num, z->num, d->x, d->y);
-             e_bg_del(z->comp->num, -1, d->x, d->y);
+             e_bg_del(e_comp->num, z->num, d->x, d->y);
+             e_bg_del(e_comp->num, -1, d->x, d->y);
              e_bg_del(-1, z->num, d->x, d->y);
              e_bg_del(-1, -1, d->x, d->y);
-             e_bg_add(z->comp->num, z->num, d->x, d->y, cfdata->bg);
+             e_bg_add(e_comp->num, z->num, d->x, d->y, cfdata->bg);
           }
         else if (cfdata->all_this_desk_screen == E_CONFIG_WALLPAPER_SCREEN)
           {
@@ -696,7 +696,7 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
                   E_Config_Desktop_Background *cfbg;
 
                   cfbg = l->data;
-                  if ((cfbg->manager == (int)z->comp->num) &&
+                  if ((cfbg->manager == (int)e_comp->num) &&
                       (cfbg->zone == (int)z->num))
                     fl = eina_list_append(fl, cfbg);
                }
@@ -709,7 +709,7 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
                            cfbg->desk_y);
                   fl = eina_list_remove_list(fl, fl);
                }
-             e_bg_add(z->comp->num, z->num, -1, -1, cfdata->bg);
+             e_bg_add(e_comp->num, z->num, -1, -1, cfdata->bg);
           }
      }
    e_bg_update();

diff --git a/src/modules/everything/evry_plug_windows.c b/src/modules/everything/evry_plug_windows.c
index 2f49a1f..344be96 100644 (file)
--- a/src/modules/everything/evry_plug_windows.c
+++ b/src/modules/everything/evry_plug_windows.c
@@ -407,7 +407,7 @@ _act_border(Evry_Action *act)
              else if (warp_to_y >= (ec->zone->y + ec->zone->h - 1))
                warp_to_y = (ec->zone->y + ec->zone->h + ec->y) / 2;
 
-             ecore_evas_pointer_warp(ec->zone->comp->ee, warp_to_x, warp_to_y);
+             ecore_evas_pointer_warp(e_comp->ee, warp_to_x, warp_to_y);
           }
         /* e_client_focus_set_with_pointer(ec); */
      }

diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index a9dad2c..d227ff5 100644 (file)
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -449,7 +449,7 @@ e_fwin_zone_new(E_Zone *zone, void *p)
 
    fwins = eina_list_append(fwins, fwin);
 
-   o = e_fm2_add(zone->comp->evas);
+   o = e_fm2_add(e_comp->evas);
    evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _e_fwin_zone_shutdown, fwin);
    page->fm_obj = o;
    _e_fwin_config_set(page);
@@ -480,7 +480,7 @@ e_fwin_zone_new(E_Zone *zone, void *p)
    evas_object_focus_set(o, !e_client_focused_get());
    evas_object_show(o);
 
-   o = e_scrollframe_add(zone->comp->evas);
+   o = e_scrollframe_add(e_comp->evas);
    e_scrollframe_custom_theme_set(o, "base/theme/fileman",
                                   "e/fileman/desktop/scrollframe");
    /* FIXME: this theme object will have more versions and options later
@@ -793,7 +793,7 @@ _e_fwin_icon_popup_handler(void *data, int type, void *event)
      {
         if (fwin->zone)
           {
-             if (ev->event_window == fwin->zone->comp->ee_win) return ECORE_CALLBACK_RENEW;
+             if (ev->event_window == e_comp->ee_win) return ECORE_CALLBACK_RENEW;
           }
         else
           {
@@ -2114,7 +2114,7 @@ _e_fwin_path(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
    if (page->fwin->win)
      xwin = elm_win_window_id_get(page->fwin->win);
    else
-     xwin = page->fwin->zone->comp->ee_win;
+     xwin = e_comp->ee_win;
 #ifndef HAVE_WAYLAND_ONLY
    ecore_x_selection_clipboard_set(xwin, path, strlen(path) + 1);
 #endif

diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c
index 6c92e6d..62f38d8 100644 (file)
--- a/src/modules/fileman/e_fwin_nav.c
+++ b/src/modules/fileman/e_fwin_nav.c
@@ -525,7 +525,7 @@ _cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
 
    m = e_menu_new();
    m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
-   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
    e_menu_activate_mouse(m, zone, x, y, 1, 1,
                          E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
    evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,

diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c
index 24c3b87..0af997f 100644 (file)
--- a/src/modules/fileman/e_mod_dbus.c
+++ b/src/modules/fileman/e_mod_dbus.c
@@ -120,7 +120,7 @@ _e_fileman_dbus_daemon_open_directory_cb(const Eldbus_Service_Interface *iface _
         directory = "/";
      }
 
-   e_fwin_new(zone->comp, dev, directory);
+   e_fwin_new(e_comp, dev, directory);
    free(dev);
    free(to_free);
    return eldbus_message_method_return_new(msg);

diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index 0eb254e..ef78844 100644 (file)
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -166,21 +166,21 @@ _e_mod_action_fileman_cb(E_Object   *obj EINA_UNUSED,
    if (zone)
      {
         if (params && params[0] == '/')
-          e_fwin_new(zone->comp, "/", params);
+          e_fwin_new(e_comp, "/", params);
         else if (params && params[0] == '~')
-          e_fwin_new(zone->comp, "~/", params + 1);
+          e_fwin_new(e_comp, "~/", params + 1);
         else if (params && strcmp(params, "(none)")) /* avoid matching paths that no longer exist */
           {
              char *path;
              path = e_util_shell_env_path_eval(params);
              if (path)
                {
-                  e_fwin_new(zone->comp, path, "/");
+                  e_fwin_new(e_comp, path, "/");
                   free(path);
                }
           }
         else
-          e_fwin_new(zone->comp, "favorites", "/");
+          e_fwin_new(e_comp, "favorites", "/");
      }
 }
 
@@ -340,7 +340,7 @@ e_mod_fileman_path_find(E_Zone *zone)
    Fileman_Path *path;
 
    EINA_LIST_FOREACH(fileman_config->paths, l, path)
-     if (path->zone == zone->comp->num + zone->num) break;
+     if (path->zone == e_comp->num + zone->num) break;
    if (l && fileman_config->view.desktop_navigation) return path;
    if (l)
      {
@@ -350,14 +350,14 @@ e_mod_fileman_path_find(E_Zone *zone)
    else
      {
         path = E_NEW(Fileman_Path, 1);
-        path->zone = zone->comp->num + zone->num;
+        path->zone = e_comp->num + zone->num;
         path->dev = eina_stringshare_add("desktop");
         fileman_config->paths = eina_list_append(fileman_config->paths, path);
         path->desktop_mode = E_FM2_VIEW_MODE_CUSTOM_ICONS;
      }
-   if ((zone->comp->num == 0) && (zone->num == 0))
+   if ((e_comp->num == 0) && (zone->num == 0))
      path->path = eina_stringshare_add("/");
    else
-     path->path = eina_stringshare_printf("%d", (zone->comp->num + zone->num));
+     path->path = eina_stringshare_printf("%d", (e_comp->num + zone->num));
    return path;
 }

diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c
index 0b5d4a2..8ebf6ef 100644 (file)
--- a/src/modules/fileman/e_mod_menu.c
+++ b/src/modules/fileman/e_mod_menu.c
@@ -27,7 +27,7 @@ _e_mod_menu_gtk_cb(void           *data,
    if (fm && ((fileman_config->view.open_dirs_in_place && evas_object_data_get(fm, "page_is_window")) ||
        (fileman_config->view.desktop_navigation && evas_object_data_get(fm, "page_is_zone"))))
      e_fm2_path_set(fm, NULL, data);
-   else if (m->zone) e_fwin_new(m->zone->comp, NULL, data);
+   else if (m->zone) e_fwin_new(e_comp, NULL, data);
 }
 
 static void
@@ -43,7 +43,7 @@ _e_mod_menu_virtual_cb(void           *data,
    if (fm && ((fileman_config->view.open_dirs_in_place && evas_object_data_get(fm, "page_is_window")) ||
        (fileman_config->view.desktop_navigation && evas_object_data_get(fm, "page_is_zone"))))
      e_fm2_path_set(fm, data, path ?: "/");
-   else if (m->zone) e_fwin_new(m->zone->comp, data, path ?: "/");
+   else if (m->zone) e_fwin_new(e_comp, data, path ?: "/");
 }
 
 static void
@@ -62,7 +62,7 @@ _e_mod_menu_volume_cb(void           *data,
            (fileman_config->view.desktop_navigation && evas_object_data_get(fm, "page_is_zone"))))
          e_fm2_path_set(fm, NULL, vol->mount_point);
         else if (m->zone)
-          e_fwin_new(m->zone->comp, NULL, vol->mount_point);
+          e_fwin_new(e_comp, NULL, vol->mount_point);
      }
    else
      {
@@ -73,7 +73,7 @@ _e_mod_menu_volume_cb(void           *data,
             (fileman_config->view.desktop_navigation && evas_object_data_get(fm, "page_is_zone"))))
           e_fm2_path_set(fm, buf, "/");
         else if (m->zone)
-          e_fwin_new(m->zone->comp, buf, "/");
+          e_fwin_new(e_comp, buf, "/");
      }
 }
 
@@ -94,7 +94,7 @@ _e_mod_menu_populate_cb(void      *data,
        (fileman_config->view.desktop_navigation && evas_object_data_get(fm, "page_is_zone"))))
      e_fm2_path_set(fm, data, path ?: "/");
    else if (m->zone)
-     e_fwin_new(m->zone->comp, data, path ?: "/");
+     e_fwin_new(e_comp, data, path ?: "/");
 }
 
 static void
@@ -491,7 +491,7 @@ static void
 _e_mod_menu_navigate_cb(void *d EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED)
 {
    if (m->zone)
-     e_fwin_new(m->zone->comp, "~/", "/");
+     e_fwin_new(e_comp, "~/", "/");
 }
 
 /* returns submenu so we can add Go to Parent */

diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index 0d666c7..451ad21 100644 (file)
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -1661,12 +1661,9 @@ _e_gadman_cb_zone_change(void *data __UNUSED__, int type, void *event)
                   break;
                }
           }
-        if (ev->zone->comp == Man->comp)
-          {
-             evas_object_hide(Man->overlay);
-             E_FREE_FUNC(Man->overlay, evas_object_del);
-             _gadman_overlay_create();
-          }
+        evas_object_hide(Man->overlay);
+        E_FREE_FUNC(Man->overlay, evas_object_del);
+        _gadman_overlay_create();
         return ECORE_CALLBACK_RENEW;
      }
 

diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 49b3f4f..bf63ee8 100644 (file)
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -2203,8 +2203,8 @@ _ibar_cb_sort(IBar *b1, IBar *b2)
      {
         int id1, id2;
         
-        id1 = z1->id + (z1->comp->num * 100) + (z1->comp->num * 10000);
-        id2 = z2->id + (z2->comp->num * 100) + (z2->comp->num * 10000);
+        id1 = z1->id + (e_comp->num * 100) + (e_comp->num * 10000);
+        id2 = z2->id + (e_comp->num * 100) + (e_comp->num * 10000);
         return id2 - id1;
      }
    return 0;

diff --git a/src/modules/illume-home/e_mod_main.c b/src/modules/illume-home/e_mod_main.c
index 19b0acf..ef9b46a 100644 (file)
--- a/src/modules/illume-home/e_mod_main.c
+++ b/src/modules/illume-home/e_mod_main.c
@@ -344,7 +344,7 @@ _il_home_desktop_find_border(E_Zone *zone, Efreet_Desktop *desktop)
         if (p) strcpy(exe, p + 1);
      }
 
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
         if (ec->zone != zone) continue;
@@ -393,7 +393,7 @@ _il_home_win_new(E_Zone *zone)
    if (!hwin) return;
 
    hwin->zone = zone;
-   hwin->win = e_win_new(zone->comp);
+   hwin->win = e_win_new(e_comp);
    if (!hwin->win) 
      {
         e_object_del(E_OBJECT(hwin));
@@ -412,9 +412,9 @@ _il_home_win_new(E_Zone *zone)
 
    desk = e_desk_current_get(zone);
    if (desk)
-     bgfile = e_bg_file_get(zone->comp->num, zone->num, desk->x, desk->y);
+     bgfile = e_bg_file_get(e_comp->num, zone->num, desk->x, desk->y);
    else
-     bgfile = e_bg_file_get(zone->comp->num, zone->num, -1, -1);
+     bgfile = e_bg_file_get(e_comp->num, zone->num, -1, -1);
 
    hwin->o_bg = edje_object_add(evas);
    edje_object_file_set(hwin->o_bg, bgfile, "e/desktop/background");
@@ -742,9 +742,9 @@ _il_home_cb_bg_change(void *data __UNUSED__, int type, void *event __UNUSED__)
         zone = hwin->zone;
         desk = e_desk_current_get(zone);
         if (desk)
-          bgfile = e_bg_file_get(zone->comp->num, zone->num, desk->x, desk->y);
+          bgfile = e_bg_file_get(e_comp->num, zone->num, desk->x, desk->y);
         else
-          bgfile = e_bg_file_get(zone->comp->num, zone->num, -1, -1);
+          bgfile = e_bg_file_get(e_comp->num, zone->num, -1, -1);
         edje_object_file_set(hwin->o_bg, bgfile, "e/desktop/background");
         eina_stringshare_del(bgfile);
      }

diff --git a/src/modules/illume-indicator/e_mod_ind_win.c b/src/modules/illume-indicator/e_mod_ind_win.c
index c815bcb..4fda308 100644 (file)
--- a/src/modules/illume-indicator/e_mod_ind_win.c
+++ b/src/modules/illume-indicator/e_mod_ind_win.c
@@ -36,7 +36,7 @@ e_mod_ind_win_new(E_Zone *zone)
    iwin->zone = zone;
 
    /* create new window */
-   iwin->win = e_win_new(zone->comp);
+   iwin->win = e_win_new(e_comp);
    iwin->win->data = iwin;
 
    /* set some properties on the window */

diff --git a/src/modules/illume-indicator/e_mod_notify.c b/src/modules/illume-indicator/e_mod_notify.c
index 5fe6811..92f1bee 100644 (file)
--- a/src/modules/illume-indicator/e_mod_notify.c
+++ b/src/modules/illume-indicator/e_mod_notify.c
@@ -180,7 +180,7 @@ _e_mod_notify_new(E_Notification_Notify *n, unsigned id)
    zone = e_util_zone_current_get(e_manager_current_get());
    nwin->zone = zone;
 
-   nwin->win = e_win_new(zone->comp);
+   nwin->win = e_win_new(e_comp);
    nwin->win->data = nwin;
 
    e_win_name_class_set(nwin->win, "Illume-Notify", "Illume-Notify");

diff --git a/src/modules/illume-keyboard/e_kbd_int.c b/src/modules/illume-keyboard/e_kbd_int.c
index 5636045..866e122 100644 (file)
--- a/src/modules/illume-keyboard/e_kbd_int.c
+++ b/src/modules/illume-keyboard/e_kbd_int.c
@@ -1725,7 +1725,7 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
    if (syskbds) ki->syskbds = eina_stringshare_add(syskbds);
    if (sysdicts) ki->sysdicts = eina_stringshare_add(sysdicts);
    zone = e_util_zone_current_get(e_manager_current_get());
-   ki->win = e_win_new(zone->comp);
+   ki->win = e_win_new(e_comp);
    states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
    states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
    ecore_x_netwm_window_state_set(ki->win->evas_win, states, 2);

diff --git a/src/modules/illume-softkey/e_mod_sft_win.c b/src/modules/illume-softkey/e_mod_sft_win.c
index 5a86138..e85a6ac 100644 (file)
--- a/src/modules/illume-softkey/e_mod_sft_win.c
+++ b/src/modules/illume-softkey/e_mod_sft_win.c
@@ -45,7 +45,7 @@ e_mod_sft_win_new(E_Zone *zone)
                                               swin));
 
    /* create new window */
-   swin->win = e_win_new(zone->comp);
+   swin->win = e_win_new(e_comp);
    swin->win->data = swin;
 
    /* set some properties on the window */
@@ -448,7 +448,7 @@ _e_mod_sft_win_border_get(E_Zone *zone, int x, int y)
    E_Client *ec;
 
    if (!zone) return NULL;
-   EINA_LIST_REVERSE_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_REVERSE_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
         if (ec->zone != zone) continue;

diff --git a/src/modules/illume2/e_illume.c b/src/modules/illume2/e_illume.c
index babaa9b..f4ecedc 100644 (file)
--- a/src/modules/illume2/e_illume.c
+++ b/src/modules/illume2/e_illume.c
@@ -522,7 +522,7 @@ e_illume_client_at_xy_get(E_Zone *zone, int x, int y)
 
    /* loop the border client list */
     /* This is done in reverse order so we get the most recent border first */
-   EINA_LIST_REVERSE_FOREACH(zone->comp->clients, l, ec) 
+   EINA_LIST_REVERSE_FOREACH(e_comp->clients, l, ec) 
      {
         if (e_client_util_ignored_get(ec)) continue;
         /* check zone and skip borders not on this zone */
@@ -675,7 +675,7 @@ e_illume_client_indicator_get(E_Zone *zone)
    if (!zone) return NULL;
 
    /* loop the client list */
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec) 
+   EINA_LIST_FOREACH(e_comp->clients, l, ec) 
      {
         if (e_client_util_ignored_get(ec)) continue;
         /* check zone and skip borders not on this zone */
@@ -746,7 +746,7 @@ e_illume_client_softkey_get(E_Zone *zone)
    if (!zone) return NULL;
 
    /* loop the border client list */
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec) 
+   EINA_LIST_FOREACH(e_comp->clients, l, ec) 
      {
         if (e_client_util_ignored_get(ec)) continue;
         /* check zone and skip borders not on this zone */
@@ -888,7 +888,7 @@ e_illume_client_home_get(E_Zone *zone)
    if (!zone) return NULL;
 
    /* loop the border client list */
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec) 
+   EINA_LIST_FOREACH(e_comp->clients, l, ec) 
      {
         if (e_client_util_ignored_get(ec)) continue;
         /* check zone and skip borders not on this zone */
@@ -925,7 +925,7 @@ e_illume_client_home_borders_get(E_Zone *zone)
    if (!zone) return NULL;
 
    /* loop the border client list */
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec) 
+   EINA_LIST_FOREACH(e_comp->clients, l, ec) 
      {
         if (e_client_util_ignored_get(ec)) continue;
         /* check zone and skip borders not on this zone */

diff --git a/src/modules/illume2/e_mod_quickpanel.c b/src/modules/illume2/e_mod_quickpanel.c
index 29cc875..1cc1301 100644 (file)
--- a/src/modules/illume2/e_mod_quickpanel.c
+++ b/src/modules/illume2/e_mod_quickpanel.c
@@ -613,7 +613,7 @@ _e_mod_quickpanel_clickwin_show(E_Illume_Quickpanel *qp)
 
    if (qp->clickwin) ecore_x_window_free(qp->clickwin);
    qp->clickwin = 0;
-   qp->clickwin = ecore_x_window_input_new(qp->zone->comp->win, 
+   qp->clickwin = ecore_x_window_input_new(qp->e_comp->win, 
                                            qp->zone->x, qp->zone->y, 
                                            qp->zone->w, qp->zone->h);
 

diff --git a/src/modules/illume2/e_mod_select_window.c b/src/modules/illume2/e_mod_select_window.c
index d562017..776baa8 100644 (file)
--- a/src/modules/illume2/e_mod_select_window.c
+++ b/src/modules/illume2/e_mod_select_window.c
@@ -70,7 +70,7 @@ _e_mod_illume_config_select_window_create(E_Config_Dialog *cfd __UNUSED__, Evas
    e_widget_ilist_clear(ow);
    e_widget_ilist_go(ow);
 
-   if ((ecs = zone->comp->clients))
+   if ((ecs = e_comp->clients))
      {
         for (i = 0, l = ecs; l; l = l->next, i++) 
           {

diff --git a/src/modules/illume2/policies/illume/policy.c b/src/modules/illume2/policies/illume/policy.c
index fcaa978..40c4676 100644 (file)
--- a/src/modules/illume2/policies/illume/policy.c
+++ b/src/modules/illume2/policies/illume/policy.c
@@ -263,7 +263,7 @@ _policy_zone_layout_update(E_Zone *zone)
 
    if (!zone) return;
 
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
         /* skip borders not on this zone */
@@ -1343,7 +1343,7 @@ _policy_zone_layout(E_Zone *zone)
    cz = e_illume_zone_config_get(zone->num);
 
    /* loop through border list and update layout */
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
         /* skip borders that are being deleted */
@@ -1473,7 +1473,7 @@ _policy_zone_move_resize(E_Zone *zone)
 
    if (!zone) return;
 
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
         /* skip borders not on this zone */
@@ -1789,7 +1789,7 @@ _policy_property_change(Ecore_X_Event_Window_Property *event)
         h = ec->h;
 
         /* look for conformant borders */
-        EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+        EINA_LIST_FOREACH(e_comp->clients, l, ec)
           {
              if (e_client_util_ignored_get(ec)) continue;
              if (ec->zone != zone) continue;
@@ -1818,7 +1818,7 @@ _policy_property_change(Ecore_X_Event_Window_Property *event)
         h = ec->h;
 
         /* look for conformant borders */
-        EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+        EINA_LIST_FOREACH(e_comp->clients, l, ec)
           {
              if (e_client_util_ignored_get(ec)) continue;
              if (ec->zone != zone) continue;
@@ -1858,7 +1858,7 @@ _policy_property_change(Ecore_X_Event_Window_Property *event)
           //y = kbd->client->y;
 
         /* look for conformant borders */
-        EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+        EINA_LIST_FOREACH(e_comp->clients, l, ec)
           {
              if (e_client_util_ignored_get(ec)) continue;
              if (ec->zone != zone) continue;

diff --git a/src/modules/illume2/policies/tablet/policy.c b/src/modules/illume2/policies/tablet/policy.c
index a7bc2dc..1fccc13 100644 (file)
--- a/src/modules/illume2/policies/tablet/policy.c
+++ b/src/modules/illume2/policies/tablet/policy.c
@@ -227,7 +227,7 @@ _policy_zone_layout_update(E_Zone *zone)
 
    if (!zone) return;
 
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
        /* skip borders not on this zone */
@@ -1051,7 +1051,7 @@ _policy_zone_layout(E_Zone *zone)
 
    cz = e_illume_zone_config_get(zone->num);
 
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
        if (e_object_is_del(E_OBJECT(ec))) continue;
@@ -1137,7 +1137,7 @@ _policy_zone_move_resize(E_Zone *zone)
 
    if (!zone) return;
 
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
        if (ec->zone != zone) continue;
@@ -1419,7 +1419,7 @@ _policy_property_change(Ecore_X_Event_Window_Property *event)
        w = ec->w;
        h = ec->h;
 
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
             if (ec->zone != zone) continue;
@@ -1446,7 +1446,7 @@ _policy_property_change(Ecore_X_Event_Window_Property *event)
        w = ec->w;
        h = ec->h;
 
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
             if (ec->zone != zone) continue;
@@ -1483,7 +1483,7 @@ _policy_property_change(Ecore_X_Event_Window_Property *event)
           //y = kbd->client->y;
 
        /* look for conformant borders */
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (e_client_util_ignored_get(ec)) continue;
             if (ec->zone != zone) continue;

diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 799a56d..4ab12ca 100644 (file)
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -745,7 +745,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
 
    /* Show popup */
 
-   pp->pager = _pager_new(zone->comp->evas, zone, NULL);
+   pp->pager = _pager_new(e_comp->evas, zone, NULL);
    
    pp->pager->popup = pp;
    pp->urgent = 0;
@@ -779,7 +779,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
    evas_object_move(pp->pager->o_table, 0, 0);
    evas_object_resize(pp->pager->o_table, width, height);
 
-   pp->o_bg = edje_object_add(zone->comp->evas);
+   pp->o_bg = edje_object_add(e_comp->evas);
    evas_object_name_set(pp->o_bg, "pager_popup");
    e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager",
                            "e/modules/pager16/popup");
@@ -1674,7 +1674,7 @@ _pager_popup_show(void)
    if (pp) _pager_popup_free(pp);
 
 #ifndef HAVE_WAYLAND_ONLY
-   input_window = ecore_x_window_input_new(zone->comp->win, 0, 0, 1, 1);
+   input_window = ecore_x_window_input_new(e_comp->win, 0, 0, 1, 1);
    ecore_x_window_show(input_window);
    if (!e_grabinput_get(input_window, 0, input_window))
      {

diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c
index f1084e2..4af3f5b 100644 (file)
--- a/src/modules/pager_plain/e_mod_main.c
+++ b/src/modules/pager_plain/e_mod_main.c
@@ -409,7 +409,7 @@ _pager_desk_livethumb_setup(Pager_Desk *pd)
 
    o = e_livethumb_thumb_get(pd->o_bg);
    if (!o) o = edje_object_add(e_livethumb_evas_get(pd->o_bg));
-   bgfile = e_bg_file_get(pd->desk->zone->comp->num, pd->desk->zone->num, pd->desk->x, pd->desk->y);
+   bgfile = e_bg_file_get(e_comp->num, pd->desk->zone->num, pd->desk->x, pd->desk->y);
    edje_object_file_set(o, bgfile, "e/desktop/background");
    e_livethumb_thumb_set(pd->o_bg, o);
    eina_stringshare_del(bgfile);
@@ -777,7 +777,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
    if (!pp) return NULL;
 
    /* Show popup */
-   pp->pager = _pager_new(zone->comp->evas, zone, NULL);
+   pp->pager = _pager_new(e_comp->evas, zone, NULL);
 
    pp->pager->popup = pp;
    pp->urgent = 0;
@@ -794,7 +794,7 @@ _pager_popup_new(E_Zone *zone, int keyaction)
    evas_object_move(pp->pager->o_table, 0, 0);
    evas_object_resize(pp->pager->o_table, width, height);
 
-   pp->o_bg = edje_object_add(zone->comp->evas);
+   pp->o_bg = edje_object_add(e_comp->evas);
    evas_object_name_set(pp->o_bg, "pager_popup");
    e_theme_edje_object_set(pp->o_bg, "base/theme/modules/pager",
                            "e/modules/pager/popup");
@@ -2448,7 +2448,7 @@ _pager_popup_show(void)
    if (pp) _pager_popup_free(pp);
 
 #ifndef HAVE_WAYLAND_ONLY
-   input_window = ecore_x_window_input_new(zone->comp->win, 0, 0, 1, 1);
+   input_window = ecore_x_window_input_new(e_comp->win, 0, 0, 1, 1);
    ecore_x_window_show(input_window);
    if (!e_grabinput_get(input_window, 0, input_window))
      {

diff --git a/src/modules/policy_mobile/e_mod_config.c b/src/modules/policy_mobile/e_mod_config.c
index da6d236..b6be864 100644 (file)
--- a/src/modules/policy_mobile/e_mod_config.c
+++ b/src/modules/policy_mobile/e_mod_config.c
@@ -17,7 +17,7 @@ _pol_conf_desk_add(Config *conf, E_Desk *desk)
    Config_Desk *d;
 
    d = E_NEW(Config_Desk, 1);
-   d->comp_num = desk->zone->comp->num;
+   d->comp_num = e_comp->num;
    d->zone_num = desk->zone->num;
    d->x = desk->x;
    d->y = desk->y;
@@ -189,7 +189,7 @@ _pol_cfd_desk_list_update(E_Config_Dialog_Data *cfdata, E_Zone *zone)
         desk = zone->desks[i];
 
         d = E_NEW(Config_Desk, 1);
-        d->comp_num = zone->comp->num;
+        d->comp_num = e_comp->num;
         d->zone_num = zone->num;
         d->x = desk->x;
         d->y = desk->y;

diff --git a/src/modules/policy_mobile/e_mod_main.c b/src/modules/policy_mobile/e_mod_main.c
index 749a1bb..df8399f 100644 (file)
--- a/src/modules/policy_mobile/e_mod_main.c
+++ b/src/modules/policy_mobile/e_mod_main.c
@@ -278,7 +278,7 @@ _pol_cb_zone_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
    for (i = 0; i < n; i++)
      {
         d = e_mod_pol_conf_desk_get_by_nums(_pol_mod->conf,
-                                            zone->comp->num,
+                                            e_comp->num,
                                             zone->num,
                                             zone->desks[i]->x,
                                             zone->desks[i]->y);
@@ -373,7 +373,7 @@ _pol_cb_zone_desk_count_set(void *data EINA_UNUSED, int type EINA_UNUSED, void *
    for (i = 0; i < n; i++)
      {
         d = e_mod_pol_conf_desk_get_by_nums(_pol_mod->conf,
-                                            zone->comp->num,
+                                            e_comp->num,
                                             zone->num,
                                             zone->desks[i]->x,
                                             zone->desks[i]->y);

diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
index ca3ce82..3e0ec15 100644 (file)
--- a/src/modules/shot/e_mod_main.c
+++ b/src/modules/shot/e_mod_main.c
@@ -600,8 +600,8 @@ _shot_now(E_Zone *zone, E_Client *ec, const char *params)
    if ((!zone) && (!ec)) return;
    if (zone)
      {
-        sman = zone->comp->man;
-        scomp = zone->comp;
+        sman = e_comp->man;
+        scomp = e_comp;
         xwin = sman->root;
         w = sw = sman->w;
         h = sh = sman->h;

diff --git a/src/modules/syscon/e_mod_main.c b/src/modules/syscon/e_mod_main.c
index fcd094a..d87f89a 100644 (file)
--- a/src/modules/syscon/e_mod_main.c
+++ b/src/modules/syscon/e_mod_main.c
@@ -69,7 +69,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 
 /* action callback */
 static void
-_e_mod_action_syscon_cb(E_Object *obj, const char *params)
+_e_mod_action_syscon_cb(E_Object *obj EINA_UNUSED, const char *params)
 {
    E_Zone *zone = NULL;
 
@@ -80,18 +80,7 @@ _e_mod_action_syscon_cb(E_Object *obj, const char *params)
    // reboot
    // suspend
    // hibernate
-   if (obj)
-     {
-        if (obj->type == E_MANAGER_TYPE)
-          zone = e_util_zone_current_get((E_Manager *)obj);
-        else if (obj->type == E_COMP_TYPE)
-          zone = e_zone_current_get();
-        else if (obj->type == E_ZONE_TYPE)
-          zone = e_util_zone_current_get(((E_Zone *)obj)->comp->man);
-        else
-          zone = e_util_zone_current_get(e_manager_current_get());
-     }
-   if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
+   zone = e_zone_current_get();
    if (zone) e_syscon_show(zone, params);
 }
 

diff --git a/src/modules/syscon/e_syscon_gadget.c b/src/modules/syscon/e_syscon_gadget.c
index b809169..4027cc9 100644 (file)
--- a/src/modules/syscon/e_syscon_gadget.c
+++ b/src/modules/syscon/e_syscon_gadget.c
@@ -74,7 +74,7 @@ _cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
    e_menu_item_toggle_set(mi, syscon_config->menu);
    e_menu_item_callback_set(mi, _cb_menu_change, inst);
    m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
-   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
    e_menu_activate_mouse(m, zone, x, y, 1, 1,
                          E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
    evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,

diff --git a/src/modules/systray/e_mod_notifier_host.c b/src/modules/systray/e_mod_notifier_host.c
index 89a3d54..ba2edb6 100644 (file)
--- a/src/modules/systray/e_mod_notifier_host.c
+++ b/src/modules/systray/e_mod_notifier_host.c
@@ -184,7 +184,7 @@ _clicked_item_cb(void *data, Evas *evas, Evas_Object *obj __UNUSED__, void *even
    e_menu_post_deactivate_callback_set(m, _menu_post_deactivate, gadcon);
 
    zone = e_gadcon_zone_get(gadcon);
-   ecore_evas_pointer_xy_get(zone->comp->ee, &x, &y);
+   ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
    e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
    evas_event_feed_mouse_up(evas, ev->button,
                          EVAS_BUTTON_NONE, ev->timestamp, NULL);

diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c
index 2da59f4..dd39e97 100644 (file)
--- a/src/modules/tasks/e_mod_main.c
+++ b/src/modules/tasks/e_mod_main.c
@@ -365,7 +365,7 @@ _tasks_new(Evas_Object *parent, E_Zone *zone, const char *id)
    tasks->config = _tasks_config_item_get(id);
    tasks->o_items = elm_box_add(e_win_evas_object_win_get(parent));
    tasks->horizontal = 1;
-   EINA_LIST_FOREACH(zone->comp->clients, l, ec)
+   EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
         if (!e_client_util_ignored_get(ec))
           tasks->clients = eina_list_append(tasks->clients, ec);

diff --git a/src/modules/winlist/e_mod_main.c b/src/modules/winlist/e_mod_main.c
index f59286c..5ae1f9f 100644 (file)
--- a/src/modules/winlist/e_mod_main.c
+++ b/src/modules/winlist/e_mod_main.c
@@ -107,7 +107,7 @@ e_modapi_save(E_Module *m __UNUSED__)
 
 /* action callback */
 static void
-_e_mod_action_winlist_cb_helper(E_Object *obj, const char *params, int modifiers, E_Winlist_Activate_Type type)
+_e_mod_action_winlist_cb_helper(E_Object *obj EINA_UNUSED, const char *params, int modifiers, E_Winlist_Activate_Type type)
 {
    E_Zone *zone = NULL;
    E_Winlist_Filter filter = E_WINLIST_FILTER_NONE;
@@ -115,18 +115,7 @@ _e_mod_action_winlist_cb_helper(E_Object *obj, const char *params, int modifiers
    int udlr = -1; // 0 for up, 1 for down, 2 for left, 3 for right
    Eina_Bool ok = EINA_TRUE;
 
-   if (obj)
-     {
-        if (obj->type == E_MANAGER_TYPE)
-          zone = e_util_zone_current_get((E_Manager *)obj);
-        else if (obj->type == E_COMP_TYPE)
-          zone = e_util_zone_current_get(((E_Comp *)obj)->man);
-        else if (obj->type == E_ZONE_TYPE)
-          zone = e_util_zone_current_get(((E_Zone *)obj)->comp->man);
-        else
-          zone = e_util_zone_current_get(e_manager_current_get());
-     }
-   if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
+   zone = e_zone_current_get();
    if (!zone) return;
    if (params)
      {

diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index a6252d0..8e43c05 100644 (file)
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -106,7 +106,7 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
 #ifndef HAVE_WAYLAND_ONLY
    if (e_comp->comp_type == E_PIXMAP_TYPE_X)
      {
-        _input_window = ecore_x_window_input_new(zone->comp->man->root, 0, 0, 1, 1);
+        _input_window = ecore_x_window_input_new(e_comp->man->root, 0, 0, 1, 1);
         ecore_x_window_show(_input_window);
         if (!e_grabinput_get(_input_window, 0, _input_window))
           {
@@ -142,12 +142,12 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
    e_client_focus_track_freeze();
 
 #ifndef HAVE_WAYLAND_ONLY
-   evas_event_feed_mouse_in(zone->comp->evas, 0, NULL);
-   evas_event_feed_mouse_move(zone->comp->evas, -1000000, -1000000, 0, NULL);
+   evas_event_feed_mouse_in(e_comp->evas, 0, NULL);
+   evas_event_feed_mouse_move(e_comp->evas, -1000000, -1000000, 0, NULL);
 #endif
 
-   evas_event_freeze(zone->comp->evas);
-   o = edje_object_add(zone->comp->evas);
+   evas_event_freeze(e_comp->evas);
+   o = edje_object_add(e_comp->evas);
    _winlist = e_comp_object_util_add(o, E_COMP_OBJECT_TYPE_POPUP);
    evas_object_layer_set(_winlist, E_LAYER_CLIENT_POPUP);
    evas_object_move(_winlist, x, y);
@@ -193,7 +193,7 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
    if (!_wins)
      {
         e_winlist_hide();
-        evas_event_thaw(zone->comp->evas);
+        evas_event_thaw(e_comp->evas);
         return 1;
      }
 
@@ -201,7 +201,7 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
        e_config->winlist_list_show_other_screen_windows)
      _last_desk = e_desk_current_get(_winlist_zone);
    if (e_config->winlist_warp_while_selecting)
-     ecore_evas_pointer_xy_get(_winlist_zone->comp->ee,
+     ecore_evas_pointer_xy_get(e_comp->ee,
                             &_last_pointer_x, &_last_pointer_y);
 
    _e_winlist_activate_nth(1);
@@ -214,7 +214,7 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
         if (ww && (ww->client == _last_client))
           e_winlist_next();
      }
-   evas_event_thaw(zone->comp->evas);
+   evas_event_thaw(e_comp->evas);
    _e_winlist_size_adjust();
 
    E_LIST_HANDLER_APPEND(_handlers, E_EVENT_CLIENT_ADD, _e_winlist_cb_event_border_add, NULL);
@@ -1060,7 +1060,7 @@ _e_winlist_restore_desktop(void)
         e_config->winlist_list_show_other_screen_windows))
      e_desk_show(_last_desk);
    if (e_config->winlist_warp_while_selecting)
-     ecore_evas_pointer_warp(_winlist_zone->comp->ee,
+     ecore_evas_pointer_warp(e_comp->ee,
                           _last_pointer_x, _last_pointer_y);
    _e_winlist_deactivate();
    _win_selected = NULL;

diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 388abe6..4f1b8d2 100644 (file)
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -251,7 +251,7 @@ _e_wizard_next_eval(void)
 static Evas_Object *
 _e_wizard_main_new(E_Zone *zone)
 {
-   o_bg = edje_object_add(zone->comp->evas);
+   o_bg = edje_object_add(e_comp->evas);
 
    e_theme_edje_object_set(o_bg, "base/theme/wizard", "e/wizard/main");
    edje_object_part_text_set(o_bg, "e.text.title", _("Welcome to Enlightenment"));
@@ -273,7 +273,7 @@ _e_wizard_extra_new(E_Zone *zone)
 {
    Evas_Object *o;
 
-   o = edje_object_add(zone->comp->evas);
+   o = edje_object_add(e_comp->evas);
    e_theme_edje_object_set(o, "base/theme/wizard", "e/wizard/extra");
    evas_object_geometry_set(o, zone->x, zone->y, zone->w, zone->h);
    evas_object_layer_set(o, E_LAYER_POPUP);