aboutsummaryrefslogtreecommitdiff
path: root/src/Gnome.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-14 12:13:36 (GMT)
committerfluxgen <fluxgen>2003-04-14 12:13:36 (GMT)
commitf4ce449632eeb85aaeae63f32a7165d71047cde0 (patch)
tree22c3cf8815c69cf4397d0567fd07327e988f9981 /src/Gnome.cc
parent0c895209d2d1425389100e6be734b960475c6883 (diff)
downloadfluxbox_pavel-f4ce449632eeb85aaeae63f32a7165d71047cde0.zip
fluxbox_pavel-f4ce449632eeb85aaeae63f32a7165d71047cde0.tar.bz2
merged with embedded-tab-branch
Diffstat (limited to 'src/Gnome.cc')
-rw-r--r--src/Gnome.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Gnome.cc b/src/Gnome.cc
index 13484c4..c35c6b8 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -1,5 +1,5 @@
1// Gnome.cc for fluxbox 1// Gnome.cc for fluxbox
2// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net) 2// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3// 3//
4// Permission is hereby granted, free of charge, to any person obtaining a 4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"), 5// copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Gnome.cc,v 1.14 2003/04/09 17:20:01 rathnor Exp $ 22// $Id: Gnome.cc,v 1.15 2003/04/14 12:11:59 fluxgen Exp $
23 23
24#include "Gnome.hh" 24#include "Gnome.hh"
25 25
@@ -116,7 +116,7 @@ void Gnome::setupWindow(FluxboxWindow &win) {
116 (unsigned char **) &data) == Success && data) { 116 (unsigned char **) &data) == Success && data) {
117 unsigned int workspace_num = *data; 117 unsigned int workspace_num = *data;
118 if (win.getWorkspaceNumber() != workspace_num) 118 if (win.getWorkspaceNumber() != workspace_num)
119 win.getScreen()->reassociateWindow(&win, workspace_num, false); 119 win.getScreen().reassociateWindow(&win, workspace_num, false);
120 XFree (data); 120 XFree (data);
121 } 121 }
122 122
@@ -250,9 +250,9 @@ bool Gnome::checkClientMessage(const XClientMessageEvent &ce, BScreen * screen,
250 cerr<<__FILE__<<"("<<__LINE__<<"): Got workspace atom="<<ce.data.l[0]<<endl; 250 cerr<<__FILE__<<"("<<__LINE__<<"): Got workspace atom="<<ce.data.l[0]<<endl;
251#endif//!DEBUG 251#endif//!DEBUG
252 if ( win !=0 && // the message sent to client window? 252 if ( win !=0 && // the message sent to client window?
253 win->getScreen() && ce.data.l[0] >= 0 && 253 ce.data.l[0] >= 0 &&
254 ce.data.l[0] < (signed)win->getScreen()->getCount()) { 254 ce.data.l[0] < (signed)win->getScreen().getCount()) {
255 win->getScreen()->changeWorkspaceID(ce.data.l[0]); 255 win->getScreen().changeWorkspaceID(ce.data.l[0]);
256 256
257 } else if (screen!=0 && //the message sent to root window? 257 } else if (screen!=0 && //the message sent to root window?
258 ce.data.l[0] >= 0 && 258 ce.data.l[0] >= 0 &&