removals

comm-release/patches/9999999-removemsnicq-25320.patch

@@ -0,0 +1,258 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Date 1657540972 -7200
+# Parent  a58c5a39cf623ad16c9e4bbd4e61088d1fc1f8b6
+Bug 1779034 - Remove dead AIM and Google Talk from Address book. r=IanN a=IanN
+
+diff --git a/suite/locales/en-US/chrome/mailnews/addressbook/abCardOverlay.dtd b/suite/locales/en-US/chrome/mailnews/addressbook/abCardOverlay.dtd
+--- a/suite/locales/en-US/chrome/mailnews/addressbook/abCardOverlay.dtd
++++ b/suite/locales/en-US/chrome/mailnews/addressbook/abCardOverlay.dtd
+@@ -121,20 +121,16 @@
+ <!ENTITY Chat.tab                       "Chat">
+ <!ENTITY Chat.accesskey                 "a">
+ <!ENTITY Yahoo.label                    "Yahoo!:">
+ <!ENTITY Yahoo.accesskey                "Y">
+ <!ENTITY Skype.label                    "Skype:">
+ <!ENTITY Skype.accesskey                "S">
+ <!ENTITY QQ.label                       "QQ:">
+ <!ENTITY QQ.accesskey                   "Q">
+-<!ENTITY MSN.label                      "MSN:">
+-<!ENTITY MSN.accesskey                  "N">
+-<!ENTITY ICQ.label                      "ICQ:">
+-<!ENTITY ICQ.accesskey                  "I">
+ <!ENTITY XMPP.label                     "Jabber ID:">
+ <!ENTITY XMPP.accesskey                 "J">
+ <!ENTITY IRC.label                      "IRC Nick:">
+ <!ENTITY IRC.accesskey                  "R">
+ 
+ <!ENTITY Photo.tab                      "Photo">
+ <!ENTITY Photo.accesskey                "o">
+ <!ENTITY GenericPhoto.label             "Generic Photo">
+diff --git a/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties b/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
+--- a/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
++++ b/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
+@@ -129,17 +129,18 @@ propertyFax=Fax
+ propertyCellular=Mobile
+ propertyPager=Pager
+ propertyBirthday=Birthday
+ propertyCustom1=Custom 1
+ propertyCustom2=Custom 2
+ propertyCustom3=Custom 3
+ propertyCustom4=Custom 4
+ 
+-# Google Talk and AIM need to stay for now because of shared mailnews code.
++# Google Talk, AIM, MSN and ICQ need to stay for now because of shared mailnews
++# code.
+ propertyGtalk=Google Talk
+ propertyAIM=AIM
+ propertyYahoo=Yahoo!
+ propertySkype=Skype
+ propertyQQ=QQ
+ propertyMSN=MSN
+ propertyICQ=ICQ
+ propertyXMPP=Jabber ID
+diff --git a/suite/mailnews/components/addrbook/content/abCardOverlay.js b/suite/mailnews/components/addrbook/content/abCardOverlay.js
+--- a/suite/mailnews/components/addrbook/content/abCardOverlay.js
++++ b/suite/mailnews/components/addrbook/content/abCardOverlay.js
+@@ -52,18 +52,16 @@ const kVcardFields =
+          ["Custom3", "Custom3"],
+          ["Custom4", "Custom4"],
+           // Other > Notes
+          ["Notes", "Notes"],
+           // Chat
+          ["Yahoo", "_Yahoo"],
+          ["Skype", "_Skype"],
+          ["QQ", "_QQ"],
+-         ["MSN", "_MSN"],
+-         ["ICQ", "_ICQ"],
+          ["XMPP", "_JabberId"],
+          ["IRC", "_IRC"]
+         ];
+ 
+ var gEditCard;
+ var gOnSaveListeners = [];
+ var gOnLoadListeners = [];
+ var gOkCallback = null;
+@@ -599,16 +597,24 @@ function CheckAndSetCardValues(cardprope
+   try {
+     cardproperty.setProperty("_GoogleTalk", "");
+   }
+   catch (ex) {}
+   try {
+     cardproperty.setProperty("_AimScreenName", "");
+   }
+   catch (ex) {}
++  try {
++    cardproperty.setProperty("_MSN", "");
++  }
++  catch (ex) {} 
++  try {
++    cardproperty.setProperty("_ICQ", "");
++  }
++  catch (ex) {}
+ 
+   return true;
+ }
+ 
+ function CleanUpWebPage(webPage)
+ {
+   // no :// yet so we should add something
+   if ( webPage.length && webPage.search("://") == -1 )
+@@ -894,17 +900,17 @@ function modifyDatepicker(aDatepicker) {
+     }
+     // make the field's value null if aValue is null and the field's value isn't
+     if (aValue == null && aField.value != null)
+       aField.value = null;
+   }
+ }
+ 
+ var chatNameFieldIds =
+-  ["Yahoo", "Skype", "QQ", "MSN", "ICQ", "XMPP", "IRC"];
++  ["Yahoo", "Skype", "QQ", "XMPP", "IRC"];
+ 
+ /**
+  * Show the 'Chat' tab and focus the first field that has a value, or
+  * the first field if none of them has a value.
+  */
+ function showChat()
+ {
+   document.getElementById('abTabPanels').parentNode.selectedTab =
+diff --git a/suite/mailnews/components/addrbook/content/abCardOverlay.xul b/suite/mailnews/components/addrbook/content/abCardOverlay.xul
+--- a/suite/mailnews/components/addrbook/content/abCardOverlay.xul
++++ b/suite/mailnews/components/addrbook/content/abCardOverlay.xul
+@@ -392,32 +392,16 @@
+           <hbox id="QQContainer" align="center">
+             <spacer flex="1"/>
+             <label control="QQ" value="&QQ.label;"
+                    accesskey="&QQ.accesskey;"/>
+             <hbox class="CardEditWidth">
+               <textbox id="QQ" flex="1" onchange="updateChatName();"/>
+             </hbox>
+           </hbox>
+-          <hbox id="MSNContainer" align="center">
+-            <spacer flex="1"/>
+-            <label control="MSN" value="&MSN.label;"
+-                   accesskey="&MSN.accesskey;"/>
+-            <hbox class="CardEditWidth">
+-              <textbox id="MSN" flex="1" onchange="updateChatName();"/>
+-            </hbox>
+-          </hbox>
+-          <hbox id="ICQContainer" align="center">
+-            <spacer flex="1"/>
+-            <label control="ICQ" value="&ICQ.label;"
+-                   accesskey="&ICQ.accesskey;"/>
+-            <hbox class="CardEditWidth">
+-              <textbox id="ICQ" flex="1" onchange="updateChatName();"/>
+-            </hbox>
+-          </hbox>
+           <hbox id="XMPPContainer" align="center">
+             <spacer flex="1"/>
+             <label control="XMPP" value="&XMPP.label;"
+                    accesskey="&XMPP.accesskey;"/>
+             <hbox class="CardEditWidth">
+               <textbox id="XMPP" flex="1" onchange="updateChatName();"/>
+             </hbox>
+           </hbox>
+diff --git a/suite/mailnews/components/addrbook/content/abCardViewOverlay.js b/suite/mailnews/components/addrbook/content/abCardViewOverlay.js
+--- a/suite/mailnews/components/addrbook/content/abCardViewOverlay.js
++++ b/suite/mailnews/components/addrbook/content/abCardViewOverlay.js
+@@ -22,18 +22,16 @@ var zPager;
+ var zBirthday;
+ var zCustom1;
+ var zCustom2;
+ var zCustom3;
+ var zCustom4;
+ var zYahoo;
+ var zSkype;
+ var zQQ;
+-var zMSN;
+-var zICQ;
+ var zXMPP;
+ var zIRC;
+ 
+ var cvData;
+ 
+ function OnLoadCardView()
+ {
+   gMapItURLFormat = GetLocalizedStringPref("mail.addr_book.mapit_url.format");
+@@ -51,18 +49,16 @@ function OnLoadCardView()
+   zBirthday = gAddressBookBundle.getString("propertyBirthday");
+   zCustom1 = gAddressBookBundle.getString("propertyCustom1");
+   zCustom2 = gAddressBookBundle.getString("propertyCustom2");
+   zCustom3 = gAddressBookBundle.getString("propertyCustom3");
+   zCustom4 = gAddressBookBundle.getString("propertyCustom4");
+   zYahoo = gAddressBookBundle.getString("propertyYahoo");
+   zSkype = gAddressBookBundle.getString("propertySkype");
+   zQQ = gAddressBookBundle.getString("propertyQQ");
+-  zMSN = gAddressBookBundle.getString("propertyMSN");
+-  zICQ = gAddressBookBundle.getString("propertyICQ");
+   zXMPP = gAddressBookBundle.getString("propertyXMPP");
+   zIRC = gAddressBookBundle.getString("propertyIRC");
+ 
+   var doc = document;
+ 
+   /* data for address book, prefixes: "cvb" = card view box
+                                       "cvh" = crad view header
+                                       "cv"  = card view (normal fields) */
+@@ -137,18 +133,16 @@ function OnLoadCardView()
+   cvData.cvbPhoto = doc.getElementById("cvbPhoto");
+   cvData.cvPhoto = doc.getElementById("cvPhoto");
+   // Chat section
+   cvData.cvbChat      = doc.getElementById("cvbChat");
+   cvData.cvhChat      = doc.getElementById("cvhChat");
+   cvData.cvYahoo      = doc.getElementById("cvYahoo");
+   cvData.cvSkype      = doc.getElementById("cvSkype");
+   cvData.cvQQ         = doc.getElementById("cvQQ");
+-  cvData.cvMSN        = doc.getElementById("cvMSN");
+-  cvData.cvICQ        = doc.getElementById("cvICQ");
+   cvData.cvXMPP       = doc.getElementById("cvXMPP");
+   cvData.cvIRC        = doc.getElementById("cvIRC");
+ }
+ 
+ // XXX todo
+ // some similar code (in spirit) already exists, see OnLoadEditList()
+ // perhaps we could combine and put in abCommon.js?
+ function GetAddressesFromURI(uri)
+@@ -292,20 +286,16 @@ function DisplayCardViewPane(realCard)
+ 
+     // Chat section
+     visible = cvSetNodeWithLabel(data.cvYahoo, zYahoo,
+                                  card.getProperty("_Yahoo"));
+     visible = cvSetNodeWithLabel(data.cvSkype, zSkype,
+                                  card.getProperty("_Skype")) || visible;
+     visible = cvSetNodeWithLabel(data.cvQQ, zQQ,
+                                  card.getProperty("_QQ")) || visible;
+-    visible = cvSetNodeWithLabel(data.cvMSN, zMSN,
+-                                 card.getProperty("_MSN")) || visible;
+-    visible = cvSetNodeWithLabel(data.cvICQ, zICQ,
+-                                 card.getProperty("_ICQ")) || visible;
+     visible = cvSetNodeWithLabel(data.cvXMPP, zXMPP,
+                                  card.getProperty("_JabberId")) || visible;
+     visible = cvSetNodeWithLabel(data.cvIRC, zIRC,
+                                  card.getProperty("_IRC")) || visible;
+     cvSetVisible(data.cvhChat, visible);
+     cvSetVisible(data.cvbChat, visible);
+ 
+     // hide description section, not show for non-mailing lists
+diff --git a/suite/mailnews/components/addrbook/content/addressbook.xul b/suite/mailnews/components/addrbook/content/addressbook.xul
+--- a/suite/mailnews/components/addrbook/content/addressbook.xul
++++ b/suite/mailnews/components/addrbook/content/addressbook.xul
+@@ -645,18 +645,16 @@
+                       <image id="cvBuddyIcon"/>
+                     </hbox>
+                   </vbox>
+                   <vbox id="cvbChat" class="cardViewGroup">
+                     <description class="CardViewHeading" id="cvhChat">&chat.heading;</description>
+                     <description class="CardViewText" id="cvYahoo"/>
+                     <description class="CardViewText" id="cvSkype"/>
+                     <description class="CardViewText" id="cvQQ"/>
+-                    <description class="CardViewText" id="cvMSN"/>
+-                    <description class="CardViewText" id="cvICQ"/>
+                     <description class="CardViewText" id="cvXMPP"/>
+                     <description class="CardViewText" id="cvIRC"/>
+                   </vbox>
+                   <!-- the description and addresses groups are only for
+                         mailing lists -->
+                   <vbox id="cvbDescription" class="cardViewGroup">
+                     <description class="CardViewHeading" id="cvhDescription">&description.heading;</description>
+                     <description class="CardViewText" id="cvDescription"/>

comm-release/patches/9999999-venkman-25320.patch

@@ -0,0 +1,49 @@
+# HG changeset patch
+# User Frank-Rainer Grahl <frgrahl@gmx.net>
+# Date 1721471057 -7200
+# Parent  a60520df982faa147221a8b1f480b192ed360d43
+Bug 9999999 -Remove unused venkman overlay from DOMi. r=IanN a=IanN
+
+diff --git a/suite/extensions/inspector/resources/content/venkmanOverlay.xul b/suite/extensions/inspector/resources/content/venkmanOverlay.xul
+deleted file mode 100644
+--- a/suite/extensions/inspector/resources/content/venkmanOverlay.xul
++++ /dev/null
+@@ -1,38 +0,0 @@
+-<?xml version="1.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/. -->
+-
+-
+-<overlay id="ovVenkman"
+-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+-
+-<script type="application/javascript" src="chrome://inspector/content/hooks.js"/>
+-
+-<script type="application/javascript"><![CDATA[
+-
+-window.addEventListener("load", InspectorVenkmanOnLoad, false);
+-
+-function InspectorVenkmanOnLoad()
+-{
+-  console._commands.add("inspect", "onInputInspect", "<object>", "Inspect somethin', yo.");  
+-}
+-
+-console.onInputInspect = function (e) 
+-{
+-  var v = evalInTargetScope (e.inputData);
+-
+-  if (!(v instanceof jsdIValue) || v.jsType != jsdIValue.TYPE_OBJECT)
+-  {
+-      var str = (v instanceof jsdIValue) ? formatValue(v) : String(v)
+-      display (getMsg(MSN_ERR_INVALID_PARAM, [MSG_VAL_EXPR, str]),
+-               MT_ERROR);
+-      return false;
+-  }
+-  
+-  inspectObject(v);
+-}
+-
+-]]></script>
+-
+-</overlay>