diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index ba5e0d5..d579e62 100644 --- a/src/Screen.cc +++ b/src/Screen.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: Screen.cc,v 1.248 2003/12/12 18:18:12 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.249 2003/12/14 01:09:00 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -1175,9 +1175,9 @@ FluxboxWindow *BScreen::createWindow(WinClient &client) { | |||
1175 | 1175 | ||
1176 | Fluxbox::instance()->attachSignals(*win); | 1176 | Fluxbox::instance()->attachSignals(*win); |
1177 | // winclient actions should have been setup when the WinClient was created | 1177 | // winclient actions should have been setup when the WinClient was created |
1178 | if (win->workspaceNumber() == currentWorkspaceID() || win->isStuck()) { | 1178 | if (win->workspaceNumber() == currentWorkspaceID() || win->isStuck()) |
1179 | win->show(); | 1179 | win->show(); |
1180 | } | 1180 | |
1181 | return win; | 1181 | return win; |
1182 | } | 1182 | } |
1183 | 1183 | ||
@@ -1237,11 +1237,10 @@ void BScreen::addWorkspaceName(const char *name) { | |||
1237 | 1237 | ||
1238 | 1238 | ||
1239 | string BScreen::getNameOfWorkspace(unsigned int workspace) const { | 1239 | string BScreen::getNameOfWorkspace(unsigned int workspace) const { |
1240 | if (workspace < m_workspace_names.size()) { | 1240 | if (workspace < m_workspace_names.size()) |
1241 | return m_workspace_names[workspace]; | 1241 | return m_workspace_names[workspace]; |
1242 | } else { | 1242 | else |
1243 | return ""; | 1243 | return ""; |
1244 | } | ||
1245 | } | 1244 | } |
1246 | 1245 | ||
1247 | void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id, | 1246 | void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id, |