summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-03-06 00:44:40 (UTC)
committer harlekin <harlekin>2004-03-06 00:44:40 (UTC)
commit4aea85aa2e205040da3ebdf50debde8b296e3c61 (patch) (side-by-side diff)
tree424ee07b5886d70d45cc5d3b5c9ed6d32fd06d5f
parent7b10be8e0ed88afe9e8964e6b5f1fe449cee3609 (diff)
downloadopie-4aea85aa2e205040da3ebdf50debde8b296e3c61.zip
opie-4aea85aa2e205040da3ebdf50debde8b296e3c61.tar.gz
opie-4aea85aa2e205040da3ebdf50debde8b296e3c61.tar.bz2
ups, works now .-)
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
@@ -512,17 +512,17 @@ void NNTPconfig::slotGetNG() {
current = list->first;
for ( current=clist_begin(list);current!=NULL;current=clist_next(current) ) {
group = ( newsnntp_group_description* ) current->data;
// qDebug( group->grp_name );
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 );
}
}
}
void NNTPconfig::slotSSL( bool enabled )
{
if ( enabled )
{
@@ -552,24 +552,27 @@ void NNTPconfig::save()
data->setServer( serverLine->text() );
data->setPort( portLine->text() );
data->setSSL( sslBox->isChecked() );
data->setLogin( loginBox->isChecked() );
data->setUser( userLine->text() );
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()
{
save();
QDialog::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
@@ -119,17 +119,17 @@ void NNTPwrapper::login()
uint16_t port;
int err = NEWSNNTP_NO_ERROR;
server = account->getServer().latin1();
port = account->getPort().toUInt();
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() ) {
// ok
User = login.getUser().latin1();
Pass = login.getPassword().latin1();
} else {
// cancel