# HG changeset patch
# User Florian Quèze <florian@queze.net>
# Date 1352419712 -3600
# Node ID f83e76da3a46adf47e2feea54be5c305aadef9e5
# Parent  82fe1991bc36ba5be4a42bf6eb883e215e88df2a
/call experiment, try: -b o -p linux,linux64,macosx64,win32 -u none -t none

diff --git a/browser/components/chat/chat-browser-prefs.js b/browser/components/chat/chat-browser-prefs.js
--- a/browser/components/chat/chat-browser-prefs.js
+++ b/browser/components/chat/chat-browser-prefs.js
@@ -1,12 +1,17 @@
 pref("messenger.options.messagesStyle.theme", "browser-messagestyles");
 pref("messenger.options.emoticonsTheme", "browser-emoticons");
 pref("messenger.conversations.textbox.autoResize", true);
 pref("messenger.conversations.doubleClickToReply", true);
 pref("purple.conversations.im.send_typing", true);
-pref("messenger.options.getAttentionOnNewMessages", true);
+pref("messenger.options.getAttentionOnNewMessages", false);
 pref("messenger.accounts.promptOnDelete", true);
 pref("messenger.buddies.showOffline", false);
 pref("purple.debug.loglevel", 3);
 pref("chat.twitter.consumerKey", "7Gzq35FbZLYJQ9n3sJmJw");
 pref("chat.twitter.consumerSecret", "fz0dXr3yul1uncHNf0vITTiIOtSKAVCvopKDrqR1Mo");
 pref("conversation.zoomLevel", "1.0");
+pref("media.navigator.enabled", true);
+pref("media.navigator.permission.disabled", true);
+pref("media.peerconnection.enabled", true);
+pref("social.manifest.facebook", "{\"origin\":\"chrome://browser/content/\",\"name\":\"XMPP Messenger\",\"iconURL\":\"chrome://branding/content/icon16.png\",\"sidebarURL\":\"chrome://browser/content/chat/blist.xul\"}");
+pref("social.enabled", true);
diff --git a/browser/components/chat/content/blist.js b/browser/components/chat/content/blist.js
--- a/browser/components/chat/content/blist.js
+++ b/browser/components/chat/content/blist.js
@@ -16,16 +16,21 @@ const events = ["buddy-authorization-req
                 "tag-shown",
                 "ui-conversation-hidden",
                 "user-display-name-changed",
                 "user-icon-changed",
                 "prpl-quit"];
 
 const showOfflineBuddiesPref = "messenger.buddies.showOffline";
 
