summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--Makefile.Embedded2
-rw-r--r--kmicromail/kmicromail.desktop2
-rw-r--r--kmicromail/libmailwrapper/abstractmail.cpp2
-rw-r--r--kmicromail/libmailwrapper/settings.cpp20
-rw-r--r--kmicromail/main.cpp8
-rw-r--r--kmicromail/mainwindow.cpp2
-rw-r--r--kopiemail.control2
8 files changed, 20 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index 2d0e855..ec2277e 100644
--- a/Makefile
+++ b/Makefile
@@ -185,13 +185,13 @@ clean:
install:
cd bin/kdepim; make install
cp -r Pim $(QPEDIR)/apps
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"
rm -f *arm.ipk
rm -f *~
cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 2d0e855..ec2277e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -185,13 +185,13 @@ clean:
install:
cd bin/kdepim; make install
cp -r Pim $(QPEDIR)/apps
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"
rm -f *arm.ipk
rm -f *~
cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
diff --git a/kmicromail/kmicromail.desktop b/kmicromail/kmicromail.desktop
index a23420a..e3efcc6 100644
--- a/kmicromail/kmicromail.desktop
+++ b/kmicromail/kmicromail.desktop
@@ -3,13 +3,13 @@ CanFastload=1
Comment=OM/PI
Comment[de]=KM/PI
Display=640x480/144dpi,480x640/144dpi
Exec=ompi
GenericName=
GenericName[de]=
-Icon=kdepim/kmicromail/kmicromail
+Icon=kdepim/kopiemail/kmicromail
MimeType=
Name=OM/Pi
StartupNotify=true
Terminal=false
TerminalOptions=
Type=Application
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)
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()
{
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()
}
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 ");
}
*/
@@ -53,13 +53,13 @@ void Settings::delAccount( Account *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 );
@@ -145,13 +145,13 @@ IMAPaccount::IMAPaccount( QString filename )
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 );
@@ -200,13 +200,13 @@ void IMAPaccount::save()
delete conf;
}
QString IMAPaccount::getFileName()
{
- return locateLocal("data", "kmicromail" ) +"/imap-" + file;
+ return locateLocal("data", "kopiemail" ) +"/imap-" + file;
}
POP3account::POP3account()
: Account()
{
file = POP3account::getUniqueFileName();
@@ -230,13 +230,13 @@ POP3account::POP3account( QString filename )
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 );
@@ -276,13 +276,13 @@ void POP3account::save()
delete conf;
}
QString POP3account::getFileName()
{
- return locateLocal("data", "kmicromail" ) +"/pop3-" + file;
+ return locateLocal("data", "kopiemail" ) +"/pop3-" + file;
}
SMTPaccount::SMTPaccount()
: Account()
{
file = SMTPaccount::getUniqueFileName();
@@ -311,13 +311,13 @@ SMTPaccount::SMTPaccount( QString filename )
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 );
@@ -357,13 +357,13 @@ void SMTPaccount::save()
delete conf;
}
QString SMTPaccount::getFileName()
{
- return locateLocal("data", "kmicromail" ) +"/smtp-" + file;
+ return locateLocal("data", "kopiemail" ) +"/smtp-" + file;
}
NNTPaccount::NNTPaccount()
: Account()
{
file = NNTPaccount::getUniqueFileName();
@@ -387,13 +387,13 @@ NNTPaccount::NNTPaccount( QString filename )
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 );
@@ -433,8 +433,8 @@ void NNTPaccount::save()
delete conf;
}
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
@@ -27,22 +27,22 @@ int main( int argc, char **argv ) {
a.setKeepRunning ();
#else
QApplication a( argc, 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")));
OpieMail mw;
#ifndef DESKTOP_VERSION
//qDebug("CONNECT ");
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 5793a58..21edfd2 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -204,13 +204,13 @@ void MainWindow::showAbout()
"libEtPan has its own licence - see LibEtPan licence\n";
KApplication::showText( cap, text );
}
void MainWindow::showEtpanLicence()
{
- KApplication::showFile( "LibEtPan licence", "kdepim/kmicromail/COPYRIGHTlibetpan" );
+ KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
}
void MainWindow::appMessage(const QCString &, const QByteArray &)
{
qDebug("appMessage implemented by subclass");
}
diff --git a/kopiemail.control b/kopiemail.control
index 339396d..52cf554 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,7 +1,7 @@
-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
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
Version: 1.9.4