aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-07-29 06:47:56 (GMT)
committermarkt <markt>2006-07-29 06:47:56 (GMT)
commit83953b8f3753aef1362cbd3af4868a7f87e451a7 (patch)
treefe9689d92afa8ac11a3e92dc71f0e565b3223aaf
parentf66d91cf2281e9a7aec64b7c903c1ba91898324f (diff)
downloadfluxbox-83953b8f3753aef1362cbd3af4868a7f87e451a7.zip
fluxbox-83953b8f3753aef1362cbd3af4868a7f87e451a7.tar.bz2
don't jump to rememberd apps on restart
-rw-r--r--ChangeLog6
-rw-r--r--src/Remember.cc2
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cb74e0a..37b1bc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/07/29: 3*06/07/29:
4 * Don't jump to remembered apps on restart (Mark)
5 Remember.cc
4 * Make _NET_CLIENT_LIST report windows in creation order - still need to fix 6 * Make _NET_CLIENT_LIST report windows in creation order - still need to fix
5 _NET_CLIENT_LIST_STACKING (Mark) 7 _NET_CLIENT_LIST_STACKING (Mark)
6 FocusControl.hh Ewmh.cc 8 FocusControl.hh Ewmh.cc
@@ -53,8 +55,8 @@ Changes for 1.0rc3:
53 * Fix a possible bug with window cycling on multiple screens (Mark) 55 * Fix a possible bug with window cycling on multiple screens (Mark)
54 fluxbox.cc WorkspaceCmd.cc 56 fluxbox.cc WorkspaceCmd.cc
55 * Include minimized windows when "alt-tabbing", added 16 to the 57 * Include minimized windows when "alt-tabbing", added 16 to the
56 Next/PrevWindow bitmask to disable the behavior (Mark) 58 Next/PrevWindow bitmask to disable the behavior (Mark)
57 FocusControl.cc/hh 59 FocusControl.cc/hh
58*06/07/13: 60*06/07/13:
59 * Remove some redundant code for loading styles (Mark) 61 * Remove some redundant code for loading styles (Mark)
60 fluxbox.cc Screen.cc RootTheme.cc/hh 62 fluxbox.cc Screen.cc RootTheme.cc/hh
diff --git a/src/Remember.cc b/src/Remember.cc
index eace6bc..2a28dda 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -970,7 +970,7 @@ void Remember::setupFrame(FluxboxWindow &win) {
970 if (app->workspace_remember) { 970 if (app->workspace_remember) {
971 // we use setWorkspace and not reassoc because we're still initialising 971 // we use setWorkspace and not reassoc because we're still initialising
972 win.setWorkspace(app->workspace); 972 win.setWorkspace(app->workspace);
973 if (app->jumpworkspace_remember) 973 if (app->jumpworkspace_remember && !Fluxbox::instance()->isStartup())
974 screen.changeWorkspaceID(app->workspace); 974 screen.changeWorkspaceID(app->workspace);
975 } 975 }
976 976