Merge branch 'master' of https://github.com/MailCore/mailcore2

3 files changed, 4 insertions, 7 deletions

diff --git a/src/core/nntp/MCNNTPGroupInfo.cpp b/src/core/nntp/MCNNTPGroupInfo.cpp
index 787967f3..8ebe08bc 100644
--- a/src/core/nntp/MCNNTPGroupInfo.cpp
+++ b/src/core/nntp/MCNNTPGroupInfo.cpp
@@ -13,10 +13,12 @@ using namespace mailcore;
 void NNTPGroupInfo::init()
 {
     mMessageCount = 0;
+    mName = NULL;
 }
 
 NNTPGroupInfo::NNTPGroupInfo()
 {
+    MC_SAFE_RELEASE(mName);
     init();
 }
 
diff --git a/src/core/nntp/MCNNTPSession.cpp b/src/core/nntp/MCNNTPSession.cpp
index f6427006..933f10f2 100644
--- a/src/core/nntp/MCNNTPSession.cpp
+++ b/src/core/nntp/MCNNTPSession.cpp
@@ -464,7 +464,7 @@ Data * NNTPSession::fetchArticle(String *groupName, unsigned int index, NNTPProg
     return result;
 }
 
-Data * NNTPSession::fetchArticleByMessageID(String * groupName, String * messageID, ErrorCode * pError)
+Data * NNTPSession::fetchArticleByMessageID(String * messageID, ErrorCode * pError)
 {
     int r;
     char * msgID;
@@ -473,11 +473,6 @@ Data * NNTPSession::fetchArticleByMessageID(String * groupName, String * message
     
     MCLog("fetch article at message-id %s", messageID->UTF8Characters());
     
-    selectGroup(groupName, pError);
-    if (* pError != ErrorNone) {
-        return NULL;
-    }
-    
     msgID = strdup(messageID->UTF8Characters());
     
     r = newsnntp_article_by_message_id(mNNTP, msgID, &content, &content_len);
diff --git a/src/core/nntp/MCNNTPSession.h b/src/core/nntp/MCNNTPSession.h
index dc2316ff..ec0080ed 100644
--- a/src/core/nntp/MCNNTPSession.h
+++ b/src/core/nntp/MCNNTPSession.h
@@ -53,7 +53,7 @@ namespace mailcore {
         virtual IndexSet * fetchAllArticles(String * groupname, ErrorCode * pError);
                 
         virtual Data * fetchArticle(String *groupName, unsigned int index, NNTPProgressCallback * callback, ErrorCode * pError);
-        virtual Data * fetchArticleByMessageID(String * groupname, String * messageID, ErrorCode * pError);
+        virtual Data * fetchArticleByMessageID(String * messageID, ErrorCode * pError);
         
         virtual time_t fetchServerDate(ErrorCode * pError);