-rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/settings.cpp | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp index 3b0ca1f..cef4e97 100644 --- a/kmicromail/libmailwrapper/abstractmail.cpp +++ b/kmicromail/libmailwrapper/abstractmail.cpp | |||
@@ -123,13 +123,13 @@ int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) | |||
123 | return 0; | 123 | return 0; |
124 | } | 124 | } |
125 | 125 | ||
126 | QString AbstractMail::defaultLocalfolder() | 126 | QString AbstractMail::defaultLocalfolder() |
127 | { | 127 | { |
128 | // QString f = getenv( "HOME" ); | 128 | // QString f = getenv( "HOME" ); |
129 | QString f = locateLocal( "data", "kmicromail/localmail"); | 129 | QString f = locateLocal( "data", "kopiemail/localmail"); |
130 | // f += "/Applications/opiemail/localmail"; | 130 | // f += "/Applications/opiemail/localmail"; |
131 | return f; | 131 | return f; |
132 | } | 132 | } |
133 | 133 | ||
134 | QString AbstractMail::draftFolder() | 134 | QString AbstractMail::draftFolder() |
135 | { | 135 | { |
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp index bdb2a25..b0a539e 100644 --- a/kmicromail/libmailwrapper/settings.cpp +++ b/kmicromail/libmailwrapper/settings.cpp | |||
@@ -25,13 +25,13 @@ Settings::Settings() | |||
25 | } | 25 | } |
26 | 26 | ||
27 | void Settings::checkDirectory() | 27 | void Settings::checkDirectory() |
28 | { | 28 | { |
29 | qDebug("Settings::checkDirectory() "); | 29 | qDebug("Settings::checkDirectory() "); |
30 | return; | 30 | return; |
31 | locateLocal("data", "kmicromail" ); | 31 | locateLocal("data", "kopiemail" ); |
32 | /* | 32 | /* |
33 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { | 33 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { |
34 | system( "mkdir -p $HOME/Applications/opiemail" ); | 34 | system( "mkdir -p $HOME/Applications/opiemail" ); |
35 | qDebug("$HOME/Applications/opiemail created "); | 35 | qDebug("$HOME/Applications/opiemail created "); |
36 | } | 36 | } |
37 | */ | 37 | */ |
@@ -53,13 +53,13 @@ void Settings::delAccount( Account *account ) | |||
53 | account->remove(); | 53 | account->remove(); |
54 | } | 54 | } |
55 | 55 | ||
56 | void Settings::updateAccounts() | 56 | void Settings::updateAccounts() |
57 | { | 57 | { |
58 | accounts.clear(); | 58 | accounts.clear(); |
59 | QDir dir( locateLocal("data", "kmicromail" ) ); | 59 | QDir dir( locateLocal("data", "kopiemail" ) ); |
60 | QStringList::Iterator it; | 60 | QStringList::Iterator it; |
61 | 61 | ||
62 | QStringList imap = dir.entryList( "imap-*" ); | 62 | QStringList imap = dir.entryList( "imap-*" ); |
63 | for ( it = imap.begin(); it != imap.end(); it++ ) { | 63 | for ( it = imap.begin(); it != imap.end(); it++ ) { |
64 | IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); | 64 | IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); |
65 | accounts.append( account ); | 65 | accounts.append( account ); |
@@ -145,13 +145,13 @@ IMAPaccount::IMAPaccount( QString filename ) | |||
145 | 145 | ||
146 | QString IMAPaccount::getUniqueFileName() | 146 | QString IMAPaccount::getUniqueFileName() |
147 | { | 147 | { |
148 | int num = 0; | 148 | int num = 0; |
149 | QString unique; | 149 | QString unique; |
150 | 150 | ||
151 | QDir dir( locateLocal("data", "kmicromail" ) ); | 151 | QDir dir( locateLocal("data", "kopiemail" ) ); |
152 | 152 | ||
153 | QStringList imap = dir.entryList( "imap-*" ); | 153 | QStringList imap = dir.entryList( "imap-*" ); |
154 | do { | 154 | do { |
155 | unique.setNum( num++ ); | 155 | unique.setNum( num++ ); |
156 | } while ( imap.contains( "imap-" + unique ) > 0 ); | 156 | } while ( imap.contains( "imap-" + unique ) > 0 ); |
157 | 157 | ||
@@ -200,13 +200,13 @@ void IMAPaccount::save() | |||
200 | delete conf; | 200 | delete conf; |
201 | } | 201 | } |
202 | 202 | ||
203 | 203 | ||
204 | QString IMAPaccount::getFileName() | 204 | QString IMAPaccount::getFileName() |
205 | { | 205 | { |
206 | return locateLocal("data", "kmicromail" ) +"/imap-" + file; | 206 | return locateLocal("data", "kopiemail" ) +"/imap-" + file; |
207 | } | 207 | } |
208 | 208 | ||
209 | POP3account::POP3account() | 209 | POP3account::POP3account() |
210 | : Account() | 210 | : Account() |
211 | { | 211 | { |
212 | file = POP3account::getUniqueFileName(); | 212 | file = POP3account::getUniqueFileName(); |
@@ -230,13 +230,13 @@ POP3account::POP3account( QString filename ) | |||
230 | 230 | ||
231 | QString POP3account::getUniqueFileName() | 231 | QString POP3account::getUniqueFileName() |
232 | { | 232 | { |
233 | int num = 0; | 233 | int num = 0; |
234 | QString unique; | 234 | QString unique; |
235 | 235 | ||
236 | QDir dir( locateLocal("data", "kmicromail" ) ); | 236 | QDir dir( locateLocal("data", "kopiemail" ) ); |
237 | 237 | ||
238 | QStringList imap = dir.entryList( "pop3-*" ); | 238 | QStringList imap = dir.entryList( "pop3-*" ); |
239 | do { | 239 | do { |
240 | unique.setNum( num++ ); | 240 | unique.setNum( num++ ); |
241 | } while ( imap.contains( "pop3-" + unique ) > 0 ); | 241 | } while ( imap.contains( "pop3-" + unique ) > 0 ); |
242 | 242 | ||
@@ -276,13 +276,13 @@ void POP3account::save() | |||
276 | delete conf; | 276 | delete conf; |
277 | } | 277 | } |
278 | 278 | ||
279 | 279 | ||
280 | QString POP3account::getFileName() | 280 | QString POP3account::getFileName() |
281 | { | 281 | { |
282 | return locateLocal("data", "kmicromail" ) +"/pop3-" + file; | 282 | return locateLocal("data", "kopiemail" ) +"/pop3-" + file; |
283 | } | 283 | } |
284 | 284 | ||
285 | SMTPaccount::SMTPaccount() | 285 | SMTPaccount::SMTPaccount() |
286 | : Account() | 286 | : Account() |
287 | { | 287 | { |
288 | file = SMTPaccount::getUniqueFileName(); | 288 | file = SMTPaccount::getUniqueFileName(); |
@@ -311,13 +311,13 @@ SMTPaccount::SMTPaccount( QString filename ) | |||
311 | 311 | ||
312 | QString SMTPaccount::getUniqueFileName() | 312 | QString SMTPaccount::getUniqueFileName() |
313 | { | 313 | { |
314 | int num = 0; | 314 | int num = 0; |
315 | QString unique; | 315 | QString unique; |
316 | 316 | ||
317 | QDir dir( locateLocal("data", "kmicromail" ) ); | 317 | QDir dir( locateLocal("data", "kopiemail" ) ); |
318 | 318 | ||
319 | QStringList imap = dir.entryList( "smtp-*" ); | 319 | QStringList imap = dir.entryList( "smtp-*" ); |
320 | do { | 320 | do { |
321 | unique.setNum( num++ ); | 321 | unique.setNum( num++ ); |
322 | } while ( imap.contains( "smtp-" + unique ) > 0 ); | 322 | } while ( imap.contains( "smtp-" + unique ) > 0 ); |
323 | 323 | ||
@@ -357,13 +357,13 @@ void SMTPaccount::save() | |||
357 | delete conf; | 357 | delete conf; |
358 | } | 358 | } |
359 | 359 | ||
360 | 360 | ||
361 | QString SMTPaccount::getFileName() | 361 | QString SMTPaccount::getFileName() |
362 | { | 362 | { |
363 | return locateLocal("data", "kmicromail" ) +"/smtp-" + file; | 363 | return locateLocal("data", "kopiemail" ) +"/smtp-" + file; |
364 | } | 364 | } |
365 | 365 | ||
366 | NNTPaccount::NNTPaccount() | 366 | NNTPaccount::NNTPaccount() |
367 | : Account() | 367 | : Account() |
368 | { | 368 | { |
369 | file = NNTPaccount::getUniqueFileName(); | 369 | file = NNTPaccount::getUniqueFileName(); |
@@ -387,13 +387,13 @@ NNTPaccount::NNTPaccount( QString filename ) | |||
387 | 387 | ||
388 | QString NNTPaccount::getUniqueFileName() | 388 | QString NNTPaccount::getUniqueFileName() |
389 | { | 389 | { |
390 | int num = 0; | 390 | int num = 0; |
391 | QString unique; | 391 | QString unique; |
392 | 392 | ||
393 | QDir dir( locateLocal("data", "kmicromail" ) ); | 393 | QDir dir( locateLocal("data", "kopiemail" ) ); |
394 | 394 | ||
395 | QStringList imap = dir.entryList( "nntp-*" ); | 395 | QStringList imap = dir.entryList( "nntp-*" ); |
396 | do { | 396 | do { |
397 | unique.setNum( num++ ); | 397 | unique.setNum( num++ ); |
398 | } while ( imap.contains( "nntp-" + unique ) > 0 ); | 398 | } while ( imap.contains( "nntp-" + unique ) > 0 ); |
399 | 399 | ||
@@ -433,8 +433,8 @@ void NNTPaccount::save() | |||
433 | delete conf; | 433 | delete conf; |
434 | } | 434 | } |
435 | 435 | ||
436 | 436 | ||
437 | QString NNTPaccount::getFileName() | 437 | QString NNTPaccount::getFileName() |
438 | { | 438 | { |
439 | return locateLocal("data", "kmicromail" ) +"/nntp-" + file; | 439 | return locateLocal("data", "kopiemail" ) +"/nntp-" + file; |
440 | } | 440 | } |