diff -r 0cfa8e449823 -r aa833f2c99b6 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Tue Jul 27 14:59:12 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Tue Jul 27 15:03:22 2010 -0500
@@ -23,8 +23,6 @@
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -57,7 +55,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
@@ -68,7 +65,6 @@
 import org.eclipse.ui.PlatformUI;
 
 import com.nokia.carbide.cpp.internal.api.sdk.SymbianBuildContextDataCache;
-import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManager;
 import com.nokia.carbide.cpp.internal.sdk.core.model.SymbianSDK;
 import com.nokia.carbide.cpp.sdk.core.ISDKManager;
 import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
@@ -229,26 +225,8 @@
 		}
 	}
 
-	private class ScanJobListener implements IJobChangeListener {
-		public void done(IJobChangeEvent event) {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					finishRescanning();
-				}
-			});
-		}
-
-		public void aboutToRun(IJobChangeEvent event) {}
-		public void awake(IJobChangeEvent event) {}
-		public void running(IJobChangeEvent event) {}
-		public void scheduled(IJobChangeEvent event) {}
-		public void sleeping(IJobChangeEvent event) {}
-		
-	}
-
 	private ISDKManager sdkMgr;
 	private List<ISymbianSDK> sdkList;
-	private ScanJobListener scanJobListner;
 	private CheckboxTableViewer sdkListTableViewer;
 	private Button addButton;
 	private Button deleteButton;
@@ -267,7 +245,6 @@
 	 */
 	public SDKPreferencePage() {
 		super();
-//		scanJobListner = new ScanJobListener();
 	}
 
 	/*
@@ -280,10 +257,6 @@
 			return; 
 		}
 		sdkList = sdkMgr.getSDKList();
-		if (sdkMgr instanceof SDKManager) {
-			SDKManager mgr = (SDKManager) sdkMgr;
-//			mgr.addScanJobListner(scanJobListner);
-		}
 
 		super.createControl(parent);
 
@@ -295,17 +268,6 @@
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.DialogPage#dispose()
-	 */
-	public void dispose() {
-		if (sdkMgr != null && sdkMgr instanceof SDKManager){
-			SDKManager mgr = (SDKManager) sdkMgr;
-			mgr.removeScanJobLisner(scanJobListner);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
 	public void init(IWorkbench arg0) {