adium-1.4 3493:355bff287503: When running a Release-Debug build,...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/355bff287503
revision:	3493:355bff287503
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Sat May 21 14:04:32 2011 +0200

When running a Release-Debug build, store the profile used correctly as the normal profile instead of the debug profile.

Refs #14432

diffs (33 lines):

diff -r 6f27a7d2fdc5 -r 355bff287503 Frameworks/Adium Framework/Source/AILoginControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AILoginControllerProtocol.h	Sat May 21 12:49:49 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AILoginControllerProtocol.h	Sat May 21 14:04:32 2011 +0200
@@ -12,7 +12,7 @@
 #define LOGIN_SHOW_WINDOW 			@"Show Login Window"	//Should hide the login window 
 
 #define LOGIN_LAST_USER				@"Last Login Name"		//Last logged in user
-#ifdef DEBUG_BUILD
+#if defined (DEBUG_BUILD) && ! defined (RELEASE_BUILD)
 #	define LOGIN_LAST_USER_DEBUG	@"Last Login Name-Debug"//Last logged in user - debug
 #endif
 
diff -r 6f27a7d2fdc5 -r 355bff287503 Source/AILoginWindowController.m
--- a/Source/AILoginWindowController.m	Sat May 21 12:49:49 2011 +0200
+++ b/Source/AILoginWindowController.m	Sat May 21 14:04:32 2011 +0200
@@ -115,7 +115,7 @@
     [loginDict setObject:[NSNumber numberWithBool:[checkbox_displayOnStartup state]] forKey:LOGIN_SHOW_WINDOW];
 
     //Save the login they used
-#ifdef DEBUG_BUILD
+#if defined (DEBUG_BUILD) && ! defined (RELEASE_BUILD)
     [loginDict setObject:selectedUserName forKey:LOGIN_LAST_USER_DEBUG];
 #else
     [loginDict setObject:selectedUserName forKey:LOGIN_LAST_USER];
@@ -253,7 +253,7 @@
 #endif
 
     //Select the login they used last
-#if DEBUG_BUILD
+#if defined (DEBUG_BUILD) && ! defined (RELEASE_BUILD)
 	lastLogin = [loginDict objectForKey:LOGIN_LAST_USER_DEBUG];
 #else
     lastLogin = [loginDict objectForKey:LOGIN_LAST_USER];