Merge and fix Paul Fariello commit 'Add uicb client move to next/prev tag'

This commit is contained in:
Martin Duquesnoy 2012-01-19 03:00:58 +01:00
parent 36c0e0671d
commit e1d1a9329b

View File

@ -182,13 +182,10 @@ uicb_tag_move_client_next(Uicb cmd)
(void)cmd;
struct tag *t;
/* Remove from current tag */
tag_client(NULL, W->client);
if((t = TAILQ_PREV(W->screen->seltag, tsub, next)))
if((t = TAILQ_NEXT(W->screen->seltag, next)))
tag_client(t, W->client);
else if( /* CIRCULAR OPTION */ 1)
tag_client(TAILQ_FIRST(&W->screen->tags, tsub), W->client);
tag_client(TAILQ_FIRST(&W->screen->tags), W->client);
}
void
@ -197,9 +194,6 @@ uicb_tag_move_client_prev(Uicb cmd)
(void)cmd;
struct tag *t;
/* Remove from current tag */
tag_client(NULL, W->client);
if((t = TAILQ_PREV(W->screen->seltag, tsub, next)))
tag_client(t, W->client);
else if( /* CIRCULAR OPTION */ 1)