From 4f5cca035b3a3ac4dc31430f3d5b854600564090 Mon Sep 17 00:00:00 2001
From: "philringnalda@gmail.com" <philringnalda@gmail.com>
Date: Sun, 15 Jul 2007 14:28:39 -0700
Subject: [PATCH] Bug 388207 - Remove the bogus and never-(properly-)shown
 'it's our fault :-(' feed preview error, r=mano

---
 browser/components/feeds/content/subscribe.xhtml         | 7 -------
 browser/components/feeds/src/FeedWriter.js               | 8 +-------
 browser/locales/en-US/chrome/browser/feeds/subscribe.dtd | 6 +-----
 browser/themes/pinstripe/browser/feeds/subscribe.css     | 2 +-
 browser/themes/winstripe/browser/feeds/subscribe.css     | 2 +-
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/browser/components/feeds/content/subscribe.xhtml b/browser/components/feeds/content/subscribe.xhtml
index 88bcdc2162c1..ace578540cda 100644
--- a/browser/components/feeds/content/subscribe.xhtml
+++ b/browser/components/feeds/content/subscribe.xhtml
@@ -44,13 +44,6 @@
 
     </div>
 
-    <!-- XXXben - get rid of me when the feed processor is bug free! -->
-    <div id="feedError" style="display:none;" dir="&locale.dir;">
-      <h1>&error.title;</h1>
-      <p>&error.message;</p>
-      <p id="errorCode"/>
-    </div>
-
     <script type="application/x-javascript">
       SubscribeHandler.init();
     </script>
diff --git a/browser/components/feeds/src/FeedWriter.js b/browser/components/feeds/src/FeedWriter.js
index f3516e223cb9..ecd51d81a54e 100755
--- a/browser/components/feeds/src/FeedWriter.js
+++ b/browser/components/feeds/src/FeedWriter.js
@@ -407,15 +407,9 @@ FeedWriter.prototype = {
 
     try {
       var container = result.doc;
-      container.title;
     }
     catch (e) {
-      LOG("Subscribe Preview: An error occurred in parsing! Fortunately, you can still subscribe...");
-      var feedError = this._document.getElementById("feedError");
-      feedError.removeAttribute("style");
-      var feedBody = this._document.getElementById("feedBody");
-      feedBody.setAttribute("style", "display:none;");
-      this._setContentText("errorCode", e);
+      LOG("Subscribe Preview: no result.doc? Why didn't the original reload?");
       return null;
     }
     return container;
diff --git a/browser/locales/en-US/chrome/browser/feeds/subscribe.dtd b/browser/locales/en-US/chrome/browser/feeds/subscribe.dtd
index d066cd6f2033..7699fc8603ff 100644
--- a/browser/locales/en-US/chrome/browser/feeds/subscribe.dtd
+++ b/browser/locales/en-US/chrome/browser/feeds/subscribe.dtd
@@ -13,8 +13,4 @@
 <!ENTITY subscribeUsing
   "Subscribe to this feed using ">
 <!ENTITY feedLiveBookmarks
-  "Live Bookmarks">
-<!ENTITY error.title
-  "Error Processing Feed">
-<!ENTITY error.message
-  "There was an error processing this feed. It's our fault. :-( You can still subscribe to the feed if you know what it is. For reference, the error was:">
+  "Live Bookmarks">
diff --git a/browser/themes/pinstripe/browser/feeds/subscribe.css b/browser/themes/pinstripe/browser/feeds/subscribe.css
index 88861ad2fc01..b33a4995af4c 100755
--- a/browser/themes/pinstripe/browser/feeds/subscribe.css
+++ b/browser/themes/pinstripe/browser/feeds/subscribe.css
@@ -8,7 +8,7 @@ html {
   font: 3mm tahoma,arial,helvetica,sans-serif;
 }
 
-#feedBody, #feedError {
+#feedBody {
   border: 1px solid THreeDShadow;
   padding: 3em;
   -moz-padding-start: 30px;
diff --git a/browser/themes/winstripe/browser/feeds/subscribe.css b/browser/themes/winstripe/browser/feeds/subscribe.css
index df81c8fc01d9..2134945f151c 100644
--- a/browser/themes/winstripe/browser/feeds/subscribe.css
+++ b/browser/themes/winstripe/browser/feeds/subscribe.css
@@ -8,7 +8,7 @@ html {
   font: 3mm tahoma,arial,helvetica,sans-serif;
 }
 
-#feedBody, #feedError {
+#feedBody {
   border: 1px solid THreeDShadow;
   padding: 3em;
   -moz-padding-start: 30px;