# HG changeset patch
# User wpaul
# Date 1245092895 18000
# Node ID 87e439e53c322fd96d66e0cea98506189b035fc2
# Parent  83c1dc10c0473dd974e42d2c675334d903a14b43# Parent  ecdc976d1827fef0a3b2952e3d5b2c53715ae64c
merged

diff -r ecdc976d1827 -r 87e439e53c32 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Mon Jun 15 08:24:11 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Mon Jun 15 14:08:15 2009 -0500
@@ -720,8 +720,16 @@
 
 		if (settingsGroup.equals(LaunchConfig_AppTRK)) {
 			setInstallationTab(configuration, project);
+
+			// set this so it's there in the config and the apply button doesn't become
+			// enabled when switching to the tab
+			configuration.setAttribute( PreferenceConstants.J_PN_FilesToTransfer, "" ); //$NON-NLS-1$
 		}
 		
+		if (settingsGroup.equals(LaunchConfig_SysTRK)) {
+			setFileTransferTab(configuration, project);
+		}
+
 		if (settingsGroup.equals(LaunchConfig_Trace32) ||
 				settingsGroup.equals(LaunchConfig_SophiaSTI))
 		{
@@ -733,7 +741,6 @@
 		if (settingsGroup.equals(LaunchConfig_AppTRK) || settingsGroup.equals(LaunchConfig_SysTRK)) {
 			setTrkMainTab(configuration, project);
 			setTrkDebuggerTab(configuration, project);
-			setFileTransferTab(configuration, project);
 			
 			// TRK Debugging: specify TRK protocol plugin.
 			//