X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Ffont.cc;h=df4823fb300279402652f8882c591a6780597b49;hb=684405eec8553918b62e334bffe29eb4712ec95c;hp=ee58ed19fbc09df559289d0036561ef0d3672f67;hpb=867d3d9a94b059a0bd7574f13e1c0c669abaf8a3;p=chaz%2Fopenbox

diff --git a/otk/font.cc b/otk/font.cc
index ee58ed19..df4823fb 100644
--- a/otk/font.cc
+++ b/otk/font.cc
@@ -51,11 +51,12 @@ BFont::BFont(int screen_num, const string &fontstring,
   
   if (!_xft_init) {
     if (!XftInit(0)) {
-      printf(_("Couldn't initialize Xft version %d.%d.%d.\n\n"),
-             XFT_MAJOR, XFT_MINOR, XFT_REVISION);
+      printf(_("Couldn't initialize Xft.\n\n"));
       ::exit(3);
     }
-    printf(_("Using Xft %d.%d.%d.\n"), XFT_MAJOR, XFT_MINOR, XFT_REVISION);
+    int version = XftGetVersion();
+    printf(_("Using Xft %d.%d.%d.\n"),
+           version / 10000 % 100, version / 100 % 100, version % 100);
     _xft_init = true;
   }
 
@@ -63,14 +64,14 @@ BFont::BFont(int screen_num, const string &fontstring,
                                   _fontstring.c_str())))
     return;
 
-  printf(_("Unable to load font: %s"), _fontstring.c_str());
+  printf(_("Unable to load font: %s\n"), _fontstring.c_str());
   printf(_("Trying fallback font: %s\n"), _fallback_font.c_str());
 
   if ((_xftfont = XftFontOpenName(OBDisplay::display, _screen_num,
                                   _fallback_font.c_str())))
     return;
 
-  printf(_("Unable to load font: %s"), _fallback_font.c_str());
+  printf(_("Unable to load font: %s\n"), _fallback_font.c_str());
   printf(_("Aborting!.\n"));
 
   ::exit(3); // can't continue without a font