# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1250018553 18000
# Node ID 393919dade6d76ba045bac9bb4acfe9b14fd7522
# Parent  410577fa5534fc3273379ec88e5159bacca458f2# Parent  2bdd901b072d8eb20d575dd9449ddc6c78df4f05
daily merge

diff -r 410577fa5534 -r 393919dade6d connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java	Tue Aug 11 14:21:42 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java	Tue Aug 11 14:22:33 2009 -0500
@@ -26,6 +26,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Display;
 
 import java.lang.reflect.InvocationTargetException;
@@ -178,7 +179,7 @@
 			return;
 			
 		final TestResult result[] = { null };
-		if (runnableContext != null) {
+		if (runnableContext != null && (!(runnableContext instanceof WizardDialog) || ((WizardDialog) runnableContext).getShell() != null)) {
 			Display.getDefault().syncExec(new Runnable() {
 				public void run() {
 					try {
diff -r 410577fa5534 -r 393919dade6d core/com.nokia.carbide.cpp/plugin.properties
--- a/core/com.nokia.carbide.cpp/plugin.properties	Tue Aug 11 14:21:42 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.properties	Tue Aug 11 14:22:33 2009 -0500
@@ -6,7 +6,8 @@
 CHEAT_SHEETS = Cheat Sheets
 CHEAT_SHEETS_MENU = &Cheat Sheets...
 
-productBlurb=Build {0} {1}\n\
+productBlurb=\nCarbide.c++ Version 2.2.0\n\
+Build {0} {1}\n\n\n\n\n\n\n\
 Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
 Visit http://www.forum.nokia.com/\n\
 This product includes software developed by Eclipse Project.\n\
diff -r 410577fa5534 -r 393919dade6d core/com.nokia.carbide.cpp/plugin.xml
--- a/core/com.nokia.carbide.cpp/plugin.xml	Tue Aug 11 14:21:42 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Tue Aug 11 14:22:33 2009 -0500
@@ -17,10 +17,7 @@
 			value="icons/Carbide_c_icon_16x16.png,icons/Carbide_c_icon_32x32.png,icons/Carbide_c_icon_48x48.png"/> 
 		<property 
 			name="aboutImage" 
-			value="icons/about.png"/> 
-		<property 
-			name="aboutTextImage" 
-			value="icons/aboutTextImage.png"/>       
+			value="icons/about.png"/>   
 		<property 
 			name="aboutText" 
 			value="%productBlurb"/> 
@@ -28,9 +25,6 @@
 			name="appName" 
 			value="Carbide.c++"/>
 		<property 
-			name="versionText" 
-			value="Version 2.2.0"/>
-		<property 
 			name="preferenceCustomization" 
 			value="plugin_customization.ini"/>
 		<property
diff -r 410577fa5534 -r 393919dade6d core/com.nokia.carbide.cpp/plugin_customization.ini
--- a/core/com.nokia.carbide.cpp/plugin_customization.ini	Tue Aug 11 14:21:42 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin_customization.ini	Tue Aug 11 14:22:33 2009 -0500
@@ -69,7 +69,7 @@
 org.eclipse.cdt.ui/semanticHighlighting.problem.color=100,100,100
 
 # this is a copy of whitesmiths code style with tab length changed from 8 to 4 (bug #3368)
-org.eclipse.cdt.ui/formatter_profile=_Symbian OS
+org.eclipse.cdt.ui/formatter_profile=Symbian OS
 org.eclipse.cdt.ui/org.eclipse.cdt.ui.formatterprofiles=<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r\n<profiles version="1">\r\n<profile kind="CodeFormatterProfile" name="Symbian OS" version="1">\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.lineSplit" value="80"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer" value="48"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_enumerator_list" value="48"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_declarator_list" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_empty_lines" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_method_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_type_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation" value="2"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expression_list" value="0"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_binary_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_conditional_expression" value="80"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_compact_if" value="0"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_binary_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration" value="80"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_body" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_block" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.char" value="mixed"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block_in_case" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.compact_else_if" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_switch" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indentation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_array_initializer" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments" value="do not insert"/>\r\n</profile>\r\n<profile kind="CodeFormatterProfile" name="S60" version="1">\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.lineSplit" value="78"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer" value="48"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_enumerator_list" value="48"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_declarator_list" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_empty_lines" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_method_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_type_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation" value="2"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expression_list" value="0"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_binary_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_conditional_expression" value="78"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_compact_if" value="0"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_binary_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration" value="80"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_body" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_block" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.char" value="space"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block_in_case" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.compact_else_if" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_switch" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indentation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_array_initializer" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments" value="do not insert"/>\r\n</profile>\r\n</profiles>\r\n
 
 # apply code formatting to C/C++ templates
diff -r 410577fa5534 -r 393919dade6d debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/AttachLaunchDelegate.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/AttachLaunchDelegate.java	Tue Aug 11 14:21:42 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/AttachLaunchDelegate.java	Tue Aug 11 14:22:33 2009 -0500
@@ -133,7 +133,7 @@
 								String defaultProcessName = exeFile.getPath().removeFileExtension().lastSegment();
 								OSProcess attachTarget = null;
 								String choosenProcessTarget = config.getAttribute(SettingsData.AttachToProcessDialog_Selection, "");
-								if (!choosenProcessTarget.contentEquals("")) {
+								if (choosenProcessTarget.length() > 0) {
 									attachTarget = chooseProcessTargetNoUI(processesOnTarget, choosenProcessTarget);
 								} else {
 									attachTarget = chooseProcessTarget(processesOnTarget, defaultProcessName);									
@@ -206,7 +206,7 @@
 		attachTarget = null;
 
 		for (OSProcess process : processesOnTarget) {
-			if (process.getName().contains(choosenProcessName)) {
+			if (process.parseProcess().getProcessName().equals(choosenProcessName)) {
 				attachTarget = process;	
 				break;
 			}
diff -r 410577fa5534 -r 393919dade6d project/com.nokia.carbide.cpp.project.core/src/com/nokia/carbide/cpp/internal/project/core/updater/UpdateTrigger.java
--- a/project/com.nokia.carbide.cpp.project.core/src/com/nokia/carbide/cpp/internal/project/core/updater/UpdateTrigger.java	Tue Aug 11 14:21:42 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.core/src/com/nokia/carbide/cpp/internal/project/core/updater/UpdateTrigger.java	Tue Aug 11 14:22:33 2009 -0500
@@ -34,24 +34,6 @@
 	// use the version of Carbide updating to as the trigger property
 	private static final String TRIGGER_PROPERTY = "1.2.0"; //$NON-NLS-1$
 	private static final String SYMBIAN_PERSPECTIVE_ID = "com.symbian.cdt.SymbianPerspective"; //$NON-NLS-1$
-	private static final String PROBLEM_VIEW_ID = "org.eclipse.ui.views.ProblemView"; //$NON-NLS-1$
-
-	private void resetProblemView() {
-		// Evidently, hiding and then reshowing the ProblemView seems to fix up the columns
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-			IViewPart part = page.findView(PROBLEM_VIEW_ID);
-			if (part != null) {
-				page.hideView(part);
-				
-				try {
-					page.showView(PROBLEM_VIEW_ID);
-				} catch (PartInitException e) {
-				}
-			}
-		}
-	}
 
 	@Override
 	protected String getLocalKey() {
@@ -89,7 +71,6 @@
 						break;
 					}
 				}
-				resetProblemView();
 			}
 		});
 	}
diff -r 410577fa5534 -r 393919dade6d templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/src/Basename.cpp
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/src/Basename.cpp	Tue Aug 11 14:21:42 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/src/Basename.cpp	Tue Aug 11 14:22:33 2009 -0500
@@ -63,7 +63,10 @@
 	// Create output console
 	TRAPD(createError, console = Console::NewL(KTextConsoleTitle, TSize(KConsFullScreen,KConsFullScreen)));
 	if (createError)
+		{
+		delete cleanup;
 		return createError;
+		}
 
 	// Run application code inside TRAP harness, wait keypress when terminated
 	TRAPD(mainError, DoStartL());