summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore 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:
185install: 185install:
186 cd bin/kdepim; make install 186 cd bin/kdepim; make install
187 cp -r Pim $(QPEDIR)/apps 187 cp -r Pim $(QPEDIR)/apps
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"
195 rm -f *arm.ipk 195 rm -f *arm.ipk
196 rm -f *~ 196 rm -f *~
197 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim 197 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:
185install: 185install:
186 cd bin/kdepim; make install 186 cd bin/kdepim; make install
187 cp -r Pim $(QPEDIR)/apps 187 cp -r Pim $(QPEDIR)/apps
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"
195 rm -f *arm.ipk 195 rm -f *arm.ipk
196 rm -f *~ 196 rm -f *~
197 cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim 197 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
3Comment=OM/PI 3Comment=OM/PI
4Comment[de]=KM/PI 4Comment[de]=KM/PI
5Display=640x480/144dpi,480x640/144dpi 5Display=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
13Terminal=false 13Terminal=false
14TerminalOptions= 14TerminalOptions=
15Type=Application 15Type=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)
123 return 0; 123 return 0;
124} 124}
125 125
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}
133 133
134QString AbstractMail::draftFolder() 134QString 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
27void Settings::checkDirectory() 27void 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
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-*" );
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
146QString IMAPaccount::getUniqueFileName() 146QString 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
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()
210 : Account() 210 : Account()
211{ 211{
212 file = POP3account::getUniqueFileName(); 212 file = POP3account::getUniqueFileName();
@@ -230,13 +230,13 @@ POP3account::POP3account( QString filename )
230 230
231QString POP3account::getUniqueFileName() 231QString 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
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()
286 : Account() 286 : Account()
287{ 287{
288 file = SMTPaccount::getUniqueFileName(); 288 file = SMTPaccount::getUniqueFileName();
@@ -311,13 +311,13 @@ SMTPaccount::SMTPaccount( QString filename )
311 311
312QString SMTPaccount::getUniqueFileName() 312QString 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
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()
367 : Account() 367 : Account()
368{ 368{
369 file = NNTPaccount::getUniqueFileName(); 369 file = NNTPaccount::getUniqueFileName();
@@ -387,13 +387,13 @@ NNTPaccount::NNTPaccount( QString filename )
387 387
388QString NNTPaccount::getUniqueFileName() 388QString 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
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
@@ -27,22 +27,22 @@ int main( int argc, char **argv ) {
27 a.setKeepRunning (); 27 a.setKeepRunning ();
28#else 28#else
29 QApplication a( argc, argv ); 29 QApplication a( argc, 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")));
46 OpieMail mw; 46 OpieMail mw;
47#ifndef DESKTOP_VERSION 47#ifndef DESKTOP_VERSION
48 //qDebug("CONNECT "); 48 //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()
204 "libEtPan has its own licence - see LibEtPan licence\n"; 204 "libEtPan has its own licence - see LibEtPan licence\n";
205 205
206 KApplication::showText( cap, text ); 206 KApplication::showText( cap, text );
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 &)
214{ 214{
215 qDebug("appMessage implemented by subclass"); 215 qDebug("appMessage implemented by subclass");
216} 216}
diff --git a/kopiemail.control b/kopiemail.control
index 339396d..52cf554 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,7 +1,7 @@
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
5Maintainer: Lutz Rogowski <lutz@pi-sync.net> 5Maintainer: Lutz Rogowski <lutz@pi-sync.net>
6Architecture: arm 6Architecture: arm
7Version: 1.9.4 7Version: 1.9.4