MCNNTP -> NNTP

4 files changed, 26 insertions, 10 deletions

diff --git a/src/async/nntp/MCNNTPFetchArticleOperation.cc b/src/async/nntp/MCNNTPFetchArticleOperation.cc
index a12f346f..1ad2ae85 100644
--- a/src/async/nntp/MCNNTPFetchArticleOperation.cc
+++ b/src/async/nntp/MCNNTPFetchArticleOperation.cc
@@ -32,6 +32,14 @@ String * NNTPFetchArticleOperation::groupName() {
     return mGroupName;
 }
 
+void NNTPFetchArticleOperation::setMessageID(String * groupName) {
+    MC_SAFE_REPLACE_COPY(String, mMessageID, groupName);
+}
+
+String * NNTPFetchArticleOperation::messageID() {
+    return mMessageID;
+}
+
 void NNTPFetchArticleOperation::setMessageIndex(unsigned int messageIndex)
 {
     mMessageIndex = messageIndex;
@@ -50,7 +58,11 @@ Data * NNTPFetchArticleOperation::data()
 void NNTPFetchArticleOperation::main()
 {
     ErrorCode error;
-    mData = session()->session()->fetchArticle(mGroupName, mMessageIndex, this, &error);
+    if (mMessageID == NULL) {
+        mData = session()->session()->fetchArticle(mGroupName, mMessageIndex, this, &error);
+    } else {
+        mData = session()->session()->fetchArticleByMessageID(mGroupName, mMessageID, &error);
+    }
     MC_SAFE_RETAIN(mData);
     setError(error);
 }
diff --git a/src/async/nntp/MCNNTPFetchArticleOperation.h b/src/async/nntp/MCNNTPFetchArticleOperation.h
index 4f607c4f..0ffa817c 100644
--- a/src/async/nntp/MCNNTPFetchArticleOperation.h
+++ b/src/async/nntp/MCNNTPFetchArticleOperation.h
@@ -23,6 +23,9 @@ namespace mailcore {
         virtual void setGroupName(String * groupName);
         virtual String * groupName();
         
+        virtual void setMessageID(String * groupName);
+        virtual String * messageID();
+        
         virtual void setMessageIndex(unsigned int messageIndex);
         virtual unsigned int messageIndex();
         
@@ -33,6 +36,7 @@ namespace mailcore {
         
     private:
         String * mGroupName;
+        String * mMessageID;
         unsigned int mMessageIndex;
         Data * mData;
         
diff --git a/src/async/nntp/MCNNTPFetchArticlesOperation.cc b/src/async/nntp/MCNNTPFetchArticlesOperation.cc
index ddca9f13..a73c9000 100644
--- a/src/async/nntp/MCNNTPFetchArticlesOperation.cc
+++ b/src/async/nntp/MCNNTPFetchArticlesOperation.cc
@@ -13,34 +13,34 @@
 
 using namespace mailcore;
 
-MCNNTPFetchArticlesOperation::MCNNTPFetchArticlesOperation()
+NNTPFetchArticlesOperation::NNTPFetchArticlesOperation()
 {
     mGroupName = NULL;
     mArticles = NULL;
 }
 
-MCNNTPFetchArticlesOperation::~MCNNTPFetchArticlesOperation()
+NNTPFetchArticlesOperation::~NNTPFetchArticlesOperation()
 {
     MC_SAFE_RELEASE(mGroupName);
     MC_SAFE_RELEASE(mArticles);
 }
 
-void MCNNTPFetchArticlesOperation::setGroupName(String * groupname)
+void NNTPFetchArticlesOperation::setGroupName(String * groupname)
 {
     MC_SAFE_REPLACE_COPY(String, mGroupName, groupname);
 }
 
-String * MCNNTPFetchArticlesOperation::groupName()
+String * NNTPFetchArticlesOperation::groupName()
 {
     return mGroupName;
 }
 
-IndexSet * MCNNTPFetchArticlesOperation::articles()
+IndexSet * NNTPFetchArticlesOperation::articles()
 {
     return mArticles;
 }
 
-void MCNNTPFetchArticlesOperation::main()
+void NNTPFetchArticlesOperation::main()
 {
     ErrorCode error;
     mArticles = session()->session()->fetchAllArticles(mGroupName, &error);
diff --git a/src/async/nntp/MCNNTPFetchArticlesOperation.h b/src/async/nntp/MCNNTPFetchArticlesOperation.h
index fa0037c8..e5fdc22e 100644
--- a/src/async/nntp/MCNNTPFetchArticlesOperation.h
+++ b/src/async/nntp/MCNNTPFetchArticlesOperation.h
@@ -16,10 +16,10 @@
 
 namespace mailcore {
     
-    class MCNNTPFetchArticlesOperation : public NNTPOperation {
+    class NNTPFetchArticlesOperation : public NNTPOperation {
     public:
-        MCNNTPFetchArticlesOperation();
-        virtual ~MCNNTPFetchArticlesOperation();
+        NNTPFetchArticlesOperation();
+        virtual ~NNTPFetchArticlesOperation();
         
         virtual void setGroupName(String * groupName);
         virtual String * groupName();