forked from enlightenment/enlightenment
de-e_comp_get()ify e
mrw I remember how to regex http://i.giphy.com/dC9dujPVeAfIY.gif
This commit is contained in:
parent
d42586869e
commit
ed897a231e
|
@ -84,8 +84,8 @@ item_menu_open(E_DBusMenu_Item *item, E_Gadcon *gadcon)
|
|||
e_gadcon_locked_set(gadcon, 1);
|
||||
e_menu_post_deactivate_callback_set(m, menu_post_deactivate, gadcon);
|
||||
|
||||
ecore_evas_pointer_xy_get(e_comp_get(gadcon)->ee, &x, &y);
|
||||
zone = e_comp_zone_xy_get(e_comp_get(gadcon), x, y);
|
||||
ecore_evas_pointer_xy_get(e_comp->ee, &x, &y);
|
||||
zone = e_comp_zone_xy_get(e_comp, x, y);
|
||||
e_menu_activate_mouse(m, zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN, 0);
|
||||
}
|
||||
|
||||
|
|
|
@ -196,7 +196,7 @@ _backlight_popup_new(Instance *inst)
|
|||
_backlight_gadget_update(inst);
|
||||
|
||||
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
|
||||
evas = e_comp_get(inst->popup)->evas;
|
||||
evas = e_comp->evas;
|
||||
|
||||
inst->o_table = e_widget_table_add(e_win_evas_win_get(evas), 0);
|
||||
|
||||
|
|
|
@ -463,7 +463,7 @@ _battery_warning_popup(Instance *inst, int t, double percent)
|
|||
inst->warning = e_gadcon_popup_new(inst->gcc, 0);
|
||||
if (!inst->warning) return;
|
||||
|
||||
e = e_comp_get(inst->warning)->evas;
|
||||
e = e_comp->evas;
|
||||
|
||||
popup_bg = edje_object_add(e);
|
||||
inst->popup_battery = edje_object_add(e);
|
||||
|
|
|
@ -314,7 +314,7 @@ _clock_popup_new(Instance *inst)
|
|||
_time_eval(inst);
|
||||
|
||||
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
|
||||
evas = e_comp_get(inst->popup)->evas;
|
||||
evas = e_comp->evas;
|
||||
|
||||
inst->o_table = elm_table_add(inst->popup->comp_object);
|
||||
|
||||
|
|
|
@ -166,7 +166,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|||
Evas_Object *o, *of, *ol, *ob;
|
||||
E_Zone *zone;
|
||||
|
||||
zone = e_zone_current_get(e_comp_get(NULL));
|
||||
zone = e_zone_current_get(e_comp);
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ _create_data(E_Config_Dialog *cfd)
|
|||
cfdata->comp = NULL;
|
||||
cfdata->client = NULL;
|
||||
if (!cfd->data)
|
||||
cfdata->comp = e_comp_get(NULL);
|
||||
cfdata->comp = e_comp;
|
||||
else
|
||||
cfdata->client = cfd->data;
|
||||
|
||||
|
|
|
@ -665,7 +665,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
|
|||
E_Radio_Group *rg;
|
||||
char path[PATH_MAX];
|
||||
|
||||
z = e_zone_current_get(e_comp_get(NULL));
|
||||
z = e_zone_current_get(e_comp);
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
|
||||
ot = e_widget_table_add(e_win_evas_win_get(evas), 0);
|
||||
|
|
|
@ -166,7 +166,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
|
|||
Eina_List *l;
|
||||
char *t;
|
||||
|
||||
zone = e_zone_current_get(e_comp_get(NULL));
|
||||
zone = e_zone_current_get(e_comp);
|
||||
|
||||
o = e_widget_table_add(e_win_evas_win_get(evas), 0);
|
||||
|
||||
|
|
|
@ -412,7 +412,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
|
|||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
|
||||
zone = e_zone_current_get(e_comp_get(NULL));
|
||||
zone = e_zone_current_get(e_comp);
|
||||
o = e_widget_list_add(evas, 0, 1);
|
||||
|
||||
rg = e_widget_radio_group_new(&(cfdata->fmdir));
|
||||
|
@ -566,7 +566,7 @@ _adv_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *
|
|||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
|
||||
zone = e_zone_current_get(e_comp_get(NULL));
|
||||
zone = e_zone_current_get(e_comp);
|
||||
o = e_widget_list_add(evas, 0, 1);
|
||||
|
||||
rg = e_widget_radio_group_new(&(cfdata->fmdir));
|
||||
|
@ -655,7 +655,7 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
E_Zone *z;
|
||||
E_Desk *d;
|
||||
|
||||
if (!(z = e_zone_current_get(e_comp_get(NULL)))) return 0;
|
||||
if (!(z = e_zone_current_get(e_comp))) return 0;
|
||||
if (!(d = e_desk_current_get(z))) return 0;
|
||||
if (cfdata->use_theme_bg)
|
||||
{
|
||||
|
|
|
@ -272,7 +272,7 @@ _econnman_popup_new(E_Connman_Instance *inst)
|
|||
return;
|
||||
|
||||
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
|
||||
evas = e_comp_get(inst->gcc)->evas;
|
||||
evas = e_comp->evas;
|
||||
|
||||
list = e_widget_list_add(evas, 0, 0);
|
||||
inst->ui.popup.list = e_widget_ilist_add(evas, 24, 24, NULL);
|
||||
|
|
|
@ -104,7 +104,7 @@ _handler_call(E_Edges_Event event, int d, double v)
|
|||
static Evas_Object *
|
||||
_input_obj(Edgeset *es, int x, int y, int w, int h)
|
||||
{
|
||||
E_Comp *c = e_comp_get(es->zone);
|
||||
E_Comp *c = e_comp;
|
||||
Evas_Object *o = evas_object_rectangle_add(c->evas);
|
||||
evas_object_color_set(o, 0, 0, 0, 0);
|
||||
evas_object_move(o, x, y);
|
||||
|
|
|
@ -171,7 +171,7 @@ _e_mod_action_fileman_cb(E_Object *obj,
|
|||
else if (obj->type == E_ZONE_TYPE)
|
||||
zone = e_zone_current_get(((E_Zone *)obj)->comp);
|
||||
else
|
||||
zone = e_zone_current_get(e_comp_get(NULL));
|
||||
zone = e_zone_current_get(e_comp);
|
||||
}
|
||||
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
|
||||
if (zone)
|
||||
|
|
|
@ -1034,7 +1034,7 @@ _ibar_cb_menu_icon_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
|
|||
IBar_Icon *ic;
|
||||
|
||||
ic = data;
|
||||
e_desktop_edit(e_comp_get(ic->ibar->inst->gcc), ic->app);
|
||||
e_desktop_edit(e_comp, ic->app);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1277,7 +1277,7 @@ _ibar_icon_menu_client_add(IBar_Icon *ic, E_Client *ec)
|
|||
|
||||
if (ec->netwm.state.skip_taskbar) return EINA_FALSE;
|
||||
o = ic->menu->o_bg;
|
||||
it = edje_object_add(e_comp_get(ec)->evas);
|
||||
it = edje_object_add(e_comp->evas);
|
||||
e_comp_object_util_del_list_append(ic->menu->comp_object, it);
|
||||
e_theme_edje_object_set(it, "base/theme/modules/ibar",
|
||||
"e/modules/ibar/menu/item");
|
||||
|
@ -1329,7 +1329,7 @@ _ibar_icon_menu(IBar_Icon *ic, Eina_Bool grab)
|
|||
ic->menu = e_gadcon_popup_new(ic->ibar->inst->gcc, 1);
|
||||
e_object_data_set(E_OBJECT(ic->menu), ic);
|
||||
E_OBJECT_DEL_SET(ic->menu, _ibar_cb_icon_menu_del);
|
||||
e = e_comp_get(ic->menu)->evas;
|
||||
e = e_comp->evas;
|
||||
o = edje_object_add(e);
|
||||
e_theme_edje_object_set(o, "base/theme/modules/ibar",
|
||||
"e/modules/ibar/menu");
|
||||
|
@ -2526,7 +2526,7 @@ _ibar_go_focus(void)
|
|||
if (_ibar_focus_win) return;
|
||||
man = e_manager_current_get();
|
||||
if (!man) return;
|
||||
_ibar_focus_win = e_comp_get(man)->ee_win;
|
||||
_ibar_focus_win = e_comp->ee_win;
|
||||
if (!e_grabinput_get(0, 0, _ibar_focus_win))
|
||||
{
|
||||
_ibar_focus_win = 0;
|
||||
|
|
|
@ -322,7 +322,7 @@ _e_mod_ind_win_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj _
|
|||
ec = iwin->win->client;
|
||||
|
||||
/* reset mouse pointer */
|
||||
e_pointer_type_pop(e_comp_get(ec)->pointer, ec, "move");
|
||||
e_pointer_type_pop(e_comp->pointer, ec, "move");
|
||||
|
||||
/* tell edj we are done moving */
|
||||
edje_object_signal_emit(iwin->o_base, "e,action,move,stop", "e");
|
||||
|
@ -362,7 +362,7 @@ _e_mod_ind_win_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj
|
|||
iwin->drag.start = 0;
|
||||
|
||||
/* change mouse pointer to indicate we are dragging */
|
||||
e_pointer_type_push(e_comp_get(iwin->win)->pointer,
|
||||
e_pointer_type_push(e_comp->pointer,
|
||||
iwin->win->client, "move");
|
||||
|
||||
/* tell edj we are going to start moving */
|
||||
|
|
|
@ -529,11 +529,11 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
|
|||
|
||||
if (ki->zoomkey.popup) return;
|
||||
|
||||
o = _theme_obj_new(e_comp_get(ki->win)->evas, ki->themedir,
|
||||
o = _theme_obj_new(e_comp->evas, ki->themedir,
|
||||
"e/modules/kbd/zoom/default");
|
||||
ki->zoomkey.base_obj = o;
|
||||
|
||||
o = e_layout_add(e_comp_get(ki->win)->evas);
|
||||
o = e_layout_add(e_comp->evas);
|
||||
e_layout_virtual_size_set(o, 100, 100);
|
||||
edje_object_part_swallow(ki->zoomkey.base_obj, "e.swallow.content", o);
|
||||
evas_object_show(o);
|
||||
|
@ -541,7 +541,7 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
|
|||
|
||||
e_layout_virtual_size_get(ki->layout_obj, &vw, &vh);
|
||||
|
||||
o = e_layout_add(e_comp_get(ki->win)->evas);
|
||||
o = e_layout_add(e_comp->evas);
|
||||
e_layout_virtual_size_set(o, vw, vh);
|
||||
e_layout_pack(ki->zoomkey.layout_obj, o);
|
||||
e_layout_child_move(o, 0, 0);
|
||||
|
@ -559,7 +559,7 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
|
|||
int selected;
|
||||
|
||||
ky = l->data;
|
||||
o = _theme_obj_new(e_comp_get(ki->win)->evas, ki->themedir,
|
||||
o = _theme_obj_new(e_comp->evas, ki->themedir,
|
||||
"e/modules/kbd/zoomkey/default");
|
||||
label = "";
|
||||
icon = NULL;
|
||||
|
@ -572,7 +572,7 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
|
|||
|
||||
edje_object_part_text_set(o, "e.text.label", label);
|
||||
|
||||
o2 = e_icon_add(e_comp_get(ki->win)->evas);
|
||||
o2 = e_icon_add(e_comp->evas);
|
||||
e_icon_fill_inside_set(o2, 1);
|
||||
// e_icon_scale_up_set(o2, 0);
|
||||
edje_object_part_swallow(o, "e.swallow.content", o2);
|
||||
|
@ -1448,11 +1448,11 @@ _e_kbd_int_dictlist_up(E_Kbd_Int *ki)
|
|||
|
||||
if (ki->dictlist.popup) return;
|
||||
|
||||
o = _theme_obj_new(e_comp_get(ki->win)->evas, ki->themedir,
|
||||
o = _theme_obj_new(e_comp->evas, ki->themedir,
|
||||
"e/modules/kbd/match/default");
|
||||
ki->dictlist.base_obj = o;
|
||||
|
||||
o = e_widget_ilist_add(e_comp_get(ki->win)->evas,
|
||||
o = e_widget_ilist_add(e_comp->evas,
|
||||
(32 * e_scale), (32 * e_scale), NULL);
|
||||
e_widget_ilist_selector_set(o, 1);
|
||||
e_widget_ilist_freeze(o);
|
||||
|
@ -1593,11 +1593,11 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
|
|||
if (!e_kbd_buf_string_matches_get(ki->kbuf)) return;
|
||||
if (ki->matchlist.popup) return;
|
||||
|
||||
o = _theme_obj_new(e_comp_get(ki->win)->evas, ki->themedir,
|
||||
o = _theme_obj_new(e_comp->evas, ki->themedir,
|
||||
"e/modules/kbd/match/default");
|
||||
ki->matchlist.base_obj = o;
|
||||
|
||||
o = e_widget_ilist_add(e_comp_get(ki->win)->evas,
|
||||
o = e_widget_ilist_add(e_comp->evas,
|
||||
(32 * e_scale), (32 * e_scale), NULL);
|
||||
e_widget_ilist_selector_set(o, 1);
|
||||
ki->matchlist.ilist_obj = o;
|
||||
|
|
|
@ -157,7 +157,7 @@ _pin_mouse_button_down(Lokker_Popup *lp, int t EINA_UNUSED, Ecore_Event_Mouse_Bu
|
|||
Evas *e;
|
||||
|
||||
if (ev->buttons != 1) return ECORE_CALLBACK_DONE;
|
||||
e = e_comp_get(lp->zone)->evas;
|
||||
e = e_comp->evas;
|
||||
evas_event_feed_mouse_move(e,
|
||||
e_comp_canvas_x_root_adjust(lp->zone->comp, ev->root.x),
|
||||
e_comp_canvas_y_root_adjust(lp->zone->comp, ev->root.y),
|
||||
|
|
|
@ -378,7 +378,7 @@ _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__
|
|||
static Evas_Object *
|
||||
_mixer_popup_add_slider(E_Mixer_Instance *inst, int value, void (*cb)(void *data, Evas_Object *obj, void *event_info))
|
||||
{
|
||||
Evas_Object *slider = e_slider_add(e_comp_get(inst->popup)->evas);
|
||||
Evas_Object *slider = e_slider_add(e_comp->evas);
|
||||
evas_object_show(slider);
|
||||
e_slider_orientation_set(slider, 0);
|
||||
e_slider_value_set(slider, value);
|
||||
|
@ -546,7 +546,7 @@ _mixer_popup_new(E_Mixer_Instance *inst)
|
|||
colspan = 2;
|
||||
|
||||
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
|
||||
evas = e_comp_get(inst->gcc)->evas;
|
||||
evas = e_comp->evas;
|
||||
|
||||
inst->ui.table = e_widget_table_add(e_win_evas_win_get(evas), 0);
|
||||
|
||||
|
@ -1123,7 +1123,7 @@ _mixer_cb_volume_modify(Eina_Bool up)
|
|||
|
||||
ctxt->last_act_time = ecore_loop_time_get();
|
||||
|
||||
if (ctxt->default_instance->conf->keybindings_popup && (!e_comp_get(NULL)->nocomp))
|
||||
if (ctxt->default_instance->conf->keybindings_popup && (!e_comp->nocomp))
|
||||
_mixer_popup_timer_new(ctxt->default_instance);
|
||||
_mixer_volume_change(ctxt->default_instance, up, EINA_TRUE);
|
||||
}
|
||||
|
@ -1160,7 +1160,7 @@ _mixer_cb_volume_mute(E_Object *obj __UNUSED__, const char *params __UNUSED__)
|
|||
|
||||
ctxt->last_act_time = ecore_loop_time_get();
|
||||
|
||||
if (ctxt->default_instance->conf->keybindings_popup && (!e_comp_get(NULL)->nocomp))
|
||||
if (ctxt->default_instance->conf->keybindings_popup && (!e_comp->nocomp))
|
||||
_mixer_popup_timer_new(ctxt->default_instance);
|
||||
_mixer_toggle_mute(ctxt->default_instance, EINA_TRUE);
|
||||
}
|
||||
|
|
|
@ -118,7 +118,7 @@ _popup_new(E_Music_Control_Instance *inst)
|
|||
Evas_Object *o;
|
||||
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
|
||||
|
||||
o = edje_object_add(e_comp_get(inst->gcc)->evas);
|
||||
o = edje_object_add(e_comp->evas);
|
||||
e_theme_edje_object_set(o, "base/theme/modules/music-control",
|
||||
"e/modules/music-control/popup");
|
||||
edje_object_signal_callback_add(o, "btn,clicked", "*", _btn_clicked, inst);
|
||||
|
|
|
@ -299,7 +299,7 @@ _notification_popup_new(E_Notification_Notify *n, unsigned id)
|
|||
switch (notification_cfg->dual_screen)
|
||||
{
|
||||
case POPUP_DISPLAY_POLICY_FIRST:
|
||||
comp = e_comp_get(NULL);
|
||||
comp = e_comp;
|
||||
zone = eina_list_data_get(comp->zones);
|
||||
break;
|
||||
case POPUP_DISPLAY_POLICY_CURRENT:
|
||||
|
@ -323,7 +323,7 @@ _notification_popup_new(E_Notification_Notify *n, unsigned id)
|
|||
EINA_SAFETY_ON_NULL_RETURN_VAL(popup, NULL);
|
||||
popup->notif = n;
|
||||
popup->id = id;
|
||||
popup->e = e_comp_get(zone)->evas;
|
||||
popup->e = e_comp->evas;
|
||||
|
||||
/* Setup the theme */
|
||||
snprintf(buf, sizeof(buf), "%s/e-module-notification.edj",
|
||||
|
@ -623,7 +623,7 @@ _notification_popdown(Popup_Data *popup,
|
|||
if (popup->pending) return;
|
||||
popups_displayed--;
|
||||
free(popup);
|
||||
e_comp_shape_queue(e_comp_get(NULL));
|
||||
e_comp_shape_queue(e_comp);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -89,7 +89,7 @@ packagekit_popup_update(E_PackageKit_Instance *inst)
|
|||
unsigned num_updates = 0;
|
||||
const char *emblem_name;
|
||||
Efreet_Desktop *desktop;
|
||||
Evas *evas = e_comp_get(inst->popup)->evas;
|
||||
Evas *evas = e_comp->evas;
|
||||
Evas_Object *icon, *end;
|
||||
char buf[PATH_MAX];
|
||||
|
||||
|
@ -178,7 +178,7 @@ packagekit_popup_new(E_PackageKit_Instance *inst)
|
|||
Evas *evas;
|
||||
|
||||
inst->popup = e_gadcon_popup_new(inst->gcc, EINA_FALSE);
|
||||
evas = e_comp_get(inst->popup)->evas;
|
||||
evas = e_comp->evas;
|
||||
|
||||
table = e_widget_table_add(e_win_evas_win_get(evas), 0);
|
||||
|
||||
|
|
|
@ -230,7 +230,7 @@ _pol_cfd_data_basic_widgets_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas,
|
|||
E_Zone *zone;
|
||||
Eina_List *l;
|
||||
|
||||
comp = e_comp_get(NULL);
|
||||
comp = e_comp;
|
||||
|
||||
base = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
|
@ -316,7 +316,7 @@ e_mod_pol_conf_init(Mod *mod)
|
|||
conf->use_softkey = 1;
|
||||
conf->softkey_size = 42;
|
||||
|
||||
comp = e_comp_get(NULL);
|
||||
comp = e_comp;
|
||||
zone = e_zone_current_get(comp);
|
||||
desk = e_desk_current_get(zone);
|
||||
_pol_conf_desk_add(conf, desk);
|
||||
|
|
|
@ -33,7 +33,7 @@ _pol_softkey_iconify(E_Zone *zone, Eina_Bool all)
|
|||
desk = e_desk_current_get(zone);
|
||||
launcher = e_mod_pol_client_launcher_get(zone);
|
||||
|
||||
E_CLIENT_REVERSE_FOREACH(e_comp_get(desk), ec)
|
||||
E_CLIENT_REVERSE_FOREACH(e_comp, ec)
|
||||
{
|
||||
if (e_client_util_ignored_get(ec)) continue;
|
||||
if (!e_client_util_desk_visible(ec, desk)) continue;
|
||||
|
@ -54,7 +54,7 @@ _pol_softkey_icon_add(E_Zone *zone, const char *name)
|
|||
Evas_Object *obj, *comp_obj;
|
||||
char path[PATH_MAX], group[PATH_MAX];
|
||||
|
||||
obj = edje_object_add(e_comp_get(NULL)->evas);
|
||||
obj = edje_object_add(e_comp->evas);
|
||||
|
||||
snprintf(group, sizeof(group), "e/modules/policy-mobile/softkey/%s", name);
|
||||
snprintf(path, sizeof(path), "%s/e-module-policy-mobile.edj",
|
||||
|
|
|
@ -612,7 +612,7 @@ _shot_now(E_Zone *zone, E_Client *ec, const char *params)
|
|||
}
|
||||
else
|
||||
{
|
||||
xwin = e_comp_get(ec)->ee_win;
|
||||
xwin = e_comp->ee_win;
|
||||
x = ec->x, y = ec->y, sw = ec->w, sh = ec->h;
|
||||
w = sw;
|
||||
h = sh;
|
||||
|
|
|
@ -80,8 +80,8 @@ e_syscon_show(E_Zone *zone, const char *defact)
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (!e_comp_grab_input(e_comp_get(zone), 1, 1)) return 0;
|
||||
evas = e_comp_get(zone)->evas;
|
||||
if (!e_comp_grab_input(e_comp, 1, 1)) return 0;
|
||||
evas = e_comp->evas;
|
||||
evas_event_freeze(evas);
|
||||
|
||||
o = edje_object_add(evas);
|
||||
|
|
|
@ -216,7 +216,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
|||
if (!inst)
|
||||
return NULL;
|
||||
inst->evas = gc->evas;
|
||||
inst->comp = e_comp_get(NULL);
|
||||
inst->comp = e_comp;
|
||||
if (!inst->comp)
|
||||
{
|
||||
E_FREE(inst);
|
||||
|
|
|
@ -172,7 +172,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas,
|
|||
E_Zone *zone;
|
||||
Eina_List *l;
|
||||
|
||||
comp = e_comp_get(NULL);
|
||||
comp = e_comp;
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
|
|
|
@ -507,7 +507,7 @@ _desk_config_apply(E_Desk *d, int old_nb_stacks, int new_nb_stacks)
|
|||
{
|
||||
E_Client *ec;
|
||||
|
||||
E_CLIENT_FOREACH(e_comp_get(NULL), ec)
|
||||
E_CLIENT_FOREACH(e_comp, ec)
|
||||
{
|
||||
_client_apply_settings(ec, NULL);
|
||||
}
|
||||
|
@ -519,7 +519,7 @@ _desk_config_apply(E_Desk *d, int old_nb_stacks, int new_nb_stacks)
|
|||
/* Add all the existing windows. */
|
||||
E_Client *ec;
|
||||
|
||||
E_CLIENT_FOREACH(e_comp_get(NULL), ec)
|
||||
E_CLIENT_FOREACH(e_comp, ec)
|
||||
{
|
||||
_add_client(ec);
|
||||
}
|
||||
|
@ -868,7 +868,7 @@ _tiling_split_type_changed_popup(void)
|
|||
/* If this is not NULL, the rest isn't either. */
|
||||
if (!o)
|
||||
{
|
||||
_G.split_popup.obj = o = edje_object_add(e_comp_get(NULL)->evas);
|
||||
_G.split_popup.obj = o = edje_object_add(e_comp->evas);
|
||||
if (!e_theme_edje_object_set(o, "base/theme/modules/tiling",
|
||||
"modules/tiling/main"))
|
||||
edje_object_file_set(o, _G.edj_path, "modules/tiling/main");
|
||||
|
@ -1503,7 +1503,7 @@ e_modapi_init(E_Module *m)
|
|||
{
|
||||
E_Client *ec;
|
||||
|
||||
E_CLIENT_FOREACH(e_comp_get(NULL), ec)
|
||||
E_CLIENT_FOREACH(e_comp, ec)
|
||||
{
|
||||
_add_client(ec);
|
||||
}
|
||||
|
|
|
@ -104,7 +104,7 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
|
|||
if (_winlist) return 0;
|
||||
|
||||
#ifndef HAVE_WAYLAND_ONLY
|
||||
if (e_comp_get(zone)->comp_type == E_PIXMAP_TYPE_X)
|
||||
if (e_comp->comp_type == E_PIXMAP_TYPE_X)
|
||||
{
|
||||
_input_window = ecore_x_window_input_new(zone->comp->man->root, 0, 0, 1, 1);
|
||||
ecore_x_window_show(_input_window);
|
||||
|
@ -116,9 +116,9 @@ e_winlist_show(E_Zone *zone, E_Winlist_Filter filter)
|
|||
}
|
||||
}
|
||||
#endif
|
||||
if (e_comp_get(zone)->comp_type != E_PIXMAP_TYPE_X)
|
||||
if (e_comp->comp_type != E_PIXMAP_TYPE_X)
|
||||
{
|
||||
if (!e_comp_grab_input(e_comp_get(zone), 1, 1))
|
||||
if (!e_comp_grab_input(e_comp, 1, 1))
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -274,7 +274,7 @@ e_winlist_hide(void)
|
|||
}
|
||||
else
|
||||
#endif
|
||||
e_comp_ungrab_input(e_comp_get(NULL), 1, 1);
|
||||
e_comp_ungrab_input(e_comp, 1, 1);
|
||||
if (ec)
|
||||
{
|
||||
if (ec->shaded)
|
||||
|
|
Loading…
Reference in New Issue