Bug 395279 Clean up old contents.rdf files and MOZ_XUL_APP defines from editor/ui. r=KaiRo,sr=Neil. NPOTB for firefox freeze.

editor/ui/composer/content/contents-region.rdf

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:editor-region"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:editor-region"
-        chrome:author="mozilla.org"
-        chrome:name="editor-region"
-#expand  	chrome:localeVersion="__MOZILLA_REGION_VERSION__">
-  </RDF:Description>
-
-</RDF:RDF>

editor/ui/composer/content/contents.rdf

@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:editor"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:editor"
-        chrome:displayName="Editor"
-        chrome:author="mozilla.org"
-        chrome:name="editor"
-        chrome:xpcNativeWrappers="true"
-#expand         chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"
-#expand         chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
-  </RDF:Description>
-  
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
-    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
-    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
-  </RDF:Seq>
-
-  <!-- editor tasks overlay -->
-  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
-    <RDF:li>chrome://editor/content/editorTasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- editor preferences branches -->
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://editor/content/editorPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- editor startup pref -->
-  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
-    <RDF:li>chrome://editor/content/editorPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- editor items for Navigator -->
-  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
-    <RDF:li>chrome://editor/content/editorNavigatorOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- editor items for Mail -->
-  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
-    <RDF:li>chrome://editor/content/editorMailOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-
-</RDF:RDF>
-

editor/ui/jar.mn

@@ -1,5 +1,4 @@
 comm.jar:
-#ifdef MOZ_XUL_APP
 % content editor %content/editor/ xpcnativewrappers=yes
 % overlay chrome://communicator/content/tasksOverlay.xul chrome://editor/content/editorTasksOverlay.xul
 % overlay chrome://messenger/content/mailWindowOverlay.xul chrome://editor/content/editorMailOverlay.xul
@@ -8,10 +7,6 @@ comm.jar:
 % overlay chrome://communicator/content/pref/pref-appearance.xul chrome://editor/content/editorPrefsOverlay.xul
 % overlay chrome://navigator/content/navigatorOverlay.xul chrome://editor/content/editorNavigatorOverlay.xul
 % content editor-region %content/editor-region/ xpcnativewrappers=yes
-#endif
-#else
-*     content/editor/contents.rdf                              (composer/content/contents.rdf)
-*     content/editor-region/contents.rdf                       (composer/content/contents-region.rdf)
 #endif
       content/editor/editor.xul                                (composer/content/editor.xul) 
       content/editor/editor.js                                 (composer/content/editor.js) 

editor/ui/locales/generic/chrome/composer/contents.rdf

@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-#filter substitution
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:@AB_CD@">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
-        <RDF:li resource="urn:mozilla:locale:@AB_CD@:editor"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:@AB_CD@:editor"
-       chrome:localeVersion="@MOZILLA_LOCALE_VERSION@"/>
-</RDF:RDF>

editor/ui/locales/generic/chrome/region/contents.rdf

@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-#filter substitution
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the locale being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:@AB_CD@"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:@AB_CD@"
-        chrome:author="mozilla.org">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:@AB_CD@:packages">
-        <RDF:li resource="urn:mozilla:locale:@AB_CD@:editor-region"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:@AB_CD@:editor-region"
-                chrome:localeVersion="@MOZILLA_REGION_VERSION@"/>
-</RDF:RDF>

editor/ui/locales/jar.mn

@@ -1,11 +1,7 @@
 #filter substitution
 
 @AB_CD@.jar:
-#ifdef MOZ_XUL_APP
 % locale editor @AB_CD@ %locale/@AB_CD@/editor/
-#else
-* locale/@AB_CD@/editor/contents.rdf                         (generic/chrome/composer/contents.rdf)
-#endif
   locale/@AB_CD@/editor/editorSmileyOverlay.dtd              (%chrome/composer/editorSmileyOverlay.dtd)
   locale/@AB_CD@/editor/editorOverlay.dtd                    (%chrome/composer/editorOverlay.dtd)
   locale/@AB_CD@/editor/editor.properties                    (%chrome/composer/editor.properties)
@@ -38,6 +34,7 @@
 
 #ifdef MOZ_SUITE
 @AB_CD@.jar:
+% locale editor-region @AB_CD@ %locale/@AB_CD@/editor-region/
   locale/@AB_CD@/editor/editor.dtd                           (%chrome/composer/editor.dtd)
   locale/@AB_CD@/editor/editorPrefsOverlay.dtd               (%chrome/composer/editorPrefsOverlay.dtd)
   locale/@AB_CD@/editor/editorNavigatorOverlay.dtd           (%chrome/composer/editorNavigatorOverlay.dtd)
@@ -54,10 +51,5 @@
   locale/@AB_CD@/editor/EditorSaveAsCharset.dtd              (%chrome/dialogs/EditorSaveAsCharset.dtd)
   locale/@AB_CD@/editor/EditorPublish.dtd                    (%chrome/dialogs/EditorPublish.dtd)
   locale/@AB_CD@/editor/EditorPublishProgress.dtd            (%chrome/dialogs/EditorPublishProgress.dtd)
-#ifdef MOZ_XUL_APP
-% locale editor-region @AB_CD@ %locale/@AB_CD@/editor-region/
-#else
-* locale/@AB_CD@/editor-region/contents.rdf                  (generic/chrome/region/contents.rdf)
-#endif
   locale/@AB_CD@/editor-region/region.properties             (%chrome/region/region.properties)
 #endif