diff options
author | markt <markt> | 2007-02-18 17:47:38 (GMT) |
---|---|---|
committer | markt <markt> | 2007-02-18 17:47:38 (GMT) |
commit | ca710b371b500d29c6849e568c43f746a787bc5f (patch) | |
tree | 29b62e214b546c3e16f8991d1495deef23e3e9b1 /src | |
parent | 9212e1d7c81934720d764c03f2d27e41d31edb56 (diff) | |
download | fluxbox-ca710b371b500d29c6849e568c43f746a787bc5f.zip fluxbox-ca710b371b500d29c6849e568c43f746a787bc5f.tar.bz2 |
little cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.cc | 3 | ||||
-rw-r--r-- | src/Window.cc | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 2a4ea9b..b676a8b 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1764,9 +1764,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) { | |||
1764 | "Workspace Warping", | 1764 | "Workspace Warping", |
1765 | "Workspace Warping - dragging windows to the edge and onto the next workspace", | 1765 | "Workspace Warping - dragging windows to the edge and onto the next workspace", |
1766 | *resource.workspace_warping, saverc_cmd); | 1766 | *resource.workspace_warping, saverc_cmd); |
1767 | _BOOLITEM(menu, Configmenu, DesktopWheeling, | ||
1768 | "Desktop MouseWheel Switching", "Workspace switching using mouse wheel", | ||
1769 | *resource.desktop_wheeling, saverc_cmd); | ||
1770 | _BOOLITEM(menu, Configmenu, DecorateTransient, | 1767 | _BOOLITEM(menu, Configmenu, DecorateTransient, |
1771 | "Decorate Transient Windows", "Decorate Transient Windows", | 1768 | "Decorate Transient Windows", "Decorate Transient Windows", |
1772 | *resource.decorate_transient, saverc_cmd); | 1769 | *resource.decorate_transient, saverc_cmd); |
diff --git a/src/Window.cc b/src/Window.cc index 0deecd2..36bd271 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -596,7 +596,6 @@ void FluxboxWindow::attachClient(WinClient &client, int x, int y) { | |||
596 | // figure out which client to raise at the end | 596 | // figure out which client to raise at the end |
597 | if (FocusControl::focusedFbWindow() == old_win) { | 597 | if (FocusControl::focusedFbWindow() == old_win) { |
598 | was_focused = true; | 598 | was_focused = true; |
599 | focused_win = FocusControl::focusedWindow(); | ||
600 | } else if (FocusControl::focusedFbWindow() != this) { | 599 | } else if (FocusControl::focusedFbWindow() != this) { |
601 | FocusControl::FocusedWindows focus_list = | 600 | FocusControl::FocusedWindows focus_list = |
602 | screen().focusControl().focusedOrderList(); | 601 | screen().focusControl().focusedOrderList(); |