start on otk::ustring (unicode/utf8)

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index 2ccc35f062656acf2c8d1f20752446b7fa3d63a8..763931f8b6fef1b177a05e4cfa55673dd2c4b228 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -117,7 +117,7 @@ Screen::Screen(int screen)
   // we have a list of desktop names
 
   if (!python_get_long("number_of_desktops", &_num_desktops))
-    _num_desktops = 4;
+    _num_desktops = 1;
   changeNumDesktops(_num_desktops); // set the hint
 
   _desktop = 0;
@@ -639,8 +639,6 @@ void Screen::restack(bool raise, Client *client)
 
 void Screen::changeDesktop(long desktop)
 {
-  assert(desktop >= 0 && desktop < _num_desktops);
-
   if (!(desktop >= 0 && desktop < _num_desktops)) return;
 
   printf("Moving to desktop %ld\n", desktop);