simplify e border icon deletion, probably fixing ticket #872

SVN revision: 72373
This commit is contained in:
Mike Blumenkrantz 2012-06-18 08:50:09 +00:00
parent 02cd801b0f
commit 939a19e9bb
1 changed files with 9 additions and 12 deletions

View File

@ -6903,26 +6903,23 @@ _e_border_eval0(E_Border *bd)
}
if (bd->client.netwm.fetch.icon)
{
int i;
if (bd->client.netwm.icons)
{
int i;
for (i = 0; i < bd->client.netwm.num_icons; i++)
free(bd->client.netwm.icons[i].data);
{
free(bd->client.netwm.icons[i].data);
bd->client.netwm.icons[i].data = NULL;
}
free(bd->client.netwm.icons);
}
if (!ecore_x_netwm_icons_get(bd->client.win,
bd->client.netwm.icons = NULL;
bd->client.netwm.num_icons = 0;
if (ecore_x_netwm_icons_get(bd->client.win,
&bd->client.netwm.icons,
&bd->client.netwm.num_icons))
{
bd->client.netwm.icons = NULL;
bd->client.netwm.num_icons = 0;
}
else
{
int i;
// um;ess the rest of e17 uses border icons OTHER than icon # 0
// unless the rest of e17 uses border icons OTHER than icon #0
// then free the rest that we don't need anymore.
for (i = 1; i < bd->client.netwm.num_icons; i++)
{