The Acount Setup Pane now works.

2010-09-25 07:34:32 -05:00 · 2010-09-25 07:34:32 -05:00 · d78ec38bf9
commit d78ec38bf9
parent cf629e2861
29 changed files with 25557 additions and 48 deletions
--- a/Classes/VoiceBase/XML/MGMXML.h
+++ b/Classes/VoiceBase/XML/MGMXML.h
@ -7,9 +7,18 @@
 *
 */

+#if TARGET_OS_IPHONE
+#import <MGMXMLNode.h>
+#import <MGMXMLElement.h>
+#import <MGMXMLDocument.h>
+#import <MGMXMLDTD.h>
+#import <MGMXMLDTDNode.h>
+#import <MGMXMLNodeOptions.h>
+#else
 #import <VoiceBase/MGMXMLNode.h>
 #import <VoiceBase/MGMXMLElement.h>
 #import <VoiceBase/MGMXMLDocument.h>
 #import <VoiceBase/MGMXMLDTD.h>
 #import <VoiceBase/MGMXMLDTDNode.h>
 #import <VoiceBase/MGMXMLNodeOptions.h>
+#endif
--- a/Classes/VoiceBase/XML/MGMXMLDTD.h
+++ b/Classes/VoiceBase/XML/MGMXMLDTD.h
@ -8,10 +8,11 @@

 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#import <MGMXMLNode.h>
 #else
 #import <Cocoa/Cocoa.h>
-#endif
 #import <VoiceBase/MGMXMLNode.h>
+#endif

@interface MGMXMLDTD : MGMXMLNode {

--- a/Classes/VoiceBase/XML/MGMXMLDTDNode.h
+++ b/Classes/VoiceBase/XML/MGMXMLDTDNode.h
@ -8,10 +8,11 @@

 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#import <MGMXMLNode.h>
 #else
 #import <Cocoa/Cocoa.h>
-#endif
 #import <VoiceBase/MGMXMLNode.h>
+#endif

@interface MGMXMLDTDNode : MGMXMLNode {

--- a/Classes/VoiceBase/XML/MGMXMLDocument.h
+++ b/Classes/VoiceBase/XML/MGMXMLDocument.h
@ -8,10 +8,11 @@

 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#import <MGMXMLNode.h>
 #else
 #import <Cocoa/Cocoa.h>
-#endif
 #import <VoiceBase/MGMXMLNode.h>
+#endif

