-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,11 +1,11 @@ | |||
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 |
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 | |||
@@ -22,17 +22,17 @@ | |||
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() |
@@ -127,17 +127,17 @@ bool SMTPwrapper::smtpSend( mailmime *mail,bool later) { | |||
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); |
@@ -447,17 +447,17 @@ bool SMTPwrapper::flushOutbox() { | |||
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); |
@@ -1 +1 @@ | |||
version = "1.9.12"; | version = "1.9.13"; | ||