-rw-r--r-- | noncore/net/mail/editaccounts.cpp | 11 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/nntpwrapper.cpp | 2 |
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 | |||
@@ -496,80 +496,83 @@ NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name, | |||
496 | connect( GetNGButton, SIGNAL( clicked() ), this, SLOT( slotGetNG() ) ); | 496 | connect( GetNGButton, SIGNAL( clicked() ), this, SLOT( slotGetNG() ) ); |
497 | fillValues(); | 497 | fillValues(); |
498 | 498 | ||
499 | connect( sslBox, SIGNAL( toggled(bool) ), SLOT( slotSSL(bool) ) ); | 499 | connect( sslBox, SIGNAL( toggled(bool) ), SLOT( slotSSL(bool) ) ); |
500 | } | 500 | } |
501 | 501 | ||
502 | void NNTPconfig::slotGetNG() { | 502 | void NNTPconfig::slotGetNG() { |
503 | save(); | 503 | save(); |
504 | data->save(); | 504 | data->save(); |
505 | NNTPwrapper* tmp = new NNTPwrapper( data ); | 505 | NNTPwrapper* tmp = new NNTPwrapper( data ); |
506 | clist* list = tmp->listAllNewsgroups(); | 506 | clist* list = tmp->listAllNewsgroups(); |
507 | 507 | ||
508 | clistcell *current; | 508 | clistcell *current; |
509 | newsnntp_group_description *group; | 509 | newsnntp_group_description *group; |
510 | 510 | ||
511 | // FIXME - test if not empty | 511 | // FIXME - test if not empty |
512 | current = list->first; | 512 | current = list->first; |
513 | for ( current=clist_begin(list);current!=NULL;current=clist_next(current) ) { | 513 | for ( current=clist_begin(list);current!=NULL;current=clist_next(current) ) { |
514 | group = ( newsnntp_group_description* ) current->data; | 514 | group = ( newsnntp_group_description* ) current->data; |
515 | // qDebug( group->grp_name ); | 515 | // qDebug( group->grp_name ); |
516 | 516 | ||
517 | QCheckListItem *item; | 517 | QCheckListItem *item; |
518 | item = new QCheckListItem( ListViewGroups, ( QString )group->grp_name, QCheckListItem::CheckBox ); | 518 | item = new QCheckListItem( ListViewGroups, ( QString )group->grp_name, QCheckListItem::CheckBox ); |
519 | if ( subscribedGroups.contains( ( QString )group->grp_name ) >= 1 ) { | 519 | if ( subscribedGroups.contains( ( QString )group->grp_name ) >= 1 ) { |
520 | item->setSelected( true ); | 520 | item->setOn( true ); |
521 | } | 521 | } |
522 | } | 522 | } |
523 | } | 523 | } |
524 | 524 | ||
525 | void NNTPconfig::slotSSL( bool enabled ) | 525 | void NNTPconfig::slotSSL( bool enabled ) |
526 | { | 526 | { |
527 | if ( enabled ) | 527 | if ( enabled ) |
528 | { | 528 | { |
529 | portLine->setText( NNTP_SSL_PORT ); | 529 | portLine->setText( NNTP_SSL_PORT ); |
530 | } | 530 | } |
531 | else | 531 | else |
532 | { | 532 | { |
533 | portLine->setText( NNTP_PORT ); | 533 | portLine->setText( NNTP_PORT ); |
534 | } | 534 | } |
535 | } | 535 | } |
536 | 536 | ||
537 | void NNTPconfig::fillValues() | 537 | void NNTPconfig::fillValues() |
538 | { | 538 | { |
539 | accountLine->setText( data->getAccountName() ); | 539 | accountLine->setText( data->getAccountName() ); |
540 | serverLine->setText( data->getServer() ); | 540 | serverLine->setText( data->getServer() ); |
541 | portLine->setText( data->getPort() ); | 541 | portLine->setText( data->getPort() ); |
542 | sslBox->setChecked( data->getSSL() ); | 542 | sslBox->setChecked( data->getSSL() ); |
543 | loginBox->setChecked( data->getLogin() ); | 543 | loginBox->setChecked( data->getLogin() ); |
544 | userLine->setText( data->getUser() ); | 544 | userLine->setText( data->getUser() ); |
545 | passLine->setText( data->getPassword() ); | 545 | passLine->setText( data->getPassword() ); |
546 | subscribedGroups = data->getGroups(); | 546 | subscribedGroups = data->getGroups(); |
547 | } | 547 | } |
548 | 548 | ||
549 | void NNTPconfig::save() | 549 | void NNTPconfig::save() |
550 | { | 550 | { |
551 | data->setAccountName( accountLine->text() ); | 551 | data->setAccountName( accountLine->text() ); |
552 | data->setServer( serverLine->text() ); | 552 | data->setServer( serverLine->text() ); |
553 | data->setPort( portLine->text() ); | 553 | data->setPort( portLine->text() ); |
554 | data->setSSL( sslBox->isChecked() ); | 554 | data->setSSL( sslBox->isChecked() ); |
555 | data->setLogin( loginBox->isChecked() ); | 555 | data->setLogin( loginBox->isChecked() ); |
556 | data->setUser( userLine->text() ); | 556 | data->setUser( userLine->text() ); |
557 | data->setPassword( passLine->text() ); | 557 | data->setPassword( passLine->text() ); |
558 | 558 | ||
559 | QListViewItemIterator list_it( ListViewGroups ); | 559 | QListViewItemIterator list_it( ListViewGroups ); |
560 | for ( ; list_it.current(); ++list_it ) { | 560 | |
561 | QStringList groupList; | 561 | QStringList groupList; |
562 | if ( list_it.current()->isSelected() ) { | 562 | for ( ; list_it.current(); ++list_it ) { |
563 | |||
564 | if ( ( (QCheckListItem*)list_it.current() )->isOn() ) { | ||
563 | qDebug(list_it.current()->text(0) ); | 565 | qDebug(list_it.current()->text(0) ); |
564 | groupList.append( list_it.current()->text(0) ); | 566 | groupList.append( list_it.current()->text(0) ); |
565 | } | 567 | } |
566 | data->setGroups( groupList ); | 568 | |
567 | } | 569 | } |
570 | data->setGroups( groupList ); | ||
568 | } | 571 | } |
569 | 572 | ||
570 | void NNTPconfig::accept() | 573 | void NNTPconfig::accept() |
571 | { | 574 | { |
572 | save(); | 575 | save(); |
573 | QDialog::accept(); | 576 | QDialog::accept(); |
574 | } | 577 | } |
575 | 578 | ||
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 | |||
@@ -103,49 +103,49 @@ void NNTPwrapper::listMessages(const QString &, QList<RecMail> &target ) | |||
103 | return; | 103 | return; |
104 | uint32_t res_messages,res_recent,res_unseen; | 104 | uint32_t res_messages,res_recent,res_unseen; |
105 | mailsession_status_folder(m_nntp->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen); | 105 | mailsession_status_folder(m_nntp->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen); |
106 | parseList(target,m_nntp->sto_session,"INBOX"); | 106 | parseList(target,m_nntp->sto_session,"INBOX"); |
107 | } | 107 | } |
108 | 108 | ||
109 | void NNTPwrapper::login() | 109 | void NNTPwrapper::login() |
110 | { | 110 | { |
111 | if (account->getOffline()) | 111 | if (account->getOffline()) |
112 | return; | 112 | return; |
113 | /* we'll hold the line */ | 113 | /* we'll hold the line */ |
114 | if ( m_nntp != NULL ) | 114 | if ( m_nntp != NULL ) |
115 | return; | 115 | return; |
116 | 116 | ||
117 | const char *server, *user, *pass; | 117 | const char *server, *user, *pass; |
118 | QString User,Pass; | 118 | QString User,Pass; |
119 | uint16_t port; | 119 | uint16_t port; |
120 | int err = NEWSNNTP_NO_ERROR; | 120 | int err = NEWSNNTP_NO_ERROR; |
121 | 121 | ||
122 | server = account->getServer().latin1(); | 122 | server = account->getServer().latin1(); |
123 | port = account->getPort().toUInt(); | 123 | port = account->getPort().toUInt(); |
124 | 124 | ||
125 | user = pass = 0; | 125 | user = pass = 0; |
126 | 126 | ||
127 | if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) { | 127 | if ( ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) && account->getLogin() ) { |
128 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); | 128 | LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true ); |
129 | login.show(); | 129 | login.show(); |
130 | if ( QDialog::Accepted == login.exec() ) { | 130 | if ( QDialog::Accepted == login.exec() ) { |
131 | // ok | 131 | // ok |
132 | User = login.getUser().latin1(); | 132 | User = login.getUser().latin1(); |
133 | Pass = login.getPassword().latin1(); | 133 | Pass = login.getPassword().latin1(); |
134 | } else { | 134 | } else { |
135 | // cancel | 135 | // cancel |
136 | qDebug( "NNTP: Login canceled" ); | 136 | qDebug( "NNTP: Login canceled" ); |
137 | return; | 137 | return; |
138 | } | 138 | } |
139 | } else { | 139 | } else { |
140 | User = account->getUser().latin1(); | 140 | User = account->getUser().latin1(); |
141 | Pass = account->getPassword().latin1(); | 141 | Pass = account->getPassword().latin1(); |
142 | } | 142 | } |
143 | 143 | ||
144 | if (User.isEmpty()) { | 144 | if (User.isEmpty()) { |
145 | user=0; | 145 | user=0; |
146 | pass = 0; | 146 | pass = 0; |
147 | } else { | 147 | } else { |
148 | user=User.latin1(); | 148 | user=User.latin1(); |
149 | pass=Pass.latin1(); | 149 | pass=Pass.latin1(); |
150 | } | 150 | } |
151 | // bool ssl = account->getSSL(); | 151 | // bool ssl = account->getSSL(); |