Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2011-10-17 16:42:10 +0000
committerJeff Johnston2011-10-17 16:51:14 +0000
commit0de31589c9c85cebfed0bff2a2b89a15d1106838 (patch)
tree73847075005ea02b730d5ba133b78f03f1f416de /valgrind/org.eclipse.linuxtools.valgrind.core
parentbd69fd9ebd4ec1b31ee8cfec15b00103cc77fd14 (diff)
downloadorg.eclipse.linuxtools-0de31589c9c85cebfed0bff2a2b89a15d1106838.tar.gz
org.eclipse.linuxtools-0de31589c9c85cebfed0bff2a2b89a15d1106838.tar.xz
org.eclipse.linuxtools-0de31589c9c85cebfed0bff2a2b89a15d1106838.zip
Apply patch for bug 360950.
* src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java (initializeDefaultPreferences): Add future support for Windows.
Diffstat (limited to 'valgrind/org.eclipse.linuxtools.valgrind.core')
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog8
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java5
2 files changed, 11 insertions, 2 deletions
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
index e5826b5b9b..3fea22a257 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-17 Jeff Johnston <jjohnstn@redhat.com>
+
+ Bug #360950
+ * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java (initializeDefaultPreferences): Add
+ future support for Windows.
+
2011-10-07 Roland Grunberg <rgrunber@redhat.com>
* src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCoreParser.java
@@ -132,4 +138,4 @@
2009-01-05 Elliott Baron <ebaron@redhat.com>
* META-INF/MANIFEST.MF: Changed version to 0.1.0.
- * build.properties: Include about.html. \ No newline at end of file
+ * build.properties: Include about.html.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java
index d722890113..e9b5b79c8c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java
@@ -63,7 +63,10 @@ public class ValgrindPlugin extends AbstractUIPlugin {
ValgrindCommand valCommand = new ValgrindCommand();
try {
store.setDefault(ValgrindPreferencePage.VALGRIND_ENABLE, true);
- store.setDefault(ValgrindPreferencePage.VALGRIND_PATH, valCommand.whichValgrind());
+ if(System.getProperty("os.name").toLowerCase().startsWith("windows")) //$NON-NLS-1$ //$NON-NLS-2$
+ store.setDefault(ValgrindPreferencePage.VALGRIND_PATH, "");
+ else
+ store.setDefault(ValgrindPreferencePage.VALGRIND_PATH, valCommand.whichValgrind());
} catch (IOException e) {
// No Valgrind installed, make disabled by default
store.setDefault(ValgrindPreferencePage.VALGRIND_ENABLE, false);

Back to the top