Backing out the patch for bug 39113, since it caused bug 648086. rs=Callek.
authorstefanh@inbox.com
Fri, 06 May 2011 23:44:23 +0200
changeset 7719 813c489a99d0d424a32cb64974b71f4ef7ed99d0
parent 7718 e2565adeaf34580100720269b142e7a8ec3c864e
child 7720 d5d1e732604fd6de668685e415a3f3139cd514be
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs39113, 648086
Backing out the patch for bug 39113, since it caused bug 648086. rs=Callek.
suite/common/pref/preferences.js
suite/common/pref/preferences.xul
suite/locales/en-US/chrome/common/pref/prefutilities.properties
--- a/suite/common/pref/preferences.js
+++ b/suite/common/pref/preferences.js
@@ -34,41 +34,16 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // The content of this file is loaded into the scope of the
 // prefwindow and will be available to all prefpanes!
 
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-function Startup()
-{
-  var profileSrvc = Components.classes["@mozilla.org/toolkit/profile-service;1"]
-                              .getService(Components.interfaces.nsIToolkitProfileService);
-  var profiles = profileSrvc.profiles;
-  var profileName = null;
-  var compTarget = Services.dirsvc.get("ProfD", Components.interfaces.nsIFile);
-
-  while (profiles.hasMoreElements()) {
-    var profile = profiles.getNext()
-                          .QueryInterface(Components.interfaces.nsIToolkitProfile);
-    if (profile.rootDir.equals(compTarget)) {
-      profileName = profile.name;
-      break;
-    }
-  }
-
-  if (profileName)
-    document.title = document.getElementById("bundle_prefutilities")
-                             .getFormattedString("preferencesAccount",
-                                                 [profileName]);
-}
-
 function EnableElementById(aElementId, aEnable, aFocus)
 {
   EnableElement(document.getElementById(aElementId), aEnable, aFocus);
 }
 
 function EnableElement(aElement, aEnable, aFocus)
 {
   let pref = document.getElementById(aElement.getAttribute("preference"));
--- a/suite/common/pref/preferences.xul
+++ b/suite/common/pref/preferences.xul
@@ -44,22 +44,21 @@
 
 <!DOCTYPE prefwindow [
   <!ENTITY % dtdPrefs    SYSTEM "chrome://communicator/locale/pref/preferences.dtd"> %dtdPrefs;
   <!ENTITY % dtdPlatform SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd"> %dtdPlatform;
 ]>
 
 <prefwindow id="prefDialog" 
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            title="&prefWindow.title;"
+            title="&prefWindow.title;" 
             style="&prefWindow.size;"
             windowtype="mozilla:preferences"
             buttons="accept,cancel,help"
-            autopanes="true"
-            onload="Startup();">
+            autopanes="true"> 
 
   <script type="application/javascript" src="chrome://communicator/content/pref/preferences.js"/>
   <!-- Used by pref-smartupdate, pref-security, pref-cookies, pref-images, pref-popups and pref-passwords, as well as pref-sync (gSyncUtils.*open* -> openUILinkIn) -->
   <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
   <script type="application/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
 
   <stringbundle id="bundle_prefutilities"
                 src="chrome://communicator/locale/pref/prefutilities.properties"/>
--- a/suite/locales/en-US/chrome/common/pref/prefutilities.properties
+++ b/suite/locales/en-US/chrome/common/pref/prefutilities.properties
@@ -9,10 +9,8 @@ choosesound=Choose a sound
 
 SoundFiles=Sounds
 
 labelDefaultFont=Default (%font_family%)
 
 stopUsingAccount.title=Do you want to stop using this account?
 differentAccount.label=This will reset all of your Sync account information and preferences.
 differentAccountConfirm.label=Reset All Information
-
-preferencesAccount=Preferences for %S profile