===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/log.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/tmux/log.c	2009/12/03 22:50:10	1.4
+++ src/usr.bin/tmux/log.c	2012/03/17 18:23:03	1.5
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.4 2009/12/03 22:50:10 nicm Exp $ */
+/* $OpenBSD: log.c,v 1.5 2012/03/17 18:23:03 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,6 +42,13 @@
 void		 log_vwrite(int, const char *, va_list);
 __dead void	 log_vfatal(const char *, va_list);
 
+/* Log callback for libevent. */
+void
+log_event_cb(unused int severity, const char *msg)
+{
+	log_warnx(msg);
+}
+
 /* Open logging to tty. */
 void
 log_open_tty(int level)
@@ -51,6 +58,7 @@
 
 	setlinebuf(stderr);
 	setlinebuf(stdout);
+	event_set_log_callback(log_event_cb);
 
 	tzset();
 }
@@ -67,6 +75,7 @@
 	log_level = level;
 
 	setlinebuf(log_file);
+	event_set_log_callback(log_event_cb);
 
 	tzset();
 }
@@ -77,6 +86,8 @@
 {
 	if (log_type == LOG_TYPE_FILE)
 		fclose(log_file);
+
+	event_set_log_callback(NULL);
 
 	log_type = LOG_TYPE_OFF;
 }