Cosmetic Changes; Fix header includes

3 files changed, 8 insertions, 10 deletions

diff --git a/src/objc/nntp/MCONNTP.h b/src/objc/nntp/MCONNTP.h
index d81e8f26..f96f296c 100644
--- a/src/objc/nntp/MCONNTP.h
+++ b/src/objc/nntp/MCONNTP.h
@@ -10,7 +10,7 @@
 
 #define MAILCORE_MCONNTP_H
 
-#include <MailCore/MCONNTPAsyncSession.h>
+#include <MailCore/MCONNTPSession.h>
 #include <MailCore/MCONNTPOperation.h>
 #include <MailCore/MCONNTPFetchHeaderOperation.h>
 #include <MailCore/MCONNTPFetchMessageOperation.h>
diff --git a/src/objc/nntp/MCONNTPSession.h b/src/objc/nntp/MCONNTPSession.h
index 7f9f78cd..214e9d9d 100644
--- a/src/objc/nntp/MCONNTPSession.h
+++ b/src/objc/nntp/MCONNTPSession.h
@@ -89,19 +89,18 @@
 /**
  Returns an operation that will fetch the content of the given message.
  
- MCONNTPFetchMessageOperation * op = [session fetchMessageOperationWithIndex:idx];
+ MCONNTPFetchMessageOperation * op = [session fetchMessageOperationWithIndex:idx inGroup:@"Group"];
  [op start:^(NSError * error, NSData * messageData) {
  // messageData is the RFC 822 formatted message data.
  }];
  */
-- (MCONNTPFetchMessageOperation *) fetchMessageOperationWithIndex:(unsigned int)index;
+- (MCONNTPFetchMessageOperation *) fetchArticleOperationWithIndex:(unsigned int)index inGroup:(NSString *)group;
 
 /**
  Returns an operation that will list all available newsgroups.
  
  MCONNTPListNewsgroupsOperation * op = [session listAllNewsgroupsOperation];
- [op start:^(NSError * error, NSData * messageData) {
- // messageData is the RFC 822 formatted message data.
+ [op start:^(NSError * error, NSArray * subscribedGroups) {
  }];
  */
 - (MCONNTPListNewsgroupsOperation *) listAllNewsgroupsOperation;
@@ -109,9 +108,8 @@
 /**
  Returns an operation that will list all newsgroups subscribed to by the user.
  
- MCONNTPListNewsgroupsOperation * op = [session listAllNewsgroupsOperation];
- [op start:^(NSError * error, NSData * messageData) {
- // messageData is the RFC 822 formatted message data.
+ MCONNTPListNewsgroupsOperation * op = [session listSubscribedNewsgroupsOperation];
+ [op start:^(NSError * error, NSArray * subscribedGroups) {
  }];
  */
 - (MCONNTPListNewsgroupsOperation *) listSubscribedNewsgroupsOperation;
diff --git a/src/objc/nntp/MCONNTPSession.mm b/src/objc/nntp/MCONNTPSession.mm
index f300d97c..eb7ce4ab 100644
--- a/src/objc/nntp/MCONNTPSession.mm
+++ b/src/objc/nntp/MCONNTPSession.mm
@@ -133,9 +133,9 @@ MCO_OBJC_SYNTHESIZE_SCALAR(dispatch_queue_t, dispatch_queue_t, setDispatchQueue,
     return MCO_TO_OBJC_OP(coreOp);
 }
 
-- (MCONNTPFetchMessageOperation *) fetchMessageOperationWithIndex:(unsigned int)index;
+- (MCONNTPFetchMessageOperation *) fetchArticleOperationWithIndex:(unsigned int)index inGroup:(NSString *)group
 {
-    mailcore::NNTPFetchMessageOperation * coreOp = MCO_NATIVE_INSTANCE->fetchMessageOperation(index);
+    mailcore::NNTPFetchMessageOperation * coreOp = MCO_NATIVE_INSTANCE->fetchArticleOperation(MCO_FROM_OBJC(mailcore::String, group), index);
     return MCO_TO_OBJC_OP(coreOp);
 }