path fixes for kopiemail

8 files changed, 20 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 2d0e855..ec2277e 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@ install:
         cp db2file/db2file $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
-        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
+        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
 
 dist:
         @echo Dont forget to do "make install" before "make dist"
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 2d0e855..ec2277e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -188,7 +188,7 @@ install:
         cp db2file/db2file $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
-        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
+        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
 
 dist:
         @echo Dont forget to do "make install" before "make dist"
diff --git a/kmicromail/kmicromail.desktop b/kmicromail/kmicromail.desktop
index a23420a..e3efcc6 100644
--- a/kmicromail/kmicromail.desktop
+++ b/kmicromail/kmicromail.desktop
@@ -6,7 +6,7 @@ Display=640x480/144dpi,480x640/144dpi
 Exec=ompi
 GenericName=
 GenericName[de]=
-Icon=kdepim/kmicromail/kmicromail
+Icon=kdepim/kopiemail/kmicromail
 MimeType=
 Name=OM/Pi
 StartupNotify=true
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
@@ -126,7 +126,7 @@ int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool)
 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;
 }
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
@@ -28,7 +28,7 @@ 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" );
@@ -56,7 +56,7 @@ void Settings::delAccount( Account *account )
 void Settings::updateAccounts()
 {
     accounts.clear();
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
     QStringList::Iterator it;
 
     QStringList imap = dir.entryList( "imap-*" );
@@ -148,7 +148,7 @@ QString IMAPaccount::getUniqueFileName()
     int num = 0;
     QString unique;
 
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "imap-*" );
     do {
@@ -203,7 +203,7 @@ void IMAPaccount::save()
 
 QString IMAPaccount::getFileName()
 {
-    return locateLocal("data", "kmicromail" ) +"/imap-" + file;
+    return locateLocal("data", "kopiemail" ) +"/imap-" + file;
 }
 
 POP3account::POP3account()
@@ -233,7 +233,7 @@ QString POP3account::getUniqueFileName()
     int num = 0;
     QString unique;
 
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "pop3-*" );
     do {
@@ -279,7 +279,7 @@ void POP3account::save()
 
 QString POP3account::getFileName()
 {
-    return locateLocal("data", "kmicromail" ) +"/pop3-" + file;
+    return locateLocal("data", "kopiemail" ) +"/pop3-" + file;
 }
 
 SMTPaccount::SMTPaccount()
@@ -314,7 +314,7 @@ QString SMTPaccount::getUniqueFileName()
     int num = 0;
     QString unique;
 
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "smtp-*" );
     do {
@@ -360,7 +360,7 @@ void SMTPaccount::save()
 
 QString SMTPaccount::getFileName()
 {
-    return locateLocal("data", "kmicromail" ) +"/smtp-" + file;
+    return locateLocal("data", "kopiemail" ) +"/smtp-" + file;
 }
 
 NNTPaccount::NNTPaccount()
@@ -390,7 +390,7 @@ QString NNTPaccount::getUniqueFileName()
     int num = 0;
     QString unique;
 
-    QDir dir( locateLocal("data", "kmicromail" ) );
+    QDir dir( locateLocal("data", "kopiemail" ) );
 
     QStringList imap = dir.entryList( "nntp-*" );
     do {
@@ -436,5 +436,5 @@ void NNTPaccount::save()
 
 QString NNTPaccount::getFileName()
 {
-    return locateLocal("data", "kmicromail" ) +"/nntp-" + file;
+    return locateLocal("data", "kopiemail" ) +"/nntp-" + file;
 }
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index 30637e2..db29ff3 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -30,16 +30,16 @@ int main( int argc,  char **argv ) {
     QApplication::setStyle( new QPlatinumStyle ());
 #endif
 
-    KGlobal::setAppName( "kmicromail" );
+    KGlobal::setAppName( "kopiemail" );
     QString fileName ;
 #ifndef DESKTOP_VERSION
     fileName = getenv("QPEDIR");
     if ( QApplication::desktop()->width() > 320 )
-        KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/");
+        KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/icons22/");
     else
-        KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/");
+        KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/");
 #else
-    fileName  = qApp->applicationDirPath () + "/kdepim/kmicromail/";
+    fileName  = qApp->applicationDirPath () + "/kdepim/kopiemail/";
     KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
 #endif 
     KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail")));
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 5793a58..21edfd2 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -207,7 +207,7 @@ void  MainWindow::showAbout()
 }
 void  MainWindow::showEtpanLicence()
 {
-    KApplication::showFile( "LibEtPan licence", "kdepim/kmicromail/COPYRIGHTlibetpan" );
+    KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
 
 } 
 void MainWindow::appMessage(const QCString &, const QByteArray &)
diff --git a/kopiemail.control b/kopiemail.control
index 339396d..52cf554 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,4 +1,4 @@
-Files:  bin/ompi apps/Pim/kmicromail.desktop  pics/kdepim/kmicromail/*   lib/libkmicro*
+Files:  bin/ompi apps/Pim/kopiemail.desktop  pics/kdepim/kopiemail/*   lib/libkmicro*
 
 Priority: optional
 Section: qpe/pim