Bug 445503 crashes.xhtml incorrectly overrides the crash reporter data directory for Thunderbird. r=ted
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 16 Jul 2008 15:51:16 +0100
changeset 15972 a61f4bfced4eb57d58332f49ecda7950e5deea15
parent 15971 9e360506ae23a45122ed5ab036c821c76e8c104a
child 15973 b87fdbfecc161974996d14882f571ddf11bdcd87
push idunknown
push userunknown
push dateunknown
reviewersted
bugs445503
milestone1.9.1a1pre
Bug 445503 crashes.xhtml incorrectly overrides the crash reporter data directory for Thunderbird. r=ted
toolkit/crashreporter/content/crashes.xhtml
toolkit/crashreporter/jar.mn
--- a/toolkit/crashreporter/content/crashes.xhtml
+++ b/toolkit/crashreporter/content/crashes.xhtml
@@ -3,21 +3,16 @@
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
 [
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   <!ENTITY % crashesDTD SYSTEM "chrome://global/locale/crashes.dtd">
   %globalDTD;
   %crashesDTD;
 ]>
 
-#ifdef MOZ_THUNDERBIRD
-#ifdef XP_MACOSX
-#define FORCE_DIR
-#endif
-#endif
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <style type="text/css">
 :root {
   font-family: sans-serif;
 }
 table {
   padding-bottom: 2em;
@@ -96,27 +91,17 @@ function populateReportList() {
   if (!reportURL) {
     document.getElementById("reportList").style.display = "none";
     document.getElementById("noConfig").style.display = "block";
     return;
   }
   var directoryService = Cc["@mozilla.org/file/directory_service;1"].
                          getService(Ci.nsIProperties);
 
-#ifdef FORCE_DIR
-  var app = Cc["@mozilla.org/xre/app-info;1"].
-            getService(Ci.nsIXULAppInfo);
-
-  // Doesn't appear to be a key for the app support directory
-  reportsDir = directoryService.get("ULibDir", Ci.nsIFile);
-  reportsDir.append("Application Support");
-  reportsDir.append(app.name);
-#else
   reportsDir = directoryService.get("UAppData", Ci.nsIFile);
-#endif
   reportsDir.append("Crash Reports");
   reportsDir.append("submitted");
 
   var reports = [];
   if (reportsDir.exists() && reportsDir.isDirectory()) {
     var entries = reportsDir.directoryEntries;
     while (entries.hasMoreElements()) {
       var file = entries.getNext().QueryInterface(Ci.nsIFile);
--- a/toolkit/crashreporter/jar.mn
+++ b/toolkit/crashreporter/jar.mn
@@ -1,2 +1,2 @@
 toolkit.jar:
-*+ content/global/crashes.xhtml              (content/crashes.xhtml) 
+  content/global/crashes.xhtml              (content/crashes.xhtml)