summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mail/editaccounts.cpp11
-rw-r--r--noncore/net/mail/libmailwrapper/nntpwrapper.cpp2
2 files changed, 8 insertions, 5 deletions
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 215380d..b8aad11 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -517,7 +517,7 @@ void NNTPconfig::slotGetNG() {
QCheckListItem *item;
item = new QCheckListItem( ListViewGroups, ( QString )group->grp_name, QCheckListItem::CheckBox );
if ( subscribedGroups.contains( ( QString )group->grp_name ) >= 1 ) {
- item->setSelected( true );
+ item->setOn( true );
}
}
}
@@ -557,14 +557,17 @@ void NNTPconfig::save()
data->setPassword( passLine->text() );
QListViewItemIterator list_it( ListViewGroups );
- for ( ; list_it.current(); ++list_it ) {
+
QStringList groupList;
- if ( list_it.current()->isSelected() ) {
+ for ( ; list_it.current(); ++list_it ) {
+
+ if ( ( (QCheckListItem*)list_it.current() )->isOn() ) {
qDebug(list_it.current()->text(0) );
groupList.append( list_it.current()->text(0) );
}
- data->setGroups( groupList );
+
}
+ data->setGroups( groupList );
}
void NNTPconfig::accept()
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
index 2d6f9a3..ecdf848 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
@@ -124,7 +124,7 @@ void NNTPwrapper::login()
user = pass = 0;
- if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
+ if ( ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) && account->getLogin() ) {
LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
login.show();
if ( QDialog::Accepted == login.exec() ) {