From ff9702ea832d3d19da418425203784decace1d20 Mon Sep 17 00:00:00 2001
From: Timo Kankare <timo.kankare@iki.fi>
Date: Fri, 16 Sep 2016 20:38:48 +0300
Subject: [PATCH] Renamed IMAP and POP3 backends as MailboxBackends.

---
 Mailnag/backends/imap.py               | 2 +-
 Mailnag/backends/pop3.py               | 2 +-
 Mailnag/common/accounts.py             | 8 ++++----
 Mailnag/configuration/accountdialog.py | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Mailnag/backends/imap.py b/Mailnag/backends/imap.py
index 14ae3cc..59d2383 100644
--- a/Mailnag/backends/imap.py
+++ b/Mailnag/backends/imap.py
@@ -34,7 +34,7 @@ import Mailnag.common.imaplib2 as imaplib
 from Mailnag.common.imaplib2 import AUTH
 
 
-class IMAPBackend(MailboxBackend):
+class IMAPMailboxBackend(MailboxBackend):
 	"""Implementation of IMAP mail boxes."""
 
 	def __init__(self, name = '', user = '', password = '', oauth2string = '',
diff --git a/Mailnag/backends/pop3.py b/Mailnag/backends/pop3.py
index 2991309..787cddb 100644
--- a/Mailnag/backends/pop3.py
+++ b/Mailnag/backends/pop3.py
@@ -32,7 +32,7 @@ import poplib
 from Mailnag.backends.base import MailboxBackend
 
 
-class POP3Backend(MailboxBackend):
+class POP3MailboxBackend(MailboxBackend):
 	"""Implementation of POP3 mail boxes."""
 	
 	def __init__(self, name = '', user = '', password = '', oauth2string = '',
diff --git a/Mailnag/common/accounts.py b/Mailnag/common/accounts.py
index 2ae468e..94e0d90 100644
--- a/Mailnag/common/accounts.py
+++ b/Mailnag/common/accounts.py
@@ -27,8 +27,8 @@
 import re
 import logging
 import json
-from Mailnag.backends.imap import IMAPBackend
-from Mailnag.backends.pop3 import POP3Backend
+from Mailnag.backends.imap import IMAPMailboxBackend
+from Mailnag.backends.pop3 import POP3MailboxBackend
 from Mailnag.common.utils import splitstr
 
 account_defaults = {
@@ -200,9 +200,9 @@ class AccountManager:
 					password = self._credentialstore.get(CREDENTIAL_KEY % (protocol, user, server))
 				
 				if imap:
-					backend = IMAPBackend(name, user, password, '', server, port, ssl, folders)
+					backend = IMAPMailboxBackend(name, user, password, '', server, port, ssl, folders)
 				else:
-					backend = POP3Backend(name, user, password, '', server, port, ssl)
+					backend = POP3MailboxBackend(name, user, password, '', server, port, ssl)
 				
 				acc = Account(enabled, name, user, password, '', server, port, ssl, imap, idle, folders, backend)
 				self._accounts.append(acc)
diff --git a/Mailnag/configuration/accountdialog.py b/Mailnag/configuration/accountdialog.py
index c8bc21b..ddc24a3 100644
--- a/Mailnag/configuration/accountdialog.py
+++ b/Mailnag/configuration/accountdialog.py
@@ -28,8 +28,8 @@ gi.require_version('GLib', '2.0')
 
 from gi.repository import GObject, GLib, Gtk
 from thread import start_new_thread
-from Mailnag.backends.imap import IMAPBackend
-from Mailnag.backends.pop3 import POP3Backend
+from Mailnag.backends.imap import IMAPMailboxBackend
+from Mailnag.backends.pop3 import POP3MailboxBackend
 from Mailnag.common.dist_cfg import PACKAGE_NAME
 from Mailnag.common.i18n import _
 from Mailnag.common.utils import get_data_file, splitstr
@@ -172,9 +172,9 @@ class AccountDialog:
 		# Create backend
 		# TODO: This is duplicate code with AccountManager.
 		if acc.imap:
-			acc.backend = IMAPBackend(acc.name, acc.user, acc.password, '', acc.server, acc.port, acc.ssl, acc.folders)
+			acc.backend = IMAPMailboxBackend(acc.name, acc.user, acc.password, '', acc.server, acc.port, acc.ssl, acc.folders)
 		else:
-			acc.backend = POP3Backend(acc.name, acc.user, acc.password, '', acc.server, acc.port, acc.ssl)
+			acc.backend = POP3MailboxBackend(acc.name, acc.user, acc.password, '', acc.server, acc.port, acc.ssl)
 	
 	
 	def _get_selected_folders(self):