Fix menu placement to avoid dead xinerama areas, possibly break other stuff

[chaz/openbox] / openbox / debug.c

diff --git a/openbox/debug.c b/openbox/debug.c
index 6b92c9ec9dd74f4aec81978282d3ef4e987cb142..8423e8ab565bb079d9a0f00cdc44cf5dc81f67ad 100644 (file)
--- a/openbox/debug.c
+++ b/openbox/debug.c
@@ -102,11 +102,11 @@ void ob_debug_enable(ObDebugType type, gboolean enable)
 static inline void log_print(FILE *out, const gchar* log_domain,
                              const gchar *level, const gchar *message)
 {
-    fprintf(out, log_domain);
+    fprintf(out, "%s", log_domain);
     fprintf(out, "-");
-    fprintf(out, level);
+    fprintf(out, "%s", level);
     fprintf(out, ": ");
-    fprintf(out, message);
+    fprintf(out, "%s", message);
     fprintf(out, "\n");
     fflush(out);
 }
@@ -136,6 +136,8 @@ static void prompt_handler(const gchar *log_domain, GLogLevelFlags log_level,
 {
     if (ob_state() == OB_STATE_RUNNING)
         prompt_show_message(message, _("Openbox"), _("Close"));
+    else
+        log_handler(log_domain, log_level, message, data);
 }
 
 static inline void log_argv(ObDebugType type,
@@ -161,7 +163,7 @@ static inline void log_argv(ObDebugType type,
         g_free(a);
     }
 
-    g_debug(message);
+    g_debug("%s", message);
     g_free(message);
 }