From: Enlightenment S. <no-...@en...> - 2009-04-10 09:58:02
|
Log: ecore_x_window_del -> ecore_x_window_free Author: caro Date: 2009-04-10 02:57:57 -0700 (Fri, 10 Apr 2009) New Revision: 39924 Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_container.c trunk/e/src/bin/e_desklock.c trunk/e/src/bin/e_dnd.c trunk/e/src/bin/e_manager.c trunk/e/src/bin/e_menu.c trunk/e/src/bin/e_zone.c trunk/e/src/modules/conf_keybindings/e_int_config_keybindings.c trunk/e/src/modules/conf_mousebindings/e_int_config_mousebindings.c trunk/e/src/modules/exebuf/e_exebuf.c trunk/e/src/modules/illume/e_appwin.c trunk/e/src/modules/illume/e_busywin.c trunk/e/src/modules/illume/e_pwr.c trunk/e/src/modules/illume/e_simplelock.c trunk/e/src/modules/illume/e_slipshelf.c trunk/e/src/modules/illume/e_slipwin.c trunk/e/src/modules/illume/e_syswin.c trunk/e/src/modules/mixer/e_mod_main.c trunk/e/src/modules/pager/e_mod_main.c trunk/e/src/modules/syscon/e_syscon.c trunk/e/src/modules/winlist/e_winlist.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/bin/e_border.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -272,10 +272,10 @@ // printf("##- ATTR FETCH FAILED/INPUT ONLY FOR 0x%x - ABORT MANAGE\n", win); e_canvas_del(bd->bg_ecore_evas); ecore_evas_free(bd->bg_ecore_evas); - ecore_x_window_del(bd->client.shell_win); + ecore_x_window_free(bd->client.shell_win); e_bindings_mouse_ungrab(E_BINDING_CONTEXT_BORDER, bd->win); e_bindings_wheel_ungrab(E_BINDING_CONTEXT_BORDER, bd->win); - ecore_x_window_del(bd->win); + ecore_x_window_free(bd->win); free(bd); return NULL; } @@ -2625,7 +2625,7 @@ return 0; e_grabinput_release(action_input_win, action_input_win); - ecore_x_window_del(action_input_win); + ecore_x_window_free(action_input_win); action_input_win = 0; return 1; } @@ -3715,11 +3715,11 @@ evas_object_del(bd->bg_object); e_canvas_del(bd->bg_ecore_evas); ecore_evas_free(bd->bg_ecore_evas); - ecore_x_window_del(bd->client.shell_win); + ecore_x_window_free(bd->client.shell_win); e_focus_setdown(bd); e_bindings_mouse_ungrab(E_BINDING_CONTEXT_BORDER, bd->win); e_bindings_wheel_ungrab(E_BINDING_CONTEXT_BORDER, bd->win); - ecore_x_window_del(bd->win); + ecore_x_window_free(bd->win); eina_hash_del(borders_hash, e_util_winid_str_get(bd->client.win), bd); eina_hash_del(borders_hash, e_util_winid_str_get(bd->bg_win), bd); @@ -7047,9 +7047,9 @@ ecore_x_window_shape_window_add_xy(twin, twin2, bd->client_inset.l, bd->client_inset.t); - ecore_x_window_del(twin2); + ecore_x_window_free(twin2); ecore_x_window_shape_window_set(bd->win, twin); - ecore_x_window_del(twin); + ecore_x_window_free(twin); } else ecore_x_window_shape_mask_set(bd->win, 0); Modified: trunk/e/src/bin/e_container.c =================================================================== --- trunk/e/src/bin/e_container.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/bin/e_container.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -933,7 +933,7 @@ { Eina_List *l; - ecore_x_window_del(con->event_win); + ecore_x_window_free(con->event_win); /* We can't use e_object_del here, because border adds a ref to itself * when it is removed, and the ref is never unref'ed */ /* FIXME: had to disable this as it was freeing already freed items during @@ -964,7 +964,7 @@ ecore_evas_free(con->bg_ecore_evas); if (con->manager->win != con->win) { - ecore_x_window_del(con->win); + ecore_x_window_free(con->win); } if (con->name) eina_stringshare_del(con->name); free(con); Modified: trunk/e/src/bin/e_desklock.c =================================================================== --- trunk/e/src/bin/e_desklock.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/bin/e_desklock.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -212,7 +212,7 @@ _("Locking the desktop failed because some application<br>" "has grabbed either the keyboard or the mouse or both<br>" "and their grab is unable to be broken.")); - ecore_x_window_del(edd->elock_wnd); + ecore_x_window_free(edd->elock_wnd); free(edd); edd = NULL; return 0; @@ -404,7 +404,7 @@ } e_grabinput_release(edd->elock_wnd, edd->elock_wnd); - ecore_x_window_del(edd->elock_wnd); + ecore_x_window_free(edd->elock_wnd); E_FREE(edd); edd = NULL; Modified: trunk/e/src/bin/e_dnd.c =================================================================== --- trunk/e/src/bin/e_dnd.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/bin/e_dnd.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -298,7 +298,7 @@ ecore_x_window_show(_drag_win); if (!e_grabinput_get(_drag_win, 1, _drag_win)) { - ecore_x_window_del(_drag_win); + ecore_x_window_free(_drag_win); return 0; } @@ -349,7 +349,7 @@ ecore_x_window_show(_drag_win); if (!e_grabinput_get(_drag_win, 1, _drag_win)) { - ecore_x_window_del(_drag_win); + ecore_x_window_free(_drag_win); return 0; } @@ -914,7 +914,7 @@ if (!(dropped = ecore_x_dnd_drop())) { - ecore_x_window_del(_drag_win); + ecore_x_window_free(_drag_win); _drag_win = 0; } if (_drag_current->cb.finished) @@ -929,7 +929,7 @@ return; } - ecore_x_window_del(_drag_win); + ecore_x_window_free(_drag_win); _drag_win = 0; if (_drag_current->data) @@ -1057,7 +1057,7 @@ E_Drop_Handler *h; e_grabinput_release(_drag_win, _drag_win); - ecore_x_window_del(_drag_win); + ecore_x_window_free(_drag_win); _drag_win = 0; _drag_win_root = 0; @@ -1363,7 +1363,7 @@ } e_grabinput_release(_drag_win, _drag_win); - ecore_x_window_del(_drag_win); + ecore_x_window_free(_drag_win); _drag_win = 0; return 1; Modified: trunk/e/src/bin/e_manager.c =================================================================== --- trunk/e/src/bin/e_manager.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/bin/e_manager.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -542,7 +542,7 @@ } if (man->root != man->win) { - ecore_x_window_del(man->win); + ecore_x_window_free(man->win); } if (man->pointer) e_object_del(E_OBJECT(man->pointer)); managers = eina_list_remove(managers, man); Modified: trunk/e/src/bin/e_menu.c =================================================================== --- trunk/e/src/bin/e_menu.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/bin/e_menu.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -1023,7 +1023,7 @@ { if (_e_menu_win) { - ecore_x_window_del(_e_menu_win); + ecore_x_window_free(_e_menu_win); e_grabinput_release(_e_menu_win, _e_menu_win); _e_menu_win = 0; } @@ -1744,7 +1744,7 @@ ecore_x_window_show(_e_menu_win); if (!e_grabinput_get(_e_menu_win, 1, _e_menu_win)) { - ecore_x_window_del(_e_menu_win); + ecore_x_window_free(_e_menu_win); _e_menu_win = 0; return; } Modified: trunk/e/src/bin/e_zone.c =================================================================== --- trunk/e/src/bin/e_zone.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/bin/e_zone.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -835,18 +835,18 @@ int x, y; /* Delete the edge windows if they exist */ - if (zone->edge.top) ecore_x_window_del(zone->edge.top); - if (zone->edge.bottom) ecore_x_window_del(zone->edge.bottom); - if (zone->edge.left) ecore_x_window_del(zone->edge.left); - if (zone->edge.right) ecore_x_window_del(zone->edge.right); - if (zone->corner.left_bottom) ecore_x_window_del(zone->corner.left_bottom); - if (zone->corner.left_top) ecore_x_window_del(zone->corner.left_top); - if (zone->corner.top_left) ecore_x_window_del(zone->corner.top_left); - if (zone->corner.top_right) ecore_x_window_del(zone->corner.top_right); - if (zone->corner.right_top) ecore_x_window_del(zone->corner.right_top); - if (zone->corner.right_bottom) ecore_x_window_del(zone->corner.right_bottom); - if (zone->corner.bottom_right) ecore_x_window_del(zone->corner.bottom_right); - if (zone->corner.bottom_left) ecore_x_window_del(zone->corner.bottom_left); + if (zone->edge.top) ecore_x_window_free(zone->edge.top); + if (zone->edge.bottom) ecore_x_window_free(zone->edge.bottom); + if (zone->edge.left) ecore_x_window_free(zone->edge.left); + if (zone->edge.right) ecore_x_window_free(zone->edge.right); + if (zone->corner.left_bottom) ecore_x_window_free(zone->corner.left_bottom); + if (zone->corner.left_top) ecore_x_window_free(zone->corner.left_top); + if (zone->corner.top_left) ecore_x_window_free(zone->corner.top_left); + if (zone->corner.top_right) ecore_x_window_free(zone->corner.top_right); + if (zone->corner.right_top) ecore_x_window_free(zone->corner.right_top); + if (zone->corner.right_bottom) ecore_x_window_free(zone->corner.right_bottom); + if (zone->corner.bottom_right) ecore_x_window_free(zone->corner.bottom_right); + if (zone->corner.bottom_left) ecore_x_window_free(zone->corner.bottom_left); /* Delete the object event callbacks */ evas_object_event_callback_del(zone->bg_event_object, Modified: trunk/e/src/modules/conf_keybindings/e_int_config_keybindings.c =================================================================== --- trunk/e/src/modules/conf_keybindings/e_int_config_keybindings.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/conf_keybindings/e_int_config_keybindings.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -954,7 +954,7 @@ ecore_event_handler_del(eh); e_grabinput_release(cfdata->locals.bind_win, cfdata->locals.bind_win); - ecore_x_window_del(cfdata->locals.bind_win); + ecore_x_window_free(cfdata->locals.bind_win); cfdata->locals.bind_win = 0; e_object_del(E_OBJECT(cfdata->locals.dia)); Modified: trunk/e/src/modules/conf_mousebindings/e_int_config_mousebindings.c =================================================================== --- trunk/e/src/modules/conf_mousebindings/e_int_config_mousebindings.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/conf_mousebindings/e_int_config_mousebindings.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -1307,7 +1307,7 @@ } cfdata->locals.handlers = NULL; e_grabinput_release(cfdata->locals.bind_win, cfdata->locals.bind_win); - ecore_x_window_del(cfdata->locals.bind_win); + ecore_x_window_free(cfdata->locals.bind_win); cfdata->locals.bind_win = 0; e_object_del(E_OBJECT(cfdata->locals.dia)); Modified: trunk/e/src/modules/exebuf/e_exebuf.c =================================================================== --- trunk/e/src/modules/exebuf/e_exebuf.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/exebuf/e_exebuf.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -157,7 +157,7 @@ ecore_x_window_show(input_window); if (!e_grabinput_get(input_window, 1, input_window)) { - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); input_window = 0; return 0; } @@ -322,7 +322,7 @@ EINA_LIST_FREE(handlers, ev) ecore_event_handler_del(ev); - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); e_grabinput_release(input_window, input_window); input_window = 0; free(cmd_buf); Modified: trunk/e/src/modules/illume/e_appwin.c =================================================================== --- trunk/e/src/modules/illume/e_appwin.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/illume/e_appwin.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -230,7 +230,7 @@ ecore_event_handler_del(handle); if (esw->animator) ecore_animator_del(esw->animator); if (esw->themedir) evas_stringshare_del(esw->themedir); - ecore_x_window_del(esw->clickwin); + ecore_x_window_free(esw->clickwin); e_object_del(E_OBJECT(esw->popup)); free(esw); } Modified: trunk/e/src/modules/illume/e_busywin.c =================================================================== --- trunk/e/src/modules/illume/e_busywin.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/illume/e_busywin.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -140,7 +140,7 @@ } if (esw->animator) ecore_animator_del(esw->animator); if (esw->themedir) evas_stringshare_del(esw->themedir); - ecore_x_window_del(esw->clickwin); + ecore_x_window_free(esw->clickwin); e_object_del(E_OBJECT(esw->popup)); free(esw); } Modified: trunk/e/src/modules/illume/e_pwr.c =================================================================== --- trunk/e/src/modules/illume/e_pwr.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/illume/e_pwr.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -179,7 +179,7 @@ _system_unreq_state(); if (coverwin) { - ecore_x_window_del(coverwin); + ecore_x_window_free(coverwin); coverwin = 0; } if (suspend_timer) Modified: trunk/e/src/modules/illume/e_simplelock.c =================================================================== --- trunk/e/src/modules/illume/e_simplelock.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/illume/e_simplelock.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -234,7 +234,7 @@ esl = locks->data; e_object_del(E_OBJECT(esl->popup)); - ecore_x_window_del(esl->win); + ecore_x_window_free(esl->win); free(esl); locks = eina_list_remove_list(locks, locks); } Modified: trunk/e/src/modules/illume/e_slipshelf.c =================================================================== --- trunk/e/src/modules/illume/e_slipshelf.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/illume/e_slipshelf.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -470,7 +470,7 @@ if (ess->animator) ecore_animator_del(ess->animator); if (ess->themedir) evas_stringshare_del(ess->themedir); if (ess->default_title) evas_stringshare_del(ess->default_title); - if (ess->clickwin) ecore_x_window_del(ess->clickwin); + if (ess->clickwin) ecore_x_window_free(ess->clickwin); e_object_del(E_OBJECT(ess->popup)); free(ess); } Modified: trunk/e/src/modules/illume/e_slipwin.c =================================================================== --- trunk/e/src/modules/illume/e_slipwin.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/illume/e_slipwin.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -218,7 +218,7 @@ ecore_event_handler_del(handle); if (esw->animator) ecore_animator_del(esw->animator); if (esw->themedir) evas_stringshare_del(esw->themedir); - ecore_x_window_del(esw->clickwin); + ecore_x_window_free(esw->clickwin); e_object_del(E_OBJECT(esw->popup)); free(esw); } Modified: trunk/e/src/modules/illume/e_syswin.c =================================================================== --- trunk/e/src/modules/illume/e_syswin.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/illume/e_syswin.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -218,7 +218,7 @@ ecore_event_handler_del(handle); if (esw->animator) ecore_animator_del(esw->animator); if (esw->themedir) evas_stringshare_del(esw->themedir); - ecore_x_window_del(esw->clickwin); + ecore_x_window_free(esw->clickwin); e_object_del(E_OBJECT(esw->popup)); free(esw); } Modified: trunk/e/src/modules/mixer/e_mod_main.c =================================================================== --- trunk/e/src/modules/mixer/e_mod_main.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/mixer/e_mod_main.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -464,7 +464,7 @@ static void _mixer_popup_input_window_destroy(E_Mixer_Instance *inst) { - ecore_x_window_del(inst->ui.input.win); + ecore_x_window_free(inst->ui.input.win); inst->ui.input.win = 0; ecore_event_handler_del(inst->ui.input.mouse_up); Modified: trunk/e/src/modules/pager/e_mod_main.c =================================================================== --- trunk/e/src/modules/pager/e_mod_main.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/pager/e_mod_main.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -2380,7 +2380,7 @@ ecore_x_window_show(input_window); if (!e_grabinput_get(input_window, 0, input_window)) { - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); input_window = 0; return 0; } @@ -2440,7 +2440,7 @@ ecore_event_handler_del(handlers->data); handlers = eina_list_remove_list(handlers, handlers); } - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); e_grabinput_release(input_window, input_window); input_window = 0; Modified: trunk/e/src/modules/syscon/e_syscon.c =================================================================== --- trunk/e/src/modules/syscon/e_syscon.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/syscon/e_syscon.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -58,7 +58,7 @@ ecore_x_window_show(input_window); if (!e_grabinput_get(input_window, 1, input_window)) { - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); input_window = 0; return 0; } @@ -67,7 +67,7 @@ if (!popup) { e_grabinput_release(input_window, input_window); - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); input_window = 0; return 0; } @@ -300,7 +300,7 @@ e_object_del(E_OBJECT(popup)); popup = NULL; e_grabinput_release(input_window, input_window); - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); input_window = 0; } Modified: trunk/e/src/modules/winlist/e_winlist.c =================================================================== --- trunk/e/src/modules/winlist/e_winlist.c 2009-04-10 09:55:48 UTC (rev 39923) +++ trunk/e/src/modules/winlist/e_winlist.c 2009-04-10 09:57:57 UTC (rev 39924) @@ -97,7 +97,7 @@ ecore_x_window_show(input_window); if (!e_grabinput_get(input_window, 0, input_window)) { - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); input_window = 0; return 0; } @@ -254,7 +254,7 @@ ecore_event_handler_del(handlers->data); handlers = eina_list_remove_list(handlers, handlers); } - ecore_x_window_del(input_window); + ecore_x_window_free(input_window); e_grabinput_release(input_window, input_window); input_window = 0; if (warp_timer) |