diff options
-rw-r--r-- | src/Workspace.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc index cf8177e..a93f7e0 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Workspace.cc,v 1.78 2003/07/28 15:06:35 rathnor Exp $ | 25 | // $Id: Workspace.cc,v 1.79 2003/08/04 16:28:10 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Workspace.hh" | 27 | #include "Workspace.hh" |
28 | 28 | ||
@@ -37,8 +37,8 @@ | |||
37 | #include "MenuItem.hh" | 37 | #include "MenuItem.hh" |
38 | 38 | ||
39 | // use GNU extensions | 39 | // use GNU extensions |
40 | #ifndef _GNU_SOURCE | 40 | #ifndef _GNU_SOURCE |
41 | #define _GNU_SOURCE | 41 | #define _GNU_SOURCE |
42 | #endif // _GNU_SOURCE | 42 | #endif // _GNU_SOURCE |
43 | 43 | ||
44 | #ifdef HAVE_CONFIG_H | 44 | #ifdef HAVE_CONFIG_H |
@@ -409,8 +409,7 @@ void Workspace::setName(const std::string &name) { | |||
409 | } else { //if name == 0 then set default name from nls | 409 | } else { //if name == 0 then set default name from nls |
410 | char tname[128]; | 410 | char tname[128]; |
411 | sprintf(tname, I18n::instance()-> | 411 | sprintf(tname, I18n::instance()-> |
412 | getMessage( | 412 | getMessage(FBNLS::WorkspaceSet, |
413 | FBNLS::WorkspaceSet, | ||
414 | FBNLS::WorkspaceDefaultNameFormat, | 413 | FBNLS::WorkspaceDefaultNameFormat, |
415 | "Workspace %d"), m_id + 1); //m_id starts at 0 | 414 | "Workspace %d"), m_id + 1); //m_id starts at 0 |
416 | m_name = tname; | 415 | m_name = tname; |
@@ -551,7 +550,7 @@ void Workspace::placeWindow(FluxboxWindow &win) { | |||
551 | 550 | ||
552 | while (!placed && | 551 | while (!placed && |
553 | (left_right ? test_x + win_w < head_right | 552 | (left_right ? test_x + win_w < head_right |
554 | : test_x > head_left)) { | 553 | : test_x > head_left)) { |
555 | 554 | ||
556 | placed = true; | 555 | placed = true; |
557 | 556 | ||
@@ -626,7 +625,7 @@ void Workspace::placeWindow(FluxboxWindow &win) { | |||
626 | 625 | ||
627 | while (!placed && | 626 | while (!placed && |
628 | (left_right ? test_x + win_w < head_right | 627 | (left_right ? test_x + win_w < head_right |
629 | : test_x > head_left)) { | 628 | : test_x > head_left)) { |
630 | 629 | ||
631 | if (left_right) | 630 | if (left_right) |
632 | next_x = head_right; // it will get shrunk | 631 | next_x = head_right; // it will get shrunk |