enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix: also move check to right function.. 

SVN revision: 49446
This commit is contained in:
Hannes Janetzek 2010-06-04 06:59:00 +00:00
parent d08037a625
commit cc7fd29743
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/everything-windows/e_mod_main.c
View File

@ -50,12 +50,17 @@ _border_item_free(Evry_Item *it)
E_FREE(bi); E_FREE(bi);
} }
static void static int
_border_item_add(Plugin *p, E_Border *bd) _border_item_add(Plugin *p, E_Border *bd)
{ {
Border_Item *bi; Border_Item *bi;
char buf[1024]; 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); bi = EVRY_ITEM_NEW(Border_Item, p, e_border_name_get(bd), _icon_get, _border_item_free);
snprintf(buf, sizeof(buf), "%d:%d %s", snprintf(buf, sizeof(buf), "%d:%d %s",
bd->desk->x, bd->desk->y, bd->desk->x, bd->desk->y,
@ -66,6 +71,8 @@ _border_item_add(Plugin *p, E_Border *bd)
e_object_ref(E_OBJECT(bd)); e_object_ref(E_OBJECT(bd));
p->borders = eina_list_append(p->borders, bi); p->borders = eina_list_append(p->borders, bi);
return 1;
} }
static int static int
@ -97,18 +104,14 @@ _cb_border_add(void *data, int type, void *event)
Plugin *p = data; Plugin *p = data;
int min; int min;
if (ev->border->client.netwm.state.skip_taskbar) if (!_border_item_add(p, ev->border))
return 1; return 1;
if (ev->border->client.netwm.state.skip_pager)
return 1;
_border_item_add(p, ev->border);
EVRY_PLUGIN_ITEMS_CLEAR(p); EVRY_PLUGIN_ITEMS_CLEAR(p);
min = EVRY_PLUGIN(p)->config->min_query; min = EVRY_PLUGIN(p)->config->min_query;
if ((!p->input && min == 0) || if ((!p->input && (min == 0)) ||
(p->input && (strlen(p->input) >= min))) (p->input && (strlen(p->input) >= min)))
{ {
EVRY_PLUGIN_ITEMS_ADD(p, p->borders, p->input, 1, 0); EVRY_PLUGIN_ITEMS_ADD(p, p->borders, p->input, 1, 0);