aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rwxr-xr-xbuild-mac/mailcore2.xcodeproj/project.pbxproj44
-rwxr-xr-xsrc/async/imap/MCAsyncIMAP.h2
-rwxr-xr-xsrc/async/imap/MCIMAPAsyncConnection.cc6
-rwxr-xr-xsrc/async/imap/MCIMAPAsyncConnection.h4
-rwxr-xr-xsrc/async/imap/MCIMAPAsyncSession.cc4
-rwxr-xr-xsrc/async/imap/MCIMAPAsyncSession.h4
-rw-r--r--src/async/imap/MCIMAPQuotaOperation.cc (renamed from src/async/imap/MCIMAPGetQuotaOperation.cc)15
-rw-r--r--src/async/imap/MCIMAPQuotaOperation.h (renamed from src/async/imap/MCIMAPGetQuotaOperation.h)12
-rwxr-xr-xsrc/core/imap/MCIMAPSession.cc1
-rwxr-xr-xsrc/objc/imap/MCOIMAP.h2
-rw-r--r--src/objc/imap/MCOIMAPQuotaOperation.h (renamed from src/objc/imap/MCOIMAPGetQuotaOperation.h)4
-rw-r--r--src/objc/imap/MCOIMAPQuotaOperation.mm (renamed from src/objc/imap/MCOIMAPGetQuotaOperation.mm)8
-rwxr-xr-xsrc/objc/imap/MCOIMAPSession.h4
-rwxr-xr-xsrc/objc/imap/MCOIMAPSession.mm4
15 files changed, 58 insertions, 57 deletions
diff --git a/.gitignore b/.gitignore
index 715128d3..73cdfa35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ xcuserdata
.DS_Store
.idea
project.xcworkspace
-.svn
example/ios/iOS UI Test/DerivedData
scripts/prebuilt.list
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index 9b9fd0e8..9c9efc3c 100755
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -7,12 +7,14 @@
objects = {
/* Begin PBXBuildFile section */
- 4B3C1BDE17ABF309008BBF4C /* MCOIMAPGetQuotaOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C1BDD17ABF307008BBF4C /* MCOIMAPGetQuotaOperation.mm */; };
- 4B3C1BE117ABF4BC008BBF4C /* MCIMAPGetQuotaOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPGetQuotaOperation.cc */; };
- 4B3C1BE217ABFF7C008BBF4C /* MCOIMAPGetQuotaOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B3C1BDC17ABF306008BBF4C /* MCOIMAPGetQuotaOperation.h */; };
- 4B3C1BE317ABFF91008BBF4C /* MCOIMAPGetQuotaOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C1BDD17ABF307008BBF4C /* MCOIMAPGetQuotaOperation.mm */; };
- 4B3C1BE417AC0156008BBF4C /* MCIMAPGetQuotaOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B3C1BE017ABF4BC008BBF4C /* MCIMAPGetQuotaOperation.h */; };
- 4B3C1BE517AC0176008BBF4C /* MCIMAPGetQuotaOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPGetQuotaOperation.cc */; };
+ 4B3C1BDE17ABF309008BBF4C /* MCOIMAPQuotaOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C1BDD17ABF307008BBF4C /* MCOIMAPQuotaOperation.mm */; };
+ 4B3C1BE117ABF4BC008BBF4C /* MCIMAPQuotaOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPQuotaOperation.cc */; };
+ 4B3C1BE217ABFF7C008BBF4C /* MCOIMAPQuotaOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B3C1BDC17ABF306008BBF4C /* MCOIMAPQuotaOperation.h */; };
+ 4B3C1BE317ABFF91008BBF4C /* MCOIMAPQuotaOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C1BDD17ABF307008BBF4C /* MCOIMAPQuotaOperation.mm */; };
+ 4B3C1BE417AC0156008BBF4C /* MCIMAPQuotaOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B3C1BE017ABF4BC008BBF4C /* MCIMAPQuotaOperation.h */; };
+ 4B3C1BE517AC0176008BBF4C /* MCIMAPQuotaOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPQuotaOperation.cc */; };
+ 4BE4029117B548B900ECC5E4 /* MCOIMAPQuotaOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B3C1BDC17ABF306008BBF4C /* MCOIMAPQuotaOperation.h */; };
+ 4BE4029217B548D900ECC5E4 /* MCIMAPQuotaOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B3C1BE017ABF4BC008BBF4C /* MCIMAPQuotaOperation.h */; };
84AF9E7E172DBAF600E60AA3 /* providers.json in Resources */ = {isa = PBXBuildFile; fileRef = 84AF9E7D172DBAF600E60AA3 /* providers.json */; };
9E774D891767C7F60065EB9B /* MCIMAPFolderStatus.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9E774D881767C7F60065EB9B /* MCIMAPFolderStatus.cc */; };
9E774D8A1767C7F60065EB9B /* MCIMAPFolderStatus.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9E774D881767C7F60065EB9B /* MCIMAPFolderStatus.cc */; };
@@ -739,6 +741,8 @@
dstPath = include/MailCore;
dstSubfolderSpec = 16;
files = (
+ 4BE4029217B548D900ECC5E4 /* MCIMAPQuotaOperation.h in CopyFiles */,
+ 4BE4029117B548B900ECC5E4 /* MCOIMAPQuotaOperation.h in CopyFiles */,
C6E665001790963E0063F2CF /* MCIMAPMessageRenderingOperation.h in CopyFiles */,
DAE42E89178F7E1800E0DB8F /* MCOIMAPMessageRenderingOperation.h in CopyFiles */,
9E774D8C1767CD490065EB9B /* MCIMAPFolderStatus.h in CopyFiles */,
@@ -928,8 +932,8 @@
dstPath = include/MailCore;
dstSubfolderSpec = 16;
files = (
- 4B3C1BE417AC0156008BBF4C /* MCIMAPGetQuotaOperation.h in CopyFiles */,
- 4B3C1BE217ABFF7C008BBF4C /* MCOIMAPGetQuotaOperation.h in CopyFiles */,
+ 4B3C1BE417AC0156008BBF4C /* MCIMAPQuotaOperation.h in CopyFiles */,
+ 4B3C1BE217ABFF7C008BBF4C /* MCOIMAPQuotaOperation.h in CopyFiles */,
DAE42E8A178F7E2200E0DB8F /* MCOIMAPMessageRenderingOperation.h in CopyFiles */,
C6E6652F1791B2530063F2CF /* MCIMAPMessageRenderingOperation.h in CopyFiles */,
9E774D8B1767CD3C0065EB9B /* MCIMAPFolderStatus.h in CopyFiles */,
@@ -1107,10 +1111,10 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 4B3C1BDC17ABF306008BBF4C /* MCOIMAPGetQuotaOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPGetQuotaOperation.h; sourceTree = "<group>"; };
- 4B3C1BDD17ABF307008BBF4C /* MCOIMAPGetQuotaOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPGetQuotaOperation.mm; sourceTree = "<group>"; };
- 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPGetQuotaOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCIMAPGetQuotaOperation.cc; sourceTree = "<group>"; };
- 4B3C1BE017ABF4BC008BBF4C /* MCIMAPGetQuotaOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPGetQuotaOperation.h; sourceTree = "<group>"; };
+ 4B3C1BDC17ABF306008BBF4C /* MCOIMAPQuotaOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPQuotaOperation.h; sourceTree = "<group>"; };
+ 4B3C1BDD17ABF307008BBF4C /* MCOIMAPQuotaOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPQuotaOperation.mm; sourceTree = "<group>"; };
+ 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPQuotaOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCIMAPQuotaOperation.cc; sourceTree = "<group>"; };
+ 4B3C1BE017ABF4BC008BBF4C /* MCIMAPQuotaOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPQuotaOperation.h; sourceTree = "<group>"; };
84AF9E7D172DBAF600E60AA3 /* providers.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = providers.json; path = ../resources/providers.json; sourceTree = "<group>"; };
9E774D871767C54E0065EB9B /* MCIMAPFolderStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPFolderStatus.h; sourceTree = "<group>"; };
9E774D881767C7F60065EB9B /* MCIMAPFolderStatus.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCIMAPFolderStatus.cc; sourceTree = "<group>"; };
@@ -1762,8 +1766,8 @@
C62C6ED716A398FA00737497 /* MCIMAPFolderInfoOperation.h */,
C64BB22916E5C0A3000DB34C /* MCIMAPCapabilityOperation.cc */,
C64BB22A16E5C0A3000DB34C /* MCIMAPCapabilityOperation.h */,
- 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPGetQuotaOperation.cc */,
- 4B3C1BE017ABF4BC008BBF4C /* MCIMAPGetQuotaOperation.h */,
+ 4B3C1BDF17ABF4BB008BBF4C /* MCIMAPQuotaOperation.cc */,
+ 4B3C1BE017ABF4BC008BBF4C /* MCIMAPQuotaOperation.h */,
9EF9AB10175F319A0027FA3B /* MCIMAPFolderStatusOperation.cc */,
9EF9AB0E175F30C20027FA3B /* MCIMAPFolderStatusOperation.h */,
C6081679177635D2001F1018 /* MCIMAPDisconnectOperation.cc */,
@@ -2220,8 +2224,8 @@
C6F61F9217016B250073032E /* MCOIMAPIdentityOperation.mm */,
C6F61F9417016B310073032E /* MCOIMAPCapabilityOperation.h */,
C6F61F9517016B310073032E /* MCOIMAPCapabilityOperation.mm */,
- 4B3C1BDC17ABF306008BBF4C /* MCOIMAPGetQuotaOperation.h */,
- 4B3C1BDD17ABF307008BBF4C /* MCOIMAPGetQuotaOperation.mm */,
+ 4B3C1BDC17ABF306008BBF4C /* MCOIMAPQuotaOperation.h */,
+ 4B3C1BDD17ABF307008BBF4C /* MCOIMAPQuotaOperation.mm */,
C6F61F9717016B460073032E /* MCOIMAPSearchExpression.h */,
C6F61F9817016B460073032E /* MCOIMAPSearchExpression.mm */,
9EF9AB06175F2EC60027FA3B /* MCOIMAPFolderStatus.h */,
@@ -2605,8 +2609,8 @@
BD63713B177DFF080094121B /* MCLibetpan.cc in Sources */,
DAACAD5117886807000B4517 /* MCHTMLRendererIMAPDataCallback.cc in Sources */,
DA89896D178A47D200F6D90A /* MCOIMAPMessageRenderingOperation.mm in Sources */,
- 4B3C1BDE17ABF309008BBF4C /* MCOIMAPGetQuotaOperation.mm in Sources */,
- 4B3C1BE117ABF4BC008BBF4C /* MCIMAPGetQuotaOperation.cc in Sources */,
+ 4B3C1BDE17ABF309008BBF4C /* MCOIMAPQuotaOperation.mm in Sources */,
+ 4B3C1BE117ABF4BC008BBF4C /* MCIMAPQuotaOperation.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2798,8 +2802,8 @@
BD63713C177DFF080094121B /* MCLibetpan.cc in Sources */,
DAACAD5217886807000B4517 /* MCHTMLRendererIMAPDataCallback.cc in Sources */,
DA89896E178A47D200F6D90A /* MCOIMAPMessageRenderingOperation.mm in Sources */,
- 4B3C1BE317ABFF91008BBF4C /* MCOIMAPGetQuotaOperation.mm in Sources */,
- 4B3C1BE517AC0176008BBF4C /* MCIMAPGetQuotaOperation.cc in Sources */,
+ 4B3C1BE317ABFF91008BBF4C /* MCOIMAPQuotaOperation.mm in Sources */,
+ 4B3C1BE517AC0176008BBF4C /* MCIMAPQuotaOperation.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h
index 511a5cf6..66ba6c7b 100755
--- a/src/async/imap/MCAsyncIMAP.h
+++ b/src/async/imap/MCAsyncIMAP.h
@@ -27,7 +27,7 @@
#include <MailCore/MCIMAPFetchNamespaceOperation.h>
#include <MailCore/MCIMAPIdentityOperation.h>
#include <MailCore/MCIMAPCapabilityOperation.h>
-#include <MailCore/MCIMAPGetQuotaOperation.h>
+#include <MailCore/MCIMAPQuotaOperation.h>
#include <MailCore/MCIMAPOperationCallback.h>
#include <MailCore/MCIMAPMessageRenderingOperation.h>
diff --git a/src/async/imap/MCIMAPAsyncConnection.cc b/src/async/imap/MCIMAPAsyncConnection.cc
index 77800bca..1472d974 100755
--- a/src/async/imap/MCIMAPAsyncConnection.cc
+++ b/src/async/imap/MCIMAPAsyncConnection.cc
@@ -30,7 +30,7 @@
#include "MCIMAPIdleOperation.h"
#include "MCIMAPIdentityOperation.h"
#include "MCIMAPCapabilityOperation.h"
-#include "MCIMAPGetQuotaOperation.h"
+#include "MCIMAPQuotaOperation.h"
#include "MCOperationQueueCallback.h"
#include "MCIMAPDisconnectOperation.h"
#include "MCIMAPAsyncSession.h"
@@ -495,9 +495,9 @@ IMAPCapabilityOperation * IMAPAsyncConnection::capabilityOperation()
return op;
}
-IMAPGetQuotaOperation * IMAPAsyncConnection::getQuotaOperation()
+IMAPQuotaOperation * IMAPAsyncConnection::quotaOperation()
{
- IMAPGetQuotaOperation * op = new IMAPGetQuotaOperation();
+ IMAPQuotaOperation * op = new IMAPQuotaOperation();
op->setSession(this);
op->autorelease();
return op;
diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h
index 8fe025c9..13f9ff7b 100755
--- a/src/async/imap/MCIMAPAsyncConnection.h
+++ b/src/async/imap/MCIMAPAsyncConnection.h
@@ -25,7 +25,7 @@ namespace mailcore {
class IMAPFetchNamespaceOperation;
class IMAPIdentityOperation;
class IMAPCapabilityOperation;
- class IMAPGetQuotaOperation;
+ class IMAPQuotaOperation;
class IMAPOperationQueueCallback;
class IMAPAsyncSession;
class IMAPConnectionLogger;
@@ -121,7 +121,7 @@ namespace mailcore {
virtual IMAPOperation * checkAccountOperation();
virtual IMAPCapabilityOperation * capabilityOperation();
- virtual IMAPGetQuotaOperation * getQuotaOperation();
+ virtual IMAPQuotaOperation * quotaOperation();
virtual IMAPMessageRenderingOperation * htmlRenderingOperation(IMAPMessage * message, String * folder);
virtual IMAPMessageRenderingOperation * htmlBodyRenderingOperation(IMAPMessage * message, String * folder);
diff --git a/src/async/imap/MCIMAPAsyncSession.cc b/src/async/imap/MCIMAPAsyncSession.cc
index 205b57b2..26c0feca 100755
--- a/src/async/imap/MCIMAPAsyncSession.cc
+++ b/src/async/imap/MCIMAPAsyncSession.cc
@@ -449,10 +449,10 @@ IMAPCapabilityOperation * IMAPAsyncSession::capabilityOperation()
return session->capabilityOperation();
}
-IMAPGetQuotaOperation * IMAPAsyncSession::getQuotaOperation()
+IMAPQuotaOperation * IMAPAsyncSession::quotaOperation()
{
IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
- return session->getQuotaOperation();
+ return session->quotaOperation();
}
void IMAPAsyncSession::setConnectionLogger(ConnectionLogger * logger)
diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h
index 212cdaab..e5c17078 100755
--- a/src/async/imap/MCIMAPAsyncSession.h
+++ b/src/async/imap/MCIMAPAsyncSession.h
@@ -33,7 +33,7 @@ namespace mailcore {
class IMAPIdentityOperation;
class IMAPAsyncConnection;
class IMAPCapabilityOperation;
- class IMAPGetQuotaOperation;
+ class IMAPQuotaOperation;
class IMAPMessageRenderingOperation;
class IMAPMessage;
@@ -134,7 +134,7 @@ namespace mailcore {
virtual IMAPOperation * checkAccountOperation();
virtual IMAPCapabilityOperation * capabilityOperation();
- virtual IMAPGetQuotaOperation * getQuotaOperation();
+ virtual IMAPQuotaOperation * quotaOperation();
virtual IMAPMessageRenderingOperation * htmlRenderingOperation(IMAPMessage * message, String * folder);
virtual IMAPMessageRenderingOperation * htmlBodyRenderingOperation(IMAPMessage * message, String * folder);
diff --git a/src/async/imap/MCIMAPGetQuotaOperation.cc b/src/async/imap/MCIMAPQuotaOperation.cc
index 572bd583..6744ac4b 100644
--- a/src/async/imap/MCIMAPGetQuotaOperation.cc
+++ b/src/async/imap/MCIMAPQuotaOperation.cc
@@ -1,42 +1,41 @@
//
-// MCIMAPGetQuotaOperation.cc
+// MCIMAPQuotaOperation.cc
// mailcore2
//
// Created by Petro Korenev on 8/2/13.
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#include "MCIMAPGetQuotaOperation.h"
+#include "MCIMAPQuotaOperation.h"
#include "MCIMAPSession.h"
#include "MCIMAPAsyncConnection.h"
using namespace mailcore;
-IMAPGetQuotaOperation::IMAPGetQuotaOperation()
+IMAPQuotaOperation::IMAPQuotaOperation()
{
mLimit = 0;
mUsage = 0;
}
-IMAPGetQuotaOperation::~IMAPGetQuotaOperation()
+IMAPQuotaOperation::~IMAPQuotaOperation()
{
}
-uint32_t IMAPGetQuotaOperation::limit()
+uint32_t IMAPQuotaOperation::limit()
{
return mLimit;
}
-uint32_t IMAPGetQuotaOperation::usage()
+uint32_t IMAPQuotaOperation::usage()
{
return mUsage;
}
-void IMAPGetQuotaOperation::main()
+void IMAPQuotaOperation::main()
{
ErrorCode error;
session()->session()->getQuota(&mUsage, &mLimit, &error);
- fprintf(stderr, "QnIQuESeqUeNcE %d %d", mUsage, mLimit);
setError(error);
}
diff --git a/src/async/imap/MCIMAPGetQuotaOperation.h b/src/async/imap/MCIMAPQuotaOperation.h
index bea3d2f6..5cef943c 100644
--- a/src/async/imap/MCIMAPGetQuotaOperation.h
+++ b/src/async/imap/MCIMAPQuotaOperation.h
@@ -1,14 +1,14 @@
//
-// MCIMAPGetQuotaOperation.h
+// MCIMAPQuotaOperation.h
// mailcore2
//
// Created by Petro Korenev on 8/2/13.
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#ifndef __MAILCORE_MCIMAPGETQUOTAOPERATION_H_
+#ifndef __MAILCORE_MCIMAPQuotaOperation_H_
-#define __MAILCORE_MCIMAPGETQUOTAOPERATION_H_
+#define __MAILCORE_MCIMAPQuotaOperation_H_
#include "MCIMAPOperation.h"
@@ -16,10 +16,10 @@
namespace mailcore {
- class IMAPGetQuotaOperation : public IMAPOperation {
+ class IMAPQuotaOperation : public IMAPOperation {
public:
- IMAPGetQuotaOperation();
- virtual ~IMAPGetQuotaOperation();
+ IMAPQuotaOperation();
+ virtual ~IMAPQuotaOperation();
// Result.
virtual uint32_t limit();
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index f423de1c..09f78ec1 100755
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -2445,7 +2445,6 @@ IndexSet * IMAPSession::search(String * folder, IMAPSearchExpression * expressio
clist * result_list = NULL;
-// int r = mailimap_uid_search(mImap, expression->shouldAvoidCharset() ? NULL : "utf-8", key, &result_list);
int r = mailimap_uid_search(mImap, "utf-8", key, &result_list);
mailimap_search_key_free(key);
MCLog("had error : %i", r);
diff --git a/src/objc/imap/MCOIMAP.h b/src/objc/imap/MCOIMAP.h
index 9e4cf6c0..e2036291 100755
--- a/src/objc/imap/MCOIMAP.h
+++ b/src/objc/imap/MCOIMAP.h
@@ -36,7 +36,7 @@
#import <MailCore/MCOIMAPFetchNamespaceOperation.h>
#import <MailCore/MCOIMAPIdentityOperation.h>
#import <MailCore/MCOIMAPCapabilityOperation.h>
-#import <MailCore/MCOIMAPGetQuotaOperation.h>
+#import <MailCore/MCOIMAPQuotaOperation.h>
#import <MailCore/MCOIMAPSearchExpression.h>
#import <MailCore/MCOIMAPMessageRenderingOperation.h>
diff --git a/src/objc/imap/MCOIMAPGetQuotaOperation.h b/src/objc/imap/MCOIMAPQuotaOperation.h
index 401b5aaa..c0463bb0 100644
--- a/src/objc/imap/MCOIMAPGetQuotaOperation.h
+++ b/src/objc/imap/MCOIMAPQuotaOperation.h
@@ -1,5 +1,5 @@
//
-// MCOIMAPGetQuotaOperation.h
+// MCOIMAPQuotaOperation.h
// mailcore2
//
// Created by Petro Korenev on 8/2/13.
@@ -8,7 +8,7 @@
#import "MCOIMAPBaseOperation.h"
-@interface MCOIMAPGetQuotaOperation : MCOIMAPBaseOperation
+@interface MCOIMAPQuotaOperation : MCOIMAPBaseOperation
- (void) start:(void (^)(NSError * error, NSUInteger usage, NSUInteger limit))completionBlock;
diff --git a/src/objc/imap/MCOIMAPGetQuotaOperation.mm b/src/objc/imap/MCOIMAPQuotaOperation.mm
index 25a6dc98..5be2571f 100644
--- a/src/objc/imap/MCOIMAPGetQuotaOperation.mm
+++ b/src/objc/imap/MCOIMAPQuotaOperation.mm
@@ -1,12 +1,12 @@
//
-// MCOIMAPGetQuotaOperation.m
+// MCOIMAPQuotaOperation.m
// mailcore2
//
// Created by Petro Korenev on 8/2/13.
// Copyright (c) 2013 MailCore. All rights reserved.
//
-#import "MCOIMAPGetQuotaOperation.h"
+#import "MCOIMAPQuotaOperation.h"
#include "MCAsyncIMAP.h"
@@ -15,11 +15,11 @@
typedef void (^CompletionType)(NSError *error, NSUInteger usage, NSUInteger limit);
-@implementation MCOIMAPGetQuotaOperation {
+@implementation MCOIMAPQuotaOperation {
CompletionType _completionBlock;
}
-#define nativeType mailcore::IMAPGetQuotaOperation
+#define nativeType mailcore::IMAPQuotaOperation
+ (void) load
{
diff --git a/src/objc/imap/MCOIMAPSession.h b/src/objc/imap/MCOIMAPSession.h
index 9776ab11..ea920114 100755
--- a/src/objc/imap/MCOIMAPSession.h
+++ b/src/objc/imap/MCOIMAPSession.h
@@ -29,7 +29,7 @@
@class MCOIMAPSearchExpression;
@class MCOIMAPIdentityOperation;
@class MCOIMAPCapabilityOperation;
-@class MCOIMAPGetQuotaOperation;
+@class MCOIMAPQuotaOperation;
@class MCOIMAPMessageRenderingOperation;
@class MCOIMAPMessage;
@@ -508,7 +508,7 @@
*/
- (MCOIMAPCapabilityOperation *) capabilityOperation;
-- (MCOIMAPGetQuotaOperation *) getQuotaOperation;
+- (MCOIMAPQuotaOperation *) quotaOperation;
/** @name Search Operations */
diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm
index 62899b37..a9bbeb5c 100755
--- a/src/objc/imap/MCOIMAPSession.mm
+++ b/src/objc/imap/MCOIMAPSession.mm
@@ -362,9 +362,9 @@ MCO_OBJC_SYNTHESIZE_SCALAR(unsigned int, unsigned int, setMaximumConnections, ma
return MCO_TO_OBJC_OP(coreOp);
}
-- (MCOIMAPGetQuotaOperation *) getQuotaOperation
+- (MCOIMAPQuotaOperation *) quotaOperation
{
- IMAPGetQuotaOperation * coreOp = MCO_NATIVE_INSTANCE->getQuotaOperation();
+ IMAPQuotaOperation * coreOp = MCO_NATIVE_INSTANCE->quotaOperation();
return MCO_TO_OBJC_OP((IMAPOperation*)coreOp);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 00:32:40 +0000