From 960aaf0defbcb79d9a68b563d1edbb2558aca18d Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com" <reed%reedloden.com>
Date: Tue, 18 Dec 2007 05:30:39 +0000
Subject: [PATCH] Bug 408685 - "After ARIA namespaces have been removed,
 correct XUL in Thunderbird" [p=marco.zehe@googlemail.com (Marco Zehe)
 r=aaronlev r+sr=bienvenu]

---
 .../compose/resources/content/addressingWidgetOverlay.js     | 2 +-
 .../compose/resources/content/addressingWidgetOverlay.xul    | 3 +--
 mailnews/news/resources/content/downloadheaders.xul          | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mailnews/compose/resources/content/addressingWidgetOverlay.js b/mailnews/compose/resources/content/addressingWidgetOverlay.js
index 068660e4da8..b468de798bb 100644
--- a/mailnews/compose/resources/content/addressingWidgetOverlay.js
+++ b/mailnews/compose/resources/content/addressingWidgetOverlay.js
@@ -261,7 +261,7 @@ function awSetInputAndPopupId(inputElem, popupElem, rowNumber)
 {
   popupElem.id = "addressCol1#" + rowNumber;
   inputElem.id = "addressCol2#" + rowNumber;
-  inputElem.setAttributeNS("http://www.w3.org/2005/07/aaa", "aaa:labelledby", popupElem.id);
+  inputElem.setAttribute("aria-labelledby", popupElem.id);
 }
 
 function awSetInputAndPopupValue(inputElem, inputValue, popupElem, popupValue, rowNumber)
diff --git a/mailnews/compose/resources/content/addressingWidgetOverlay.xul b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
index a5ca1ad7db5..0e7256a3179 100644
--- a/mailnews/compose/resources/content/addressingWidgetOverlay.xul
+++ b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
@@ -75,8 +75,7 @@
       
       <listcell class="addressingWidgetCell">
         <textbox id="addressCol2#1" class="plain textbox-addressingWidget uri-element"
-                 xmlns:aaa="http://www.w3.org/2005/07/aaa"
-                 aaa:labelledby="addressCol1#1"
+                 aria-labelledby="addressCol1#1"
                  type="autocomplete" flex="1"
                  searchSessions="addrbook" timeout="300" maxrows="4" 
                  autoFill="true" autoFillAfterMatch="true" forceComplete="true"
diff --git a/mailnews/news/resources/content/downloadheaders.xul b/mailnews/news/resources/content/downloadheaders.xul
index 6c28a2be7dd..52164377095 100644
--- a/mailnews/news/resources/content/downloadheaders.xul
+++ b/mailnews/news/resources/content/downloadheaders.xul
@@ -42,7 +42,6 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/downloadheaders.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:aaa="http://www.w3.org/2005/07/aaa"
         style="max-width: 27em;"
         buttonpack="center"
         ondialogaccept="return OkButtonCallback();"
@@ -64,8 +63,8 @@
         <radio id="some" selected="true" label="&download.label;"
                accesskey="&download.accesskey;"
                oncommand="setupDownloadUI(true);"
-               aaa:labelledby="some number headers"/>
-        <textbox id="number" size="7" aaa:labelledby="some number headers"/>
+               aria-labelledby="some number headers"/>
+        <textbox id="number" size="7" aria-labelledby="some number headers"/>
         <label value="&headers.label;" accesskey="&headers.accesskey;"
                id="headers" control="number"/>
       </hbox>