free mem when fetching new info

NULL checks


SVN revision: 23451
This commit is contained in:
sebastid 2006-06-15 19:27:27 +00:00 committed by sebastid
parent 63a5ae8fd5
commit bd4da9e87c
2 changed files with 3 additions and 2 deletions

View File

@ -4830,6 +4830,7 @@ _e_border_eval(E_Border *bd)
}
if (bd->client.icccm.fetch.window_role)
{
if (bd->client.icccm.window_role) free(bd->client.icccm.window_role);
bd->client.icccm.window_role = ecore_x_icccm_window_role_get(bd->client.win);
bd->client.icccm.fetch.window_role = 0;
}

View File

@ -183,7 +183,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
}
if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) &&
(!(!strcmp("borderless", bd->client.border.name))))
((!bd->client.border.name) || (strcmp("borderless", bd->client.border.name))))
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Shaded"));
@ -214,7 +214,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Borderless"));
e_menu_item_check_set(mi, 1);
e_menu_item_toggle_set(mi, !strcmp("borderless", bd->client.border.name));
e_menu_item_toggle_set(mi, ((bd->client.border.name) && !strcmp("borderless", bd->client.border.name)));
e_menu_item_callback_set(mi, _e_border_menu_cb_borderless, bd);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",