bug 373395 - Rename 'General' pane of preferences to prevent namespace collisions with Fx/Tb. Patch by Stefan Sitter <ssitter@googlemail.com>, r=lilmatt

calendar/base/content/preferences/general.js

@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK *****
  */
 
-var gGeneralPane = {
+var gCalendarGeneralPane = {
 
     init: function () {
         var df = Components.classes["@mozilla.org/calendar/datetime-formatter;1"]

calendar/base/content/preferences/general.xul

@@ -48,7 +48,7 @@
     %preferencesDTD;
 ]>
 
-<overlay id="GeneralPaneOverlay"
+<overlay id="CalendarGeneralPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="calPreferencesBoxGeneral">
@@ -76,7 +76,7 @@
             <preference id="calendar.autorefresh.enabled"
                         name="calendar.autorefresh.enabled"
                         type="bool"
-                        onchange="gGeneralPane.autoRefreshPrefChanged();"/>
+                        onchange="gCalendarGeneralPane.autoRefreshPrefChanged();"/>
             <preference id="calendar.autorefresh.timeout"
                         name="calendar.autorefresh.timeout"
                         type="int"/>

calendar/base/content/preferences/preferences.xul

@@ -75,7 +75,7 @@
 
     <prefpane id="paneGeneral"
               label="&paneGeneral.title;"
-              onpaneload="gGeneralPane.init();"
+              onpaneload="gCalendarGeneralPane.init();"
               src="chrome://calendar/content/preferences/general.xul">
         <vbox id="calPreferencesBoxGeneral"/>
     </prefpane>

calendar/lightning/content/messenger-overlay-preferences.xul

@@ -52,7 +52,8 @@
     <prefwindow id="MailPreferences">
         <prefpane id="paneLightning" 
                   label="&lightning.taskLabel;"
-                  onpaneload="gGeneralPane.init(); gAlarmsPane.init(); gCategoriesPane.init(); gTimezonesPane.init();">
+                  onpaneload="gCalendarGeneralPane.init(); gAlarmsPane.init(); 
+                              gCategoriesPane.init(); gTimezonesPane.init();">
             <tabbox id="calPreferencesTabbox" flex="1" onselect="">
                 <tabs>
                     <tab id="calPreferencesTabGeneral"