 #define MGMXMLDocPtr (xmlDocPtr)commonXML

--- a/Classes/VoiceBase/XML/MGMXMLElement.h
+++ b/Classes/VoiceBase/XML/MGMXMLElement.h
@ -8,10 +8,11 @@

 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
+#import <MGMXMLNode.h>
 #else
 #import <Cocoa/Cocoa.h>
-#endif
 #import <VoiceBase/MGMXMLNode.h>
+#endif

@interface MGMXMLElement : MGMXMLNode {

--- a/Classes/VoiceMac/MGMAccountSetup.m
+++ b/Classes/VoiceMac/MGMAccountSetup.m
@ -87,7 +87,7 @@ NSString * const MGMSIPDefaultDomain = @"proxy01.sipphone.com";
 			[continueButton setEnabled:YES];
 			break;
 		case 2:
-			[titleField setStringValue:@"Account Set Up"];
+			[titleField setStringValue:@"Account Setup"];
 			if (isAttached)
 				[backButton setTitle:MGMSCancel];
 			else
@ -163,7 +163,7 @@ NSString * const MGMSIPDefaultDomain = @"proxy01.sipphone.com";
 			break;
 		}
 		case 9: {
-			[titleField setStringValue:@"Set Up Successful"];
+			[titleField setStringValue:@"Setup Successful"];
 			NSString *type = nil;
 			if (accountType==0)
 				type = MGMSGoogleVoice;
@ -176,7 +176,7 @@ NSString * const MGMSIPDefaultDomain = @"proxy01.sipphone.com";
 			[backButton setEnabled:NO];
 			[continueButton setTitle:MGMSDone];
 			[continueButton setEnabled:YES];
-			[S9MessageField setStringValue:[NSString stringWithFormat:@"You have sucessfully set up your %@ account. You may continue to the Application or you add another account by pressing \"Add Another Account\". If you are confused about VoiceMac, please read the documentation which explains how you use it and all you can do with it.", type]];
+			[S9MessageField setStringValue:[NSString stringWithFormat:@"You have sucessfully set up your %@ account. You may continue to the Application or add another account by pressing \"Add Another Account\". If you are confused about VoiceMac, please read the documentation which explains all you can do with it.", type]];
 			break;
 		}
 	}
--- a/Classes/VoiceMob/MGMAccountSetup.h
+++ b/Classes/VoiceMob/MGMAccountSetup.h
@ -0,0 +1,120 @@
+//
+//  MGMAccountSetup.h
+//  VoiceMob
+//
+//  Created by Mr. Gecko on 9/24/10.
+//  Copyright (c) 2010 Mr. Gecko's Media (James Coleman). All rights reserved. http://mrgeckosmedia.com/
+//
+
+#import <UIKit/UIKit.h>
+
+@class MGMUser, MGMInstance, MGMURLConnectionManager, MGMSIPAccount;
+
+@interface MGMAccountSetup : NSObject {
+	IBOutlet UIView *setupView;
+	CGRect setupRect;
+	CGRect setupKeyboardRect;
+	IBOutlet UIView *view;
+	IBOutlet UILabel *titleField;
+	IBOutlet UIBarButtonItem *backButton;
+	IBOutlet UIBarButtonItem *continueButton;
+	
+	UIView *lastView;
+	UIView *nextView;
+	BOOL displaying;
+	BOOL needsDisplay;
+	BOOL goingBack;
+	BOOL backEnabled;
+	BOOL continueEnabled;
+	int step;
+	int accountType;
+	NSMutableArray *accountsCreated;
+	
+	//Step 1 - Welcome To VoiceMac
+	IBOutlet UIView *S1View;
+	
+	//Step 2 - Account Type
+	IBOutlet UIView *S2View;
+	IBOutlet UIButton *S2GVButton;
+	IBOutlet UIButton *S2GCButton;
+	IBOutlet UIButton *S2SIPButton;
+	
+	//Step 3 - Google Voice Privacy Policy
+	IBOutlet UIView *S3View;
+	IBOutlet UIWebView *S3Browser;
+	
+	//Step 4 - Google Voice Setup
+	IBOutlet UIView *S4View;
+	IBOutlet UITextField *S4EmailField;
+	IBOutlet UITextField *S4PasswordField;
+	
+	//Step 5 - Google Contacts Setup
+	IBOutlet UIView *S5View;
+	IBOutlet UITextField *S5EmailField;
+	IBOutlet UITextField *S5PasswordField;
+	
+	//Step 6 - SIP Setup
+	IBOutlet UIView *S6View;
+	IBOutlet UITextField *S6FullNameField;
+	IBOutlet UITextField *S6DomainField;
+	IBOutlet UITextField *S6RegistrarField;
+	IBOutlet UITextField *S6UserNameField;
+	IBOutlet UITextField *S6PasswordField;
+	
+	//Step 7 - Checking Login Credentials
+	IBOutlet UIView *S7View;
+	IBOutlet UIActivityIndicatorView *S7Progress;
+	IBOutlet UILabel *S7StatusField;
+	MGMUser *S7CheckUser;
+	MGMInstance *S7CheckInstance;
+	MGMURLConnectionManager *S7ConnectionManager;
+#if MGMSIPENABLED
+	MGMSIPAccount *S7CheckSIPAccount;
+	BOOL S7AccountRegistered;
+	NSTimer *S7SIPRegistrationTimeout;
+#endif
+	
+	//Step 8 - Setup Error
+	IBOutlet UIView *S8View;
+	IBOutlet UITextView *S8MessageField;
+	NSString *S8Message;
+	
+	//Step 9 - Setup Successful
+	IBOutlet UIView *S9View;
+	IBOutlet UITextView *S9MessageField;
+}
+- (UIView *)view;
+
+- (IBAction)closeKeyboard:(id)sender;
+
+- (void)displayStep;
+- (IBAction)back:(id)sender;
+- (IBAction)continue:(id)sender;
+
+//Step 2
+- (IBAction)S2SelectType:(id)sender;
+
+//Step 4
+- (void)S4Reset;
+
+//Step 5
+- (void)S5Reset;
+
+//Step 6
+- (IBAction)S6ShowKeyboard:(id)sender;
+- (IBAction)S6CloseKeyboard:(id)sender;
+- (IBAction)S6UserNameChanged:(id)sender;
+- (IBAction)S6DomainChanged:(id)sender;
+- (void)S6Reset;
+
+//Step 7
+- (void)S7CheckGoogleVoice;
+- (void)S7CheckGoogleContacts;
+- (void)S7CheckSIP;
+#if MGMSIPENABLED
+- (void)loginErrored;
+#endif
+
+//Step 9
+- (IBAction)S9AddAnotherAccount:(id)sender;
+@end
--- a/Classes/VoiceMob/MGMAccountSetup.m
+++ b/Classes/VoiceMob/MGMAccountSetup.m
@ -0,0 +1,601 @@
+//
+//  MGMAccountSetup.m
+//  VoiceMob
+//
+//  Created by Mr. Gecko on 9/24/10.
+//  Copyright (c) 2010 Mr. Gecko's Media (James Coleman). All rights reserved. http://mrgeckosmedia.com/
+//
+
+#import "MGMAccountSetup.h"
+#import "MGMSIPUser.h"
+#import "MGMVMAddons.h"
+#import <VoiceBase.h>
+#import <MGMUsers/MGMUsers.h>
+
+NSString * const MGMRadioButton = @"Radio";
+NSString * const MGMRadioSelectedButton = @"RadioSelected";
+
+NSString * const MGMSGoBack = @"Go Back";
+NSString * const MGMSCancel = @"Cancel";
+NSString * const MGMSDisagree = @"Disagree";
+NSString * const MGMSContinue = @"Continue";
+NSString * const MGMSDone = @"Done";
+NSString * const MGMSAgree = @"Agree";
+
+NSString * const MGMSGoogleVoice = @"Google Voice";
+NSString * const MGMSGoogleContacts = @"Google Contacts";
+NSString * const MGMSSIP = @"Session Initiation Protocol";
+NSString * const MGMSAccountType = @"MGMSAccountType";
+
+NSString * const MGMS7Crediential = @"Checking Login Credentials.";
+NSString * const MGMS7SIPWaiting = @"Waiting for Registration Status.";
+
+NSString * const MGMSIPDefaultDomain = @"proxy01.sipphone.com";
+
+@implementation MGMAccountSetup
+- (id)init {
+	if (self = [super init]) {
+		if (![[NSBundle mainBundle] loadNibNamed:[[UIDevice currentDevice] appendDeviceSuffixToString:@"AccountSetup"] owner:self options:nil]) {
+			NSLog(@"Unable to load Account Setup");
+		} else {
+			displaying = NO;
+			needsDisplay = NO;
+			goingBack = NO;
+			step = 1;
+			accountType = 1;
+			accountsCreated = [NSMutableArray new];
+			S7ConnectionManager = [[MGMURLConnectionManager managerWithCookieStorage:nil] retain];
+			setupRect = [setupView frame];
+			setupKeyboardRect = setupRect;
+			setupKeyboardRect.origin.y = (-(setupKeyboardRect.size.height-45))+246;
+		}
+	}
+	return self;
+}
+- (void)dealloc {
+	if (setupView!=nil)
+		[setupView release];
+	if (accountsCreated!=nil)
+		[accountsCreated release];
+	if (S7CheckUser!=nil)
+		[S7CheckUser release];
+	if (S7CheckInstance!=nil)
+		[S7CheckInstance release];
+	if (S7ConnectionManager!=nil)
+		[S7ConnectionManager release];
+#if MGMSIPENABLED
+	if (S7CheckSIPAccount!=nil)
+		[S7CheckSIPAccount release];
+#endif
+	if (S8Message!=nil)
+		[S8Message release];
+	[super dealloc];
+}
+
+- (UIView *)view {
+	return setupView;
+}
+
+- (IBAction)closeKeyboard:(id)sender {
+	
+}
+
+- (void)setStep:(int)theStep {
+	step = theStep;
+}
+- (void)displayStep {
+	if (displaying) {
+		needsDisplay = YES;
+		return;
+	}
+	switch (step) {
+		case 1:
+			nextView = S1View;
+			[titleField setText:@"Welcome to VoiceMob"];
+			[backButton setTitle:MGMSGoBack];
+			[backButton setEnabled:NO];
+			[continueButton setTitle:MGMSContinue];
+			[continueButton setEnabled:YES];
+			break;
+		case 2:
+			nextView = S2View;
+			[titleField setText:@"Account Setup"];
+			[backButton setTitle:MGMSGoBack];
+			[backButton setEnabled:YES];
+			[continueButton setTitle:MGMSContinue];
+			[continueButton setEnabled:YES];
+			break;
+		case 3:
+			nextView = S3View;
+			[titleField setText:@"Google Voice Privacy Policy"];
+			[backButton setTitle:MGMSDisagree];
+			[backButton setEnabled:YES];
+			[continueButton setTitle:MGMSAgree];
+			[continueButton setEnabled:YES];
+			[S3Browser loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://www.google.com/googlevoice/legal-notices.html"]]];
+			break;
+		case 4:
+		case 5:
+		case 6: {
+			if (step==4)
+				nextView = S4View;
+			else if (step==5)
+				nextView = S5View;
+			else if (step==6)
+				nextView = S6View;
+			NSString *type = nil;
+			if (accountType==0)
+				type = MGMSGoogleVoice;
+			else if (accountType==1)
+				type = MGMSGoogleContacts;
+			else if (accountType==2)
+				type = MGMSSIP;
+			[titleField setText:[NSString stringWithFormat:@"Set Up %@", type]];
+			[backButton setTitle:MGMSGoBack];
+			[backButton setEnabled:YES];
+			[continueButton setTitle:MGMSContinue];
+			[continueButton setEnabled:YES];
+			break;
+		}
+		case 7:
+			nextView = S7View;
+			[titleField setText:@"Checking Credentials"];
+			[backButton setTitle:MGMSGoBack];
+			[backButton setEnabled:NO];
+			[continueButton setTitle:MGMSContinue];
+			[continueButton setEnabled:NO];
+			[S7StatusField setText:MGMS7Crediential];
+			if (accountType==0)
+				[self S7CheckGoogleVoice];
+			else if (accountType==1)
+				[self S7CheckGoogleContacts];
+			else if (accountType==2)
+				[self S7CheckSIP];
+			[S7Progress startAnimating];
+			break;
+		case 8: {
+			nextView = S8View;
+			[S7Progress stopAnimating];
+			NSString *type = nil;
+			if (accountType==0)
+				type = MGMSGoogleVoice;
+			else if (accountType==1)
+				type = MGMSGoogleContacts;
+			else if (accountType==2)
+				type = MGMSSIP;
+			[titleField setText:@"Credentials Error"];
+			[backButton setTitle:MGMSGoBack];
+			[backButton setEnabled:YES];
+			[continueButton setTitle:MGMSContinue];
+			[continueButton setEnabled:NO];
+			[S8MessageField setText:[NSString stringWithFormat:@"Unable to set up your %@ account, the error we receviced was \"%@\" Please go back and correct the problem.", type, S8Message]];
+			if (S8Message!=nil) {
+				[S8Message release];
+				S8Message = nil;
+			}
+			break;
+		}
+		case 9: {
+			nextView = S9View;
+			[titleField setText:@"Setup Successful"];
+			NSString *type = nil;
+			if (accountType==0)
+				type = MGMSGoogleVoice;
+			else if (accountType==1)
+				type = MGMSGoogleContacts;
+			else if (accountType==2)
+				type = MGMSSIP;
+			[S7Progress stopAnimating];
+			[backButton setTitle:MGMSGoBack];
+			[backButton setEnabled:NO];
+			[continueButton setTitle:MGMSDone];
+			[continueButton setEnabled:YES];
+			[S9MessageField setText:[NSString stringWithFormat:@"You have sucessfully set up your %@ account. You may continue to the Application or add another account by pressing \"Add Another Account\". If you are confused about VoiceMob, please read the documentation which explains all you can do with it.", type]];
+			break;
+		}
+	}
+	if (lastView==nil) {
+		[view addSubview:nextView];
+		lastView = nextView;
+	} else if (lastView!=nextView) {
+		backEnabled = [backButton isEnabled];
+		[backButton setEnabled:NO];
+		continueEnabled = [continueButton isEnabled];
+		[continueButton setEnabled:NO];
+		displaying = YES;
+		if (goingBack) {
+			CGRect inViewFrame = [nextView frame];
+			inViewFrame.origin.x = -inViewFrame.size.width;
+			[nextView setFrame:inViewFrame];
+			[view addSubview:nextView];
+			[UIView beginAnimations:@"push" context:nil];
+			[UIView setAnimationDuration:0.5];
+			[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
+			[UIView setAnimationDelegate:self];
+			[UIView setAnimationDidStopSelector:@selector(displayAnimationDidStop:finished:context:)];
+			[nextView setFrame:[lastView frame]];
+			CGRect outViewFrame = [lastView frame];
+			outViewFrame.origin.x = outViewFrame.size.width;
+			[lastView  setFrame:outViewFrame];
+			[UIView commitAnimations];
+		} else {
+			CGRect inViewFrame = [nextView frame];
+			inViewFrame.origin.x = inViewFrame.size.width;
+			[nextView setFrame:inViewFrame];
+			[view addSubview:nextView];
+			[UIView beginAnimations:nil context:nil];
+			[UIView setAnimationDuration:0.5];
+			[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
+			[UIView setAnimationDelegate:self];
+			[UIView setAnimationDidStopSelector:@selector(displayAnimationDidStop:finished:context:)];
+			[nextView setFrame:[lastView frame]];
+			CGRect outViewFrame = [lastView frame];
+			outViewFrame.origin.x = -outViewFrame.size.width;
+			[lastView setFrame:outViewFrame];
+			[UIView commitAnimations];
+		}
+	}
+}
+- (void)displayAnimationDidStop:(NSString *)animationID finished:(NSNumber *)finished context:(void *)context {
+	[backButton setEnabled:backEnabled];
+	[continueButton setEnabled:continueEnabled];
+	[lastView removeFromSuperview];
+	lastView = nextView;
+	nextView = nil;
+	displaying = NO;
+	if (needsDisplay) {
+		needsDisplay = NO;
+		[self displayStep];
+	}
+}
+							  
+- (IBAction)back:(id)sender {
+	switch (step) {
+		case 2:
+			step--;
+			break;
+		case 4:
+			step = 3;
+			break;
+		case 3:
+		case 5:
+		case 6:
+			if (accountType==0)
+				[self S4Reset];
+			else if (accountType==1)
+				[self S5Reset];
+			else if (accountType==2)
+				[self S6Reset];
+			step = 2;
+			break;
+		case 8:
+			if (accountType==0)
+				step = 4;
+			else if (accountType==1)
+				step = 5;
+			else if (accountType==2)
+				step = 6;
+			break;
+		default:
+			step--;
+			break;
+	}
+	goingBack = YES;
+	[self displayStep];
+}
+- (IBAction)continue:(id)sender {
+	switch (step) {
+		case 2:
+			switch (accountType) {
+				case 1:
+					step = 5;
+					break;
+				case 2: {
+#if MGMSIPENABLED
+					step = 6;
+#else
+					UIAlertView *theAlert = [[UIAlertView new] autorelease];
+					[theAlert setTitle:@"Unable to Add Account"];
+					[theAlert setMessage:@"MGMSIP is not compiled with VoiceMob, you can not add a SIP account without first compiling with MGMSIP."];
+					[theAlert addButtonWithTitle:@"Ok"];
+					[theAlert show];
+					return;
+#endif
+					break;
+				}
+				default:
+					step++;
+					break;
+			}
+			break;
+		case 4:
+		case 5:
+		case 6: {
+			BOOL emptyFields = NO;
+			if (accountType==0) {
+				if ([[S4EmailField text] isEqual:@""] || [[S4PasswordField text] isEqual:@""])
+					emptyFields = YES;
+			} else if (accountType==1) {
+				if ([[S5EmailField text] isEqual:@""] || [[S5PasswordField text] isEqual:@""])
+					emptyFields = YES;
+			} else if (accountType==2) {
+				if ([[S6UserNameField text] isEqual:@""] || [[S6PasswordField text] isEqual:@""])
+					emptyFields = YES;
+			}
+			if (emptyFields) {
+				UIAlertView *theAlert = [[UIAlertView new] autorelease];
+				[theAlert setTitle:@"Missing Information"];
+				[theAlert setMessage:@"It appears as if you did not fill the required fields, please fill out the required fields and then continue."];
+				[theAlert addButtonWithTitle:@"Ok"];
+				[theAlert show];
+				return;
+			}
+			step = 7;
+			break;
+		}
+		case 9:
+			[accountsCreated makeObjectsPerformSelector:@selector(start)];
+			[self release];
+			return;
+		default:
+			step++;
+			break;
+	}
+	goingBack = NO;
+	[self displayStep];
+}
+
+//Step 2
+- (IBAction)S2SelectType:(id)sender {
+	[S2GVButton setImage:[UIImage imageNamed:MGMRadioButton] forState:UIControlStateNormal];
+	[S2GCButton setImage:[UIImage imageNamed:MGMRadioButton] forState:UIControlStateNormal];
+	[S2SIPButton setImage:[UIImage imageNamed:MGMRadioButton] forState:UIControlStateNormal];
+	accountType = [sender tag]-1;
+	if (accountType==0)
+		[S2GVButton setImage:[UIImage imageNamed:MGMRadioSelectedButton] forState:UIControlStateNormal];
+	else if (accountType==1)
+		[S2GCButton setImage:[UIImage imageNamed:MGMRadioSelectedButton] forState:UIControlStateNormal];
+	else if (accountType==2)
+		[S2SIPButton setImage:[UIImage imageNamed:MGMRadioSelectedButton] forState:UIControlStateNormal];
+}
+
+//Step 4
+- (void)S4Reset {
+	[S4EmailField setText:@""];
+	[S4PasswordField setText:@""];
+}
+
+//Step 5
+- (void)S5Reset {
+	[S5EmailField setText:@""];
+	[S5PasswordField setText:@""];
+}
+
+//Step 6
+- (IBAction)S6ShowKeyboard:(id)sender {
+	if (CGRectEqualToRect([setupView frame], setupRect)) {
+		[UIView beginAnimations:nil context:nil];
+		[UIView setAnimationDuration:0.3];
+		[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
+		[setupView setFrame:setupKeyboardRect];
+		[UIView commitAnimations];
+	}
+}
+- (IBAction)S6CloseKeyboard:(id)sender {
+	[UIView beginAnimations:nil context:nil];
+	[UIView setAnimationDuration:0.3];
+	[UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
+	[setupView setFrame:setupRect];
+	[UIView commitAnimations];
+}
+- (IBAction)S6UserNameChanged:(id)sender {
+	[S6FullNameField setPlaceholder:[S6UserNameField text]];
+}
+- (IBAction)S6DomainChanged:(id)sender {
+	if ([[S6DomainField text] isEqual:@""])
+		[S6RegistrarField setPlaceholder:MGMSIPDefaultDomain];
+	else
+		[S6RegistrarField setPlaceholder:[S6DomainField text]];
+}
+- (void)S6Reset {
+	[S6FullNameField setText:@""];
+	[S6FullNameField setPlaceholder:@"UserName"];
+	[S6DomainField setText:@""];
+	[S6RegistrarField setText:@""];
+	[S6UserNameField setText:@""];
+	[S6PasswordField setText:@""];
+}
+
+//Step 7
+- (void)S7CheckGoogleVoice {
+	S7CheckUser = [[MGMUser createUserWithName:[S4EmailField text] password:[S4PasswordField text]] retain];
+	[S7CheckUser setSetting:MGMSGoogleVoice forKey:MGMSAccountType];
+	S7CheckInstance = [[MGMInstance instanceWithUser:S7CheckUser delegate:self isCheck:YES] retain];
+}
+- (void)loginError:(NSError *)theError {
+	if (S7CheckUser!=nil) {
+		[S7CheckUser remove];
+		[S7CheckUser release];
+		S7CheckUser = nil;
+	}
+	if (S7CheckInstance!=nil) {
+		[S7CheckInstance release];
+		S7CheckInstance = nil;
+	}
+	NSLog(@"Login Failed %@", theError);
+	S8Message = [[theError localizedDescription] copy];
+	step = 8;
+	[self displayStep];
+}
+- (void)loginSuccessful {
+	if (S7CheckUser!=nil) {
+		[accountsCreated addObject:S7CheckUser];
+		MGMUser *contactsUser = [MGMUser createUserWithName:[S4EmailField text] password:[S4PasswordField text]];
+		[contactsUser setSetting:MGMSGoogleContacts forKey:MGMSAccountType];
+		[S7CheckUser setSetting:[contactsUser settingForKey:MGMUserID] forKey:MGMCGoogleContactsUser];
+		[S7CheckUser release];
+		S7CheckUser = nil;
+	}
+	if (S7CheckInstance!=nil) {
+		[S7CheckInstance release];
+		S7CheckInstance = nil;
+	}
+	[self S4Reset];
+	step = 9;
+	[self displayStep];
+}
+
+- (void)S7CheckGoogleContacts {
+	S7CheckUser = [[MGMUser createUserWithName:[S5EmailField text] password:[S5PasswordField text]] retain];
+	[S7CheckUser setSetting:MGMSGoogleContacts forKey:MGMSAccountType];
+	NSString *username = [S7CheckUser settingForKey:MGMUserName];
+	if (![username containsString:@"@"])
+		username = [username stringByAppendingString:@"@gmail.com"];
+	NSURLCredential *credentials = [NSURLCredential credentialWithUser:username password:[S7CheckUser password] persistence:NSURLCredentialPersistenceForSession];
+	[S7ConnectionManager setCookieStorage:[S7CheckUser cookieStorage]];
+	[S7ConnectionManager setCredentials:credentials];
+	[S7ConnectionManager setCustomUseragent:MGMGCUseragent];
+	NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:MGMGCAuthenticationURL] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:15.0];
+	[request setHTTPMethod:MGMPostMethod];
+	[request setValue:MGMURLForm forHTTPHeaderField:MGMContentType];
+	[request setHTTPBody:[[NSString stringWithFormat:MGMGCAuthenticationBody, [username addPercentEscapes], [[S7CheckUser password] addPercentEscapes]] dataUsingEncoding:NSUTF8StringEncoding]];
+	[S7ConnectionManager connectionWithRequest:request delegate:self didFailWithError:@selector(authentication:didFailWithError:) didFinish:@selector(authenticationDidFinish:) invisible:NO object:nil];
+}
+- (void)authentication:(NSDictionary *)theInfo didFailWithError:(NSError *)theError {
+	if (S7CheckUser!=nil) {
+		[S7CheckUser remove];
+		[S7CheckUser release];
+		S7CheckUser = nil;
+	}
+	if (S7ConnectionManager!=nil)
+		[S7ConnectionManager setCookieStorage:nil];
+	NSLog(@"Login Failed %@", theError);
+	S8Message = [[theError localizedDescription] copy];
+	step = 8;
+	[self displayStep];
+}
+- (void)authenticationDidFinish:(NSDictionary *)theInfo {
+	NSDictionary *info = [MGMGoogleContacts dictionaryWithData:[theInfo objectForKey:MGMConnectionData]];
+	if (S7ConnectionManager!=nil)
+		[S7ConnectionManager setCookieStorage:nil];
+	if (S7CheckUser!=nil) {
+		if ([info objectForKey:@"Error"]!=nil) {
+			[S7CheckUser remove];
+			[S7CheckUser release];
+			S7CheckUser = nil;
+			S8Message = [@"Unable to login. Please check your Credentials." retain];
+			step = 8;
+			[self displayStep];
+			return;
+		}
+		[S7CheckUser done];
+		[S7CheckUser release];
+		S7CheckUser = nil;
+	}
+	
+	[self S5Reset];
+	step = 9;
+	[self displayStep];
+}
+
+- (void)S7CheckSIP {
+#if MGMSIPENABLED
+	if (![[MGMSIP sharedSIP] isStarted]) [[MGMSIP sharedSIP] start];
+	S7CheckUser = [[MGMUser createUserWithName:[S6UserNameField text] password:[S6PasswordField text]] retain];
+	[S7CheckUser setSetting:MGMSSIP forKey:MGMSAccountType];
+	NSString *fullName = [S6FullNameField text];
+	if ([fullName isEqual:@""])
+		fullName = [S6UserNameField text];
+	[S7CheckUser setSetting:fullName forKey:MGMSIPAccountFullName];
+	[S7CheckUser setSetting:[S6UserNameField text] forKey:MGMSIPAccountUserName];
+	if ([[S6UserNameField text] isPhone])
+		[S7CheckUser setSetting:[[S6UserNameField text] areaCode] forKey:MGMSIPUserAreaCode];
+	if ([[S6DomainField text] isEqual:@""])
+		[S7CheckUser setSetting:MGMSIPDefaultDomain forKey:MGMSIPAccountDomain];
+	else
+		[S7CheckUser setSetting:[S6DomainField text] forKey:MGMSIPAccountDomain];
+	if (![[S6RegistrarField text] isEqual:@""])
+		[S7CheckUser setSetting:[S6RegistrarField text] forKey:MGMSIPAccountRegistrar];
+	S7CheckSIPAccount = [[MGMSIPAccount alloc] initWithSettings:[S7CheckUser settings]];
+	[S7CheckSIPAccount setDelegate:self];
+	S7AccountRegistered = NO;
+	NSLog(@"Logging in");
+	[NSThread detachNewThreadSelector:@selector(login) toTarget:S7CheckSIPAccount withObject:nil];
+#endif
+}
+- (NSString *)password {
+	return [S7CheckUser password];
+}
+- (void)registrationChanged {
+#if MGMSIPENABLED
+	if (S7SIPRegistrationTimeout!=nil) {
+		[S7SIPRegistrationTimeout invalidate];
+		[S7SIPRegistrationTimeout release];
+		S7SIPRegistrationTimeout = nil;
+	}
+	if (S7CheckSIPAccount!=nil) {
+		if (![S7CheckSIPAccount isRegistered]) {
+			[S7CheckSIPAccount setLastError:@"Unable to Register with Server. Please check your credentials."];
+			[self loginErrored];
+			return;
+		}
+		[S7CheckSIPAccount setDelegate:nil];
+		[S7CheckSIPAccount logout];
+		[S7CheckSIPAccount release];
+		S7CheckSIPAccount = nil;
+	}
+	if (S7CheckUser!=nil) {
+		[accountsCreated addObject:S7CheckUser];
+		[S7CheckUser release];
+		S7CheckUser = nil;
+	}
+	[self S6Reset];
+	S7AccountRegistered = YES;
+	step = 9;
+	[self performSelectorOnMainThread:@selector(displayStep) withObject:nil waitUntilDone:NO];
+#endif
+}
+#if MGMSIPENABLED
+- (void)S7SIPTimeout {
+	if (S7SIPRegistrationTimeout!=nil) {
+		[S7SIPRegistrationTimeout invalidate];
+		[S7SIPRegistrationTimeout release];
+		S7SIPRegistrationTimeout = nil;
+	}
+	[S7CheckSIPAccount setLastError:@"Registration Timeout."];
+	[self loginErrored];
+}
+- (void)loggedIn {
+	[S7StatusField setText:MGMS7SIPWaiting];
+	[self performSelectorOnMainThread:@selector(S7StartRegistrationTimeoutTimer) withObject:nil waitUntilDone:NO];
+}
+- (void)S7StartRegistrationTimeoutTimer {
+	if (!S7AccountRegistered)
+		S7SIPRegistrationTimeout = [[NSTimer scheduledTimerWithTimeInterval:10.0 target:self selector:@selector(S7SIPTimeout) userInfo:nil repeats:NO] retain];
+}
+- (void)loginErrored {
+	if (S7CheckUser!=nil) {
+		[S7CheckUser remove];
+		[S7CheckUser release];
+		S7CheckUser = nil;
+	}
+	if (S7CheckSIPAccount!=nil) {
+		NSLog(@"Login Failed %@", [S7CheckSIPAccount lastError]);
+		S8Message = [[S7CheckSIPAccount lastError] copy];
+		[S7CheckSIPAccount setDelegate:nil];
+		[S7CheckSIPAccount logout];
+		[S7CheckSIPAccount release];
+		S7CheckSIPAccount = nil;
+	}
+	step = 8;
+	[self performSelectorOnMainThread:@selector(displayStep) withObject:nil waitUntilDone:NO];
+}
+#endif
+
+//Step 9
+- (IBAction)S9AddAnotherAccount:(id)sender {
+	goingBack = YES;
+	step = 2;
+	[self displayStep];
+}
+@end
--- a/Classes/VoiceMob/MGMController.m
+++ b/Classes/VoiceMob/MGMController.m
@ -7,7 +7,16 @@
 //

 #import "MGMController.h"
+#import "MGMAccountSetup.h"
+#import "MGMVMAddons.h"

@implementation MGMController
-
+- (void)awakeFromNib {
+	NSLog(@"Device is %@", ([[UIDevice currentDevice] isPad] ? @"iPad" : @"iPhone/iPod"));
+	MGMAccountSetup *accountSetup = [MGMAccountSetup new];
+	[accountSetup displayStep];
+	[[self view] addSubview:[accountSetup view]];
+	[mainWindow addSubview:[self view]];
+	[mainWindow makeKeyAndVisible];
+}
@end
--- a/Classes/VoiceMob/MGMSIPUser.h
+++ b/Classes/VoiceMob/MGMSIPUser.h
@ -0,0 +1,17 @@
+//
+//  MGMSIPUser.h
+//  VoiceMob
+//
+//  Created by Mr. Gecko on 9/24/10.
+//  Copyright (c) 2010 Mr. Gecko's Media (James Coleman). All rights reserved. http://mrgeckosmedia.com/
+//
+
+#import <UIKit/UIKit.h>
+
+extern NSString * const MGMSIPUserAreaCode;
+
+@interface MGMSIPUser : NSObject {
+
+}
+
+@end
--- a/Classes/VoiceMob/MGMSIPUser.m
+++ b/Classes/VoiceMob/MGMSIPUser.m
@ -0,0 +1,15 @@
+//
+//  MGMSIPUser.m
+//  VoiceMob
+//
+//  Created by Mr. Gecko on 9/24/10.
+//  Copyright (c) 2010 Mr. Gecko's Media (James Coleman). All rights reserved. http://mrgeckosmedia.com/
+//
+
+#import "MGMSIPUser.h"
+
+NSString * const MGMSIPUserAreaCode = @"MGMVSIPUserAreaCode";
+
+@implementation MGMSIPUser
+
+@end
--- a/Classes/VoiceMob/MGMVMAddons.h
+++ b/Classes/VoiceMob/MGMVMAddons.h
@ -0,0 +1,14 @@
+//
+//  MGMVMAddons.h
+//  VoiceMob
+//
+//  Created by Mr. Gecko on 9/24/10.
+//  Copyright (c) 2010 Mr. Gecko's Media (James Coleman). All rights reserved. http://mrgeckosmedia.com/
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIDevice (MGMVMAddons)
+- (BOOL)isPad;
+- (NSString *)appendDeviceSuffixToString:(NSString *)theString;
+@end
--- a/Classes/VoiceMob/MGMVMAddons.m
+++ b/Classes/VoiceMob/MGMVMAddons.m
@ -0,0 +1,23 @@
+//
+//  MGMVMAddons.m
+//  VoiceMob
+//
+//  Created by Mr. Gecko on 9/24/10.
+//  Copyright (c) 2010 Mr. Gecko's Media (James Coleman). All rights reserved. http://mrgeckosmedia.com/
+//
+
+#import "MGMVMAddons.h"
+
+@implementation UIDevice (MGMVMAddons)
+- (BOOL)isPad {
+	if ([self respondsToSelector:@selector(userInterfaceIdiom)])
+		return ([self userInterfaceIdiom]==UIUserInterfaceIdiomPad);
+	return NO;
+}
+- (NSString *)appendDeviceSuffixToString:(NSString *)theString {
+	if ([self isPad])
+		return [theString stringByAppendingString:@"_iPad"];
+	else
+		return [theString stringByAppendingString:@"_iPhone"];
+}
+@end
--- a/Libraries/lib/libMGMUsers.a
+++ b/Libraries/lib/libMGMUsers.a
--- a/Resources/VoiceMac/English.lproj/AccountSetup.xib
+++ b/Resources/VoiceMac/English.lproj/AccountSetup.xib
@ -21,7 +21,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1"/>
+			<integer value="72"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@ -1087,7 +1087,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<object class="NSTextFieldCell" key="NSCell" id="481025305">
 													<int key="NSCellFlags">67239424</int>
 													<int key="NSCellFlags2">272891904</int>
-													<string key="NSContents">You have sucessfully set up your ACCOUNTTYPE account. You may continue to the Application or you add another account by pressing "Add Another Account". If you are confused about VoiceMac, please read the documentation which explains how you use it and all you can do with it.</string>
+													<string key="NSContents">You have sucessfully set up your ACCOUNTTYPE account. You may continue to the Application or add another account by pressing "Add Another Account". If you are confused about VoiceMac, please read the documentation which explains all you can do with it.</string>
 													<reference key="NSSupport" ref="657871326"/>
 													<reference key="NSControlView" ref="346176237"/>
 													<reference key="NSBackgroundColor" ref="373911208"/>
@ -1483,7 +1483,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="382086081"/>
 						</object>
 						<reference key="parent" ref="949528223"/>
-						<string key="objectName">Set Up Error</string>
+						<string key="objectName">Setup Error</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">133</int>
@ -1516,7 +1516,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="449508199"/>
 						</object>
 						<reference key="parent" ref="949528223"/>
-						<string key="objectName">Set Up Successful</string>
+						<string key="objectName">Setup Successful</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">72</int>
@ -1633,7 +1633,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="959500869"/>
 						</object>
 						<reference key="parent" ref="949528223"/>
-						<string key="objectName">SIP Set Up</string>
+						<string key="objectName">SIP Setup</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">68</int>
@ -1816,7 +1816,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="556009103"/>
 						</object>
 						<reference key="parent" ref="949528223"/>
-						<string key="objectName">Google Contacts Set Up</string>
+						<string key="objectName">Google Contacts Setup</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">45</int>
@ -1909,7 +1909,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="967428825"/>
 						</object>
 						<reference key="parent" ref="949528223"/>
-						<string key="objectName">Google Voice Set Up</string>
+						<string key="objectName">Google Voice Setup</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">43</int>
@ -2222,9 +2222,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>{{260, 176}, {579, 410}}</string>
+					<string>{{334, 336}, {579, 410}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{260, 176}, {579, 410}}</string>
+					<string>{{334, 336}, {579, 410}}</string>
 					<boolean value="NO"/>
 					<string>{196, 240}</string>
 					<string>{{202, 428}, {480, 270}}</string>
@ -3351,7 +3351,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../../VoiceMac.xcodeproj</string>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../../../VoiceMac.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NS.key.0">VoiceMac Setup</string>
--- a/Resources/VoiceMac/English.lproj/NumberOptions.xib
+++ b/Resources/VoiceMac/English.lproj/NumberOptions.xib
--- a/Resources/VoiceMob/AccountSetup_iPhone.xib
+++ b/Resources/VoiceMob/AccountSetup_iPhone.xib
--- a/Resources/VoiceMob/Info.plist
+++ b/Resources/VoiceMob/Info.plist
@ -9,7 +9,9 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string></string>
+	<string>VoiceMob.png</string>
+	<key>UIPrerenderedIcon</key>
+	<true/>
 	<key>CFBundleIdentifier</key>
 	<string>com.MrGeckosMedia.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
--- a/Resources/VoiceMob/MainWindow_iPad.xib
+++ b/Resources/VoiceMob/MainWindow_iPad.xib
@ -12,6 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@ -47,10 +48,11 @@
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
 			<object class="IBUIWindow" id="380026005">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">1316</int>
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
 				<string key="NSFrameSize">{768, 1024}</string>
+				<reference key="NSSuperview"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@ -67,29 +69,21 @@
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="700386176"/>
-					</object>
-					<int key="connectionID">7</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">mainWindow</string>
 						<reference key="source" ref="700386176"/>
 						<reference key="destination" ref="380026005"/>
 					</object>
-					<int key="connectionID">8</int>
+					<int key="connectionID">10</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">rootViewController</string>
-						<reference key="source" ref="380026005"/>
+						<string key="label">delegate</string>
+						<reference key="source" ref="841351856"/>
 						<reference key="destination" ref="700386176"/>
 					</object>
-					<int key="connectionID">9</int>
+					<int key="connectionID">12</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@ -149,7 +143,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 						</object>
 					</object>
-					<string>{{341, 4}, {783, 752}}</string>
+					<string>{{75, 4}, {783, 752}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<integer value="1"/>
 					<string>MGMController</string>
@ -173,7 +167,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">9</int>
+			<int key="maxID">12</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
--- a/Resources/VoiceMob/MainWindow_iPhone.xib
+++ b/Resources/VoiceMob/MainWindow_iPhone.xib
@ -82,14 +82,6 @@
 					</object>
 					<int key="connectionID">8</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">rootViewController</string>
-						<reference key="source" ref="380026005"/>
-						<reference key="destination" ref="455002292"/>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
--- a/Resources/VoiceMob/Radio.ai
+++ b/Resources/VoiceMob/Radio.ai
--- a/Resources/VoiceMob/Radio.png
+++ b/Resources/VoiceMob/Radio.png
--- a/Resources/VoiceMob/RadioSelected.ai
+++ b/Resources/VoiceMob/RadioSelected.ai
--- a/Resources/VoiceMob/RadioSelected.png
+++ b/Resources/VoiceMob/RadioSelected.png
--- a/Resources/VoiceMob/VoiceMob
+++ b/Resources/VoiceMob/VoiceMob
--- a/Resources/VoiceMob/VoiceMob
+++ b/Resources/VoiceMob/VoiceMob
--- a/VoiceMac.xcodeproj/project.pbxproj
+++ b/VoiceMac.xcodeproj/project.pbxproj
@ -87,7 +87,6 @@
 		2A1174CE12456F2700D119B5 /* n7.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A11741D12456F2600D119B5 /* n7.png */; };
 		2A1174D012456F2700D119B5 /* n8.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A11741F12456F2600D119B5 /* n8.png */; };
 		2A1174D212456F2700D119B5 /* n9.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A11742112456F2600D119B5 /* n9.png */; };
-		2A1174D312456F2700D119B5 /* NumberOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A11742212456F2600D119B5 /* NumberOptions.xib */; };
 		2A1174D512456F2700D119B5 /* Accounts.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A11742512456F2600D119B5 /* Accounts.png */; };
 		2A1174D812456F2700D119B5 /* SIP.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A11742812456F2600D119B5 /* SIP.png */; };
 		2A1174DB12456F2700D119B5 /* SMSThemes.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A11742B12456F2600D119B5 /* SMSThemes.png */; };
