ecore_x_window_del -> ecore_x_window_free

SVN revision: 39924

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 445c65b..d535bf0 100644 (file)
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -272,10 +272,10 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
 //     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 @@ _e_border_action_input_win_del(void)
      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 @@ _e_border_free(E_Border *bd)
    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 @@ _e_border_eval(E_Border *bd)
             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);

diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index 2a26619..308bf0d 100644 (file)
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -933,7 +933,7 @@ _e_container_free(E_Container *con)
 {
    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 @@ _e_container_free(E_Container *con)
    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);

diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index 288014f..544195a 100644 (file)
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -212,7 +212,7 @@ e_desklock_show(void)
                           _("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_desklock_hide(void)
      }
    
    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;

diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 398dbf5..9029fec 100644 (file)
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -298,7 +298,7 @@ e_drag_start(E_Drag *drag, int x, int y)
    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 @@ e_drag_xdnd_start(E_Drag *drag, int x, int y)
    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 @@ _e_drag_end(Ecore_X_Window root, int x, int y)
 
        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 @@ _e_drag_end(Ecore_X_Window root, int x, int y)
        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_drag_free(E_Drag *drag)
        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_dnd_cb_event_dnd_finished(void *data, int type, void *event)
      }
 
    e_grabinput_release(_drag_win, _drag_win);
-   ecore_x_window_del(_drag_win);
+   ecore_x_window_free(_drag_win);
    _drag_win = 0;
 
    return 1;

diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index 2b75854..88497a6 100644 (file)
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -542,7 +542,7 @@ _e_manager_free(E_Manager *man)
      }
    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);   

diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 0751621..8ff0f56 100644 (file)
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1023,7 +1023,7 @@ e_menu_idler_before(void)
      {
        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 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
        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;
          }

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index a73f74d..5b0ddab 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -835,18 +835,18 @@ _e_zone_free(E_Zone *zone)
    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, 

diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index 489c6f4..9bbe21d 100644 (file)
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -954,7 +954,7 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
      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));

diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
index 64fa772..ed9fd7d 100644 (file)
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
@@ -1307,7 +1307,7 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
      }
    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));

diff --git a/src/modules/exebuf/e_exebuf.c b/src/modules/exebuf/e_exebuf.c
index 8e92bd2..7d22570 100644 (file)
--- a/src/modules/exebuf/e_exebuf.c
+++ b/src/modules/exebuf/e_exebuf.c
@@ -157,7 +157,7 @@ e_exebuf_show(E_Zone *zone)
    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 @@ e_exebuf_hide(void)
    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);

diff --git a/src/modules/illume/e_appwin.c b/src/modules/illume/e_appwin.c
index bfa2d05..52a55a6 100644 (file)
--- a/src/modules/illume/e_appwin.c
+++ b/src/modules/illume/e_appwin.c
@@ -230,7 +230,7 @@ _e_appwin_free(E_Appwin *esw)
      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);
 }

diff --git a/src/modules/illume/e_busywin.c b/src/modules/illume/e_busywin.c
index 90862df..1d203f1 100644 (file)
--- a/src/modules/illume/e_busywin.c
+++ b/src/modules/illume/e_busywin.c
@@ -140,7 +140,7 @@ _e_busywin_free(E_Busywin *esw)
      }
    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);
 }

diff --git a/src/modules/illume/e_pwr.c b/src/modules/illume/e_pwr.c
index f164a61..9593666 100644 (file)
--- a/src/modules/illume/e_pwr.c
+++ b/src/modules/illume/e_pwr.c
@@ -179,7 +179,7 @@ _cb_saver(void *data, int ev_type, void *ev)
        _system_unreq_state();
        if (coverwin)
          {
-            ecore_x_window_del(coverwin);
+            ecore_x_window_free(coverwin);
             coverwin = 0;
          }
        if (suspend_timer)

diff --git a/src/modules/illume/e_simplelock.c b/src/modules/illume/e_simplelock.c
index dc3b968..79f42cd 100644 (file)
--- a/src/modules/illume/e_simplelock.c
+++ b/src/modules/illume/e_simplelock.c
@@ -234,7 +234,7 @@ e_simplelock_hide(void)
        
        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);
      }

diff --git a/src/modules/illume/e_slipshelf.c b/src/modules/illume/e_slipshelf.c
index 4035026..f66ad3d 100644 (file)
--- a/src/modules/illume/e_slipshelf.c
+++ b/src/modules/illume/e_slipshelf.c
@@ -470,7 +470,7 @@ _e_slipshelf_free(E_Slipshelf *ess)
    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);
 }

diff --git a/src/modules/illume/e_slipwin.c b/src/modules/illume/e_slipwin.c
index 0a157f5..6609e22 100644 (file)
--- a/src/modules/illume/e_slipwin.c
+++ b/src/modules/illume/e_slipwin.c
@@ -218,7 +218,7 @@ _e_slipwin_free(E_Slipwin *esw)
      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);
 }

diff --git a/src/modules/illume/e_syswin.c b/src/modules/illume/e_syswin.c
index 3c7789f..1927673 100644 (file)
--- a/src/modules/illume/e_syswin.c
+++ b/src/modules/illume/e_syswin.c
@@ -218,7 +218,7 @@ _e_syswin_free(E_Syswin *esw)
      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);
 }

diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 391a5d2..4799e9c 100644 (file)
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -464,7 +464,7 @@ _mixer_popup_input_window_key_down_cb(void *data, int type, void *event)
 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);

diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index ee961a7..4925aef 100644 (file)
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -2380,7 +2380,7 @@ _pager_popup_show()
    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 @@ _pager_popup_hide(int switch_desk)
        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;
 

diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index be2cc87..3a3abf4 100644 (file)
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -58,7 +58,7 @@ e_syscon_show(E_Zone *zone, const char *defact)
    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 @@ e_syscon_show(E_Zone *zone, const char *defact)
    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_syscon_hide(void)
    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;
 }
 

diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 7bc31ef..254781a 100644 (file)
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -97,7 +97,7 @@ e_winlist_show(E_Zone *zone)
    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 @@ e_winlist_hide(void)
        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)