integrated changes from codaFi into my branch so we can merge this into the main mailcore branch

4 files changed, 6 insertions, 14 deletions

diff --git a/src/core/imap/MCIMAPMessage.cc b/src/core/imap/MCIMAPMessage.cc
index 8d3c5c02..59d67654 100644
--- a/src/core/imap/MCIMAPMessage.cc
+++ b/src/core/imap/MCIMAPMessage.cc
@@ -83,7 +83,6 @@ uint32_t IMAPMessage::size()
 void IMAPMessage::setSize(uint32_t size)
 {
     mSize = size;
-    
 }
 
 void IMAPMessage::setFlags(MessageFlag flags)
diff --git a/src/core/imap/MCIMAPSearchExpression.cc b/src/core/imap/MCIMAPSearchExpression.cc
index 0aa791d0..f7ac2a0f 100644
--- a/src/core/imap/MCIMAPSearchExpression.cc
+++ b/src/core/imap/MCIMAPSearchExpression.cc
@@ -245,7 +245,7 @@ IMAPSearchExpression * IMAPSearchExpression::searchSizeLarger(uint32_t size)
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
     expr->mKind = IMAPSearchKindSizeLarger;
-    expr->mNumber = size;
+    expr->mLongNumber = size;
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
@@ -253,7 +253,7 @@ IMAPSearchExpression * IMAPSearchExpression::searchSizeSmaller(uint32_t size)
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
     expr->mKind = IMAPSearchKindSizeSmaller;
-    expr->mNumber = size;
+    expr->mLongNumber = size;
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
@@ -303,11 +303,6 @@ uint64_t IMAPSearchExpression::longNumber()
     return mLongNumber;
 }
 
-uint32_t IMAPSearchExpression::number()
-{
-    return mNumber;
-}
-
 time_t IMAPSearchExpression::date()
 {
     return mDate;
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index 6d313730..2696366c 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -18,7 +18,6 @@ namespace mailcore {
         virtual String * header();
         virtual String * value();
         virtual uint64_t longNumber();
-        virtual uint32_t number();
         virtual time_t date();
         virtual IMAPSearchExpression * leftExpression();
         virtual IMAPSearchExpression * rightExpression();
@@ -45,9 +44,9 @@ namespace mailcore {
         static IMAPSearchExpression * searchBeforeReceivedDate(time_t date);
         static IMAPSearchExpression * searchOnReceivedDate(time_t date);
         static IMAPSearchExpression * searchSinceReceivedDate(time_t date);
-        static IMAPSearchExpression * searchSizeLarger(uint32_t number);
+        static IMAPSearchExpression * searchSizeLarger(uint32_t size);
         static IMAPSearchExpression * searchSizeSmaller(uint32_t size);
-        static IMAPSearchExpression * searchGmailThreadID(uint64_t size);
+        static IMAPSearchExpression * searchGmailThreadID(uint64_t number);
         static IMAPSearchExpression * searchAnd(IMAPSearchExpression * left, IMAPSearchExpression * right);
         static IMAPSearchExpression * searchOr(IMAPSearchExpression * left, IMAPSearchExpression * right);
         
@@ -61,7 +60,6 @@ namespace mailcore {
         String * mHeader;
         String * mValue;
         uint64_t mLongNumber;
-        uint32_t mNumber;
         time_t mDate;
         IMAPSearchExpression * mLeftExpression;
         IMAPSearchExpression * mRightExpression;
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index 009bdc9f..76dbc604 100755
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -2741,11 +2741,11 @@ static struct mailimap_search_key * searchKeyFromSearchExpression(IMAPSearchExpr
         }
         case IMAPSearchKindSizeLarger:
         {
-            return mailimap_search_key_new_larger(expression->number());
+            return mailimap_search_key_new_larger( (uint32_t) expression->longNumber());
         }
         case IMAPSearchKindSizeSmaller:
         {
-            return mailimap_search_key_new_smaller(expression->number());
+            return mailimap_search_key_new_smaller( (uint32_t) expression->longNumber());
         }
         case IMAPSearchKindOr:
         {