-rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 4 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.cpp | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/settings.cpp | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp index 5441a9b..91332c3 100644 --- a/kmicromail/libmailwrapper/imapwrapper.cpp +++ b/kmicromail/libmailwrapper/imapwrapper.cpp | |||
@@ -168,13 +168,13 @@ void IMAPwrapper::login() | |||
168 | } | 168 | } |
169 | if (account->ConnectionType()==1) { | 169 | if (account->ConnectionType()==1) { |
170 | force_tls = true; | 170 | force_tls = true; |
171 | } | 171 | } |
172 | 172 | ||
173 | if ( ssl ) { | 173 | if ( ssl ) { |
174 | qDebug("using ssl "); | 174 | //qDebug("using ssl "); |
175 | err = mailimap_ssl_connect( m_imap, (char*)server.latin1(), port ); | 175 | err = mailimap_ssl_connect( m_imap, (char*)server.latin1(), port ); |
176 | } else { | 176 | } else { |
177 | err = mailimap_socket_connect( m_imap, (char*)server.latin1(), port ); | 177 | err = mailimap_socket_connect( m_imap, (char*)server.latin1(), port ); |
178 | } | 178 | } |
179 | 179 | ||
180 | if ( err != MAILIMAP_NO_ERROR && | 180 | if ( err != MAILIMAP_NO_ERROR && |
@@ -1244,13 +1244,13 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder, | |||
1244 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb) | 1244 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb) |
1245 | { | 1245 | { |
1246 | if (targetWrapper != this || maxSizeInKb > 0 ) { | 1246 | if (targetWrapper != this || maxSizeInKb > 0 ) { |
1247 | mMax = 0; | 1247 | mMax = 0; |
1248 | progress( tr("Copy")); | 1248 | progress( tr("Copy")); |
1249 | AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb); | 1249 | AbstractMail::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit, maxSizeInKb); |
1250 | qDebug("IMAPwrapper::mvcpAllMails::Using generic"); | 1250 | //qDebug("IMAPwrapper::mvcpAllMails::Using generic"); |
1251 | // odebug << "Using generic" << oendl; | 1251 | // odebug << "Using generic" << oendl; |
1252 | return; | 1252 | return; |
1253 | } | 1253 | } |
1254 | mailimap_set *set = 0; | 1254 | mailimap_set *set = 0; |
1255 | login(); | 1255 | login(); |
1256 | if (!m_imap) { | 1256 | if (!m_imap) { |
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp index 962dac0..641d4d9 100644 --- a/kmicromail/libmailwrapper/mhwrapper.cpp +++ b/kmicromail/libmailwrapper/mhwrapper.cpp | |||
@@ -62,13 +62,12 @@ MHwrapper::~MHwrapper() | |||
62 | { | 62 | { |
63 | clean_storage(); | 63 | clean_storage(); |
64 | } | 64 | } |
65 | 65 | ||
66 | void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb ) | 66 | void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb ) |
67 | { | 67 | { |
68 | qDebug("MHwrapper::listMessages "); | ||
69 | init_storage(); | 68 | init_storage(); |
70 | if (!m_storage) { | 69 | if (!m_storage) { |
71 | return; | 70 | return; |
72 | } | 71 | } |
73 | QString f = buildPath(mailbox); | 72 | QString f = buildPath(mailbox); |
74 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 73 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
@@ -191,13 +190,12 @@ int MHwrapper::createMbox(const QString&folder,const FolderP&pfolder,const QStri | |||
191 | 190 | ||
192 | int r = mailsession_create_folder(m_storage->sto_session,(char*)f.latin1()); | 191 | int r = mailsession_create_folder(m_storage->sto_session,(char*)f.latin1()); |
193 | if (r != MAIL_NO_ERROR) { | 192 | if (r != MAIL_NO_ERROR) { |
194 | qDebug("error creating folder "); | 193 | qDebug("error creating folder "); |
195 | return 0; | 194 | return 0; |
196 | } | 195 | } |
197 | qDebug("Folder created "); | ||
198 | return 1; | 196 | return 1; |
199 | } | 197 | } |
200 | 198 | ||
201 | void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder) | 199 | void MHwrapper::storeMessage(const char*msg,size_t length, const QString&Folder) |
202 | { | 200 | { |
203 | init_storage(); | 201 | init_storage(); |
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp index 766eba0..40b5591 100644 --- a/kmicromail/libmailwrapper/settings.cpp +++ b/kmicromail/libmailwrapper/settings.cpp | |||
@@ -23,13 +23,12 @@ Settings::Settings() | |||
23 | { | 23 | { |
24 | updateAccounts(); | 24 | updateAccounts(); |
25 | } | 25 | } |
26 | 26 | ||
27 | void Settings::checkDirectory() | 27 | void Settings::checkDirectory() |
28 | { | 28 | { |
29 | qDebug("Settings::checkDirectory() "); | ||
30 | return; | 29 | return; |
31 | locateLocal("data", "kopiemail" ); | 30 | locateLocal("data", "kopiemail" ); |
32 | /* | 31 | /* |
33 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { | 32 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { |
34 | system( "mkdir -p $HOME/Applications/opiemail" ); | 33 | system( "mkdir -p $HOME/Applications/opiemail" ); |
35 | qDebug("$HOME/Applications/opiemail created "); | 34 | qDebug("$HOME/Applications/opiemail created "); |
@@ -207,21 +206,20 @@ void IMAPaccount::read() | |||
207 | offline = conf->readBoolEntry("Offline",false); | 206 | offline = conf->readBoolEntry("Offline",false); |
208 | localFolder = conf->readEntry( "LocalFolder" ); | 207 | localFolder = conf->readEntry( "LocalFolder" ); |
209 | maxMailSize = conf->readNumEntry( "MaxSize",0 ); | 208 | maxMailSize = conf->readNumEntry( "MaxSize",0 ); |
210 | int lf = conf->readNumEntry( "LastFetch",0 ); | 209 | int lf = conf->readNumEntry( "LastFetch",0 ); |
211 | QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) ); | 210 | QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) ); |
212 | leaveOnServer = conf->readBoolEntry("LeaveOnServer",false); | 211 | leaveOnServer = conf->readBoolEntry("LeaveOnServer",false); |
213 | qDebug("reading last fetch: %d ", lf); | ||
214 | if ( lf < 0 ) lf = 0; | 212 | if ( lf < 0 ) lf = 0; |
215 | lastFetch = dt.addSecs( lf ); | 213 | lastFetch = dt.addSecs( lf ); |
216 | delete conf; | 214 | delete conf; |
217 | } | 215 | } |
218 | 216 | ||
219 | void IMAPaccount::save() | 217 | void IMAPaccount::save() |
220 | { | 218 | { |
221 | qDebug("saving %s ",getFileName().latin1() ); | 219 | |
222 | Settings::checkDirectory(); | 220 | Settings::checkDirectory(); |
223 | 221 | ||
224 | KConfig *conf = new KConfig( getFileName() ); | 222 | KConfig *conf = new KConfig( getFileName() ); |
225 | conf->setGroup( "IMAP Account" ); | 223 | conf->setGroup( "IMAP Account" ); |
226 | conf->writeEntry( "Account", accountName ); | 224 | conf->writeEntry( "Account", accountName ); |
227 | conf->writeEntry( "Server", server ); | 225 | conf->writeEntry( "Server", server ); |