diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2013-01-16 14:34:07 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2013-01-16 14:35:32 +0000 |
| commit | 4603bd0549f7b246042522a04abdb0d5f6af3922 (patch) | |
| tree | b2c12cb5b4f9e5023e28caee8bf2b1f6ad8c9552 /telepathy-logger | |
| parent | 7d84e7b97603af85c78a3021ae9aabe572f942c9 (diff) | |
| download | telepathy-logger-4603bd0549f7b246042522a04abdb0d5f6af3922.tar.gz | |
log-store-xml: simplify choosing basedir
log_store_xml_get_name() makes the same Empathy vs. TpLogger decision as
the test_mode path was making. Since the log store's name is used to
find the real directory, it also seems better to use the same code path
in the test suite.
Diffstat (limited to 'telepathy-logger')
| -rw-r--r-- | telepathy-logger/log-store-xml.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c index f02785a..0b25690 100644 --- a/telepathy-logger/log-store-xml.c +++ b/telepathy-logger/log-store-xml.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2003-2007 Imendio AB - * Copyright (C) 2007-2011 Collabora Ltd. + * Copyright (C) 2007-2013 Collabora Ltd. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1770,14 +1770,13 @@ log_store_xml_get_basedir (TplLogStoreXml *self) if (self->priv->test_mode && g_getenv ("TPL_TEST_LOG_DIR") != NULL) { user_data_dir = g_getenv ("TPL_TEST_LOG_DIR"); - name = self->priv->empathy_legacy ? "Empathy" : "TpLogger"; } else { user_data_dir = g_get_user_data_dir (); - name = log_store_xml_get_name ((TplLogStore *) self); } + name = log_store_xml_get_name ((TplLogStore *) self); dir = g_build_path (G_DIR_SEPARATOR_S, user_data_dir, name, "logs", NULL); log_store_xml_set_basedir (self, dir); |