author | zautrix <zautrix> | 2005-03-10 21:14:19 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-10 21:14:19 (UTC) |
commit | 6e3c3178fa8e0c421753c08506b4a91bbcecc26f (patch) (unidiff) | |
tree | ff9c2b22376e71e135f59154c6aeeb8ed95f10ce /kmicromail/editaccounts.cpp | |
parent | 3a1891136e7b1290a6b3ddd573a863e51bd3047b (diff) | |
download | kdepimpi-6e3c3178fa8e0c421753c08506b4a91bbcecc26f.zip kdepimpi-6e3c3178fa8e0c421753c08506b4a91bbcecc26f.tar.gz kdepimpi-6e3c3178fa8e0c421753c08506b4a91bbcecc26f.tar.bz2 |
smtp ompi fix
-rw-r--r-- | kmicromail/editaccounts.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp index f1075c0..49049f6 100644 --- a/kmicromail/editaccounts.cpp +++ b/kmicromail/editaccounts.cpp | |||
@@ -331,5 +331,5 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, | |||
331 | data = account; | 331 | data = account; |
332 | 332 | ||
333 | fillValues(); | 333 | //fillValues(); |
334 | 334 | ||
335 | connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) ); | 335 | connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) ); |
@@ -339,5 +339,6 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, | |||
339 | ComboBox1->insertItem( "Run command instead", 3 ); | 339 | ComboBox1->insertItem( "Run command instead", 3 ); |
340 | CommandEdit->hide(); | 340 | CommandEdit->hide(); |
341 | ComboBox1->setCurrentItem( data->ConnectionType() ); | 341 | fillValues(); |
342 | // ComboBox1->setCurrentItem( data->ConnectionType() ); | ||
342 | } | 343 | } |
343 | 344 | ||
@@ -410,5 +411,5 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name, | |||
410 | { | 411 | { |
411 | data = account; | 412 | data = account; |
412 | fillValues(); | 413 | //fillValues(); |
413 | 414 | ||
414 | connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) ); | 415 | connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) ); |
@@ -418,5 +419,6 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name, | |||
418 | ComboBox1->insertItem( "Run command instead", 3 ); | 419 | ComboBox1->insertItem( "Run command instead", 3 ); |
419 | CommandEdit->hide(); | 420 | CommandEdit->hide(); |
420 | ComboBox1->setCurrentItem( data->ConnectionType() ); | 421 | fillValues(); |
422 | //ComboBox1->setCurrentItem( data->ConnectionType() ); | ||
421 | } | 423 | } |
422 | 424 | ||
@@ -492,5 +494,5 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name, | |||
492 | connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) ); | 494 | connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) ); |
493 | 495 | ||
494 | fillValues(); | 496 | // fillValues(); |
495 | QIconSet icon; | 497 | QIconSet icon; |
496 | //icon = SmallIcon("fileexport"); | 498 | //icon = SmallIcon("fileexport"); |
@@ -501,10 +503,12 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name, | |||
501 | connect( SignaturButton, SIGNAL( clicked() ), this, SLOT( chooseSig() ) ); | 503 | connect( SignaturButton, SIGNAL( clicked() ), this, SLOT( chooseSig() ) ); |
502 | connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) ); | 504 | connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) ); |
503 | ComboBox1->insertItem( "Only if available", 0 ); | 505 | ComboBox1->insertItem( "No secure connection, no TLS", 0 ); |
504 | ComboBox1->insertItem( "Always, Negotiated", 1 ); | 506 | ComboBox1->insertItem( "Only if available, try TLS", 1 ); |
505 | ComboBox1->insertItem( "Connect on secure port", 2 ); | 507 | ComboBox1->insertItem( "Always, use TLS", 2 ); |
506 | ComboBox1->insertItem( "Run command instead", 3 ); | 508 | ComboBox1->insertItem( "Connect on secure port (SSL)", 3 ); |
509 | ComboBox1->insertItem( "Run command instead", 4 ); | ||
507 | CommandEdit->hide(); | 510 | CommandEdit->hide(); |
508 | ComboBox1->setCurrentItem( data->ConnectionType() ); | 511 | fillValues(); |
512 | //ComboBox1->setCurrentItem( data->ConnectionType() ); | ||
509 | } | 513 | } |
510 | void SMTPconfig::chooseSig() | 514 | void SMTPconfig::chooseSig() |