From cc7fd29743f7a981b7ac30181bd01b2f5556c958 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Fri, 4 Jun 2010 06:59:00 +0000 Subject: [PATCH] fix: also move check to right function.. SVN revision: 49446 --- src/modules/everything-windows/e_mod_main.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/modules/everything-windows/e_mod_main.c b/src/modules/everything-windows/e_mod_main.c index b7db848ff..dba522a63 100644 --- a/src/modules/everything-windows/e_mod_main.c +++ b/src/modules/everything-windows/e_mod_main.c @@ -50,12 +50,17 @@ _border_item_free(Evry_Item *it) E_FREE(bi); } -static void +static int _border_item_add(Plugin *p, E_Border *bd) { Border_Item *bi; char buf[1024]; + if (bd->client.netwm.state.skip_taskbar) + return 0; + if (bd->client.netwm.state.skip_pager) + return 0; + bi = EVRY_ITEM_NEW(Border_Item, p, e_border_name_get(bd), _icon_get, _border_item_free); snprintf(buf, sizeof(buf), "%d:%d %s", bd->desk->x, bd->desk->y, @@ -66,6 +71,8 @@ _border_item_add(Plugin *p, E_Border *bd) e_object_ref(E_OBJECT(bd)); p->borders = eina_list_append(p->borders, bi); + + return 1; } static int @@ -97,18 +104,14 @@ _cb_border_add(void *data, int type, void *event) Plugin *p = data; int min; - if (ev->border->client.netwm.state.skip_taskbar) + if (!_border_item_add(p, ev->border)) return 1; - if (ev->border->client.netwm.state.skip_pager) - return 1; - - _border_item_add(p, ev->border); EVRY_PLUGIN_ITEMS_CLEAR(p); min = EVRY_PLUGIN(p)->config->min_query; - if ((!p->input && min == 0) || + if ((!p->input && (min == 0)) || (p->input && (strlen(p->input) >= min))) { EVRY_PLUGIN_ITEMS_ADD(p, p->borders, p->input, 1, 0);