removed dependies to libetpan from the frontend and some stuff more

1 files changed, 17 insertions, 19 deletions

diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index b8aad11..28d531b 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -2,26 +2,24 @@
 #include "defines.h"
 #include "editaccounts.h"
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qt.h>
 #include <qstringlist.h>
 
 #include <libmailwrapper/nntpwrapper.h>
 
-#include <libetpan/nntpdriver.h>
-
 AccountListItem::AccountListItem( QListView *parent, Account *a)
         : QListViewItem( parent )
 {
     account = a;
     setText( 0, account->getAccountName() );
     setText( 1, account->getType() );
 }
 
 EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
         : EditAccountsUI( parent, name, modal, flags )
 {
     qDebug( "New Account Configuration Widget" );
@@ -494,65 +492,65 @@ NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name,
     connect( loginBox, SIGNAL( toggled(bool) ), userLine, SLOT( setEnabled(bool) ) );
     connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) );
     connect( GetNGButton,  SIGNAL( clicked() ), this, SLOT( slotGetNG() ) );
     fillValues();
 
     connect( sslBox, SIGNAL( toggled(bool) ), SLOT( slotSSL(bool) ) );
 }
 
 void NNTPconfig::slotGetNG() {
     save();
     data->save();
     NNTPwrapper* tmp = new NNTPwrapper( data );
-    clist* list =  tmp->listAllNewsgroups();
-
-    clistcell *current;
-    newsnntp_group_description *group;
-
-   // FIXME - test if not empty
-    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->setOn( true );
-                }
-       }
+    QStringList list =  tmp->listAllNewsgroups();
+    
+    ListViewGroups->clear();
+
+    for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+         QCheckListItem *item;
+         item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+         if ( subscribedGroups.contains( (*it) ) >= 1 ) {
+             item->setOn( true );
+         }
+    }
 }
 
 void NNTPconfig::slotSSL( bool enabled )
 {
     if ( enabled )
     {
         portLine->setText( NNTP_SSL_PORT );
     }
     else
     {
         portLine->setText( NNTP_PORT );
     }
 }
 
 void NNTPconfig::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     sslBox->setChecked( data->getSSL() );
     loginBox->setChecked( data->getLogin() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
     subscribedGroups = data->getGroups();
+    /* don't forget that - you will overwrite values if user clicks cancel! */
+    for ( QStringList::Iterator it = subscribedGroups.begin(); it != subscribedGroups.end(); ++it ) {
+         QCheckListItem *item;
+         item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+         item->setOn( true );
+    }
 }
 
 void NNTPconfig::save()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setSSL( sslBox->isChecked() );
     data->setLogin( loginBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );