Bug 388207 - Remove the bogus and never-(properly-)shown 'it's our fault :-(' feed preview error, r=mano

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>

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;

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">

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;

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;