telepathy-logger: log-store-xml: simplify choosing basedir

[Will Thompson]

Module: telepathy-logger
Branch: master
Commit: 4603bd0549f7b246042522a04abdb0d5f6af3922
URL:    http://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=4603bd0549f7b246042522a04abdb0d5f6af3922

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Wed Jan 16 14:34:07 2013 +0000

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.

---

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