Set up work for making a 3.5 prerelease.

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 800e6a210d3141a2fffd4eba1dc7b9816a167a0f..c597d23ff6d6d2cdb13707eb9ec86d8a02faca1e 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -43,8 +43,8 @@
 #include "ping.h"
 #include "prompt.h"
 #include "gettext.h"
-#include "render/render.h"
-#include "render/theme.h"
+#include "obrender/render.h"
+#include "obrender/theme.h"
 #include "obt/display.h"
 #include "obt/prop.h"
 #include "obt/keyboard.h"
@@ -274,7 +274,8 @@ gint main(gint argc, gchar **argv)
                                         config_font_inactivewindow,
                                         config_font_menutitle,
                                         config_font_menuitem,
-                                        config_font_osd)))
+                                        config_font_activeosd,
+                                        config_font_inactiveosd)))
                 {
                     RrThemeFree(ob_rr_theme);
                     ob_rr_theme = theme;