mirror of
https://github.com/pulb/mailnag.git
synced 2026-05-06 20:56:50 +02:00
Renamed IMAP and POP3 backends as MailboxBackends.
This commit is contained in:
@@ -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 = '',
|
||||
|
||||
@@ -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 = '',
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user