diff options
Diffstat (limited to 'src/net/imap')
| -rw-r--r-- | src/net/imap/IMAPConnection.cpp | 9 | ||||
| -rw-r--r-- | src/net/imap/IMAPServiceInfos.cpp | 6 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/net/imap/IMAPConnection.cpp b/src/net/imap/IMAPConnection.cpp index 180caa4b..69dfcb1e 100644 --- a/src/net/imap/IMAPConnection.cpp +++ b/src/net/imap/IMAPConnection.cpp @@ -85,13 +85,8 @@ void IMAPConnection::connect() const port_t port = GET_PROPERTY(port_t, PROPERTY_SERVER_PORT); // Create the time-out handler - if (HAS_PROPERTY(PROPERTY_TIMEOUT_FACTORY)) - { - timeoutHandlerFactory* tof = platformDependant::getHandler()-> - getTimeoutHandlerFactory(GET_PROPERTY(string, PROPERTY_TIMEOUT_FACTORY)); - - m_timeoutHandler = tof->create(); - } + if (m_store->getTimeoutHandlerFactory()) + m_timeoutHandler = m_store->getTimeoutHandlerFactory()->create(); // Create and connect the socket m_socket = m_store->getSocketFactory()->create(); diff --git a/src/net/imap/IMAPServiceInfos.cpp b/src/net/imap/IMAPServiceInfos.cpp index a5d1ca5a..85b23a34 100644 --- a/src/net/imap/IMAPServiceInfos.cpp +++ b/src/net/imap/IMAPServiceInfos.cpp @@ -61,8 +61,6 @@ const IMAPServiceInfos::props& IMAPServiceInfos::getProperties() const property(serviceInfos::property::SERVER_ADDRESS, serviceInfos::property::FLAG_REQUIRED), property(serviceInfos::property::SERVER_PORT, "143"), - - property(serviceInfos::property::TIMEOUT_FACTORY) }; static props imapsProps = @@ -84,8 +82,6 @@ const IMAPServiceInfos::props& IMAPServiceInfos::getProperties() const property(serviceInfos::property::SERVER_ADDRESS, serviceInfos::property::FLAG_REQUIRED), property(serviceInfos::property::SERVER_PORT, "993"), - - property(serviceInfos::property::TIMEOUT_FACTORY) }; return m_imaps ? imapsProps : imapProps; @@ -118,8 +114,6 @@ const std::vector <serviceInfos::property> IMAPServiceInfos::getAvailablePropert list.push_back(p.PROPERTY_SERVER_ADDRESS); list.push_back(p.PROPERTY_SERVER_PORT); - list.push_back(p.PROPERTY_TIMEOUT_FACTORY); - return list; } |