vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IF_FREE -> E_FREE 

SVN revision: 16573
This commit is contained in:
sebastid 2005-09-05 15:24:07 +00:00 committed by sebastid
parent a617a7f840
commit 880a2f20e8
20 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_actions.c
View File

@ -1004,7 +1004,7 @@ static void
_e_action_free(E_Action *act)
{
actions = evas_hash_del(actions, act->name, act);
IF_FREE(act->name);
E_FREE(act->name);
free(act);
}

20
src/bin/e_apps.c
View File

@ -726,7 +726,7 @@ _e_app_free(E_App *a)
_e_apps = evas_hash_del(_e_apps, a->path, a);
_e_apps_list = evas_list_remove(_e_apps_list, a);
_e_app_fields_empty(a);
IF_FREE(a->path);
E_FREE(a->path);
free(a);
}
}
@ -874,15 +874,15 @@ _e_app_fields_fill(E_App *a, const char *path)
static void
_e_app_fields_empty(E_App *a)
{
IF_FREE(a->name);
IF_FREE(a->generic);
IF_FREE(a->comment);
IF_FREE(a->exe);
IF_FREE(a->icon_class);
IF_FREE(a->win_name);
IF_FREE(a->win_class);
IF_FREE(a->win_title);
IF_FREE(a->win_role);
E_FREE(a->name);
E_FREE(a->generic);
E_FREE(a->comment);
E_FREE(a->exe);
E_FREE(a->icon_class);
E_FREE(a->win_name);
E_FREE(a->win_class);
E_FREE(a->win_title);
E_FREE(a->win_role);
}
static Ecore_List *

2
src/bin/e_bg.c
View File

@ -166,7 +166,7 @@ e_bg_del(int container, int zone, int desk_x, int desk_y)
(cfbg->desk_x == desk_x) && (cfbg->desk_y == desk_y))
{
e_config->desktop_backgrounds = evas_list_remove_list(e_config->desktop_backgrounds, l);
IF_FREE(cfbg->file);
E_FREE(cfbg->file);
free(cfbg);
break;
}

8
src/bin/e_border.c
View File

