3 files changed, 11 insertions, 7 deletions

diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
index ecdf848..798879d 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
@@ -87,32 +87,32 @@ RecBody NNTPwrapper::fetchBody( const RecMail &mail ) {
     body = parseMail(mailmsg);
 
     /* clean up */
     if (mailmsg)
         mailmessage_free(mailmsg);
     if (message)
         free(message);
 
     return body;
 }
 
 
-void NNTPwrapper::listMessages(const QString &, QList<RecMail> &target )
+void NNTPwrapper::listMessages(const QString & which, QList<RecMail> &target )
 {
     login();
     if (!m_nntp)
         return;
     uint32_t res_messages,res_recent,res_unseen;
-    mailsession_status_folder(m_nntp->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen);
-    parseList(target,m_nntp->sto_session,"INBOX");
+    mailsession_status_folder(m_nntp->sto_session,(char*)which.latin1(),&res_messages,&res_recent,&res_unseen);
+    parseList(target,m_nntp->sto_session,which);
 }
 
 void NNTPwrapper::login()
 {
     if (account->getOffline())
         return;
     /* we'll hold the line */
     if ( m_nntp != NULL )
         return;
 
     const char *server, *user, *pass;
     QString User,Pass;
@@ -183,26 +183,31 @@ void NNTPwrapper::logout()
 {
     int err = NEWSNNTP_NO_ERROR;
     if ( m_nntp == NULL )
         return;
     mailstorage_free(m_nntp);
    m_nntp = 0;
 }
 
 QList<Folder>* NNTPwrapper::listFolders() {
 
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
-
-//    folders->append(inb);
+    QStringList groups;
+    if (account) {
+        groups = account->getGroups();
+    }
+    for ( QStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) {
+        folders->append(new Folder((*it),"."));
+    }
     return folders;
 }
 
   clist *  NNTPwrapper::listAllNewsgroups() {
  login();
     clist *result = 0;
     clistcell *current;
     newsnntp_group_description *list;
   if ( m_nntp )   {
   mailsession * session = m_nntp->sto_session;
  newsnntp * news =  ( (  nntp_session_state_data * )session->sess_data )->nntp_session;
    int err = newsnntp_list_newsgroups(news, NULL, &result);
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.h b/noncore/net/mail/libmailwrapper/nntpwrapper.h
index e4d4a37..e8e2cf4 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.h
@@ -16,25 +16,25 @@ class NNTPwrapper : public Genericwrapper
  Q_OBJECT
 
 public:
     NNTPwrapper( NNTPaccount *a );
     virtual ~NNTPwrapper();
 
    /* mailbox will be ignored */
     virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
     /* should only get the subscribed one */
     virtual QList<Folder>* listFolders();
     /* mailbox will be ignored */
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
-     clist * listAllNewsgroups();
+    clist * listAllNewsgroups();
     virtual void deleteMail(const RecMail&mail);
     virtual void answeredMail(const RecMail&mail);
     virtual int deleteAllMail(const Folder*);
 
     virtual RecBody fetchBody( const RecMail &mail );
     virtual encodedString* fetchRawBody(const RecMail&mail);
     virtual void logout();
     virtual const QString&getType()const;
     virtual const QString&getName()const;
     static void nntp_progress( size_t current, size_t maximum );
 
 protected:
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index f64c17d..0d34fd5 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -429,13 +429,12 @@ void NNTPaccount::save()
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "Subscribed" , subscribedGroups, ',' );
     conf->write();
     delete conf;
 }
 
 
 QString NNTPaccount::getFileName()
 {
     return (QString) getenv( "HOME" ) + "/Applications/opiemail/nntp-" + file;
 }
-