author | zautrix <zautrix> | 2004-10-31 18:40:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-31 18:40:14 (UTC) |
commit | 16292c7f13b40a07b51b41c701cd106ccfd2f37b (patch) (unidiff) | |
tree | f3e2dfe11b00f1d910eaeaafd28b0d97aa717ce1 | |
parent | 043e2d256df36945779bf4568df46b6e4ae51e0e (diff) | |
download | kdepimpi-16292c7f13b40a07b51b41c701cd106ccfd2f37b.zip kdepimpi-16292c7f13b40a07b51b41c701cd106ccfd2f37b.tar.gz kdepimpi-16292c7f13b40a07b51b41c701cd106ccfd2f37b.tar.bz2 |
hope it works..
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 6 | ||||
-rw-r--r-- | version | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index b663918..cead6bb 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,27 +1,27 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 1.9.11 | 3 | Version: 1.9.13 |
4 | Release: SuSE_9.1 | 4 | Release: SuSE_9.1 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
7 | Source:http://sourceforge.net/projects/kdepimpi/ | 7 | Source:http://sourceforge.net/projects/kdepimpi/ |
8 | URL:http://sourceforge.net/projects/kdepimpi/ | 8 | URL:http://sourceforge.net/projects/kdepimpi/ |
9 | Packager: zautrix | 9 | Packager: zautrix |
10 | 10 | ||
11 | %description | 11 | %description |
12 | This package contains the platform-independent PIM programs from | 12 | This package contains the platform-independent PIM programs from |
13 | www.pi-sync.net, compiled for SuSE 9.1: | 13 | www.pi-sync.net, compiled for SuSE 9.1: |
14 | KTimeTacker/Pi | 14 | KTimeTacker/Pi |
15 | KPhone/Pi | 15 | KPhone/Pi |
16 | KAddressbook/Pi | 16 | KAddressbook/Pi |
17 | KOrganizer/Pi | 17 | KOrganizer/Pi |
18 | PasswordManager/Pi | 18 | PasswordManager/Pi |
19 | 19 | ||
20 | These applications do not need anything from the KDE-desktop | 20 | These applications do not need anything from the KDE-desktop |
21 | at all to run on Linux. However, there is a dependency from | 21 | at all to run on Linux. However, there is a dependency from |
22 | two KDE libs, because a small command line program is included | 22 | two KDE libs, because a small command line program is included |
23 | to make it possible to sync with the KDE-desktop applications. | 23 | to make it possible to sync with the KDE-desktop applications. |
24 | 24 | ||
25 | These applications are independent from the KDE-desktop | 25 | These applications are independent from the KDE-desktop |
26 | environment. That means, nothing of your existing | 26 | environment. That means, nothing of your existing |
27 | KDE-desktop setup will be changed, or any data | 27 | KDE-desktop setup will be changed, or any data |
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index eb07ef1..f54fe2b 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp | |||
@@ -6,49 +6,49 @@ | |||
6 | #include "sendmailprogress.h" | 6 | #include "sendmailprogress.h" |
7 | 7 | ||
8 | //#include <opie2/odebug.h> | 8 | //#include <opie2/odebug.h> |
9 | //#include <qt.h> | 9 | //#include <qt.h> |
10 | #include <qapplication.h> | 10 | #include <qapplication.h> |
11 | #include <qmessagebox.h> | 11 | #include <qmessagebox.h> |
12 | #include <stdlib.h> | 12 | #include <stdlib.h> |
13 | #ifndef DESKTOP_VERSION | 13 | #ifndef DESKTOP_VERSION |
14 | //#include <qpe/config.h> | 14 | //#include <qpe/config.h> |
15 | #include <qpe/qcopenvelope_qws.h> | 15 | #include <qpe/qcopenvelope_qws.h> |
16 | #endif | 16 | #endif |
17 | #include <libetpan/libetpan.h> | 17 | #include <libetpan/libetpan.h> |
18 | #include <klocale.h> | 18 | #include <klocale.h> |
19 | #include <kglobal.h> | 19 | #include <kglobal.h> |
20 | #include <kconfig.h> | 20 | #include <kconfig.h> |
21 | 21 | ||
22 | 22 | ||
23 | using namespace Opie::Core; | 23 | using namespace Opie::Core; |
24 | progressMailSend*SMTPwrapper::sendProgress = 0; | 24 | progressMailSend*SMTPwrapper::sendProgress = 0; |
25 | 25 | ||
26 | SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) | 26 | SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) |
27 | : Generatemail() | 27 | : Generatemail() |
28 | { | 28 | { |
29 | m_SmtpAccount = aSmtp; | 29 | m_SmtpAccount = aSmtp; |
30 | KConfig cfg( locateLocal("config", "kopiemail" ) ); | 30 | KConfig cfg( locateLocal("config", "kopiemailrc" ) ); |
31 | cfg.setGroup( "Status" ); | 31 | cfg.setGroup( "Status" ); |
32 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); | 32 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); |
33 | emit queuedMails( m_queuedMail ); | 33 | emit queuedMails( m_queuedMail ); |
34 | connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) ) ); | 34 | connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) ) ); |
35 | m_smtp = 0; | 35 | m_smtp = 0; |
36 | } | 36 | } |
37 | 37 | ||
38 | SMTPwrapper::~SMTPwrapper() | 38 | SMTPwrapper::~SMTPwrapper() |
39 | { | 39 | { |
40 | disc_server(); | 40 | disc_server(); |
41 | } | 41 | } |
42 | 42 | ||
43 | void SMTPwrapper::emitQCop( int queued ) { | 43 | void SMTPwrapper::emitQCop( int queued ) { |
44 | #ifndef DESKTOP_VERSION | 44 | #ifndef DESKTOP_VERSION |
45 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); | 45 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); |
46 | env << queued; | 46 | env << queued; |
47 | #endif | 47 | #endif |
48 | } | 48 | } |
49 | 49 | ||
50 | QString SMTPwrapper::mailsmtpError( int errnum ) { | 50 | QString SMTPwrapper::mailsmtpError( int errnum ) { |
51 | switch ( errnum ) { | 51 | switch ( errnum ) { |
52 | case MAILSMTP_NO_ERROR: | 52 | case MAILSMTP_NO_ERROR: |
53 | return i18n( "No error" ); | 53 | return i18n( "No error" ); |
54 | case MAILSMTP_ERROR_UNEXPECTED_CODE: | 54 | case MAILSMTP_ERROR_UNEXPECTED_CODE: |
@@ -111,49 +111,49 @@ void SMTPwrapper::storeMail(const char*mail, size_t length, const QString&box) { | |||
111 | bool SMTPwrapper::smtpSend( mailmime *mail,bool later) { | 111 | bool SMTPwrapper::smtpSend( mailmime *mail,bool later) { |
112 | clist *rcpts = 0; | 112 | clist *rcpts = 0; |
113 | char *from, *data; | 113 | char *from, *data; |
114 | size_t size; | 114 | size_t size; |
115 | 115 | ||
116 | from = data = 0; | 116 | from = data = 0; |
117 | 117 | ||
118 | mailmessage * msg = 0; | 118 | mailmessage * msg = 0; |
119 | msg = mime_message_init(mail); | 119 | msg = mime_message_init(mail); |
120 | mime_message_set_tmpdir(msg,getenv( "HOME" )); | 120 | mime_message_set_tmpdir(msg,getenv( "HOME" )); |
121 | int r = mailmessage_fetch(msg,&data,&size); | 121 | int r = mailmessage_fetch(msg,&data,&size); |
122 | mime_message_detach_mime(msg); | 122 | mime_message_detach_mime(msg); |
123 | mailmessage_free(msg); | 123 | mailmessage_free(msg); |
124 | if (r != MAIL_NO_ERROR || !data) { | 124 | if (r != MAIL_NO_ERROR || !data) { |
125 | if (data) | 125 | if (data) |
126 | free(data); | 126 | free(data); |
127 | qDebug("Error fetching mime... "); | 127 | qDebug("Error fetching mime... "); |
128 | return false; | 128 | return false; |
129 | } | 129 | } |
130 | msg = 0; | 130 | msg = 0; |
131 | if (later) { | 131 | if (later) { |
132 | storeMail(data,size,"Outgoing"); | 132 | storeMail(data,size,"Outgoing"); |
133 | if (data) | 133 | if (data) |
134 | free( data ); | 134 | free( data ); |
135 | KConfig cfg( locateLocal("config", "kopiemail" ) ); | 135 | KConfig cfg( locateLocal("config", "kopiemailrc" ) ); |
136 | cfg.setGroup( "Status" ); | 136 | cfg.setGroup( "Status" ); |
137 | cfg.writeEntry( "outgoing", ++m_queuedMail ); | 137 | cfg.writeEntry( "outgoing", ++m_queuedMail ); |
138 | emit queuedMails( m_queuedMail ); | 138 | emit queuedMails( m_queuedMail ); |
139 | return true; | 139 | return true; |
140 | } | 140 | } |
141 | from = getFrom( mail ); | 141 | from = getFrom( mail ); |
142 | rcpts = createRcptList( mail->mm_data.mm_message.mm_fields ); | 142 | rcpts = createRcptList( mail->mm_data.mm_message.mm_fields ); |
143 | bool result = smtpSend(from,rcpts,data,size); | 143 | bool result = smtpSend(from,rcpts,data,size); |
144 | if (data) { | 144 | if (data) { |
145 | free(data); | 145 | free(data); |
146 | } | 146 | } |
147 | if (from) { | 147 | if (from) { |
148 | free(from); | 148 | free(from); |
149 | } | 149 | } |
150 | if (rcpts) | 150 | if (rcpts) |
151 | smtp_address_list_free( rcpts ); | 151 | smtp_address_list_free( rcpts ); |
152 | return result; | 152 | return result; |
153 | } | 153 | } |
154 | 154 | ||
155 | void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*failuremessage) | 155 | void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*failuremessage) |
156 | { | 156 | { |
157 | if (data) { | 157 | if (data) { |
158 | storeMail(data,size,"Sendfailed"); | 158 | storeMail(data,size,"Sendfailed"); |
159 | } | 159 | } |
@@ -431,36 +431,36 @@ bool SMTPwrapper::flushOutbox() { | |||
431 | return true; | 431 | return true; |
432 | } | 432 | } |
433 | } | 433 | } |
434 | 434 | ||
435 | 435 | ||
436 | sendProgress = new progressMailSend(); | 436 | sendProgress = new progressMailSend(); |
437 | sendProgress->show(); | 437 | sendProgress->show(); |
438 | sendProgress->setMaxMails(mailsToSend.count()); | 438 | sendProgress->setMaxMails(mailsToSend.count()); |
439 | 439 | ||
440 | while (mailsToSend.count()>0) { | 440 | while (mailsToSend.count()>0) { |
441 | if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) { | 441 | if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) { |
442 | QMessageBox::critical(0,i18n("Error sending mail"), | 442 | QMessageBox::critical(0,i18n("Error sending mail"), |
443 | i18n("Error sending queued mail - breaking")); | 443 | i18n("Error sending queued mail - breaking")); |
444 | returnValue = false; | 444 | returnValue = false; |
445 | break; | 445 | break; |
446 | } | 446 | } |
447 | mailsToRemove.append((*mailsToSend.begin())); | 447 | mailsToRemove.append((*mailsToSend.begin())); |
448 | mailsToSend.remove(mailsToSend.begin()); | 448 | mailsToSend.remove(mailsToSend.begin()); |
449 | sendProgress->setCurrentMails(mailsToRemove.count()); | 449 | sendProgress->setCurrentMails(mailsToRemove.count()); |
450 | } | 450 | } |
451 | if (reset_user_value) { | 451 | if (reset_user_value) { |
452 | m_SmtpAccount->setUser(oldUser); | 452 | m_SmtpAccount->setUser(oldUser); |
453 | m_SmtpAccount->setPassword(oldPw); | 453 | m_SmtpAccount->setPassword(oldPw); |
454 | } | 454 | } |
455 | KConfig cfg( locateLocal("config", "kopiemail" ) ); | 455 | KConfig cfg( locateLocal("config", "kopiemailrc" ) ); |
456 | cfg.setGroup( "Status" ); | 456 | cfg.setGroup( "Status" ); |
457 | m_queuedMail = 0; | 457 | m_queuedMail = 0; |
458 | cfg.writeEntry( "outgoing", m_queuedMail ); | 458 | cfg.writeEntry( "outgoing", m_queuedMail ); |
459 | emit queuedMails( m_queuedMail ); | 459 | emit queuedMails( m_queuedMail ); |
460 | sendProgress->hide(); | 460 | sendProgress->hide(); |
461 | delete sendProgress; | 461 | delete sendProgress; |
462 | sendProgress = 0; | 462 | sendProgress = 0; |
463 | wrap->deleteMails(mbox,mailsToRemove); | 463 | wrap->deleteMails(mbox,mailsToRemove); |
464 | delete wrap; | 464 | delete wrap; |
465 | return returnValue; | 465 | return returnValue; |
466 | } | 466 | } |
@@ -1 +1 @@ | |||
version = "1.9.12"; | version = "1.9.13"; | ||