[next] telepathy-glib: log-store-xml: stop using TPL_TEST_LOG_DIR

Simon McVittie smcv at kemper.freedesktop.org
Thu Mar 20 10:25:43 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 6ec6168387c72f6edda434a18d0f7bd968794052
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=6ec6168387c72f6edda434a18d0f7bd968794052

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Jan  8 12:37:07 2014 +0100

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);
     }



More information about the telepathy-commits mailing list