@ -112,6 +111,7 @@
 		2A1176681245725C00D119B5 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A1176671245725B00D119B5 /* QuartzCore.framework */; };
 		2A117685124573D600D119B5 /* VoiceMac.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2A117684124573D600D119B5 /* VoiceMac.icns */; };
 		2A11770412458C8A00D119B5 /* blankicon.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A11770312458C8A00D119B5 /* blankicon.png */; };
+		2A1E9986124D69F300D3BEAE /* NumberOptions.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E9985124D69F300D3BEAE /* NumberOptions.xib */; };
 		2A91A3F61247D6B900013B43 /* AccountsPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A91A3F81247D6B900013B43 /* AccountsPane.xib */; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 /* End PBXBuildFile section */
@ -265,7 +265,7 @@
 		2A11741D12456F2600D119B5 /* n7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = n7.png; sourceTree = "<group>"; };
 		2A11741F12456F2600D119B5 /* n8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = n8.png; sourceTree = "<group>"; };
 		2A11742112456F2600D119B5 /* n9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = n9.png; sourceTree = "<group>"; };
-		2A11742212456F2600D119B5 /* NumberOptions.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NumberOptions.xib; sourceTree = "<group>"; };
+		2A11742212456F2600D119B5 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NumberOptions.xib; sourceTree = "<group>"; };
 		2A11742512456F2600D119B5 /* Accounts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Accounts.png; sourceTree = "<group>"; };
 		2A11742812456F2600D119B5 /* SIP.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = SIP.png; sourceTree = "<group>"; };
 		2A11742912456F2600D119B5 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/SIPPane.xib; sourceTree = "<group>"; };
@ -511,7 +511,7 @@
 				2A11740712456F2600D119B5 /* micVolume.png */,
 				2A03CC791247D46D00730F0C /* MultiSMS.xib */,
 				2A11740912456F2600D119B5 /* Number Pad */,
