add a root menu

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index 7556d1c8cb0f28ed7af6540513287aa9fb942e2a..b9a17b48786c744d62e5a7bcec372288e1660bd5 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -1,4 +1,6 @@
 #include "font.h"
+#include "color.h"
+#include "mask.h"
 #include "theme.h"
 #include "kernel/geom.h"
 #include "kernel/gettext.h"
@@ -21,7 +23,7 @@ static void font_startup(void)
 #endif /* DEBUG */
     if (!XftInit(0)) {
         g_warning(_("Couldn't initialize Xft.\n"));
-        exit(3);
+        exit(EXIT_FAILURE);
     }
 #ifdef DEBUG
     version = XftGetVersion();
@@ -69,9 +71,8 @@ RrFont *RrFontOpen(const RrInstance *inst, char *fontstring)
         return out;
     }
     g_warning(_("Unable to load font: %s\n"), "sans");
-    g_warning(_("Aborting!.\n"));
 
-    exit(3); /* can't continue without a font */
+    return NULL;
 }
 
 void RrFontClose(RrFont *f)