Make an executive decision to not support regions.

[cydia.git] / Cydia / MIMEAddress.mm

diff --git a/Cydia/MIMEAddress.mm b/Cydia/MIMEAddress.mm
index 984971627d3fa55be5325948c4964c0212625453..a30be35f290d6a61ebd271060a033e1f700cb9e4 100644 (file)
--- a/Cydia/MIMEAddress.mm
+++ b/Cydia/MIMEAddress.mm
@@ -1,5 +1,5 @@
 /* Cydia - iPhone UIKit Front-End for Debian APT
- * Copyright (C) 2008-2012  Jay Freeman (saurik)
+ * Copyright (C) 2008-2015  Jay Freeman (saurik)
 */
 
 /* GNU General Public License, Version 3 {{{ */
@@ -19,11 +19,12 @@
 **/
 /* }}} */
 
-#include "Cydia/MIMEAddress.h"
+#include "CyteKit/UCPlatform.h"
 
-#include <WebKit/WebScriptObject.h>
+#include "Cydia/MIMEAddress.h"
+#include "CyteKit/RegEx.hpp"
 
-#include "CyteKit/PerlCompatibleRegEx.hpp"
+#include "iPhonePrivate.h"
 
 @implementation MIMEAddress
 
@@ -61,9 +62,9 @@
 - (id) initWithString:(NSString *)string {
     if ((self = [super init]) != nil) {
         const char *data = [string UTF8String];
-        size_t size = [string length];
+        size_t size = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
 
-        static Pcre address_r("^\"?(.*)\"? <([^>]*)>$");
+        static RegEx address_r("\"?(.*)\"? <([^>]*)>");
 
         if (address_r(data, size)) {
             name_ = address_r[1];