From e41d8f064782e4fccf8079679e07e3433631cd2a Mon Sep 17 00:00:00 2001
From: "attinasi%netscape.com"
 <attinasi%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 20 Nov 2001 22:21:14 +0000
Subject: [PATCH] Moving loading and broken image icons to /res for embedding.
 b=110384 r=adamlock,sfraser sr=sfraser,waterson

git-svn-id: svn://10.0.0.236/trunk@108627 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsImageFrame.cpp       |  4 ++--
 mozilla/layout/html/base/src/Makefile.in      | 13 +++++++++----
 mozilla/layout/html/base/src/makefile.win     |  4 ++--
 mozilla/layout/html/base/src/nsImageFrame.cpp |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp
index 7d8b78be3f1..0dd3ec1e23a 100644
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@@ -2036,8 +2036,8 @@ nsImageFrame::CanLoadImage(nsIURI *aURI)
 
 nsresult nsImageFrame::LoadIcons(nsIPresContext *aPresContext)
 {
-  nsAutoString loadingSrc(NS_LITERAL_STRING("resource:/res/html/loading-image.gif")); 
-  nsAutoString brokenSrc(NS_LITERAL_STRING("resource:/res/html/broken-image.gif")); 
+  NS_NAMED_LITERAL_STRING(loadingSrc,"resource:/res/loading-image.gif"); 
+  NS_NAMED_LITERAL_STRING(brokenSrc,"resource:/res/broken-image.gif");
 
   nsresult rv = NS_OK;
   PRBool doLoad = PR_FALSE;  // only load icons once...
diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in
index 7fd73ed083d..0aa674c13f3 100644
--- a/mozilla/layout/html/base/src/Makefile.in
+++ b/mozilla/layout/html/base/src/Makefile.in
@@ -121,9 +121,7 @@ endif
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-RESOURCES =					\
-		$(srcdir)/broken-image.gif	\
-		$(srcdir)/loading-image.gif	\
+RESOURCES_HTML =					\
 		$(srcdir)/gopher-audio.gif	\
 		$(srcdir)/gopher-binary.gif	\
 		$(srcdir)/gopher-find.gif	\
@@ -135,6 +133,12 @@ RESOURCES =					\
 		$(srcdir)/gopher-unknown.gif	\
 		$(NULL)
 
+RESOURCES =					\
+		$(srcdir)/broken-image.gif	\
+		$(srcdir)/loading-image.gif \
+		$(NULL)
+
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -152,5 +156,6 @@ INCLUDES	+= \
 		$(NULL)
 
 install::
-	$(INSTALL) $(RESOURCES) $(DIST)/bin/res/html
+	$(INSTALL) $(RESOURCES_HTML) $(DIST)/bin/res/html
+	$(INSTALL) $(RESOURCES) $(DIST)/bin/res
 
diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win
index 92604213c46..6a47ccaacee 100644
--- a/mozilla/layout/html/base/src/makefile.win
+++ b/mozilla/layout/html/base/src/makefile.win
@@ -133,8 +133,8 @@ install:: $(LIBRARY)
 	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
 
 install::
-	$(MAKE_INSTALL) broken-image.gif $(DIST)\bin\res\html
-	$(MAKE_INSTALL) loading-image.gif $(DIST)\bin\res\html
+	$(MAKE_INSTALL) broken-image.gif $(DIST)\bin\res
+	$(MAKE_INSTALL) loading-image.gif $(DIST)\bin\res
 	$(MAKE_INSTALL) gopher-audio.gif $(DIST)\bin\res\html
 	$(MAKE_INSTALL) gopher-binary.gif $(DIST)\bin\res\html
 	$(MAKE_INSTALL) gopher-find.gif $(DIST)\bin\res\html
diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp
index 7d8b78be3f1..0dd3ec1e23a 100644
--- a/mozilla/layout/html/base/src/nsImageFrame.cpp
+++ b/mozilla/layout/html/base/src/nsImageFrame.cpp
@@ -2036,8 +2036,8 @@ nsImageFrame::CanLoadImage(nsIURI *aURI)
 
 nsresult nsImageFrame::LoadIcons(nsIPresContext *aPresContext)
 {
-  nsAutoString loadingSrc(NS_LITERAL_STRING("resource:/res/html/loading-image.gif")); 
-  nsAutoString brokenSrc(NS_LITERAL_STRING("resource:/res/html/broken-image.gif")); 
+  NS_NAMED_LITERAL_STRING(loadingSrc,"resource:/res/loading-image.gif"); 
+  NS_NAMED_LITERAL_STRING(brokenSrc,"resource:/res/broken-image.gif");
 
   nsresult rv = NS_OK;
   PRBool doLoad = PR_FALSE;  // only load icons once...