@ -2180,7 +2180,7 @@ _e_border_free(E_Border *bd)
bd->cur_mouse_action = NULL;
}
IF_FREE(bd->shape_rects);
E_FREE(bd->shape_rects);
bd->shape_rects_num = 0;
/*
if (bd->dangling_ref_check)
@ -4534,7 +4534,7 @@ _e_border_eval(E_Border *bd)
}
if (rem->apply & E_REMEMBER_APPLY_BORDER)
{
IF_FREE(bd->client.border.name);
E_FREE(bd->client.border.name);
if (rem->prop.border)
bd->client.border.name = strdup(rem->prop.border);
bd->client.border.changed = 1;
@ -5206,7 +5206,7 @@ _e_border_eval(E_Border *bd)
e_container_shape_solid_rect_set(bd->shape, 0, 0, 0, 0);
else
e_container_shape_solid_rect_set(bd->shape, bd->client_inset.l, bd->client_inset.t, bd->client.w, bd->client.h);
IF_FREE(bd->shape_rects);
E_FREE(bd->shape_rects);
bd->shape_rects = rects;
bd->shape_rects_num = num;
e_container_shape_rects_set(bd->shape, rects, num);
@ -5216,7 +5216,7 @@ _e_border_eval(E_Border *bd)
}
else
{
IF_FREE(bd->shape_rects);
E_FREE(bd->shape_rects);
bd->shape_rects = NULL;
bd->shape_rects_num = 0;
e_container_shape_rects_set(bd->shape, NULL, 0);

4
src/bin/e_config.c
View File

@ -1002,7 +1002,7 @@ e_config_init(void)
int
e_config_shutdown(void)
{
IF_FREE(_e_config_profile);
E_FREE(_e_config_profile);
E_CONFIG_DD_FREE(_e_config_edd);
E_CONFIG_DD_FREE(_e_config_module_edd);
E_CONFIG_DD_FREE(_e_config_font_default_edd);
@ -1055,7 +1055,7 @@ e_config_profile_get(void)
void e_config_profile_set(char *prof)
{
IF_FREE(_e_config_profile);
E_FREE(_e_config_profile);
_e_config_profile = strdup(prof);
}

2
src/bin/e_desk.c
View File

@ -109,7 +109,7 @@ e_desk_name_del(int container, int zone, int desk_x, int desk_y)
(cfname->desk_x == desk_x) && (cfname->desk_y == desk_y))
{
e_config->desktop_names = evas_list_remove_list(e_config->desktop_names, l);
IF_FREE(cfname->name);
E_FREE(cfname->name);
free(cfname);
break;
}

4
src/bin/e_dialog.c
View File

@ -182,8 +182,8 @@ _e_dialog_free(E_Dialog *dia)
db = dia->buttons->data;
dia->buttons = evas_list_remove_list(dia->buttons, dia->buttons);
IF_FREE(db->label);
IF_FREE(db->icon);
E_FREE(db->label);
E_FREE(db->icon);
evas_object_del(db->obj);
free(db);
}

6
src/bin/e_dnd.c
View File

@ -527,7 +527,7 @@ e_drag_idler_before(void)
}
if (changed)
{
IF_FREE(drag->shape_rects);
E_FREE(drag->shape_rects);
drag->shape_rects = rects;
drag->shape_rects_num = num;
e_container_shape_rects_set(drag->shape, rects, num);
@ -537,7 +537,7 @@ e_drag_idler_before(void)
}
else
{
IF_FREE(drag->shape_rects);
E_FREE(drag->shape_rects);
drag->shape_rects = NULL;
drag->shape_rects_num = 0;
e_container_shape_rects_set(drag->shape, NULL, 0);
@ -556,7 +556,7 @@ _e_drag_free(E_Drag *drag)
{
_drag_list = evas_list_remove(_drag_list, drag);
IF_FREE(drag->shape_rects);
E_FREE(drag->shape_rects);
drag->shape_rects_num = 0;
e_object_unref(E_OBJECT(drag->container));
e_container_shape_hide(drag->shape);

10
src/bin/e_error.c
View File

@ -108,7 +108,7 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
o = evas_object_image_add(e);
s = e_path_find(path_images, "e.png");
evas_object_image_file_set(o, s, NULL);
IF_FREE(s);
E_FREE(s);
evas_object_move(o, 16, 16);
evas_object_resize(o, 64, 64);
evas_object_image_fill_set(o, 0, 0, 64, 64);
@ -193,7 +193,7 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
o = evas_object_image_add(e);
s = e_path_find(path_images, "button_out.png");
evas_object_image_file_set(o, s, NULL);
IF_FREE(s);
E_FREE(s);
evas_object_move(o, (error_w - 64) / 2, error_h - 16 - 32);
evas_object_resize(o, 64, 32);
evas_object_image_fill_set(o, 0, 0, 64, 32);
@ -223,7 +223,7 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
o = evas_object_image_add(e);
s = e_path_find(path_images, "error_bg.png");
evas_object_image_file_set(o, s, NULL);
IF_FREE(s);
E_FREE(s);
evas_object_move(o, 0, 0);
evas_object_image_fill_set(o, 0, 0, error_w, error_h);
evas_object_resize(o, error_w, error_h);
@ -375,7 +375,7 @@ _e_error_cb_ok_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
ee = data;
s = e_path_find(path_images, "button_in.png");
evas_object_image_file_set(obj, s, NULL);
IF_FREE(s);
E_FREE(s);
}
static void
@ -391,7 +391,7 @@ _e_error_cb_ok_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
ee = data;
s = e_path_find(path_images, "button_out.png");
evas_object_image_file_set(obj, s, NULL);
IF_FREE(s);
E_FREE(s);
o = evas_object_name_find(ecore_evas_get(ee), "allocated");
if (o)
{

14
src/bin/e_gadman.c
View File

@ -599,7 +599,7 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
e_menu_item_toggle_set(mi, gmc->use_autow);
s = e_path_find(path_icons, "default.edj");
e_menu_item_icon_edje_set(mi, s, "auto_width");
IF_FREE(s);
E_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_auto_width, gmc);
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@ -608,13 +608,13 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
e_menu_item_label_set(mi, _("Half Screen Width"));
s = e_path_find(path_icons, "default.edj");
e_menu_item_icon_edje_set(mi, s, "half_width");
IF_FREE(s);
E_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_half_width, gmc);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Full Screen Width"));
s = e_path_find(path_icons, "default.edj");
e_menu_item_icon_edje_set(mi, s, "full_width");
IF_FREE(s);
E_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_full_width, gmc);
}
disallow = (gmc->policy & E_GADMAN_POLICY_EDGES)
@ -626,7 +626,7 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
e_menu_item_label_set(mi, _("Center Horizontally"));
s = e_path_find(path_icons, "default.edj");
e_menu_item_icon_edje_set(mi, s, "center_horiz");
IF_FREE(s);
E_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_center_horiz, gmc);
}
if (seperator)
@ -646,7 +646,7 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
e_menu_item_toggle_set(mi, gmc->use_autoh);
s = e_path_find(path_icons, "default.edj"),
e_menu_item_icon_edje_set(mi, s, "auto_height");
IF_FREE(s);
E_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_auto_height, gmc);
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@ -655,7 +655,7 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
e_menu_item_label_set(mi, _("Half Screen Height"));
s = e_path_find(path_icons, "default.edj");
e_menu_item_icon_edje_set(mi, s, "half_height");
IF_FREE(s);
E_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_half_height, gmc);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Full Screen Height"));
@ -672,7 +672,7 @@ e_gadman_client_menu_new(E_Gadman_Client *gmc)
e_menu_item_label_set(mi, _("Center Vertically"));
s = e_path_find(path_icons, "default.edj");
e_menu_item_icon_edje_set(mi, s, "center_vert");
IF_FREE(s);
E_FREE(s);
e_menu_item_callback_set(mi, _e_gadman_cb_center_vert, gmc);
}
if (seperator)

4
src/bin/e_hints.c
View File

@ -263,7 +263,7 @@ e_hints_client_list_set(void)
ecore_x_netwm_client_list_stacking_set(m->root, NULL, 0);
}
}
IF_FREE(clients);
E_FREE(clients);
}
/* Client list is already in stacking order, so this function is nearly
@ -322,7 +322,7 @@ e_hints_client_stacking_set(void)
ecore_x_netwm_client_list_stacking_set(m->root, NULL, 0);
}
}
IF_FREE(clients);
E_FREE(clients);
}
void

6
src/bin/e_init.c
View File

@ -80,7 +80,7 @@ e_init_init(void)
/* FIXME: "init.edj" needs to come from config */
s = e_path_find(path_init, "init.edj"),
edje_object_file_set(o, s, "init/splash");
IF_FREE(s);
E_FREE(s);
_e_init_object = o;
}
/* other screens */
@ -89,7 +89,7 @@ e_init_init(void)
/* FIXME: "init.edj" needs to come from config */
s = e_path_find(path_init, "init.edj"),
edje_object_file_set(o, s, "init/extra_screen");
IF_FREE(s);
E_FREE(s);
}
evas_object_move(o, scr->x, scr->y);
evas_object_resize(o, scr->w, scr->h);
@ -102,7 +102,7 @@ e_init_init(void)
/* FIXME: "init.edj" needs to come from config */
s = e_path_find(path_init, "init.edj"),
edje_object_file_set(o, s, "init/splash");
IF_FREE(s);
E_FREE(s);
_e_init_object = o;
evas_object_move(o, 0, 0);
evas_object_resize(o, w, h);

