2 files changed, 23 insertions, 14 deletions

diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
index 798879d..a766a59 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp
@@ -181,62 +181,71 @@ void NNTPwrapper::login()
 
 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 );
     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();
+QStringList NNTPwrapper::listAllNewsgroups() {
+    login();
+    QStringList res;
     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);
-
-   if ( err == NEWSNNTP_NO_ERROR ) {
-        return result;
-   }
- }
+    clistcell *current = 0;
+    newsnntp_group_description *group;
+
+    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);
+        if ( err == NEWSNNTP_NO_ERROR && result) {
+            for ( current=clist_begin(result);current!=NULL;current=clist_next(current) ) {
+                group = (  newsnntp_group_description* ) current->data;
+                if (!group||!group->grp_name||strlen(group->grp_name)==0) continue;
+                res.append(group->grp_name);
+            }
+        }
+    }
+    if (result) {
+        clist_free(result);
+    }
+    return res;
 }
 
 void NNTPwrapper::answeredMail(const RecMail&) {}
 
 void NNTPwrapper::statusFolder(folderStat&target_stat,const QString&) {
     login();
     target_stat.message_count = 0;
     target_stat.message_unseen = 0;
     target_stat.message_recent = 0;
     if (!m_nntp)
         return;
     int r = mailsession_status_folder(m_nntp->sto_session,0,&target_stat.message_count,
                                       &target_stat.message_recent,&target_stat.message_unseen);
 }
 
 
 encodedString* NNTPwrapper::fetchRawBody(const RecMail&mail) {
     char*target=0;
     size_t length=0;
     encodedString*res = 0;
     mailmessage * mailmsg = 0;
     int err = mailsession_get_message(m_nntp->sto_session, mail.getNumber(), &mailmsg);
     err = mailmessage_fetch(mailmsg,&target,&length);
     if (mailmsg)
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.h b/noncore/net/mail/libmailwrapper/nntpwrapper.h
index e8e2cf4..4d03754 100644
--- a/noncore/net/mail/libmailwrapper/nntpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/nntpwrapper.h
@@ -4,45 +4,45 @@
 #include "mailwrapper.h"
 #include "genericwrapper.h"
 #include <qstring.h>
 #include <libetpan/clist.h>
 
 class encodedString;
 struct mailstorage;
 struct mailfolder;
 
 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();
+    QStringList 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:
     void login();
     NNTPaccount *account;
     mailstorage* m_nntp;
 
 
 };
 
 #endif