Completely reworked ContactList API. Fixes bug #471611, bug #467280, bug #459540...

[empathy.git] / libempathy / empathy-log-manager.c

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index e234ec521c383531af83f1ce17230cd1d6b4e38b..e47f50fb83ac6c6345781a5257b00cc6940aa9ad 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -634,24 +634,22 @@ log_manager_get_dir (EmpathyLogManager *manager,
 {
        const gchar *account_id;
        gchar       *basedir;
-       gchar       *str;
 
        account_id = mc_account_get_unique_name (account);
-       basedir = 
-       str = g_build_path (G_DIR_SEPARATOR_S,
-                           log_manager_get_basedir (manager),
-                           account_id,
-                           chat_id,
-                           NULL);
 
        if (chatroom) {
                basedir = g_build_path (G_DIR_SEPARATOR_S,
-                                       str,
+                                       log_manager_get_basedir (manager),
+                                       account_id,
                                        LOG_DIR_CHATROOMS,
+                                       chat_id,
                                        NULL);
-               g_free (str);
        } else {
-               basedir = str;
+               basedir = g_build_path (G_DIR_SEPARATOR_S,
+                                       log_manager_get_basedir (manager),
+                                       account_id,
+                                       chat_id,
+                                       NULL);
        }
 
        return basedir;