Updating branch refs/heads/xfce-4.10 to 0003144fdff6f3508b604103065512eb839ab838 (commit) from f09ea920648d4414c747d390d7cfb2aed230c1e7 (commit)
commit 0003144fdff6f3508b604103065512eb839ab838 Author: Olivier Fourdan <four...@xfce.org> Date: Wed Jul 18 22:30:36 2012 +0200 Revert part of git commit 8637c3a as this breaks deletetion of current workspace (bug 8827) src/workspaces.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/workspaces.c b/src/workspaces.c index fb19ab0..f57eec9 100644 --- a/src/workspaces.c +++ b/src/workspaces.c @@ -492,7 +492,8 @@ workspaceInsert (ScreenInfo * screen_info, guint position) void workspaceDelete (ScreenInfo * screen_info, guint position) { - guint count; + Client *c; + guint i, count; g_return_if_fail (screen_info != NULL); @@ -504,6 +505,14 @@ workspaceDelete (ScreenInfo * screen_info, guint position) return; } + for (c = screen_info->clients, i = 0; i < screen_info->client_count; c = c->next, i++) + { + if (c->win_workspace > position) + { + clientSetWorkspace (c, c->win_workspace - 1, TRUE); + } + } + workspaceSetCount(screen_info, count - 1); } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits