diff -ru mail_merge1/chrome.manifest mail_merge2/chrome.manifest
--- mail_merge1/chrome.manifest 2018-06-13 03:22:01.000000000 -0400
+++ mail_merge2/chrome.manifest 2018-09-13 20:43:52.573702252 -0400
@@ -2,6 +2,8 @@
overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://mailmerge/content/overlay-tb.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6}
overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://mailmerge/content/overlay-sm.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://mailmerge/content/overlay-tb.xul application={3aa07e56-beb0-47a0-b0cb-c735edd25419}
+overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://mailmerge/content/overlay-sm.xul application={9184b6fe-4a5c-484d-8b4b-efbfccbfb514}
locale mailmerge cs-CZ locale/cs-CZ/
locale mailmerge da-DK locale/da-DK/
diff -ru mail_merge1/content/dialog.js mail_merge2/content/dialog.js
--- mail_merge1/content/dialog.js 2018-06-13 03:22:01.000000000 -0400
+++ mail_merge2/content/dialog.js 2018-09-13 18:25:12.327032499 -0400
@@ -64,22 +64,13 @@
try {
- /* Thunderbird 52 */
+ /* Icedove-UXP 52 */
document.getElementById("mailmerge-cardbook-cardbook").value = prefs.getComplexValue("cardbook", Components.interfaces.nsISupportsString).data;
document.getElementById("mailmerge-addressbook-addressbook").value = prefs.getComplexValue("addressbook", Components.interfaces.nsISupportsString).data;
document.getElementById("mailmerge-csv-file").value = prefs.getComplexValue("file", Components.interfaces.nsISupportsString).data;
} catch(e) {}
- try {
-
- /* Thunderbird 57 */
- document.getElementById("mailmerge-cardbook-cardbook").value = prefs.getStringPref("cardbook");
- document.getElementById("mailmerge-addressbook-addressbook").value = prefs.getStringPref("addressbook");
- document.getElementById("mailmerge-csv-file").value = prefs.getStringPref("file");
-
- } catch(e) {}
-
mailmerge.update();
},
@@ -104,7 +95,7 @@
try {
- /* Thunderbird 52 */
+ /* Icedove-UXP 52 */
var string = Components.classes["@mozilla.org/supports-string;1"].createInstance(Components.interfaces.nsISupportsString);
string.data = document.getElementById("mailmerge-cardbook-cardbook").value;
@@ -118,15 +109,6 @@
} catch(e) {}
- try {
-
- /* Thunderbird 57 */
- prefs.setStringPref("cardbook", document.getElementById("mailmerge-cardbook-cardbook").value);
- prefs.setStringPref("addressbook", document.getElementById("mailmerge-addressbook-addressbook").value);
- prefs.setStringPref("file", document.getElementById("mailmerge-csv-file").value);
-
- } catch(e) {}
-
window.arguments[0].accept = true;
},
diff -ru mail_merge1/content/overlay.js mail_merge2/content/overlay.js
--- mail_merge1/content/overlay.js 2018-06-13 03:22:01.000000000 -0400
+++ mail_merge2/content/overlay.js 2018-09-13 18:26:17.058618122 -0400
@@ -34,7 +34,7 @@
try {
- /* Thunderbird */
+ /* Icedove-UXP */
var bundle = document.getElementById("bundle_composeMsgs");
Services.prompt.alert(window, bundle.getString("addressInvalidTitle"), bundle.getString("noRecipients"));
return;
@@ -43,7 +43,7 @@
try {
- /* SeaMonkey */
+ /* Iceape-UXP */
var bundle = document.getElementById("bundle_composeMsgs");
Services.prompt.alert(window, "Mail Merge", bundle.getString("12511"));
return;
@@ -156,14 +156,14 @@
try {
- /* Thunderbird */
+ /* Icedove-UXP */
if(gSendOperationInProgress || gSaveOperationInProgress) { window.setTimeout(function() { mailmerge.compose(); }, 1000); return; }
} catch(e) {}
try {
- /* SeaMonkey */
+ /* Iceape-UXP */
if(gSendOrSaveOperationInProgress) { window.setTimeout(function() { mailmerge.compose(); }, 1000); return; }
} catch(e) {}
diff -ru mail_merge1/install.rdf mail_merge2/install.rdf
--- mail_merge1/install.rdf 2018-06-13 03:22:01.000000000 -0400
+++ mail_merge2/install.rdf 2018-09-13 20:42:06.840645902 -0400
@@ -30,21 +30,30 @@
-
- {3550f703-e582-4d05-9a08-453d09bdfdc6}
+
+ {3aa07e56-beb0-47a0-b0cb-c735edd25419}
52.0
- 60.*
+ 52.*
-
+
{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
2.49
- 2.49.*
+ 52.*
+
+
+
+
+ {3aa07e56-beb0-47a0-b0cb-c735edd25419}
+ 52.0
+ 52.*
+
+