Clarify Subscribed vs Default

7 files changed, 11 insertions, 11 deletions

diff --git a/src/async/nntp/MCNNTPAsyncSession.cc b/src/async/nntp/MCNNTPAsyncSession.cc
index 40993567..a290b8d3 100644
--- a/src/async/nntp/MCNNTPAsyncSession.cc
+++ b/src/async/nntp/MCNNTPAsyncSession.cc
@@ -191,7 +191,7 @@ NNTPListNewsgroupsOperation * NNTPAsyncSession::listAllNewsgroupsOperation()
     return op;
 }
 
-NNTPListNewsgroupsOperation * NNTPAsyncSession::listSubscribedNewsgroupsOperation()
+NNTPListNewsgroupsOperation * NNTPAsyncSession::listDefaultNewsgroupsOperation()
 {
     NNTPListNewsgroupsOperation * op = new NNTPListNewsgroupsOperation();
     op->setSession(this);
diff --git a/src/async/nntp/MCNNTPAsyncSession.h b/src/async/nntp/MCNNTPAsyncSession.h
index c0d93fb2..d0fea2d0 100644
--- a/src/async/nntp/MCNNTPAsyncSession.h
+++ b/src/async/nntp/MCNNTPAsyncSession.h
@@ -58,7 +58,7 @@ namespace mailcore {
         virtual NNTPFetchArticleOperation * fetchArticleOperation(String *groupName, unsigned int index);
         
         virtual NNTPListNewsgroupsOperation * listAllNewsgroupsOperation();
-        virtual NNTPListNewsgroupsOperation * listSubscribedNewsgroupsOperation();
+        virtual NNTPListNewsgroupsOperation * listDefaultNewsgroupsOperation();
         
         virtual NNTPOperation * disconnectOperation();
         
diff --git a/src/async/nntp/MCNNTPListNewsgroupsOperation.cc b/src/async/nntp/MCNNTPListNewsgroupsOperation.cc
index 253b38d0..3747bacf 100644
--- a/src/async/nntp/MCNNTPListNewsgroupsOperation.cc
+++ b/src/async/nntp/MCNNTPListNewsgroupsOperation.cc
@@ -40,7 +40,7 @@ void NNTPListNewsgroupsOperation::main()
     ErrorCode error;
     
     if (mListsSuscribed) {
-        mGroups = session()->session()->listSubscribedNewsgroups(&error);
+        mGroups = session()->session()->listDefaultNewsgroups(&error);
     } else {
         mGroups = session()->session()->listAllNewsgroups(&error);
     }
diff --git a/src/core/nntp/MCNNTPSession.cc b/src/core/nntp/MCNNTPSession.cc
index 66b8dadc..a1a4646b 100644
--- a/src/core/nntp/MCNNTPSession.cc
+++ b/src/core/nntp/MCNNTPSession.cc
@@ -359,7 +359,7 @@ Array * NNTPSession::listAllNewsgroups(ErrorCode * pError)
     return result;
 }
 
-Array * NNTPSession::listSubscribedNewsgroups(ErrorCode * pError)
+Array * NNTPSession::listDefaultNewsgroups(ErrorCode * pError)
 {
     int r;
     clist * subd_groups;
diff --git a/src/core/nntp/MCNNTPSession.h b/src/core/nntp/MCNNTPSession.h
index 47d78a46..e5ebbd91 100644
--- a/src/core/nntp/MCNNTPSession.h
+++ b/src/core/nntp/MCNNTPSession.h
@@ -45,7 +45,7 @@ namespace mailcore {
         virtual void checkAccount(ErrorCode * pError);
         
         virtual Array * /* NNTPGroupInfo */ listAllNewsgroups(ErrorCode * pError);
-        virtual Array * listSubscribedNewsgroups(ErrorCode * pError);
+        virtual Array * listDefaultNewsgroups(ErrorCode * pError);
         
         virtual MessageHeader * fetchHeader(String *groupName, unsigned int index, ErrorCode * pError);
         
diff --git a/src/objc/nntp/MCONNTPSession.h b/src/objc/nntp/MCONNTPSession.h
index 8d12608b..8b632647 100644
--- a/src/objc/nntp/MCONNTPSession.h
+++ b/src/objc/nntp/MCONNTPSession.h
@@ -104,13 +104,13 @@
 - (MCONNTPListNewsgroupsOperation *) listAllNewsgroupsOperation;
 
 /**
- Returns an operation that will list all newsgroups subscribed to by the user.
+ Returns an operation that will list server-suggested default newsgroups.
  
- MCONNTPListNewsgroupsOperation * op = [session listSubscribedNewsgroupsOperation];
- [op start:^(NSError * error, NSArray * subscribedGroups) {
+ MCONNTPListNewsgroupsOperation * op = [session listDefaultNewsgroupsOperation];
+ [op start:^(NSError * error, NSArray * defaultGroups) {
  }];
  */
-- (MCONNTPListNewsgroupsOperation *) listSubscribedNewsgroupsOperation;
+- (MCONNTPListNewsgroupsOperation *) listDefaultNewsgroupsOperation;
 
 /**
  Returns an operation that will disconnect the session.
diff --git a/src/objc/nntp/MCONNTPSession.mm b/src/objc/nntp/MCONNTPSession.mm
index 23e2e786..ed5bd81d 100644
--- a/src/objc/nntp/MCONNTPSession.mm
+++ b/src/objc/nntp/MCONNTPSession.mm
@@ -145,8 +145,8 @@ MCO_OBJC_SYNTHESIZE_SCALAR(dispatch_queue_t, dispatch_queue_t, setDispatchQueue,
     return MCO_TO_OBJC_OP(coreOp);
 }
 
-- (MCONNTPListNewsgroupsOperation *) listSubscribedNewsgroupsOperation {
-    mailcore::NNTPListNewsgroupsOperation * coreOp = MCO_NATIVE_INSTANCE->listSubscribedNewsgroupsOperation();
+- (MCONNTPListNewsgroupsOperation *) listDefaultNewsgroupsOperation {
+    mailcore::NNTPListNewsgroupsOperation * coreOp = MCO_NATIVE_INSTANCE->listDefaultNewsgroupsOperation();
     return MCO_TO_OBJC_OP(coreOp);
 }