From 6ec6168387c72f6edda434a18d0f7bd968794052 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 8 Jan 2014 12:37:07 +0100 Subject: [PATCH 01/12] log-store-xml: stop using TPL_TEST_LOG_DIR It's actually not needed as we already properly tweak XDG_DATA_HOME for tests. --- telepathy-logger/log-store-xml.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c index 9d56900..f3bb2c8 100644 --- a/telepathy-logger/log-store-xml.c +++ b/telepathy-logger/log-store-xml.c @@ -1752,21 +1752,11 @@ log_store_xml_get_basedir (TplLogStoreXml *self) if (self->priv->basedir == NULL) { gchar *dir; - const char *user_data_dir; const char *name; - if (self->priv->test_mode && g_getenv ("TPL_TEST_LOG_DIR") != NULL) - { - user_data_dir = g_getenv ("TPL_TEST_LOG_DIR"); - } - else - { - user_data_dir = g_get_user_data_dir (); - } - name = _tpl_log_store_get_name ((TplLogStore *) self); - dir = g_build_path (G_DIR_SEPARATOR_S, user_data_dir, name, "logs", - NULL); + dir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), name, + "logs", NULL); log_store_xml_set_basedir (self, dir); g_free (dir); } -- 1.8.4.2