summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-12-10 05:47:33 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-12-10 05:47:33 +0000
commit7fa28277a13731e66f2e764fc96a1f2f6048d9aa (patch)
tree9916efe6257f5c29f1bb574a1b4f56b6643012cb
parent041b33c450ec54ad85d9f642035f0cc9d9195e26 (diff)
downloadmetacity-7fa28277a13731e66f2e764fc96a1f2f6048d9aa.tar.gz
metacity-7fa28277a13731e66f2e764fc96a1f2f6048d9aa.tar.bz2
oops, remove extra workspace creation, and update to current pref.
2001-12-10 Havoc Pennington <hp@pobox.com> * src/screen.c (meta_screen_new): oops, remove extra workspace creation, and update to current pref.
-rw-r--r--ChangeLog5
-rw-r--r--src/screen.c9
2 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b46900..58b4bda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-10 Havoc Pennington <hp@pobox.com>
+
+ * src/screen.c (meta_screen_new): oops, remove extra workspace
+ creation, and update to current pref.
+
2001-12-09 Havoc Pennington <hp@pobox.com>
* src/workspace.c (meta_workspace_free): update number of
diff --git a/src/screen.c b/src/screen.c
index a04f39f..5b7f655 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -220,13 +220,8 @@ meta_screen_new (MetaDisplay *display,
* so create that required workspace.
*/
screen->active_workspace = meta_workspace_new (screen);
- /* FIXME, for now there are always 6 workspaces... */
- meta_workspace_new (screen);
- meta_workspace_new (screen);
- meta_workspace_new (screen);
- meta_workspace_new (screen);
- meta_workspace_new (screen);
-
+ update_num_workspaces (screen);
+
meta_screen_grab_keys (screen);
screen->ui = meta_ui_new (screen->display->xdisplay,