author | zautrix <zautrix> | 2004-07-06 16:42:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-06 16:42:29 (UTC) |
commit | 12695014a6bbf791f084d479a33883eeeb6d4e3b (patch) (unidiff) | |
tree | 7877a59b574584303f930a91c8f265aa27e84e0a | |
parent | 45e2744074e876a74919b340efc320bdadadcb25 (diff) | |
download | kdepimpi-12695014a6bbf791f084d479a33883eeeb6d4e3b.zip kdepimpi-12695014a6bbf791f084d479a33883eeeb6d4e3b.tar.gz kdepimpi-12695014a6bbf791f084d479a33883eeeb6d4e3b.tar.bz2 |
Fixed a crash
-rw-r--r-- | kmicromail/composemail.cpp | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index c1b58a4..9060364 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -74,4 +74,12 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
74 | } | 74 | } |
75 | } | 75 | } |
76 | if ( smtpAccounts.count() > 0 ) { | ||
77 | fillValues( smtpAccountBox->currentItem() ); | ||
78 | } else { | ||
79 | QMessageBox::information( 0, tr( "Problem" ), | ||
80 | tr( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ), | ||
81 | tr( "Ok" ) ); | ||
82 | return; | ||
83 | } | ||
76 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); | 84 | connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); |
77 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); | 85 | connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); |
@@ -84,12 +92,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
84 | mMail = 0; | 92 | mMail = 0; |
85 | warnAttach = true; | 93 | warnAttach = true; |
86 | if ( smtpAccounts.count() > 0 ) { | 94 | |
87 | fillValues( smtpAccountBox->currentItem() ); | ||
88 | } else { | ||
89 | QMessageBox::information( 0, tr( "Problem" ), | ||
90 | tr( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ), | ||
91 | tr( "Ok" ) ); | ||
92 | return; | ||
93 | } | ||
94 | } | 95 | } |
95 | void ComposeMail::saveAsDraft() | 96 | void ComposeMail::saveAsDraft() |
@@ -257,4 +258,10 @@ void ComposeMail::removeAttachment() | |||
257 | void ComposeMail::accept() | 258 | void ComposeMail::accept() |
258 | { | 259 | { |
260 | if ( smtpAccountBox->count() == 0 ) { | ||
261 | |||
262 | reject(); | ||
263 | return; | ||
264 | } | ||
265 | |||
259 | if (! checkBoxLater->isChecked() ) { | 266 | if (! checkBoxLater->isChecked() ) { |
260 | int yesno = QMessageBox::warning(0,tr("Stop editing message"), | 267 | int yesno = QMessageBox::warning(0,tr("Stop editing message"), |
@@ -328,4 +335,9 @@ void ComposeMail::reject() | |||
328 | //qDebug("button %d ", yesno); | 335 | //qDebug("button %d ", yesno); |
329 | if (yesno == 0) { | 336 | if (yesno == 0) { |
337 | if ( toLine->text().isEmpty() ) { | ||
338 | QMessageBox::warning(0,tr("Sending mail"), | ||
339 | tr("No Receiver spezified" ) ); | ||
340 | return; | ||
341 | } | ||
330 | saveAsDraft(); | 342 | saveAsDraft(); |
331 | } | 343 | } |