-				2A11742212456F2600D119B5 /* NumberOptions.xib */,
+				2A1E9985124D69F300D3BEAE /* NumberOptions.xib */,
 				2A11742312456F2600D119B5 /* Preferences */,
 				2A03CC7B1247D47400730F0C /* RecordedView.xib */,
 				2A03CC7D1247D47A00730F0C /* SIPCallWindow.xib */,
@ -712,7 +712,7 @@
 				2A1174CE12456F2700D119B5 /* n7.png in Resources */,
 				2A1174D012456F2700D119B5 /* n8.png in Resources */,
 				2A1174D212456F2700D119B5 /* n9.png in Resources */,
-				2A1174D312456F2700D119B5 /* NumberOptions.xib in Resources */,
+				2A1E9986124D69F300D3BEAE /* NumberOptions.xib in Resources */,
 				2A1174D512456F2700D119B5 /* Accounts.png in Resources */,
 				2A91A3F61247D6B900013B43 /* AccountsPane.xib in Resources */,
 				2A1174D812456F2700D119B5 /* SIP.png in Resources */,
@ -911,6 +911,14 @@
 			name = MainMenu.xib;
 			sourceTree = "<group>";
 		};
+		2A1E9985124D69F300D3BEAE /* NumberOptions.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				2A11742212456F2600D119B5 /* English */,
+			);
+			name = NumberOptions.xib;
+			sourceTree = "<group>";
+		};
 		2A91A3F81247D6B900013B43 /* AccountsPane.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
--- a/VoiceMob.png
+++ b/VoiceMob.png
--- a/VoiceMob.xcodeproj/project.pbxproj
+++ b/VoiceMob.xcodeproj/project.pbxproj
@ -15,6 +15,21 @@
 		2A1E97D9124D261E00D3BEAE /* MGMController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A1E97D8124D261E00D3BEAE /* MGMController.m */; };
 		2A1E9826124D2B3D00D3BEAE /* MainWindow_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E9825124D2B3D00D3BEAE /* MainWindow_iPhone.xib */; };
 		2A1E9838124D2B7200D3BEAE /* MainWindow_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E9837124D2B7200D3BEAE /* MainWindow_iPad.xib */; };
