summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-10 15:30:01 (UTC)
committer zautrix <zautrix>2004-09-10 15:30:01 (UTC)
commit4af018e98a29e859df1b28a437c4965bb9676394 (patch) (unidiff)
treeac71fa15fdd2eca263730493de378482952d8c80
parent14056eb4ec076bc243dcb9f600999eb437fb8afd (diff)
downloadkdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.zip
kdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.tar.gz
kdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.tar.bz2
path fixes for kopiemail
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
@@ -188,7 +188,7 @@ install:
188 cp db2file/db2file $(QPEDIR)/bin/db2file 188 cp db2file/db2file $(QPEDIR)/bin/db2file
189 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 189 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
190 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 190 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
191 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop 191 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
192 192
193dist: 193dist:
194 @echo Dont forget to do "make install" before "make dist" 194 @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:
188 cp db2file/db2file $(QPEDIR)/bin/db2file 188 cp db2file/db2file $(QPEDIR)/bin/db2file
189 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop 189 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
190 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop 190 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
191 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop 191 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
192 192
193dist: 193dist:
194 @echo Dont forget to do "make install" before "make dist" 194 @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
6Exec=ompi 6Exec=ompi
7GenericName= 7GenericName=
8GenericName[de]= 8GenericName[de]=
9Icon=kdepim/kmicromail/kmicromail 9Icon=kdepim/kopiemail/kmicromail
10MimeType= 10MimeType=
11Name=OM/Pi 11Name=OM/Pi
12StartupNotify=true 12StartupNotify=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)
126QString AbstractMail::defaultLocalfolder() 126QString 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}
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()
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" );
@@ -56,7 +56,7 @@ void Settings::delAccount( Account *account )
56void Settings::updateAccounts() 56void 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-*" );
@@ -148,7 +148,7 @@ QString IMAPaccount::getUniqueFileName()
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 {
@@ -203,7 +203,7 @@ void IMAPaccount::save()
203 203
204QString IMAPaccount::getFileName() 204QString IMAPaccount::getFileName()
205{ 205{
206 return locateLocal("data", "kmicromail" ) +"/imap-" + file; 206 return locateLocal("data", "kopiemail" ) +"/imap-" + file;
207} 207}
208 208
209POP3account::POP3account() 209POP3account::POP3account()
@@ -233,7 +233,7 @@ QString POP3account::getUniqueFileName()
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 {
@@ -279,7 +279,7 @@ void POP3account::save()
279 279
280QString POP3account::getFileName() 280QString POP3account::getFileName()
281{ 281{
282 return locateLocal("data", "kmicromail" ) +"/pop3-" + file; 282 return locateLocal("data", "kopiemail" ) +"/pop3-" + file;
283} 283}
284 284
285SMTPaccount::SMTPaccount() 285SMTPaccount::SMTPaccount()
@@ -314,7 +314,7 @@ QString SMTPaccount::getUniqueFileName()
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 {
@@ -360,7 +360,7 @@ void SMTPaccount::save()
360 360
361QString SMTPaccount::getFileName() 361QString SMTPaccount::getFileName()
362{ 362{
363 return locateLocal("data", "kmicromail" ) +"/smtp-" + file; 363 return locateLocal("data", "kopiemail" ) +"/smtp-" + file;
364} 364}
365 365
366NNTPaccount::NNTPaccount() 366NNTPaccount::NNTPaccount()
@@ -390,7 +390,7 @@ QString NNTPaccount::getUniqueFileName()
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 {
@@ -436,5 +436,5 @@ void NNTPaccount::save()
436 436
437QString NNTPaccount::getFileName() 437QString NNTPaccount::getFileName()
438{ 438{
439 return locateLocal("data", "kmicromail" ) +"/nntp-" + file; 439 return locateLocal("data", "kopiemail" ) +"/nntp-" + file;
440} 440}
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 ) {
30 QApplication::setStyle( new QPlatinumStyle ()); 30 QApplication::setStyle( new QPlatinumStyle ());
31#endif 31#endif
32 32
33 KGlobal::setAppName( "kmicromail" ); 33 KGlobal::setAppName( "kopiemail" );
34 QString fileName ; 34 QString fileName ;
35#ifndef DESKTOP_VERSION 35#ifndef DESKTOP_VERSION
36 fileName = getenv("QPEDIR"); 36 fileName = getenv("QPEDIR");
37 if ( QApplication::desktop()->width() > 320 ) 37 if ( QApplication::desktop()->width() > 320 )
38 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/"); 38 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/icons22/");
39 else 39 else
40 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/"); 40 KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/");
41#else 41#else
42 fileName = qApp->applicationDirPath () + "/kdepim/kmicromail/"; 42 fileName = qApp->applicationDirPath () + "/kdepim/kopiemail/";
43 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); 43 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
44#endif 44#endif
45 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail"))); 45 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()
207} 207}
208void MainWindow::showEtpanLicence() 208void MainWindow::showEtpanLicence()
209{ 209{
210 KApplication::showFile( "LibEtPan licence", "kdepim/kmicromail/COPYRIGHTlibetpan" ); 210 KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
211 211
212} 212}
213void MainWindow::appMessage(const QCString &, const QByteArray &) 213void 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 @@
1Files: bin/ompi apps/Pim/kmicromail.desktop pics/kdepim/kmicromail/* lib/libkmicro* 1Files: bin/ompi apps/Pim/kopiemail.desktop pics/kdepim/kopiemail/* lib/libkmicro*
2 2
3Priority: optional 3Priority: optional
4Section: qpe/pim 4Section: qpe/pim