From 300f811f3bbf10455ca55d9b01da6705dd1e07bb Mon Sep 17 00:00:00 2001
From: Ricardo Mones <ricardo@mones.org>
Date: Sat, 25 Feb 2017 13:14:35 +0100
Subject: [PATCH] Remove duplicated code and include

---
 src/imap.c | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/src/imap.c b/src/imap.c
index 6c9161aed..eb810a3aa 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -77,8 +77,6 @@ typedef struct _IMAPSession	IMAPSession;
 typedef struct _IMAPNameSpace	IMAPNameSpace;
 typedef struct _IMAPFolderItem	IMAPFolderItem;
 
-#include "prefs_account.h"
-
 #define IMAP_FOLDER(obj)	((IMAPFolder *)obj)
 #define IMAP_FOLDER_ITEM(obj)	((IMAPFolderItem *)obj)
 #define IMAP_SESSION(obj)	((IMAPSession *)obj)
@@ -427,7 +425,6 @@ static gint imap_get_flags			(Folder 	*folder,
 						 FolderItem 	*item,
                     				 MsgInfoList 	*msglist,
 						 GHashTable 	*msgflags);
-static gchar *imap_folder_get_path		(Folder		*folder);
 static gchar *imap_item_get_path		(Folder		*folder,
 						 FolderItem	*item);
 static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
@@ -3044,35 +3041,6 @@ static FolderItem *imap_create_special_folder(Folder *folder,
 	return new_item;
 }
 
-static gchar *imap_folder_get_path(Folder *folder)
-{
-	gchar *folder_path;
-
-	g_return_val_if_fail(folder != NULL, NULL);
-        g_return_val_if_fail(folder->account != NULL, NULL);
-
-#ifdef G_OS_WIN32
-	gchar *sanitized_dirname = g_strdup(folder->account->recv_server);
-	g_strdelimit(sanitized_dirname, ":", ',');
-#endif
-
-        folder_path = g_strconcat(get_imap_cache_dir(),
-                                  G_DIR_SEPARATOR_S,
-#ifdef G_OS_WIN32
-																	sanitized_dirname,
-#else
-                                  folder->account->recv_server,
-#endif
-                                  G_DIR_SEPARATOR_S,
-                                  folder->account->userid,
-                                  NULL);
-
-#ifdef G_OS_WIN32
-	g_free(sanitized_dirname);
-#endif
-	return folder_path;
-}
-
 #ifdef G_OS_WIN32
 static gchar *imap_encode_unsafe_chars(const gchar *str)
 {
@@ -3109,8 +3077,9 @@ static gchar *imap_item_get_path(Folder *folder, FolderItem *item)
 	gchar *item_path = NULL;
 	
 	g_return_val_if_fail(folder != NULL, NULL);
+	g_return_val_if_fail(folder->account != NULL, NULL);
 	g_return_val_if_fail(item != NULL, NULL);
-	folder_path = imap_folder_get_path(folder);
+	folder_path = prefs_account_cache_dir(folder->account, FALSE);
 
 	g_return_val_if_fail(folder_path != NULL, NULL);
 
-- 
2.25.1