s/__openbox_version/OPENBOX_VERSION

[chaz/openbox] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index 03576905477bfdc0306d56463ae66f916a944b5e..c16fba2d809c02abf640aac08a8d4f754a37c8b1 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -62,14 +62,14 @@ static void showHelp(int exitval) {
   // print program usage and command line options
   printf(i18n(mainSet, mainUsage,
               "Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
-              "                 2001 - 2002 Sean 'Shaleh' Perry\n"
-              "                 1997 - 2000, 2002 Brad Hughes\n\n"
+              "                    2001 - 2002 Sean 'Shaleh' Perry\n"
+              "                    1997 - 2000, 2002 Brad Hughes\n\n"
               "  -display <string>\t\tuse display connection.\n"
               "  -rc <string>\t\t\tuse alternate resource file.\n"
               "  -menu <string>\t\tuse alternate menu file.\n"
               "  -version\t\t\tdisplay version and exit.\n"
               "  -help\t\t\t\tdisplay this help text and exit.\n\n"),
-         __openbox_version);
+         OPENBOX_VERSION);
 
   // some people have requested that we print out compile options
   // as well
@@ -77,8 +77,8 @@ static void showHelp(int exitval) {
               "Compile time options:\n"
               "  Debugging:\t\t\t%s\n"
               "  Shape:\t\t\t%s\n"
-              "  Slit:\t\t\t\t%s\n"
-              "  Event Clobbering:\t\t%s\n"
+              "  Xft:\t\t\t\t%s\n"
+              "  Xinerama:\t\t\t%s\n"
               "  8bpp Ordered Dithering:\t%s\n\n"),
 #ifdef    DEBUG
          i18n(CommonSet, CommonYes, "yes"),
@@ -92,17 +92,17 @@ static void showHelp(int exitval) {
          i18n(CommonSet, CommonNo, "no"),
 #endif // SHAPE
 
-#ifdef    SLIT
+#ifdef    XFT
          i18n(CommonSet, CommonYes, "yes"),
-#else // !SLIT
+#else // !XFT
          i18n(CommonSet, CommonNo, "no"),
-#endif // SLIT
+#endif // XFT
 
-#ifndef   NOCLOBBER
+#ifdef    XINERAMA
          i18n(CommonSet, CommonYes, "yes"),
-#else // !NOCLOBBER
+#else // !XINERAMA
          i18n(CommonSet, CommonNo, "no"),
-#endif // NOCLOBBER
+#endif // XINERAMA
 
 #ifdef    ORDEREDPSEUDO
          i18n(CommonSet, CommonYes, "yes")
@@ -119,7 +119,7 @@ int main(int argc, char **argv) {
   char *rc_file = (char *) 0;
   char *menu_file = (char *) 0;
 
-  i18n.openCatalog("blackbox.cat");
+  i18n.openCatalog("openbox.cat");
 
   for (int i = 1; i < argc; ++i) {
     if (! strcmp(argv[i], "-rc")) {
@@ -172,7 +172,7 @@ int main(int argc, char **argv) {
       printf("Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
              "                    2001 - 2002 Sean 'Shaleh' Perry\n"
              "                    1997 - 2000, 2002 Brad Hughes\n\n",
-             __openbox_version);
+             OPENBOX_VERSION);
 
       ::exit(0);
     } else if (! strcmp(argv[i], "-help")) {