From b7066f41912c886c914e96255db2095f081f2e63 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Sat, 13 Feb 2010 19:11:23 +0000 Subject: [PATCH] And use e_border_name_get to get name SVN revision: 46154 --- src/modules/illume2/e_illume_border.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/modules/illume2/e_illume_border.c b/src/modules/illume2/e_illume_border.c index f629b803d..d7532be9c 100644 --- a/src/modules/illume2/e_illume_border.c +++ b/src/modules/illume2/e_illume_border.c @@ -35,12 +35,10 @@ e_illume_border_is_keyboard(E_Border *bd) if (bd->client.vkbd.vkbd) return 1; if (il_cfg->policy.vkbd.match.title) { - char *title; + const char *title; - title = bd->client.netwm.name; - if (!title) title = bd->client.icccm.title; - if ((title) && - (!strcmp(title, il_cfg->policy.vkbd.title))) + title = e_border_name_get(bd); + if (!strcmp(title, il_cfg->policy.vkbd.title)) return 1; } if (il_cfg->policy.vkbd.match.name) @@ -68,13 +66,10 @@ e_illume_border_is_bottom_panel(E_Border *bd) { if (il_cfg->policy.softkey.match.title) { - char *title; - int ret = 0; + const char *title; - title = bd->client.netwm.name; - if (!title) title = bd->client.icccm.title; - if ((title) && - (!strcmp(title, il_cfg->policy.softkey.title))) + title = e_border_name_get(bd); + if (!strcmp(title, il_cfg->policy.softkey.title)) return 1; } if (il_cfg->policy.softkey.match.name) @@ -100,12 +95,10 @@ e_illume_border_is_top_shelf(E_Border *bd) { if (il_cfg->policy.indicator.match.title) { - char *title; + const char *title; - title = bd->client.netwm.name; - if (!title) title = bd->client.icccm.title; - if ((title) && - (!strcmp(title, il_cfg->policy.indicator.title))) + title = e_border_name_get(bd); + if (!strcmp(title, il_cfg->policy.indicator.title)) return 1; } if (il_cfg->policy.indicator.match.name)