+if (!("Services" in window))
+  Components.utils.import("resource:///modules/imServices.jsm");
+if (!("Core" in window))
+  Components.utils.import("resource:///modules/ibCore.jsm");
+
 var gBuddyListContextMenu = null;
 
 function buddyListContextMenu(aXulMenu) {
   this.target  = document.popupNode;
   this.menu    = aXulMenu;
   let localName = this.target.localName;
   this.onContact = localName == "contact";
   this.onBuddy = localName == "buddy";
@@ -714,30 +719,16 @@ var buddyList = {
       var win = blistWindows.getNext();
       if (win != window) {
         win.QueryInterface(Ci.nsIDOMWindow).focus();
         window.close();
         return;
       }
     }
 
-    // Move the window to the right of the screen on new profiles.
-    let docElt = document.documentElement;
-    if (!docElt.hasAttribute("height")) {
-      docElt.setAttribute("height", screen.availHeight || 600);
-      let width = parseInt(docElt.getAttribute("width"));
-      window.moveTo(screen.availLeft + screen.availWidth - width,
-                    screen.availTop);
-    }
-
-    // TODO remove this once we cleanup the way the menus are inserted
-    let menubar = document.getElementById("blistMenubar");
-    let statusArea = document.getElementById("statusArea");
-    statusArea.parentNode.insertBefore(menubar, statusArea);
-
     buddyList.displayCurrentStatus();
     buddyList.displayUserDisplayName();
     buddyList.displayUserIcon();
 
     let prefBranch = Services.prefs;
     buddyList._showOffline = prefBranch.getBoolPref(showOfflineBuddiesPref);
     if (buddyList._showOffline) {
       document.getElementById("context-show-offline-buddies")
diff --git a/browser/components/chat/content/blist.xul b/browser/components/chat/content/blist.xul
--- a/browser/components/chat/content/blist.xul
+++ b/browser/components/chat/content/blist.xul
@@ -17,37 +17,22 @@
 ]>
 
 <window
   id     = "blistWindow"
   windowtype="Messenger:blist"
   title  = "&brandShortName;"
   width  = "200"
   persist= "width height screenX screenY storeScreenX storeScreenY"
-#ifndef XP_MACOSX
-  onclose= "event.preventDefault(); goQuitApplication();"
-#endif
   xmlns  = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript" src="chrome://browser/content/chat/utilities.js"/>
   <script type="application/javascript" src="chrome://browser/content/chat/blist.js"/>
 
   <stringbundle id="instantbirdBundle" src="chrome://browser/locale/chat/instantbird.properties"/>
 
-#include menus.xul.inc
-
-#ifdef XP_MACOSX
-  <commandset id="blistCommands">
-    <command id="cmd_close" oncommand="window.close();"/>
-  </commandset>
-
-  <keyset id="blistKeys">
-    <key id="key_close" key="w" modifiers="accel" command="cmd_close"/>
-  </keyset>
-
-#endif
   <popupset id="mainPopupSet">
     <tooltip id="buddyTooltip" type="buddy"
              onpopupshowing="return !('_droptarget' in window);"/>
 
     <menupopup id="buddyListContextMenu"
                onpopupshowing="if (event.target != this) return true; gBuddyListContextMenu = new buddyListContextMenu(this); return gBuddyListContextMenu.shouldDisplay;"
                onpopuphiding="if (event.target == this) { gBuddyListContextMenu = null; }">
       <menuitem id="context-openconversation"
@@ -108,16 +93,20 @@
         </menupopup>
       </menu>
       <menuseparator id="context-show-offline-buddies-separator"/>
       <menuitem id="context-show-offline-buddies"
                 label="&showOfflineBuddiesCmd.label;"
                 accesskey="&showOfflineBuddiesCmd.accesskey;"
                 type="checkbox"
                 oncommand="gBuddyListContextMenu.toggleShowOfflineBuddies();"/>
+      <menuitem id="context-show-accounts"
+                label="&accountManager;"
+                accesskey="&account.accesskey;"
+                oncommand="Core.showAccounts();"/>
     </menupopup>
   </popupset>
 
   <toolbox id="mainToolbox">
     <toolbar id="statusArea">
       <stack id="statusImageStack">
         <image id="userIcon" role="button"
                aria-label="&userIcon.label;" tooltiptext="&userIcon.label;"
diff --git a/browser/components/chat/content/conversation.xml b/browser/components/chat/content/conversation.xml
--- a/browser/components/chat/content/conversation.xml
+++ b/browser/components/chat/content/conversation.xml
@@ -200,16 +200,48 @@
           }
           else {
             // Buddy no longer in the room
             color = this._computeColor(name);
           }
           aMsg.color = "color: hsl(" + color + ", 100%, 40%);";
         }
 
+        try {
+          let sdp = JSON.parse(aMsg.message)
+          if (("type" in sdp) && ("sdp" in sdp)) {
+            if (!aMsg.incoming)
+              return;
+
+            if (sdp.type == "offer") {
+              let conv = this._conv;
+              let fail = function(err) {
+                conv.systemMessage("failed to call: " + err);
+              };
+              let pc = this.initPeerConnection();
+              pc.setRemoteDescription(sdp, (function() {
+                this.getAudioVideo(function() {
+                  pc.createAnswer(function(answer) {
+                    pc.setLocalDescription(answer, function() {
+                      conv.sendMsg(JSON.stringify(answer));
+                    }, fail);
+                  }, fail);
+                }, fail);
+              }).bind(this), fail);
+              this._conv.markAsRead();
+              return;
+            }
+            else if (sdp.type == "answer") {
+              this.pc.setRemoteDescription(sdp);
+              this._conv.markAsRead();
+              return;
+            }
+          }
+        } catch(e) { }
+
         let read = this._readCount > 0;
         let isUnreadMessage = !read && aMsg.incoming && !aMsg.system;
         let isTabFocused = this.tab && this.tab.selected && document.hasFocus();
         let shouldSetUnreadFlag = this.tab && isUnreadMessage && !isTabFocused;
         let firstUnread = this.tab && !this.tab.hasAttribute("unread") &&
                           isUnreadMessage && this._isAfterFirstRealMessage &&
                           (!isTabFocused || this._writingContextMessages);
 
