From b1804a21ebfd51dcb788dbd74638ffe8221f04f8 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sat, 13 Feb 2010 16:19:41 +0000 Subject: [PATCH] Don't need the return variable here. Don't free the title. SVN revision: 46146 --- src/modules/illume2/e_illume_border.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/modules/illume2/e_illume_border.c b/src/modules/illume2/e_illume_border.c index b9d35af62..f629b803d 100644 --- a/src/modules/illume2/e_illume_border.c +++ b/src/modules/illume2/e_illume_border.c @@ -36,14 +36,12 @@ e_illume_border_is_keyboard(E_Border *bd) if (il_cfg->policy.vkbd.match.title) { char *title; - int ret = 0; title = bd->client.netwm.name; if (!title) title = bd->client.icccm.title; if ((title) && (!strcmp(title, il_cfg->policy.vkbd.title))) - ret = 1; - if (ret) return ret; + return 1; } if (il_cfg->policy.vkbd.match.name) { @@ -77,9 +75,7 @@ e_illume_border_is_bottom_panel(E_Border *bd) if (!title) title = bd->client.icccm.title; if ((title) && (!strcmp(title, il_cfg->policy.softkey.title))) - ret = 1; - if (title) free(title); - if (ret) return ret; + return 1; } if (il_cfg->policy.softkey.match.name) { @@ -105,15 +101,12 @@ e_illume_border_is_top_shelf(E_Border *bd) if (il_cfg->policy.indicator.match.title) { char *title; - int ret = 0; title = bd->client.netwm.name; if (!title) title = bd->client.icccm.title; if ((title) && (!strcmp(title, il_cfg->policy.indicator.title))) - ret = 1; - if (title) free(title); - if (ret) return ret; + return 1; } if (il_cfg->policy.indicator.match.name) { @@ -136,15 +129,12 @@ e_illume_border_is_home(E_Border *bd) if (il_cfg->policy.home.match.title) { char *title; - int ret = 0; title = bd->client.netwm.name; if (!title) title = bd->client.icccm.title; if ((title) && (!strcmp(title, il_cfg->policy.home.title))) - ret = 1; - if (title) free(title); - if (ret) return ret; + return 1; } if (il_cfg->policy.home.match.name) {