summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/Gnome.cc2
-rw-r--r--src/Remember.cc4
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bb87563..1d14605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.13 2Changes for 0.9.13
3*05/05/13:
4 * Fix a segfault crash, and a similar potential one (Simon)
5 Remember.cc Gnome.cc
3*05/05/12: 6*05/05/12:
4 * Fixed configure.in for iconv for different platforms (Mathias) 7 * Fixed configure.in for iconv for different platforms (Mathias)
5 * Fixed setenv/putenv issues on platforms which dont support setenv (Mathias) 8 * Fixed setenv/putenv issues on platforms which dont support setenv (Mathias)
diff --git a/src/Gnome.cc b/src/Gnome.cc
index 097a462..9fd1a48 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -120,7 +120,7 @@ void Gnome::setupFrame(FluxboxWindow &win) {
120 (unsigned char **) &data) && data) { 120 (unsigned char **) &data) && data) {
121 unsigned int workspace_num = *data; 121 unsigned int workspace_num = *data;
122 if (win.workspaceNumber() != workspace_num) 122 if (win.workspaceNumber() != workspace_num)
123 win.screen().reassociateWindow(&win, workspace_num, false); 123 win.setWorkspace(workspace_num);
124 XFree (data); 124 XFree (data);
125 } else { 125 } else {
126 updateWorkspace(win); 126 updateWorkspace(win);
diff --git a/src/Remember.cc b/src/Remember.cc
index b15a861..e3d3db0 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -828,8 +828,8 @@ void Remember::setupFrame(FluxboxWindow &win) {
828 BScreen &screen = winclient.screen(); 828 BScreen &screen = winclient.screen();
829 829
830 if (app->workspace_remember) { 830 if (app->workspace_remember) {
831 // TODO: fix placement to initialise properly 831 // we use setWorkspace and not reassoc because we're still initialising
832 screen.reassociateWindow(&win, app->workspace, true); 832 win.setWorkspace(app->workspace);
833 if (app->jumpworkspace_remember) 833 if (app->jumpworkspace_remember)
834 screen.changeWorkspaceID(app->workspace); 834 screen.changeWorkspaceID(app->workspace);
835 } 835 }