path fixes for kopiemail

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
@@ -117,25 +117,25 @@ QString AbstractMail::gen_attachment_id()
 
     return "{" + stream.read().stripWhiteSpace() + "}";
 }
 
 int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool)
 {
     return 0;
 }
 
 QString AbstractMail::defaultLocalfolder()
 {
     //  QString f = getenv( "HOME" );
-    QString f = locateLocal( "data", "kmicromail/localmail");
+    QString f = locateLocal( "data", "kopiemail/localmail");
     //  f += "/Applications/opiemail/localmail";
     return f;
 }
 
 QString AbstractMail::draftFolder()
 {
     return QString("Drafts");
 }
 
 /* temporary - will be removed when implemented in all classes */
 void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
 {
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
@@ -19,25 +19,25 @@
 
 
 Settings::Settings()
     : QObject()
 {
    updateAccounts();
 }
 
 void Settings::checkDirectory()
 {
     qDebug("Settings::checkDirectory()  ");
     return;
-    locateLocal("data", "kmicromail" );
+    locateLocal("data", "kopiemail" );
     /*
     if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) {
         system( "mkdir -p $HOME/Applications/opiemail" );
         qDebug("$HOME/Applications/opiemail created ");
     }
     */
 }
 
 QList<Account> Settings::getAccounts()
 {
     return accounts;
 }
@@ -47,25 +47,25 @@ void Settings::addAccount( Account *account )
     accounts.append( account );
 }
 
 void Settings::delAccount( Account *account )
 {
     accounts.remove( account );
     account->remove();
 }
 
 void Settings::updateAccounts()
 {
     accounts.clear();
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
     QStringList::Iterator it;
 
     QStringList imap = dir.entryList( "imap-*" );
     for ( it = imap.begin(); it != imap.end(); it++ ) {
         IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") );
         accounts.append( account );
     }
 
     QStringList pop3 = dir.entryList( "pop3-*" );
     for ( it = pop3.begin(); it != pop3.end(); it++ ) {
         POP3account *account = new POP3account( (*it).replace(0, 5, "") );
         accounts.append( account );
@@ -139,25 +139,25 @@ IMAPaccount::IMAPaccount( QString filename )
     accountName = "New IMAP Account";
     ssl = false;
     connectionType = 1;
     type = MAILLIB::A_IMAP;
     port = IMAP_PORT;
 }
 
 QString IMAPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
 
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "imap-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "imap-" + unique ) > 0 );
 
     return unique;
 }
 
 void IMAPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
@@ -194,25 +194,25 @@ void IMAPaccount::save()
     conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "MailPrefix",prefix);
     conf->writeEntry( "Offline",offline);
     conf->write();
     delete conf;
 }
 
 
 QString IMAPaccount::getFileName()
 {
-    return locateLocal("data", "kmicromail" ) +"/imap-" + file;
+    return locateLocal("data", "kopiemail" ) +"/imap-" + file;
 }
 
 POP3account::POP3account()
     : Account()
 {
     file = POP3account::getUniqueFileName();
     accountName = "New POP3 Account";
     ssl = false;
     connectionType = 1;
     type = MAILLIB::A_POP3;
     port = POP3_PORT;
 }
@@ -224,25 +224,25 @@ POP3account::POP3account( QString filename )
     accountName = "New POP3 Account";
     ssl = false;
     connectionType = 1;
     type = MAILLIB::A_POP3;
     port = POP3_PORT;
 }
 
 QString POP3account::getUniqueFileName()
 {
     int num = 0;
     QString unique;
 
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "pop3-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "pop3-" + unique ) > 0 );
 
     return unique;
 }
 
 void POP3account::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
@@ -270,25 +270,25 @@ void POP3account::save()
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "Offline",offline);
     conf->write();
     delete conf;
 }
 
 
 QString POP3account::getFileName()
 {
-    return locateLocal("data", "kmicromail" ) +"/pop3-" + file;
+    return locateLocal("data", "kopiemail" ) +"/pop3-" + file;
 }
 
 SMTPaccount::SMTPaccount()
     : Account()
 {
     file = SMTPaccount::getUniqueFileName();
     accountName = "New SMTP Account";
     ssl = false;
     connectionType = 1;
     login = false;
     useCC = false;
     useBCC = false;
@@ -305,25 +305,25 @@ SMTPaccount::SMTPaccount( QString filename )
     ssl = false;
     connectionType = 1;
     login = false;
     type = MAILLIB::A_SMTP;
     port = SMTP_PORT;
 }
 
 QString SMTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
 
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "smtp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "smtp-" + unique ) > 0 );
 
     return unique;
 }
 
 void SMTPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
@@ -351,25 +351,25 @@ void SMTPaccount::save()
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "ConnectionType", connectionType );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->write();
     delete conf;
 }
 
 
 QString SMTPaccount::getFileName()
 {
-    return locateLocal("data", "kmicromail" ) +"/smtp-" + file;
+    return locateLocal("data", "kopiemail" ) +"/smtp-" + file;
 }
 
 NNTPaccount::NNTPaccount()
     : Account()
 {
     file = NNTPaccount::getUniqueFileName();
     accountName = "New NNTP Account";
     ssl = false;
     login = false;
     type = MAILLIB::A_NNTP;
     port = NNTP_PORT;
 }
@@ -381,25 +381,25 @@ NNTPaccount::NNTPaccount( QString filename )
     accountName = "New NNTP Account";
     ssl = false;
     login = false;
     type = MAILLIB::A_NNTP;
     port = NNTP_PORT;
 }
 
 QString NNTPaccount::getUniqueFileName()
 {
     int num = 0;
     QString unique;
 
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "nntp-*" );
     do {
         unique.setNum( num++ );
     } while ( imap.contains( "nntp-" + unique ) > 0 );
 
     return unique;
 }
 
 void NNTPaccount::read()
 {
     Config *conf = new Config( getFileName(), Config::File );
@@ -427,14 +427,14 @@ void NNTPaccount::save()
     conf->writeEntry( "SSL", ssl );
     conf->writeEntry( "Login", login );
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "Subscribed" , subscribedGroups, ',' );
     conf->write();
     delete conf;
 }
 
 
 QString NNTPaccount::getFileName()
 {
-    return locateLocal("data", "kmicromail" ) +"/nntp-" + file;
+    return locateLocal("data", "kopiemail" ) +"/nntp-" + file;
 }