From a677717aa3aa795a029526f53e99d2de51eed44f Mon Sep 17 00:00:00 2001
From: Alain Magloire
Date: Fri, 28 May 2004 17:10:18 +0000
Subject: 	Reverse part of a patch from TF concerning 	memory images.
 We need to look at this closer. 	For now it seem to break some icons.

	* src/org/eclipse/cdt/internal/ui/CPluginImages.java
---
 core/org.eclipse.cdt.ui/ChangeLog                  |  8 ++++++++
 .../org/eclipse/cdt/internal/ui/CPluginImages.java | 23 +++++++++++-----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index d6ec8302bb0..962c238d4f4 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-27 Alain Magloire
+
+	Reverse part of a patch from TF concerning
+	memory images. We need to look at this closer.
+	For now it seem to break some icons.
+
+	* src/org/eclipse/cdt/internal/ui/CPluginImages.java
+
 2004-05-27 Alain Magloire
 
 	Patch from Thomas Fletcher
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
index c78866ec9d7..afe436a9895 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
@@ -262,18 +262,19 @@ public class CPluginImages {
 	 * Sets all available image descriptors for the given action.
 	 */	
 	public static void setImageDescriptors(IAction action, String type, String relPath) {
-//Use the managed version so that we ensure that there is no resource handle leaks
-//Let the widget itself manage the disabled/hover attribution.  This was a huge leak
-//		relPath= relPath.substring(NAME_PREFIX_LENGTH);
-//		action.setDisabledImageDescriptor(create(T + "d" + type, relPath)); //$NON-NLS-1$
-//		action.setHoverImageDescriptor(create(T + "c" + type, relPath)); //$NON-NLS-1$
-//		action.setImageDescriptor(create(T + "e" + type, relPath)); //$NON-NLS-1$
+		relPath= relPath.substring(NAME_PREFIX_LENGTH);
+		action.setDisabledImageDescriptor(create(T + "d" + type, relPath)); //$NON-NLS-1$
+		action.setHoverImageDescriptor(create(T + "c" + type, relPath)); //$NON-NLS-1$
+		action.setImageDescriptor(create(T + "e" + type, relPath)); //$NON-NLS-1$
 
-		ImageDescriptor desc = getImageRegistry().getDescriptor(relPath);
-		if(desc == null) {
-			desc = createManaged(T + "c" + type, relPath);
-		}	
-		action.setImageDescriptor(desc);
+		// We are still not sure about this, let see TF results first.
+		//		Use the managed version so that we ensure that there is no resource handle leaks
+		//		Let the widget itself manage the disabled/hover attribution.  This was a huge leak
+		//ImageDescriptor desc = getImageRegistry().getDescriptor(relPath);
+		//if(desc == null) {
+		//	desc = createManaged(T + "c" + type, relPath);
+		//}	
+		//action.setImageDescriptor(desc);
 	}
 	
 	/**
-- 
cgit v1.2.3