@@ -250,16 +282,94 @@
             this.tab.setAttribute("attention", "true");
           this.tab.setAttribute("unread", "true");
         }
 */
       ]]>
       </body>
      </method>
 
+     <method name="initPeerConnection">
+      <parameter name="aPeerConnection"/>
+      <parameter name="aSuccessCallback"/>
+      <parameter name="aErrorCallback"/>
+      <body>
+      <![CDATA[
+        let doc = this.browser.contentDocument;
+        let body = doc.getElementById("ibcontent");
+
+        let remoteVideo = doc.createElement("video");
+        remoteVideo.setAttribute("id", "remoteVideo");
+        remoteVideo.setAttribute("width", "258");
+        remoteVideo.setAttribute("height", "194");
+        remoteVideo.setAttribute("style", "position: fixed; top: -1px; left: 0; z-index: 1;");
+        body.appendChild(remoteVideo);
+
+        let localVideo = doc.createElement("video");
+        localVideo.setAttribute("id", "localVideo");
+        localVideo.setAttribute("width", "75");
+        localVideo.setAttribute("height", "54");
+        localVideo.setAttribute("style", "position: fixed; top: 139px; left: 186px; z-index: 2;");
+        body.appendChild(localVideo);
+
+        let localAudio = doc.createElement("audio");
+        localAudio.setAttribute("id", "localAudio");
+        localAudio.setAttribute("muted", "true");
+        body.appendChild(localAudio);
+
+        let remoteAudio = doc.createElement("audio");
+        remoteAudio.setAttribute("id", "remoteAudio");
+        body.appendChild(remoteAudio);
+
+        doc.getElementById("Chat").setAttribute("style", "position: fixed; left: 0; width: 100%; overflow: auto !important; top: 194px; height: " + (this.browser.contentWindow.innerHeight - 194) + "px");
+
+        this.pc = new mozRTCPeerConnection();
+
+        this.pc.onaddstream = function(obj) {
+          let type = obj.type;
+          if (type == "video") {
+            remoteVideo.mozSrcObject = obj.stream;
+            remoteVideo.play();
+          } else if (type == "audio") {
+            remoteAudio.mozSrcObject = obj.stream;
+            remoteAudio.play();
+          } else {
+            aErrorCallback("sender onaddstream of unknown type, obj = " + obj.toSource());
+          }
+        };
+
+        return this.pc;
+      ]]>
+      </body>
+     </method>
+
+     <method name="getAudioVideo">
+      <parameter name="aSuccessCallback"/>
+      <parameter name="aErrorCallback"/>
+      <body>
+      <![CDATA[
+        let win = this.browser.contentWindow;
+        let pc = this.pc;
+        win.navigator.mozGetUserMedia({video: true}, function(stream) {
+          let localVideo = win.document.getElementById("localVideo");
+          localVideo.mozSrcObject = stream;
+          localVideo.play();
+          pc.addStream(stream);
+          win.navigator.mozGetUserMedia({audio: true}, function(stream) {
+            let localAudio = win.document.getElementById("localAudio");
+            localAudio.mozSrcObject = stream;
+            localAudio.play();
+            pc.addStream(stream);
+            aSuccessCallback();
+          }, aErrorCallback);
+        }, aErrorCallback);
+      ]]>
+      </body>
+     </method>
+
      <method name="sendMsg">
       <parameter name="aMsg"/>
       <body>
       <![CDATA[
         if (!aMsg)
           return;
 
         let account = this._conv.account;
@@ -274,16 +384,32 @@
           }
           else if (aMsg.match(/^\/(?:say)? .*/))
             aMsg = aMsg.slice(aMsg.indexOf(" ") + 1);
           else if (Services.cmd.executeCommand(aMsg, this._conv.target)) {
             this._conv.sendTyping(0);
             this.resetInput();
             return;
           }
+          else if (aMsg == "/call") {
+            let conv = this._conv;
+            let fail = function(err) {
+              conv.systemMessage("failed to call: " + err);
+            };
+            let pc = this.initPeerConnection();
+            this.getAudioVideo(function() {
+              pc.createOffer(function(offer) {
+                pc.setLocalDescription(offer, function() {
+                  conv.sendMsg(JSON.stringify(offer));
+                }, fail);
+              }, fail);
+            }, fail);
+            this.resetInput();
+            return;
+          }
           else if (account.protocol.slashCommandsNative && account.connected) {
             let cmd = aMsg.match(/^\/[^ ]+/);
             if (cmd && cmd != "/me") {
               this._conv.systemMessage(
                 this.bundle.formatStringFromName("unknownCommand", [cmd], 1),
                 true);
               return;
             }
diff --git a/browser/components/chat/content/instantbird.css b/browser/components/chat/content/instantbird.css
--- a/browser/components/chat/content/instantbird.css
+++ b/browser/components/chat/content/instantbird.css
@@ -23,32 +23,32 @@ conversation {
 /*
 @media all and (min-height: 251px) {
   .conv-top-info {
     -moz-binding: url("chrome://browser/content/chat/conversation.xml#conv-info-large") !important;
   }
 }
 
 @media all and (max-height: 250px) {
-*/
   .conv-top-info {
     -moz-binding: url("chrome://browser/content/chat/conversation.xml#conv-info-small") !important;
   }
 
   .statusMessage:not([editing]),
   .statusMessageWithDash[editing] {
     display: none;
   }
-/*}
+}
 
 @media all and (max-height: 200px) {
+*/
   .conv-top-info {
     display: none;
   }
-}
+/*}
 */
 
 .alltargets-item {
   -moz-binding: url("chrome://browser/content/chat/conversation.xml#menuitem-target");
 }
 
 browser[type="content-conversation"] {
   -moz-binding: url("chrome://chat/content/convbrowser.xml#browser");
diff --git a/browser/components/chat/content/menus.xul b/browser/components/chat/content/menus.xul
--- a/browser/components/chat/content/menus.xul
+++ b/browser/components/chat/content/menus.xul
@@ -56,29 +56,16 @@
         </menu>
         <menuseparator id="menu_FileQuitSeparator"/>
         <!-- menu_FileQuitItem modified on all three platforms via overlays -->
         <menuitem id="menu_FileQuitItem"
                   label="&quitApplicationCmd.label;"
                   command="cmd_quitApplication"/>
       </menupopup>
     </menu>
-    <menu label="&tools.menu;" id="toolsMenu" accesskey="&tools.accesskey;">
-      <menupopup id="toolsMenuPopup"> <!-- has onpopupshowing on mac -->
-        <menuitem id="accountsMenuItem" label="&accountManager;" command="accountmanager" key="accountsetup" accesskey="&account.accesskey;"/>
-        <menuitem id="addonsMenuItem" label="&addonManager;" command="cmd_addons" key="addonskey" accesskey="&addonManager.accesskey;"/>
-        <menuseparator/>
-        <menuitem id="errorConsoleMenuItem" label="&errorConsoleCmd.label;" oncommand="menus.errors()" key="errorConsoleKey" accesskey="&errorConsoleCmd.accesskey;"/>
-        <menuseparator id="prefSep"/>
-        <menuitem id="menu_preferences"
-                  label="&preferencesCmd.label;"
-                  accesskey="&preferencesCmd.accesskey;"
-                  oncommand="menus.preferences();"/>
-      </menupopup>
-    </menu>
 #ifdef XP_MACOSX
     <!-- Mac window menu -->
 #include ../../../../toolkit/content/macWindowMenu.inc
 #endif
     <menu label="&help.menu;" id="helpMenu" accesskey="&help.accesskey;">
 #ifdef MOZ_UPDATER
       <menupopup id="helpMenuPopup" onpopupshowing="menus.displayUpdateStatus();">
         <menuitem id="updatesMenuItem" label="&checkForUpdates;" oncommand="menus.updates()"/>
diff --git a/browser/components/chat/jar.mn b/browser/components/chat/jar.mn
--- a/browser/components/chat/jar.mn
+++ b/browser/components/chat/jar.mn
@@ -59,17 +59,16 @@ browser.jar:
 	skin/classic/browser/chat/status.css          (themes/status.css)
 *	skin/classic/browser/chat/viewlog.css         (themes/viewlog.css)
 	skin/classic/browser/chat/newMessage.png      (themes/newMessage.png)
 	skin/classic/browser/chat/expand.png          (themes/expand.png)
 	skin/classic/browser/chat/collapse.png        (themes/collapse.png)
 	skin/classic/browser/chat/userIcon.png        (themes/userIcon.png)
 #ifdef XP_WIN
 *	skin/classic/aero/browser/chat/accounts.css	 (themes/accounts-aero.css)
-	skin/classic/aero/browser/chat/alert.css         (themes/alert.css)
 *	skin/classic/aero/browser/chat/richlistbox.css   (themes/richlistbox.css)
 *	skin/classic/aero/browser/chat/accountWizard.css (themes/accountWizard.css)
 	skin/classic/aero/browser/chat/founder.png       (themes/founder.png)
 	skin/classic/aero/browser/chat/operator.png      (themes/operator.png)
 	skin/classic/aero/browser/chat/half-operator.png (themes/half-operator.png)
 	skin/classic/aero/browser/chat/voice.png         (themes/voice.png)
 *	skin/classic/aero/browser/chat/blist.css	 (themes/blist-aero.css)
 	skin/classic/aero/browser/chat/buddytooltip.css  (themes/buddytooltip.css)
diff --git a/browser/components/chat/modules/imWindows.jsm b/browser/components/chat/modules/imWindows.jsm
--- a/browser/components/chat/modules/imWindows.jsm
+++ b/browser/components/chat/modules/imWindows.jsm
@@ -70,17 +70,17 @@ var Conversations = {
     if (!this.isUIConversationDisplayed(uiConv))
       this.showConversation(uiConv);
     // The conversation may still not be displayed if we are waiting
     // for a new window. In this case the conversation will be focused
     // automatically anyway.
     if (this.isUIConversationDisplayed(uiConv)) {
       let conv = this._uiConv[uiConv.id];
       let doc = conv.ownerDocument;
-      doc.getElementById("conversations").selectedTab = conv.tab;
+//      doc.getElementById("conversations").selectedTab = conv.tab;
       conv.focus();
       doc.defaultView.focus();
 #ifdef XP_MACOSX
       Components.classes["@mozilla.org/widget/macdocksupport;1"]
                 .getService(Components.interfaces.nsIMacDockSupport)
                 .activateApplication(true);
 #endif
     }
diff --git a/browser/components/chat/themes/conversation.css b/browser/components/chat/themes/conversation.css
--- a/browser/components/chat/themes/conversation.css
+++ b/browser/components/chat/themes/conversation.css
@@ -191,17 +191,16 @@
   }
 
   .userIcon[src] + .statusTypeIcon {
     margin-left: 32px;
   }
 }
 
 @media all and (max-height: 250px) {
-*/
   .conv-top-info {
     -moz-box-align: baseline;
   }
 
   .displayName,
   .statusMessageWithDash {
     margin: 2px 0 !important;
   }
@@ -217,17 +216,17 @@
 %else
     margin: -3px 0 -1px 9px !important;
 %endif
   }
 
   .statusTypeIcon {
     margin: 1px 3px;
   }
-/*}*/
+}*/
 
 .conv-messages {
   min-width: 150px;
 %ifndef XP_MACOSX
 %ifndef XP_WIN
   border-bottom: solid 1px GrayText;
 %else
   border: 1px solid rgba(0, 0, 0, 0.25);
diff --git a/browser/locales/en-US/chrome/browser/chat/mintrayr.dtd b/browser/locales/en-US/chrome/browser/chat/mintrayr.dtd
deleted file mode 100644
--- a/browser/locales/en-US/chrome/browser/chat/mintrayr.dtd
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY mintrayr.minimize "Minimize to Tray">
-<!ENTITY mintrayr.minimize.tip "Minimizes the current window to the system tray">
-<!ENTITY mintrayr.restore "Restore">
-<!ENTITY mintrayr.keys.minimize.keycode "VK_F9">
-<!ENTITY mintrayr.keys.minimize.modifiers "">
diff --git a/browser/locales/en-US/chrome/browser/chat/quitDialog.properties b/browser/locales/en-US/chrome/browser/chat/quitDialog.properties
deleted file mode 100644
--- a/browser/locales/en-US/chrome/browser/chat/quitDialog.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-dialogTitle=Unread message(s)
-message=You have unread message(s) in #1 conversation, do you really want to continue?;You have unread messages in #1 conversations, do you really want to continue?
-checkbox=Do &not ask next time
-quitButton=&Quit
-restartButton=&Restart
diff --git a/browser/locales/en-US/chrome/browser/chat/region.properties b/browser/locales/en-US/chrome/browser/chat/region.properties
deleted file mode 100644
--- a/browser/locales/en-US/chrome/browser/chat/region.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-browser.search.order.2=Yahoo
diff --git a/browser/locales/en-US/chrome/browser/chat/tabbrowser.dtd b/browser/locales/en-US/chrome/browser/chat/tabbrowser.dtd
deleted file mode 100644
--- a/browser/locales/en-US/chrome/browser/chat/tabbrowser.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  untitledTab            "(Untitled)">
-<!ENTITY  newTab.label           "New Tab">
-<!ENTITY  newTab.accesskey       "N">
-<!ENTITY  closeTab.label         "Close Tab">
-<!ENTITY  closeTab.accesskey     "c">
-<!ENTITY  closeOtherTabs.accesskey "o">
-<!ENTITY  closeOtherTabs.label     "Close Other Tabs">
-<!ENTITY  openTabInNewWindow.label     "Open in a New Window">
-<!ENTITY  openTabInNewWindow.accesskey "W">
-<!ENTITY  showLogs.label         "Show Logs">
-<!ENTITY  showLogs.accesskey     "L">
-<!ENTITY  closeConv.label        "Close Conversation">
-<!ENTITY  closeConv.accesskey    "v">
-<!ENTITY  hideConv.label         "Put Conversation on Hold">
-<!ENTITY  hideConv.accesskey     "h">
-<!ENTITY  listAllTabs.label      "List all tabs">
-<!ENTITY  newTabButton.tooltip   "Open a new tab">
diff --git a/browser/locales/en-US/chrome/browser/chat/tabbrowser.properties b/browser/locales/en-US/chrome/browser/chat/tabbrowser.properties
deleted file mode 100644
--- a/browser/locales/en-US/chrome/browser/chat/tabbrowser.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-tabs.closeWarningTitle=Confirm close
-tabs.closeWarningMessage=You are about to close #1 conversation with unread messages. Are you sure you want to continue?;You are about to close #1 conversations with unread messages. Are you sure you want to continue?
-tabs.closeButton=Close conversation;Close conversations
-tabs.closeWarningPromptMe=Warn me when I attempt to close multiple conversations with unread messages
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -110,18 +110,16 @@
     locale/browser/chat/accountWizard.dtd	(%chrome/browser/chat/accountWizard.dtd)
     locale/browser/chat/accountWizard.properties (%chrome/browser/chat/accountWizard.properties)
     locale/browser/chat/addbuddy.dtd		(%chrome/browser/chat/addbuddy.dtd)
     locale/browser/chat/buddytooltip.properties (%chrome/browser/chat/buddytooltip.properties)
     locale/browser/chat/core.properties	        (%chrome/browser/chat/core.properties)
     locale/browser/chat/instantbird.dtd	        (%chrome/browser/chat/instantbird.dtd)
     locale/browser/chat/instantbird.properties  (%chrome/browser/chat/instantbird.properties)
     locale/browser/chat/joinChat.dtd		(%chrome/browser/chat/joinChat.dtd)
-    locale/browser/chat/proxies.dtd		(%chrome/browser/chat/proxies.dtd)
-    locale/browser/chat/proxies.properties	(%chrome/browser/chat/proxies.properties)
     locale/browser/chat/updates.properties	(%chrome/browser/chat/updates.properties)
 % locale browser-region @AB_CD@ %locale/browser-region/
     locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
 # the following files are browser-specific overrides
     locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
     locale/browser/appstrings.properties       (%chrome/overrides/appstrings.properties)
     locale/browser/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)
 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd