From 09ec213a31dcf5c5123bcf37b16a2188210cc064 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 13 Mar 2015 17:47:36 -0400 Subject: [PATCH] remove e_util_zone_current_get() usage --- src/bin/e_actions.c | 16 ++++++++-------- src/bin/e_backlight.c | 2 +- src/bin/e_config_dialog.c | 2 +- src/bin/e_desklock.c | 2 +- src/bin/e_gadcon.c | 4 ++-- src/bin/e_int_client_menu.c | 2 +- src/bin/e_int_menus.c | 2 +- src/bin/e_shelf.c | 2 +- src/bin/e_test.c | 2 +- src/bin/e_toolbar.c | 2 +- src/bin/e_utils.c | 3 +-- src/bin/e_widget_bgpreview.c | 2 +- src/modules/backlight/e_mod_main.c | 2 +- src/modules/battery/e_mod_main.c | 2 +- src/modules/bluez4/e_mod_main.c | 2 +- src/modules/clock/e_mod_main.c | 2 +- src/modules/conf/e_conf.c | 2 +- src/modules/conf/e_mod_main.c | 6 +++--- src/modules/conf_randr/e_smart_monitor.c | 2 +- src/modules/connman/e_mod_main.c | 4 ++-- src/modules/cpufreq/e_mod_main.c | 4 ++-- src/modules/everything/evry_gadget.c | 4 ++-- src/modules/everything/evry_plug_apps.c | 2 +- src/modules/everything/evry_plug_windows.c | 4 ++-- src/modules/everything/evry_util.c | 2 +- src/modules/fileman/e_fwin.c | 4 ++-- src/modules/fileman/e_fwin_nav.c | 2 +- src/modules/fileman/e_mod_dbus.c | 4 ++-- src/modules/gadman/e_mod_gadman.c | 4 ++-- src/modules/ibar/e_mod_main.c | 10 +++++----- src/modules/ibox/e_mod_main.c | 4 ++-- src/modules/illume-indicator/e_mod_notify.c | 2 +- src/modules/illume-keyboard/e_kbd_int.c | 2 +- src/modules/illume-keyboard/e_mod_main.c | 2 +- src/modules/illume2/e_mod_select_window.c | 2 +- src/modules/lokker/lokker.c | 6 +++--- src/modules/mixer/conf_module.c | 2 +- src/modules/mixer/e_mod_main.c | 4 ++-- src/modules/msgbus/msgbus_desktop.c | 4 ++-- src/modules/music-control/ui.c | 2 +- src/modules/notification/e_mod_popup.c | 2 +- src/modules/packagekit/e_mod_main.c | 2 +- src/modules/pager/e_mod_main.c | 6 +++--- src/modules/pager_plain/e_mod_main.c | 6 +++--- src/modules/shot/e_mod_main.c | 6 +++--- src/modules/start/e_mod_main.c | 2 +- src/modules/syscon/e_syscon_gadget.c | 4 ++-- src/modules/systray/e_mod_main.c | 2 +- src/modules/tasks/e_mod_main.c | 2 +- src/modules/temperature/e_mod_main.c | 2 +- src/modules/tiling/e_mod_tiling.c | 2 +- src/modules/xkbswitch/e_mod_main.c | 5 ++--- 52 files changed, 86 insertions(+), 88 deletions(-) diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index d0f08047a..2da334fb7 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -1144,7 +1144,7 @@ window_jump_to(const char *params) if (strcmp(ec->icccm.name, params)) continue; /* Jump to the screen the window is on if it isn't on the current screen but * only if we don't have to warp the pointer anyway */ - current_zone = e_util_zone_current_get(e_manager_current_get()); + current_zone = e_zone_current_get(); /* Change the virtual desktop if the window isn't on the current virtual desktop */ e_desk_show(ec->desk); @@ -1352,7 +1352,7 @@ _e_actions_zone_get(E_Object *obj) if (obj) { if (obj->type == (int)E_MANAGER_TYPE) - return e_util_zone_current_get((E_Manager *)obj); + return e_zone_current_get(); else if (obj->type == (int)E_COMP_TYPE) return e_zone_current_get(); else if (obj->type == (int)E_ZONE_TYPE) @@ -1364,7 +1364,7 @@ _e_actions_zone_get(E_Object *obj) else if (e_obj_is_win(obj)) return e_win_client_get((void*)obj)->zone; } - return e_util_zone_current_get(e_manager_current_get()); + return e_zone_current_get(); } ACT_FN_GO(desk_flip_by, ) @@ -1642,7 +1642,7 @@ ACT_FN_GO(screen_send_to, ) int scr; zone = _e_actions_zone_get(obj); - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + if (!zone) zone = e_zone_current_get(); if (!zone) return; if (!params) return; @@ -1679,7 +1679,7 @@ ACT_FN_GO(screen_send_by, ) int scr = 0; zone = _e_actions_zone_get(obj); - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + if (!zone) zone = e_zone_current_get(); if (!zone) return; if (!params) return; @@ -2008,7 +2008,7 @@ ACT_FN_GO(app_new_instance, __UNUSED__) zone = _e_actions_zone_get(obj); if (!zone) - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if (!obj) obj = E_OBJECT(e_client_focused_get()); if ((!obj) || (!zone)) return; @@ -2029,7 +2029,7 @@ ACT_FN_GO(desk_deskshow_toggle, __UNUSED__) E_Zone *zone; zone = _e_actions_zone_get(obj); - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + if (!zone) zone = e_zone_current_get(); if (zone) e_desk_deskshow(zone); } @@ -2038,7 +2038,7 @@ ACT_FN_GO(cleanup_windows, __UNUSED__) E_Zone *zone; zone = _e_actions_zone_get(obj); - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + if (!zone) zone = e_zone_current_get(); if (zone) e_place_zone_region_smart_cleanup(zone); } diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c index 114abb087..c9e308aef 100644 --- a/src/bin/e_backlight.c +++ b/src/bin/e_backlight.c @@ -117,7 +117,7 @@ e_backlight_level_set(E_Zone *zone, double val, double tim) else if (val > 1.0) val = 1.0; if ((fabs(val - e_bl_val) < DBL_EPSILON) && (!bl_anim)) return; - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + if (!zone) zone = e_zone_current_get(); ecore_event_add(E_EVENT_BACKLIGHT_CHANGE, NULL, NULL, NULL); bl_now = e_bl_val; diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c index 9eb8d4a01..b75f13943 100644 --- a/src/bin/e_config_dialog.c +++ b/src/bin/e_config_dialog.c @@ -106,7 +106,7 @@ e_config_dialog_find(const char *name, const char *class) E_Zone *z; E_Client *ec; - z = e_util_zone_current_get(e_manager_current_get()); + z = e_zone_current_get(); ec = e_win_client_get(cfd->dia->win); e_client_uniconify(ec); elm_win_raise(cfd->dia->win); diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index 43011c085..42c8e6a21 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -249,7 +249,7 @@ e_desklock_show(Eina_Bool suspend) { E_Zone *zone; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if (zone) e_configure_registry_call("screen/screen_lock", NULL, NULL); return 0; diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 8b3efe6d7..07a71a92c 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -2457,7 +2457,7 @@ _e_gadcon_cb_client_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *o E_Menu_Item *mi; int cx, cy; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); e_gadcon_locked_set(gcc->gadcon, 1); mn = e_menu_new(); @@ -3175,7 +3175,7 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch); zone = gcc->gadcon->zone; - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + if (!zone) zone = e_zone_current_get(); e_menu_activate_mouse(m, zone, cx + ev->output.x, cy + ev->output.y, 1, 1, diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c index 2a425b138..ab6279c64 100644 --- a/src/bin/e_int_client_menu.c +++ b/src/bin/e_int_client_menu.c @@ -1615,7 +1615,7 @@ _e_client_menu_cb_kbdshrtct_add(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m E_Zone *zone; if (!(ec = data)) return; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if (!zone) return; e_configure_registry_call("keyboard_and_mouse/key_bindings", NULL, ec->desktop->exec); diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index d20ad84b0..7d0b349ba 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -1835,7 +1835,7 @@ _e_int_menus_shelves_add_cb(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_ { E_Zone *zone; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); e_shelf_new_dialog(zone); } diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index 4496a0eb7..47c30a494 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -1653,7 +1653,7 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNU e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, NULL, NULL); e_menu_activate_mouse(mn, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp); diff --git a/src/bin/e_test.c b/src/bin/e_test.c index f754c3c89..bccea7a8e 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -10,7 +10,7 @@ deskmirror_test(void *d EINA_UNUSED) E_Zone *zone; Evas_Object *o; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); o = e_deskmirror_add(e_desk_current_get(zone), 0, 0); evas_object_move(o, zone->x + zone->w - (zone->w / 4), zone->y + zone->h / 2); evas_object_resize(o, zone->w / 4, zone->h / 4); diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c index a26768465..56880fb47 100644 --- a/src/bin/e_toolbar.c +++ b/src/bin/e_toolbar.c @@ -313,7 +313,7 @@ _e_toolbar_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U e_menu_post_deactivate_callback_set(mn, _e_toolbar_menu_cb_post, tbar); tbar->menu = mn; _e_toolbar_menu_append(tbar, mn); - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); 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_utils.c b/src/bin/e_utils.c index 71c4dd021..1db385d80 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -985,8 +985,7 @@ e_util_module_config_check(const char *module_name, int loaded, int current) EAPI Eina_Bool e_util_fullscreen_current_any(void) { - E_Manager *man = e_manager_current_get(); - E_Zone *zone = e_util_zone_current_get(man); + E_Zone *zone = e_zone_current_get(); E_Desk *desk; if ((zone) && (zone->fullscreen > 0)) return EINA_TRUE; diff --git a/src/bin/e_widget_bgpreview.c b/src/bin/e_widget_bgpreview.c index 95fa9308f..d935bcd13 100644 --- a/src/bin/e_widget_bgpreview.c +++ b/src/bin/e_widget_bgpreview.c @@ -191,7 +191,7 @@ _e_wid_reconfigure(E_Widget_Data *wd) E_Widget_Desk_Data *dd; double zone_ratio, desk_ratio; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); evas_object_geometry_get(wd->table, NULL, NULL, &tw, &th); if ((tw == 0) || (th == 0)) diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c index 273b76015..ec6b1678b 100644 --- a/src/modules/backlight/e_mod_main.c +++ b/src/modules/backlight/e_mod_main.c @@ -252,7 +252,7 @@ _backlight_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __U E_Menu_Item *mi; int x, y; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); m = e_menu_new(); diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index 34dad74f8..acddc97f3 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -201,7 +201,7 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, NULL, NULL); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, diff --git a/src/modules/bluez4/e_mod_main.c b/src/modules/bluez4/e_mod_main.c index 2a47e3cb6..3351e6be1 100644 --- a/src/modules/bluez4/e_mod_main.c +++ b/src/modules/bluez4/e_mod_main.c @@ -467,7 +467,7 @@ _ebluez4_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL); e_menu_activate_mouse(inst->menu, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), x + ev->output.x, y + ev->output.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/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index e4f43a4ea..4ebdbd20e 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -577,7 +577,7 @@ _clock_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE E_Menu_Item *mi; int x, y; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); m = e_menu_new(); diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c index 86446fce2..3d8ede508 100644 --- a/src/modules/conf/e_conf.c +++ b/src/modules/conf/e_conf.c @@ -78,7 +78,7 @@ e_configure_show(E_Comp *comp, const char *params) eco = _e_configure; ec = e_win_client_get(eco->win); - z = e_util_zone_current_get(e_manager_current_get()); + z = e_zone_current_get(); z2 = ec->zone; evas_object_show(eco->win); elm_win_raise(eco->win); diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c index d72a6122d..95443abb1 100644 --- a/src/modules/conf/e_mod_main.c +++ b/src/modules/conf/e_mod_main.c @@ -371,15 +371,15 @@ _e_mod_action_conf_cb(E_Object *obj, const char *params) if (obj) { if (obj->type == E_MANAGER_TYPE) - zone = e_util_zone_current_get((E_Manager *)obj); + zone = e_zone_current_get(); else if (obj->type == E_COMP_TYPE) zone = e_zone_current_get(); else if (obj->type == E_ZONE_TYPE) zone = ((E_Zone *)obj); else - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); } - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + if (!zone) zone = e_zone_current_get(); if ((zone) && (params)) e_configure_registry_call(params, NULL, params); else if (zone) diff --git a/src/modules/conf_randr/e_smart_monitor.c b/src/modules/conf_randr/e_smart_monitor.c index d7719e603..ce581e9b7 100644 --- a/src/modules/conf_randr/e_smart_monitor.c +++ b/src/modules/conf_randr/e_smart_monitor.c @@ -335,7 +335,7 @@ e_smart_monitor_background_set(Evas_Object *obj, Evas_Coord dx, Evas_Coord dy) /* get the zone number */ if (!(zone = e_comp_zone_xy_get(dx, dy))) - zone = e_util_zone_current_get(man); + zone = e_zone_current_get(); sd->zone_num = zone->num; /* get the desk */ diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c index 31bf1d13b..09c6e6d4d 100644 --- a/src/modules/connman/e_mod_main.c +++ b/src/modules/connman/e_mod_main.c @@ -196,7 +196,7 @@ _econnman_app_launch(E_Connman_Instance *inst) zone = e_gadcon_client_zone_get(inst->gcc); if (!zone) - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); e_exec(zone, desktop, NULL, NULL, "econnman/app"); efreet_desktop_free(desktop); @@ -434,7 +434,7 @@ _econnman_menu_new(E_Connman_Instance *inst, Evas_Event_Mouse_Down *ev) m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0); e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), x + ev->output.x, y + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); } diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index ea09eeaf8..b7453974d 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -425,7 +425,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ e_gadcon_locked_set(inst->gcc->gadcon, 1); e_menu_activate_mouse(mg, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp); evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, @@ -450,7 +450,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ &cx, &cy, NULL, NULL); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.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/everything/evry_gadget.c b/src/modules/everything/evry_gadget.c index 8827e0f71..62bd56c36 100644 --- a/src/modules/everything/evry_gadget.c +++ b/src/modules/everything/evry_gadget.c @@ -466,7 +466,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ } } - win = evry_show(e_util_zone_current_get(e_manager_current_get()), + win = evry_show(e_zone_current_get(), 0, inst->cfg->plugin, !inst->illume_mode); if (!win) return; @@ -503,7 +503,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, NULL, NULL); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c index 4b965bd1a..282bc4540 100644 --- a/src/modules/everything/evry_plug_apps.c +++ b/src/modules/everything/evry_plug_apps.c @@ -1066,7 +1066,7 @@ _run_executable(Evry_Action *act) { GET_FILE(file, act->it1.item); - e_exec(e_util_zone_current_get(e_manager_current_get()), NULL, file->path, NULL, NULL); + e_exec(e_zone_current_get(), NULL, file->path, NULL, NULL); return 1; } diff --git a/src/modules/everything/evry_plug_windows.c b/src/modules/everything/evry_plug_windows.c index 344be967d..26e70a3cd 100644 --- a/src/modules/everything/evry_plug_windows.c +++ b/src/modules/everything/evry_plug_windows.c @@ -287,7 +287,7 @@ _check_border(Evry_Action *act, const Evry_Item *it) int action = EVRY_ITEM_DATA_INT_GET(act); E_Client *ec = bi->client; - E_Zone *zone = e_util_zone_current_get(e_manager_current_get()); + E_Zone *zone = e_zone_current_get(); if (!ec) { @@ -333,7 +333,7 @@ _act_border(Evry_Action *act) int action = EVRY_ITEM_DATA_INT_GET(act); E_Client *ec = bi->client; - E_Zone *zone = e_util_zone_current_get(e_manager_current_get()); + E_Zone *zone = e_zone_current_get(); int focus = 0; if (!ec) diff --git a/src/modules/everything/evry_util.c b/src/modules/everything/evry_util.c index 07d072d87..a6a189193 100644 --- a/src/modules/everything/evry_util.c +++ b/src/modules/everything/evry_util.c @@ -568,7 +568,7 @@ evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file) GET_APP(app, it_app); GET_FILE(file, it_file); - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if (app->desktop) { diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index d227ff5d2..2231b5030 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -718,7 +718,7 @@ _e_fwin_new(const char *dev, evas_object_size_hint_min_set(fwin->win, MINIMUM_WIDTH, MINIMUM_HEIGHT); - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if ((zone) && (zone->w < DEFAULT_WIDTH)) { int w, h; @@ -2030,7 +2030,7 @@ _e_fwin_cb_dir_handler(void *data __UNUSED__, Evas_Object *obj, const char *path if (rp && (rp != path) && (evas_object_data_del(obj, "fileman_terminal_realpath"))) //icon menu; use rp path = rp; if (chdir(path) < 0) perror("chdir"); - e_exec(e_util_zone_current_get(e_manager_current_get()), tdesktop, NULL, NULL, "fileman"); + e_exec(e_zone_current_get(), tdesktop, NULL, NULL, "fileman"); if (chdir(buf) < 0) perror("chdir"); /* FIXME: if info != null then check mime type and offer options based * on that diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c index 62f38d82d..c1c59dece 100644 --- a/src/modules/fileman/e_fwin_nav.c +++ b/src/modules/fileman/e_fwin_nav.c @@ -521,7 +521,7 @@ _cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void inst = data; ev = event_info; if ((ev->button != 3) || (inst->gcc->menu)) return; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); m = e_menu_new(); m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0); diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c index 0af997fdc..6e28d6ea6 100644 --- a/src/modules/fileman/e_mod_dbus.c +++ b/src/modules/fileman/e_mod_dbus.c @@ -73,7 +73,7 @@ _e_fileman_dbus_daemon_open_directory_cb(const Eldbus_Service_Interface *iface _ if ((!directory) || (directory[0] == '\0')) return _e_fileman_dbus_daemon_error(msg, "no directory provided."); - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if (!zone) return _e_fileman_dbus_daemon_error(msg, "could not find a zone."); @@ -168,7 +168,7 @@ _e_fileman_dbus_daemon_open_file_cb(const Eldbus_Service_Interface *iface __UNUS if ((!param_file) || (param_file[0] == '\0')) return _e_fileman_dbus_daemon_error(msg, "no file provided."); - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if (!zone) return _e_fileman_dbus_daemon_error(msg, "could not find a zone."); diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index 451ad210f..c070b263e 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -353,7 +353,7 @@ _gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer, E_C E_Gadcon *gc; int w, h; - gc = gadman_gadcon_get(e_util_zone_current_get(e_manager_current_get()), + gc = gadman_gadcon_get(e_zone_current_get(), layer); /* Create Config_Gadcon_Client */ @@ -1261,7 +1261,7 @@ on_frame_click(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void gcc->menu = m; e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(gcc->gadcon->evas, ev->button, diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index bf63ee85e..848d0c9c5 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -494,7 +494,7 @@ _ibar_cb_empty_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU e_gadcon_canvas_zone_geometry_get(b->inst->gcc->gadcon, &cx, &cy, &cw, &ch); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(b->inst->gcc->gadcon->evas, ev->button, @@ -1615,7 +1615,7 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS e_gadcon_canvas_zone_geometry_get(ic->ibar->inst->gcc->gadcon, &cx, &cy, NULL, NULL); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); } @@ -2133,9 +2133,9 @@ static Ecore_Event_Handler *_ibar_key_down_handler = NULL; static void _ibar_go_unfocus(void); static IBar * -_ibar_manager_find(E_Manager *man) +_ibar_manager_find(void) { - E_Zone *z = e_util_zone_current_get(man); + E_Zone *z = e_zone_current_get(); IBar *b; Eina_List *l; @@ -2534,7 +2534,7 @@ _ibar_go_focus(void) _ibar_key_down_handler = ecore_event_handler_add (ECORE_EVENT_KEY_DOWN, _ibar_focus_cb_key_down, NULL); if (!_ibar_key_down_handler) goto err; - b = _ibar_manager_find(man); + b = _ibar_manager_find(); if (!b) goto err; _ibar_focus(b); return; diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index 2f78be039..56e356d93 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -362,7 +362,7 @@ _ibox_cb_empty_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU e_gadcon_canvas_zone_geometry_get(b->inst->gcc->gadcon, &cx, &cy, NULL, NULL); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(b->inst->gcc->gadcon->evas, ev->button, @@ -734,7 +734,7 @@ _ibox_cb_icon_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS e_gadcon_canvas_zone_geometry_get(ic->ibox->inst->gcc->gadcon, &cx, &cy, NULL, NULL); e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); } diff --git a/src/modules/illume-indicator/e_mod_notify.c b/src/modules/illume-indicator/e_mod_notify.c index 92f1bee77..997695165 100644 --- a/src/modules/illume-indicator/e_mod_notify.c +++ b/src/modules/illume-indicator/e_mod_notify.c @@ -177,7 +177,7 @@ _e_mod_notify_new(E_Notification_Notify *n, unsigned id) nwin->notify = n; nwin->id = id; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); nwin->zone = zone; nwin->win = e_win_new(e_comp); diff --git a/src/modules/illume-keyboard/e_kbd_int.c b/src/modules/illume-keyboard/e_kbd_int.c index 866e1222d..91466c6db 100644 --- a/src/modules/illume-keyboard/e_kbd_int.c +++ b/src/modules/illume-keyboard/e_kbd_int.c @@ -1724,7 +1724,7 @@ e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts) if (themedir) ki->themedir = eina_stringshare_add(themedir); 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()); + zone = e_zone_current_get(); ki->win = e_win_new(e_comp); states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR; states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER; diff --git a/src/modules/illume-keyboard/e_mod_main.c b/src/modules/illume-keyboard/e_mod_main.c index db7dfc2e2..221b22301 100644 --- a/src/modules/illume-keyboard/e_mod_main.c +++ b/src/modules/illume-keyboard/e_mod_main.c @@ -101,7 +101,7 @@ _il_kbd_start(void) { E_Zone *zone; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); inst = e_exec(zone, desktop, NULL, NULL, "illume-keyboard"); if (inst) { diff --git a/src/modules/illume2/e_mod_select_window.c b/src/modules/illume2/e_mod_select_window.c index 776baa8b9..fb8398fe3 100644 --- a/src/modules/illume2/e_mod_select_window.c +++ b/src/modules/illume2/e_mod_select_window.c @@ -60,7 +60,7 @@ _e_mod_illume_config_select_window_create(E_Config_Dialog *cfd __UNUSED__, Evas E_Zone *zone; int i, sel = -1; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); list = e_widget_list_add(evas, 0, 0); ow = e_widget_ilist_add(evas, 24, 24, NULL); e_widget_ilist_selector_set(ow, 1); diff --git a/src/modules/lokker/lokker.c b/src/modules/lokker/lokker.c index 9b60e9c72..8cc8289d2 100644 --- a/src/modules/lokker/lokker.c +++ b/src/modules/lokker/lokker.c @@ -293,7 +293,7 @@ _text_login_box_add(Lokker_Popup *lp) Evas *evas; zone = lp->zone; - last_active_zone = current_zone = e_util_zone_current_get(e_manager_current_get()); + last_active_zone = current_zone = e_zone_current_get(); total_zone_num = eina_list_count(e_comp->zones); if (total_zone_num > 1) { @@ -401,7 +401,7 @@ _lokker_popup_add(E_Zone *zone) evas_object_layer_set(lp->comp_object, E_LAYER_DESKLOCK); evas_object_clip_set(lp->comp_object, lp->zone->bg_clip_object); - last_active_zone = current_zone = e_util_zone_current_get(e_manager_current_get()); + last_active_zone = current_zone = e_zone_current_get(); total_zone_num = eina_list_count(e_comp->zones); if (total_zone_num > 1) { @@ -481,7 +481,7 @@ _lokker_cb_mouse_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *event E_Zone *current_zone; Eina_List *l; - current_zone = e_util_zone_current_get(e_manager_current_get()); + current_zone = e_zone_current_get(); if (current_zone == last_active_zone) return ECORE_CALLBACK_PASS_ON; diff --git a/src/modules/mixer/conf_module.c b/src/modules/mixer/conf_module.c index 0cbcbc5ae..1385ae5bc 100644 --- a/src/modules/mixer/conf_module.c +++ b/src/modules/mixer/conf_module.c @@ -164,7 +164,7 @@ cb_mixer_call(void *data, void *data2 __UNUSED__) if (ctxt->conf->external_mixer_enabled) { - E_Zone *zone = e_util_zone_current_get(e_manager_current_get()); + E_Zone *zone = e_zone_current_get(); e_exec (zone, NULL, ctxt->conf->external_mixer_command, NULL, NULL); return; } diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index 9c497a2f4..26399453c 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -513,7 +513,7 @@ _mixer_popup_cb_mixer(void *data, void *data2 __UNUSED__) if (ctxt->conf->external_mixer_enabled) { - E_Zone *zone = e_util_zone_current_get(e_manager_current_get()); + E_Zone *zone = e_zone_current_get(); e_exec (zone, NULL, ctxt->conf->external_mixer_command, NULL, NULL); return; } @@ -664,7 +664,7 @@ _mixer_menu_new(E_Mixer_Instance *inst, Evas_Event_Mouse_Down *ev) E_Menu_Item *mi; int x, y; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); m = e_menu_new(); diff --git a/src/modules/msgbus/msgbus_desktop.c b/src/modules/msgbus/msgbus_desktop.c index dac684cbc..0b35c76dd 100644 --- a/src/modules/msgbus/msgbus_desktop.c +++ b/src/modules/msgbus/msgbus_desktop.c @@ -37,7 +37,7 @@ cb_desktop_show(const Eldbus_Service_Interface *iface __UNUSED__, return reply; } - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); DBG("show desktop %d,%d from zone %p.", x, y, zone); e_zone_desk_flip_to(zone, x, y); @@ -59,7 +59,7 @@ cb_desktop_show_by_name(const Eldbus_Service_Interface *iface __UNUSED__, return reply; } - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); DBG("show desktop %s from zone %p.", name, zone); count = zone->desk_x_count * zone->desk_y_count; for (i = 0; i < count; i++) diff --git a/src/modules/music-control/ui.c b/src/modules/music-control/ui.c index 522195143..3fe05c9bf 100644 --- a/src/modules/music-control/ui.c +++ b/src/modules/music-control/ui.c @@ -266,7 +266,7 @@ music_control_mouse_down_cb(void *data, Evas *evas __UNUSED__, Evas_Object *obj { E_Menu *m; E_Menu_Item *mi; - E_Zone *zone = e_util_zone_current_get(e_manager_current_get()); + E_Zone *zone = e_zone_current_get(); int x, y; if (inst->popup) diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c index 6a66007cb..da24f73ff 100644 --- a/src/modules/notification/e_mod_popup.c +++ b/src/modules/notification/e_mod_popup.c @@ -304,7 +304,7 @@ _notification_popup_new(E_Notification_Notify *n, unsigned id) break; case POPUP_DISPLAY_POLICY_CURRENT: case POPUP_DISPLAY_POLICY_ALL: - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); break; case POPUP_DISPLAY_POLICY_MULTI: if ((notification_cfg->corner == CORNER_BR) || diff --git a/src/modules/packagekit/e_mod_main.c b/src/modules/packagekit/e_mod_main.c index a3cf5b2a5..db890d720 100644 --- a/src/modules/packagekit/e_mod_main.c +++ b/src/modules/packagekit/e_mod_main.c @@ -37,7 +37,7 @@ _mouse_down_cb(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, { E_Menu *m; E_Menu_Item *mi; - E_Zone *zone = e_util_zone_current_get(e_manager_current_get()); + E_Zone *zone = e_zone_current_get(); int x, y; if (inst->popup) diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index 4ab12cabd..000ddb594 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -866,7 +866,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, NULL, NULL); - e_menu_activate_mouse(m, e_util_zone_current_get(e_manager_current_get()), + e_menu_activate_mouse(m, e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, @@ -1588,7 +1588,7 @@ _pager_desk_cb_drag_finished(E_Drag *drag, int dropped) { /* wasn't dropped on pager, switch with current desktop */ if (!pd->desk) return; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); desk = e_desk_current_get(zone); EINA_LIST_FOREACH(pagers, l, p) { @@ -1668,7 +1668,7 @@ _pager_popup_show(void) if ((act_popup) || (input_window)) return 0; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); pp = _pager_popup_find(zone); if (pp) _pager_popup_free(pp); diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c index 4af3f5b44..dea0423f4 100644 --- a/src/modules/pager_plain/e_mod_main.c +++ b/src/modules/pager_plain/e_mod_main.c @@ -881,7 +881,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, NULL, NULL); - e_menu_activate_mouse(m, e_util_zone_current_get(e_manager_current_get()), + e_menu_activate_mouse(m, e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, @@ -2362,7 +2362,7 @@ _pager_desk_cb_drag_finished(E_Drag *drag, int dropped) { /* wasn't dropped on pager, switch with current desktop */ if (!pd->desk) return; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); desk = e_desk_current_get(zone); EINA_LIST_FOREACH(pagers, l, p) { @@ -2442,7 +2442,7 @@ _pager_popup_show(void) if ((act_popup) || (input_window)) return 0; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); pp = _pager_popup_find(zone); if (pp) _pager_popup_free(pp); diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index 3e0ec15b9..a9db16821 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -938,15 +938,15 @@ _e_mod_action_cb(E_Object *obj, const char *params) if (obj) { if (obj->type == E_MANAGER_TYPE) - zone = e_util_zone_current_get((E_Manager *)obj); + zone = e_zone_current_get(); else if (obj->type == E_COMP_TYPE) zone = e_zone_current_get(); else if (obj->type == E_ZONE_TYPE) zone = ((E_Zone *)obj); else - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); } - if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); + if (!zone) zone = e_zone_current_get(); if (!zone) return; E_FREE_FUNC(timer, ecore_timer_del); _shot_now(zone, NULL, params); diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c index 84aba840e..07b2bddec 100644 --- a/src/modules/start/e_mod_main.c +++ b/src/modules/start/e_mod_main.c @@ -288,7 +288,7 @@ _button_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_ e_gadcon_locked_set(inst->gcc->gadcon, 1); e_menu_activate_mouse(inst->main_menu, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), x, y, w, h, dir, ev->timestamp); edje_object_signal_emit(inst->o_button, "e,state,focused", "e"); } diff --git a/src/modules/syscon/e_syscon_gadget.c b/src/modules/syscon/e_syscon_gadget.c index 4027cc956..605e95fae 100644 --- a/src/modules/syscon/e_syscon_gadget.c +++ b/src/modules/syscon/e_syscon_gadget.c @@ -65,7 +65,7 @@ _cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void inst = data; ev = event_info; if (ev->button != 3) return; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); m = e_menu_new(); mi = e_menu_item_new(m); @@ -171,7 +171,7 @@ _cb_shutdown_show(void *data, Evas_Object *obj __UNUSED__, const char *emission Evas_Coord x, y, w, h, cx, cy; if (!(inst = data)) return; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); if (!syscon_config->menu) { e_syscon_show(zone, NULL); diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c index 555701e03..4cd3b6a24 100644 --- a/src/modules/systray/e_mod_main.c +++ b/src/modules/systray/e_mod_main.c @@ -98,7 +98,7 @@ _systray_menu_new(Instance *inst, Evas_Event_Mouse_Down *ev) //E_Menu_Item *mi; int x, y; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); m = e_menu_new(); //mi = e_menu_item_new(m); diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c index dd39e97c0..2c2d76b7f 100644 --- a/src/modules/tasks/e_mod_main.c +++ b/src/modules/tasks/e_mod_main.c @@ -757,7 +757,7 @@ _tasks_cb_item_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU e_gadcon_client_menu_set(item->tasks->gcc, item->client->border_menu); e_menu_activate_mouse(item->client->border_menu, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), cx + ev->output.x, cy + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); evas_event_feed_mouse_up(item->tasks->gcc->gadcon->evas, ev->button, diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 183bf9bb0..023df652f 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -234,7 +234,7 @@ _temperature_face_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0); e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, NULL, NULL); - e_menu_activate_mouse(m, e_util_zone_current_get(e_manager_current_get()), + e_menu_activate_mouse(m, e_zone_current_get(), cx + ev->output.x, cy + ev->output.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/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c index 2fe3dbd58..a4b16d9da 100644 --- a/src/modules/tiling/e_mod_tiling.c +++ b/src/modules/tiling/e_mod_tiling.c @@ -1685,7 +1685,7 @@ _gadget_mouse_down_cb(void *data, Evas *e, Evas_Object *obj EINA_UNUSED, void *e E_Menu_Item *mi; int x, y; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); m = e_menu_new(); mi = e_menu_item_new(m); diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c index c60e41e07..c9ef4ec48 100644 --- a/src/modules/xkbswitch/e_mod_main.c +++ b/src/modules/xkbswitch/e_mod_main.c @@ -331,7 +331,7 @@ _e_xkb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE NULL, NULL); /* Activate - we show the menu relative to the gadget */ e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), + e_zone_current_get(), (x + ev->output.x), (y + ev->output.y), 1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp); evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, @@ -458,8 +458,7 @@ _e_xkb_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSE * the start menu - thus the need for direction etc. */ e_menu_activate_mouse(inst->lmenu, - e_util_zone_current_get - (e_manager_current_get()), + e_zone_current_get(), x, y, w, h, dir, ev->timestamp); } else if (ev->button == 2) /* Middle click */