From ffb3d3654ff6229e232484f7f270d425178ecae6 Mon Sep 17 00:00:00 2001 From: David Laban Date: Thu, 7 Apr 2011 14:01:40 +0100 Subject: Restore TPSIP_* environment variables' functionality If RAKIA_* environment variables exist then we prefer them. --- src/telepathy-rakia.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/telepathy-rakia.c') diff --git a/src/telepathy-rakia.c b/src/telepathy-rakia.c index 7012a23..a79c6f2 100644 --- a/src/telepathy-rakia.c +++ b/src/telepathy-rakia.c @@ -46,6 +46,7 @@ main (int argc, char** argv) int status; gpointer logdata; guint fatal_mask; + const gchar *logfile_string; fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); fatal_mask |= G_LOG_LEVEL_CRITICAL; @@ -55,12 +56,16 @@ main (int argc, char** argv) rakia_debug_set_flags_from_env (); #endif - if (g_getenv ("RAKIA_PERSIST") || g_getenv ("RAKIA_PERSIST")) + if (g_getenv ("RAKIA_PERSIST") || g_getenv ("TPSIP_PERSIST")) { tp_debug_set_persistent (TRUE); } - tp_debug_divert_messages (g_getenv ("RAKIA_LOGFILE")); + logfile_string = g_getenv ("RAKIA_LOGFILE"); + if (logfile_string == NULL) + logfile_string = g_getenv ("TPSIP_LOGFILE"); + + tp_debug_divert_messages (logfile_string); logdata = rakia_sofia_log_init (); -- cgit v1.2.3