+		2A1E991F124D499800D3BEAE /* MGMVMAddons.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A1E991E124D499800D3BEAE /* MGMVMAddons.m */; };
+		2A1E993E124D4CC400D3BEAE /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A1E993D124D4CC400D3BEAE /* AddressBook.framework */; };
+		2A1E9944124D4CD100D3BEAE /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A1E9943124D4CD100D3BEAE /* libxml2.dylib */; };
+		2A1E9948124D4CEC00D3BEAE /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A1E9947124D4CEC00D3BEAE /* AVFoundation.framework */; };
+		2A1E996D124D4DD100D3BEAE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A1E996C124D4DD100D3BEAE /* Security.framework */; };
+		2A1E997C124D69DE00D3BEAE /* AccountSetup_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E997B124D69DE00D3BEAE /* AccountSetup_iPhone.xib */; };
+		2A1E99A2124D70A500D3BEAE /* Radio.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E99A0124D70A500D3BEAE /* Radio.png */; };
+		2A1E99A3124D70A500D3BEAE /* RadioSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E99A1124D70A500D3BEAE /* RadioSelected.png */; };
+		2A1E99A6124D77F900D3BEAE /* MGMAccountSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A1E99A5124D77F900D3BEAE /* MGMAccountSetup.m */; };
+		2A1E9A0F124D827B00D3BEAE /* VoiceMob Setup.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E9A0E124D827B00D3BEAE /* VoiceMob Setup.png */; };
+		2A1E9AEC124DA3CC00D3BEAE /* MGMSIPUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A1E9AEB124DA3CC00D3BEAE /* MGMSIPUser.m */; };
+		2A1E9B0F124DA4CB00D3BEAE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A1E9B0E124DA4CB00D3BEAE /* AudioToolbox.framework */; };
+		2A1E9B13124DA4D700D3BEAE /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A1E9B12124DA4D700D3BEAE /* CoreAudio.framework */; };
+		2A1E9B45124DA63C00D3BEAE /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A1E9B44124DA63C00D3BEAE /* CFNetwork.framework */; };
+		2A1E9BA6124DB1AE00D3BEAE /* VoiceMob.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A1E9BA5124DB1AE00D3BEAE /* VoiceMob.png */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@ -54,6 +69,24 @@
 		2A1E97D8124D261E00D3BEAE /* MGMController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGMController.m; sourceTree = "<group>"; };
 		2A1E9825124D2B3D00D3BEAE /* MainWindow_iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow_iPhone.xib; sourceTree = "<group>"; };
 		2A1E9837124D2B7200D3BEAE /* MainWindow_iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow_iPad.xib; sourceTree = "<group>"; };
+		2A1E991D124D499800D3BEAE /* MGMVMAddons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGMVMAddons.h; sourceTree = "<group>"; };
+		2A1E991E124D499800D3BEAE /* MGMVMAddons.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGMVMAddons.m; sourceTree = "<group>"; };
+		2A1E993D124D4CC400D3BEAE /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
+		2A1E9943124D4CD100D3BEAE /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
+		2A1E9947124D4CEC00D3BEAE /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		2A1E996C124D4DD100D3BEAE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		2A1E997B124D69DE00D3BEAE /* AccountSetup_iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountSetup_iPhone.xib; sourceTree = "<group>"; };
+		2A1E99A0124D70A500D3BEAE /* Radio.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Radio.png; sourceTree = "<group>"; };
+		2A1E99A1124D70A500D3BEAE /* RadioSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RadioSelected.png; sourceTree = "<group>"; };
+		2A1E99A4124D77F900D3BEAE /* MGMAccountSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGMAccountSetup.h; sourceTree = "<group>"; };
+		2A1E99A5124D77F900D3BEAE /* MGMAccountSetup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGMAccountSetup.m; sourceTree = "<group>"; };
+		2A1E9A0E124D827B00D3BEAE /* VoiceMob Setup.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "VoiceMob Setup.png"; sourceTree = "<group>"; };
+		2A1E9AEA124DA3CC00D3BEAE /* MGMSIPUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGMSIPUser.h; sourceTree = "<group>"; };
+		2A1E9AEB124DA3CC00D3BEAE /* MGMSIPUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGMSIPUser.m; sourceTree = "<group>"; };
+		2A1E9B0E124DA4CB00D3BEAE /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		2A1E9B12124DA4D700D3BEAE /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
+		2A1E9B44124DA63C00D3BEAE /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+		2A1E9BA5124DB1AE00D3BEAE /* VoiceMob.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VoiceMob.png; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@ -65,6 +98,13 @@
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
 				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
 				288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
+				2A1E993E124D4CC400D3BEAE /* AddressBook.framework in Frameworks */,
+				2A1E9944124D4CD100D3BEAE /* libxml2.dylib in Frameworks */,
+				2A1E9948124D4CEC00D3BEAE /* AVFoundation.framework in Frameworks */,
+				2A1E996D124D4DD100D3BEAE /* Security.framework in Frameworks */,
+				2A1E9B0F124DA4CB00D3BEAE /* AudioToolbox.framework in Frameworks */,
+				2A1E9B13124DA4D700D3BEAE /* CoreAudio.framework in Frameworks */,
+				2A1E9B45124DA63C00D3BEAE /* CFNetwork.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -107,6 +147,13 @@
 				1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
 				1D30AB110D05D00D00671497 /* Foundation.framework */,
 				288765FC0DF74451002DB57D /* CoreGraphics.framework */,
