new version of bsetroot ported from blackbox cvs

[chaz/openbox] / src / BaseDisplay.cc

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 81d3c5c72bb723edb2e1e78d8ac1c2c01a07efdc..01e1b3324826438e1583972678291c8d7c931eb1 100644 (file)
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -338,8 +338,8 @@ BaseDisplay::BaseDisplay(const char *app_name, char *dpy_name) {
   XSetErrorHandler((XErrorHandler) handleXErrors);
 
   screenInfoList.reserve(ScreenCount(display));
-  for (int i = 0; i < number_of_screens; i++)
-    screenInfoList.push_back(new ScreenInfo(*this, i));
+  for (unsigned int s = 0; s < number_of_screens; s++)
+    screenInfoList.push_back(new ScreenInfo(*this, s));
 
 #ifndef   NOCLOBBER
   NumLockMask = ScrollLockMask = 0;
@@ -512,8 +512,6 @@ void BaseDisplay::grab(void) {
 void BaseDisplay::ungrab(void) {
   if (! --server_grabs)
     XUngrabServer(display);
-
-  if (server_grabs < 0) server_grabs = 0;
 }