From a7d6556d98a9be3ba3ddbc090fad039ef8df23da Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Tue, 26 Jul 2005 21:05:45 +0000
Subject: [PATCH] Bug 105224: Two identical directory source container types.

---
 debug/org.eclipse.cdt.debug.core/ChangeLog        |   4 ++++
 .../org.eclipse.cdt.debug.core/plugin.properties  |   4 ++--
 debug/org.eclipse.cdt.debug.ui/ChangeLog          |   5 +++++
 .../icons/obj16/directory_obj.gif                 | Bin 0 -> 162 bytes
 debug/org.eclipse.cdt.debug.ui/plugin.xml         |   2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 debug/org.eclipse.cdt.debug.ui/icons/obj16/directory_obj.gif

diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 3a4f97e6711..6678fa1f262 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-26 Mikhail Khodjaiants
+	Bug 105224: Two identical directory source container types.
+	* plugin.properties
+
 2005-07-26 Mikhail Khodjaiants
 	Bug 102929: Race conditions when setting breakpoints at launch.
 	The initial breakpoint settings, stop in main and resume are batched 
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.properties b/debug/org.eclipse.cdt.debug.core/plugin.properties
index 1b1ca22e57c..20b9d5e4e4f 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.core/plugin.properties
@@ -22,5 +22,5 @@ containerName.mapping=Path Mapping
 containerDescription.mapping=A path mapping.
 containerName.mapEntry=Path Map Entry
 containerDescription.mapEntry=An entry in a path mapping.
-containerName.directory=Directory
-containerDescription.directory=A directory in the local file system
+containerName.directory=File System Directory With Subfolders
+containerDescription.directory=A directory in the local file system with the subfolders search option.
diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 9996daf7acf..9161d04362b 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26 Mikhail Khodjaiants
+	Bug 105224: Two identical directory source container types.
+	+ icons\obj16\directory_obj.gif
+	* plugin.xml
+
 2005-07-25 Alain Magloire
 	Part fix for PR 100992: The signature was incorrect for structure/unions.
 	
diff --git a/debug/org.eclipse.cdt.debug.ui/icons/obj16/directory_obj.gif b/debug/org.eclipse.cdt.debug.ui/icons/obj16/directory_obj.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7937f33e027dc905b4189b7c6452a69f7f4de903
GIT binary patch
literal 162
zcmZ?wbhEHb6krfw_{_lY9|(SbShY&4sHo`5s?hpStyQ5~PoF-$va0^d6(Cx*s$T0#
zy%qxuDE?$&1hI8M1jr0#7JmT-x0!n)^!9vC?V8l%;acdvYTaD1eH)SrJ|x|@*wAxQ
zXus{<jN{sDjBWEa-p~@5?${)fxgu(9bEAU7hXgjM+25Jus!s(qNlv(0bbWd>3xhQP
D^Kn5!

literal 0
HcmV?d00001

diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 661e9084d30..f097d86e4ab 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1238,7 +1238,7 @@
       <sourceContainerPresentation
             browserClass="org.eclipse.cdt.debug.internal.ui.sourcelookup.CDirectorySourceContainerBrowser"
             containerTypeID="org.eclipse.cdt.debug.core.containerType.directory"
-            icon="icons/obj16/folder_obj.gif"
+            icon="icons/obj16/directory_obj.gif"
             id="org.eclipse.cdt.debug.ui.containerPresentation.directory"/>
    </extension>
    <extension