+				2A1E993D124D4CC400D3BEAE /* AddressBook.framework */,
+				2A1E9943124D4CD100D3BEAE /* libxml2.dylib */,
+				2A1E9947124D4CEC00D3BEAE /* AVFoundation.framework */,
+				2A1E996C124D4DD100D3BEAE /* Security.framework */,
+				2A1E9B0E124DA4CB00D3BEAE /* AudioToolbox.framework */,
+				2A1E9B44124DA63C00D3BEAE /* CFNetwork.framework */,
+				2A1E9B12124DA4D700D3BEAE /* CoreAudio.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@ -114,8 +161,14 @@
 		2A1E97BC124D22A900D3BEAE /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				2A1E991D124D499800D3BEAE /* MGMVMAddons.h */,
+				2A1E991E124D499800D3BEAE /* MGMVMAddons.m */,
 				2A1E97D7124D261E00D3BEAE /* MGMController.h */,
 				2A1E97D8124D261E00D3BEAE /* MGMController.m */,
+				2A1E99A4124D77F900D3BEAE /* MGMAccountSetup.h */,
+				2A1E99A5124D77F900D3BEAE /* MGMAccountSetup.m */,
+				2A1E9AEA124DA3CC00D3BEAE /* MGMSIPUser.h */,
+				2A1E9AEB124DA3CC00D3BEAE /* MGMSIPUser.m */,
 			);
 			name = Classes;
 			path = Classes/VoiceMob;
