aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 90fcc78..4a243ff 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.169 2003/05/16 00:35:50 fluxgen Exp $ 25// $Id: Screen.cc,v 1.170 2003/05/17 11:05:33 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -125,17 +125,15 @@ static bool running = true;
125namespace { 125namespace {
126 126
127int anotherWMRunning(Display *display, XErrorEvent *) { 127int anotherWMRunning(Display *display, XErrorEvent *) {
128 fprintf(stderr, 128 cerr<<I18n::instance()->
129 I18n::instance()->
130 getMessage( 129 getMessage(
131 FBNLS::ScreenSet, FBNLS::ScreenAnotherWMRunning, 130 FBNLS::ScreenSet, FBNLS::ScreenAnotherWMRunning,
132 "BScreen::BScreen: an error occured while querying the X server.\n" 131 "BScreen::BScreen: an error occured while querying the X server.\n"
133 " another window manager already running on display %s.\n"), 132 " another window manager already running on display ")<<DisplayString(display)<<endl;
134 DisplayString(display));
135 133
136 running = false; 134 running = false;
137 135
138 return(-1); 136 return -1;
139} 137}
140 138
141FbTk::Menu *createMenuFromScreen(BScreen &screen) { 139FbTk::Menu *createMenuFromScreen(BScreen &screen) {
@@ -1301,8 +1299,12 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1301 *layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); 1299 *layerManager().getLayer(Fluxbox::instance()->getNormalLayer()));
1302 1300
1303#ifdef SLIT 1301#ifdef SLIT
1304 if (win->initialState() == WithdrawnState) 1302 if (win->initialState() == WithdrawnState) {
1305 slit()->addClient(win->clientWindow()); 1303 delete win;
1304 win = 0;
1305 slit()->addClient(client);
1306 return 0;
1307 }
1306#endif // SLIT 1308#endif // SLIT
1307 1309
1308 if (!win->isManaged()) { 1310 if (!win->isManaged()) {