diff options
| author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
|---|---|---|
| committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
| commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
| tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/WorkspaceCmd.cc | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-argb.zip fluxbox_lack-argb.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/WorkspaceCmd.cc')
| -rw-r--r-- | src/WorkspaceCmd.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc index dbcc5dd..d72ef13 100644 --- a/src/WorkspaceCmd.cc +++ b/src/WorkspaceCmd.cc | |||
| @@ -189,7 +189,7 @@ REGISTER_COMMAND_PARSER(prevwindow, parseWindowList, void); | |||
| 189 | REGISTER_COMMAND_PARSER(prevgroup, parseWindowList, void); | 189 | REGISTER_COMMAND_PARSER(prevgroup, parseWindowList, void); |
| 190 | REGISTER_COMMAND_PARSER(arrangewindows, parseWindowList, void); | 190 | REGISTER_COMMAND_PARSER(arrangewindows, parseWindowList, void); |
| 191 | 191 | ||
| 192 | }; // end anonymous namespace | 192 | } // end anonymous namespace |
| 193 | 193 | ||
| 194 | void AttachCmd::execute() { | 194 | void AttachCmd::execute() { |
| 195 | BScreen *screen = Fluxbox::instance()->keyScreen(); | 195 | BScreen *screen = Fluxbox::instance()->keyScreen(); |
| @@ -318,7 +318,7 @@ REGISTER_COMMAND_PARSER(rightworkspace, parseIntCmd, void); | |||
| 318 | REGISTER_COMMAND_PARSER(leftworkspace, parseIntCmd, void); | 318 | REGISTER_COMMAND_PARSER(leftworkspace, parseIntCmd, void); |
| 319 | REGISTER_COMMAND_PARSER(workspace, parseIntCmd, void); | 319 | REGISTER_COMMAND_PARSER(workspace, parseIntCmd, void); |
| 320 | 320 | ||
| 321 | }; // end anonymous namespace | 321 | } // end anonymous namespace |
| 322 | 322 | ||
| 323 | void NextWorkspaceCmd::execute() { | 323 | void NextWorkspaceCmd::execute() { |
| 324 | BScreen *screen = Fluxbox::instance()->mouseScreen(); | 324 | BScreen *screen = Fluxbox::instance()->mouseScreen(); |