@ -124,9 +177,14 @@
 		2A1E97C0124D22DA00D3BEAE /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				2A1E9BA5124DB1AE00D3BEAE /* VoiceMob.png */,
+				2A1E9A0E124D827B00D3BEAE /* VoiceMob Setup.png */,
 				2A1E97C1124D22DA00D3BEAE /* Info.plist */,
 				2A1E9825124D2B3D00D3BEAE /* MainWindow_iPhone.xib */,
 				2A1E9837124D2B7200D3BEAE /* MainWindow_iPad.xib */,
+				2A1E997B124D69DE00D3BEAE /* AccountSetup_iPhone.xib */,
+				2A1E99A0124D70A500D3BEAE /* Radio.png */,
+				2A1E99A1124D70A500D3BEAE /* RadioSelected.png */,
 			);
 			name = Resources;
 			path = Resources/VoiceMob;
@ -209,6 +267,11 @@
 			files = (
 				2A1E9826124D2B3D00D3BEAE /* MainWindow_iPhone.xib in Resources */,
 				2A1E9838124D2B7200D3BEAE /* MainWindow_iPad.xib in Resources */,
+				2A1E997C124D69DE00D3BEAE /* AccountSetup_iPhone.xib in Resources */,
+				2A1E99A2124D70A500D3BEAE /* Radio.png in Resources */,
+				2A1E99A3124D70A500D3BEAE /* RadioSelected.png in Resources */,
+				2A1E9A0F124D827B00D3BEAE /* VoiceMob Setup.png in Resources */,
+				2A1E9BA6124DB1AE00D3BEAE /* VoiceMob.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -221,6 +284,9 @@
 			files = (
 				2A1E97BF124D22A900D3BEAE /* main.m in Sources */,
 				2A1E97D9124D261E00D3BEAE /* MGMController.m in Sources */,
+				2A1E991F124D499800D3BEAE /* MGMVMAddons.m in Sources */,
+				2A1E99A6124D77F900D3BEAE /* MGMAccountSetup.m in Sources */,
+				2A1E9AEC124DA3CC00D3BEAE /* MGMSIPUser.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -245,6 +311,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Classes/VoiceMob/VoiceMob_Prefix.pch;
 				INFOPLIST_FILE = Resources/VoiceMob/Info.plist;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/Libraries/lib\"",
+				);
 				PRODUCT_NAME = VoiceMob;
 			};
 			name = Debug;
@ -257,11 +327,105 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = VoiceMob_Prefix.pch;
 				INFOPLIST_FILE = "VoiceMob-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/Libraries/lib\"",
+				);
 				PRODUCT_NAME = VoiceMob;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
 		};
+		2A1E9928124D4C3000D3BEAE /* Debug SIP */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/usr/include/libxml2,
+					"\"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/usr/local/include\"",
+					"\"$(SRCROOT)/Libraries/include\"",
+					"\"$(SRCROOT)/SIP/opt/include\"",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
+				OTHER_CFLAGS = (
+					"-fblocks",
+					"-DMGMSIPENABLED=1",
+				);
+				OTHER_LDFLAGS = "-all_load";
+				PREBINDING = NO;
+				SDKROOT = iphoneos4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = "Debug SIP";
+		};
+		2A1E9929124D4C3000D3BEAE /* Debug SIP */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = Classes/VoiceMob/VoiceMob_Prefix.pch;
+				INFOPLIST_FILE = Resources/VoiceMob/Info.plist;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/Libraries/lib\"",
+				);
+				PRODUCT_NAME = VoiceMob;
+			};
+			name = "Debug SIP";
+		};
+		2A1E992A124D4C3600D3BEAE /* Release SIP */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/usr/include/libxml2,
+					"\"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/usr/local/include\"",
+					"\"$(SRCROOT)/Libraries/include\"",
+					"\"$(SRCROOT)/SIP/opt/include\"",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
+				OTHER_CFLAGS = (
+					"-DNS_BLOCK_ASSERTIONS=1",
+					"-fblocks",
+					"-DMGMSIPENABLED=1",
+				);
+				OTHER_LDFLAGS = "-all_load";
+				PREBINDING = NO;
+				SDKROOT = iphoneos4.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = "Release SIP";
+		};
+		2A1E992B124D4C3600D3BEAE /* Release SIP */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = VoiceMob_Prefix.pch;
+				INFOPLIST_FILE = "VoiceMob-Info.plist";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/Libraries/lib\"",
+				);
+				PRODUCT_NAME = VoiceMob;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = "Release SIP";
+		};
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@ -272,11 +436,13 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
+					/usr/include/libxml2,
 					"\"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/usr/local/include\"",
 					"\"$(SRCROOT)/Libraries/include\"",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 3.1;
 				OTHER_CFLAGS = "-fblocks";
+				OTHER_LDFLAGS = "-all_load";
 				PREBINDING = NO;
 				SDKROOT = iphoneos4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@ -293,6 +459,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
+					/usr/include/libxml2,
 					"\"$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/usr/local/include\"",
 					"\"$(SRCROOT)/Libraries/include\"",
 				);
@ -301,6 +468,7 @@
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-fblocks",
 				);
+				OTHER_LDFLAGS = "-all_load";
 				PREBINDING = NO;
 				SDKROOT = iphoneos4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@ -314,7 +482,9 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1D6058940D05DD3E006BFB54 /* Debug */,
+				2A1E9929124D4C3000D3BEAE /* Debug SIP */,
 				1D6058950D05DD3E006BFB54 /* Release */,
+				2A1E992B124D4C3600D3BEAE /* Release SIP */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@ -323,7 +493,9 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
+				2A1E9928124D4C3000D3BEAE /* Debug SIP */,
 				C01FCF5008A954540054247B /* Release */,
+				2A1E992A124D4C3600D3BEAE /* Release SIP */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;