Support HAZE_LOGFILE for diverting stdout and stderr

20080629114516-9f02e-1959791b1531a0054f7ed1a8176071ac9670d6aa.gz

3 files changed, 13 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 0de3860..a250c90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,11 @@ PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.7])
 AC_SUBST(TP_GLIB_CFLAGS)
 AC_SUBST(TP_GLIB_LIBS)
 
+AC_CHECK_LIB(telepathy-glib, tp_debug_divert_messages,
+  [ AC_DEFINE(HAVE_TP_DEBUG_DIVERT_MESSAGES, [],
+    [Define if tp_debug_divert_messages() is provided by telepathy-glib]) ],
+  [], [$TP_GLIB_LIBS])
+
 AC_CHECK_LIB(purple, purple_dbus_uninit,
   [ AC_DEFINE(HAVE_PURPLE_DBUS_UNINIT, [],
     [Define if purple_dbus_uninit is present in libpurple]) ],
diff --git a/src/main.c b/src/main.c
index 16f3f21..83a22b2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -277,6 +277,10 @@ main(int argc,
     if (g_getenv ("HAZE_PERSIST"))
         tp_debug_set_persistent (TRUE);
 
+#ifdef HAVE_TP_DEBUG_DIVERT_MESSAGES
+    tp_debug_divert_messages (g_getenv ("HAZE_LOGFILE"));
+#endif
+
     ret = tp_run_connection_manager (UI_ID, PACKAGE_VERSION, get_cm, argc,
                                      argv);
 
diff --git a/src/telepathy-haze.8.in b/src/telepathy-haze.8.in
index dfb1353..8641a11 100644
--- a/src/telepathy-haze.8.in
+++ b/src/telepathy-haze.8.in
@@ -28,6 +28,10 @@ May be set to "all" for full debug output, or various undocumented options
 \fBHAZE_PERSIST\fR=1
 If set, Haze will not automatically close itself after five seconds without
 any connections.
+.TP
+\fBHAZE_LOGFILE\fR=\fIfilename\fR
+If set, all debugging output will be written to \fIfilename\fR rather than
+to the terminal.
 .SH SEE ALSO
 .IR http://telepathy.freedesktop.org/ ,
 .BR empathy (1),