From 408a6a0c4a41f428d99a2a5ee8effd6821d951cd Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 23 Aug 2007 22:10:50 +0000
Subject: [PATCH] Monotone-Parent: 6ba5493c91f538701d638d36d00899eaa08ff21f
 Monotone-Revision: 3e993bd57ea644d0e5344b9c04aa3026c95efcee

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-23T22:10:50
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Mailer/SOGoDraftObject.m  | 31 +----------------------------
 SoObjects/SOGo/NSString+Utilities.h |  2 ++
 SoObjects/SOGo/NSString+Utilities.m | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 6c49beb97..a8a631351 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -53,6 +53,7 @@
 
 #import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
+#import <SoObjects/SOGo/NSString+Utilities.h>
 #import <SoObjects/SOGo/SOGoMailer.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import "SOGoMailAccount.h"
@@ -66,36 +67,6 @@ static NSString *contentTypeValue = @"text/plain; charset=utf-8";
 static NSString *headerKeys[] = {@"subject", @"to", @"cc", @"bcc", 
 				 @"from", @"replyTo", nil};
 
-@interface NSString (NGMimeHelpers)
-
-- (NSString *) asQPSubjectString: (NSString *) encoding;
-
-@end
-
-@implementation NSString (NGMimeHelpers)
-
-- (NSString *) asQPSubjectString: (NSString *) encoding;
-{
-  NSString *qpString, *subjectString;
-  NSData *subjectData, *destSubjectData;
-
-  subjectData = [self dataUsingEncoding: NSUTF8StringEncoding];
-  destSubjectData = [subjectData dataByEncodingQuotedPrintable];
-
-  qpString = [[NSString alloc] initWithData: destSubjectData
-			       encoding: NSASCIIStringEncoding];
-  [qpString autorelease];
-  if ([qpString length] > [self length])
-    subjectString = [NSString stringWithFormat: @"=?%@?Q?%@?=",
-			      encoding, qpString];
-  else
-    subjectString = self;
-
-  return subjectString;
-}
-
-@end
-
 @implementation SOGoDraftObject
 
 static NGMimeType  *TextPlainType  = nil;
diff --git a/SoObjects/SOGo/NSString+Utilities.h b/SoObjects/SOGo/NSString+Utilities.h
index 7cd8042b4..0f2e95a99 100644
--- a/SoObjects/SOGo/NSString+Utilities.h
+++ b/SoObjects/SOGo/NSString+Utilities.h
@@ -46,6 +46,8 @@
 /* bare email addresses */
 - (NSString *) pureEMailAddress;
 
+- (NSString *) asQPSubjectString: (NSString *) encoding;
+
 #ifndef GNUSTEP_BASE_LIBRARY
 - (BOOL) boolValue;
 #endif
diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 38c09bad5..bb8ece23c 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -268,6 +268,26 @@ static NSMutableCharacterSet *urlAfterEndingChars = nil;
   return pureAddress;
 }
 
+- (NSString *) asQPSubjectString: (NSString *) encoding
+{
+  NSString *qpString, *subjectString;
+  NSData *subjectData, *destSubjectData;
+
+  subjectData = [self dataUsingEncoding: NSUTF8StringEncoding];
+  destSubjectData = [subjectData dataByEncodingQuotedPrintable];
+
+  qpString = [[NSString alloc] initWithData: destSubjectData
+			       encoding: NSASCIIStringEncoding];
+  [qpString autorelease];
+  if ([qpString length] > [self length])
+    subjectString = [NSString stringWithFormat: @"=?%@?Q?%@?=",
+			      encoding, qpString];
+  else
+    subjectString = self;
+
+  return subjectString;
+}
+
 #if LIB_FOUNDATION_LIBRARY
 - (BOOL) boolValue
 {