ustring seems to be working! yay!

[chaz/openbox] / otk / display.cc

diff --git a/otk/display.cc b/otk/display.cc
index 59a48aeee47116cde11ea0fa1f8b18b344a4a8e1..36c7f52f86e9e479a28d032c54ddba3d7d5c9623 100644 (file)
--- a/otk/display.cc
+++ b/otk/display.cc
@@ -100,9 +100,9 @@ line argument.\n\n"));
     printf(_("Couldn't mark display connection as close-on-exec.\n\n"));
     ::exit(1);
   }
-  if (! XSupportsLocale())
+  if (!XSupportsLocale())
     printf(_("X server does not support locale.\n"));
-  if (XSetLocaleModifiers("") == NULL)
+  if (!XSetLocaleModifiers(""))
     printf(_("Cannot set locale modifiers for the X server.\n"));
   
   // set our error handler for X errors
@@ -110,7 +110,6 @@ line argument.\n\n"));
 
   // set the DISPLAY environment variable for any lauched children, to the
   // display we're using, so they open in the right place.
-  // XXX rm -> std::string dtmp = "DISPLAY=" + DisplayString(display);
   putenv(std::string("DISPLAY=") + DisplayString(display));
   
   // find the availability of X extensions we like to use