8
src/bin/e_int_menus.c
View File

@ -667,7 +667,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
e_menu_item_label_set(mi, _("Cleanup Windows"));
s = e_path_find(path_icons, "default.edj");
e_menu_item_icon_edje_set(mi, s, "windows");
IF_FREE(s);
E_FREE(s);
e_menu_item_callback_set(mi, _e_int_menus_clients_cleanup_cb, zone);
e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_clients_free_hook);
@ -860,9 +860,9 @@ _e_int_menus_themes_edit_mode_cb(void *data, E_Menu *m, E_Menu_Item *mi)
if (!strcmp(et->category, "theme"))
{
e_config->themes = evas_list_remove_list(e_config->themes, l);
IF_FREE(et->category);
IF_FREE(et->file);
IF_FREE(et);
E_FREE(et->category);
E_FREE(et->file);
E_FREE(et);
break;
}
}

10
src/bin/e_intl.c
View File

@ -80,11 +80,11 @@ e_intl_init(void)
int
e_intl_shutdown(void)
{
IF_FREE(_e_intl_language);
IF_FREE(_e_intl_orig_lc_messages);
IF_FREE(_e_intl_orig_language);
IF_FREE(_e_intl_orig_lc_all);
IF_FREE(_e_intl_orig_lang);
E_FREE(_e_intl_language);
E_FREE(_e_intl_orig_lc_messages);
E_FREE(_e_intl_orig_language);
E_FREE(_e_intl_orig_lc_all);
E_FREE(_e_intl_orig_lang);
evas_list_free(_e_intl_languages);
return 1;
}

