summaryrefslogtreecommitdiff
path: root/src/telepathy-rakia.c
diff options
context:
space:
mode:
authorDavid Laban <david.laban@collabora.co.uk>2011-04-07 14:01:40 +0100
committerDavid Laban <david.laban@collabora.co.uk>2011-06-15 17:03:16 -0400
commit273dd9c975c3ec303f5b394c4652ab25970b4490 (patch)
treed8cccddfc0df6fd128217d69b95ff363841058e1 /src/telepathy-rakia.c
parentec92b4aedc7261e4af84d8e44f56da39d6033ec4 (diff)
Restore TPSIP_* environment variables' functionality
If RAKIA_* environment variables exist then we prefer them.
Diffstat (limited to 'src/telepathy-rakia.c')
-rw-r--r--src/telepathy-rakia.c9
1 files changed, 7 insertions, 2 deletions
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 ();