16
src/bin/e_ipc_handlers.h
View File

@ -1148,7 +1148,7 @@ break;
REQ_STRING(params[0], HDL);
#elif (TYPE == E_WM_IN)
STRING(s, HDL);
IF_FREE(e_config->language);
E_FREE(e_config->language);
e_config->language = strdup(s);
if ((e_config->language) && (strlen(e_config->language) > 0))
e_intl_language_set(e_config->language);
@ -2285,9 +2285,9 @@ break;
if (eb)
{
e_config->mouse_bindings = evas_list_remove(e_config->mouse_bindings, eb);
IF_FREE(eb->action);
IF_FREE(eb->params);
IF_FREE(eb);
E_FREE(eb->action);
E_FREE(eb->params);
E_FREE(eb);
e_border_button_bindings_ungrab_all();
e_bindings_mouse_del(bind.context, bind.button, bind.modifiers,
bind.any_mod, bind.action, bind.params);
@ -2603,10 +2603,10 @@ break;
if (eb)
{
e_config->key_bindings = evas_list_remove(e_config->key_bindings, eb);
IF_FREE(eb->key);
IF_FREE(eb->action);
IF_FREE(eb->params);
IF_FREE(eb);
E_FREE(eb->key);
E_FREE(eb->action);
E_FREE(eb->params);
E_FREE(eb);
e_managers_keys_ungrab();
e_bindings_key_del(bind.context, bind.key, bind.modifiers,
bind.any_mod, bind.action, bind.params);

6
src/bin/e_menu.c
View File

@ -799,7 +799,7 @@ e_menu_idler_before(void)
}
if (changed)
{
IF_FREE(m->shape_rects);
E_FREE(m->shape_rects);
m->shape_rects = rects;
m->shape_rects_num = num;
e_container_shape_rects_set(m->shape, rects, num);
@ -809,7 +809,7 @@ e_menu_idler_before(void)
}
else
{
IF_FREE(m->shape_rects);
E_FREE(m->shape_rects);
m->shape_rects = NULL;
m->shape_rects_num = 0;
e_container_shape_rects_set(m->shape, NULL, 0);
@ -849,7 +849,7 @@ _e_menu_free(E_Menu *m)
Evas_List *l, *tmp;
_e_menu_unrealize(m);
IF_FREE(m->shape_rects);
E_FREE(m->shape_rects);
m->shape_rects_num = 0;
for (l = m->items; l;)
{

4
src/bin/e_module.c
View File

@ -53,8 +53,8 @@ e_module_init(void)
}
else
{
IF_FREE(em->name);
IF_FREE(em);
E_FREE(em->name);
E_FREE(em);
e_config->modules = evas_list_remove_list(e_config->modules, pl);
e_config_save_queue();
}

6
src/bin/e_popup.c
View File

@ -216,7 +216,7 @@ e_popup_idler_before(void)
}
if (changed)
{
IF_FREE(pop->shape_rects);
E_FREE(pop->shape_rects);
pop->shape_rects = rects;
pop->shape_rects_num = num;
e_container_shape_rects_set(pop->shape, rects, num);
@ -226,7 +226,7 @@ e_popup_idler_before(void)
}
else
{
IF_FREE(pop->shape_rects);
E_FREE(pop->shape_rects);
pop->shape_rects = NULL;
pop->shape_rects_num = 0;
e_container_shape_rects_set(pop->shape, NULL, 0);
@ -243,7 +243,7 @@ e_popup_idler_before(void)
static void
_e_popup_free(E_Popup *pop)
{
IF_FREE(pop->shape_rects);
E_FREE(pop->shape_rects);
pop->shape_rects_num = 0;
e_container_shape_hide(pop->shape);
e_object_del(E_OBJECT(pop->shape));

24
src/bin/e_prefix.c
View File

@ -22,12 +22,12 @@ e_prefix_determine(char *argv0)
{
char *p;
IF_FREE(_exe_path);
IF_FREE(_prefix_path);
IF_FREE(_prefix_path_locale);
IF_FREE(_prefix_path_bin);
IF_FREE(_prefix_path_data);
IF_FREE(_prefix_path_lib);
E_FREE(_exe_path);
E_FREE(_prefix_path);
E_FREE(_prefix_path_locale);
E_FREE(_prefix_path_bin);
E_FREE(_prefix_path_data);
E_FREE(_prefix_path_lib);
if (!_e_prefix_try_proc())
{
@ -104,12 +104,12 @@ e_prefix_determine(char *argv0)
void
e_prefix_fallback(void)
{
IF_FREE(_exe_path);
IF_FREE(_prefix_path);
IF_FREE(_prefix_path_locale);
IF_FREE(_prefix_path_bin);
IF_FREE(_prefix_path_data);
IF_FREE(_prefix_path_lib);
E_FREE(_exe_path);
E_FREE(_prefix_path);
E_FREE(_prefix_path_locale);
E_FREE(_prefix_path_bin);
E_FREE(_prefix_path_data);
E_FREE(_prefix_path_lib);
_e_prefix_fallbacks();
}

28
src/bin/e_remember.c
View File

@ -137,12 +137,12 @@ e_remember_find(E_Border *bd)
void
e_remember_update(E_Remember *rem, E_Border *bd)
{
IF_FREE(rem->name);
IF_FREE(rem->class);
IF_FREE(rem->title);
IF_FREE(rem->role);
IF_FREE(rem->prop.border);
IF_FREE(rem->prop.command);
E_FREE(rem->name);
E_FREE(rem->class);
E_FREE(rem->title);
E_FREE(rem->role);
E_FREE(rem->prop.border);
E_FREE(rem->prop.command);
if (bd->client.icccm.name)
rem->name = strdup(bd->client.icccm.name);
@ -198,7 +198,7 @@ e_remember_update(E_Remember *rem, E_Border *bd)
rem->prop.lock_focus_out = bd->lock_focus_out;
rem->prop.lock_life = bd->lock_life;
IF_FREE(rem->prop.border);
E_FREE(rem->prop.border);
if (bd->client.border.name)
rem->prop.border = strdup(bd->client.border.name);
@ -214,7 +214,7 @@ e_remember_update(E_Remember *rem, E_Border *bd)
rem->prop.head = bd->zone->container->manager->num;
/* FIXME: e17 doesn't fetch WM_COMMAND property yet
IF_FREE(rem->prop.command);
E_FREE(rem->prop.command);
*/
e_config_save_queue();
@ -225,11 +225,11 @@ static void
_e_remember_free(E_Remember *rem)
{
e_config->remembers = evas_list_remove(e_config->remembers, rem);
IF_FREE(rem->name);
IF_FREE(rem->class);
IF_FREE(rem->title);
IF_FREE(rem->role);
IF_FREE(rem->prop.border);
IF_FREE(rem->prop.command);
E_FREE(rem->name);
E_FREE(rem->class);
E_FREE(rem->title);
E_FREE(rem->role);
E_FREE(rem->prop.border);
E_FREE(rem->prop.command);
free(rem);
}