From d65207749ed4ec1336f8acf9ca5a900004202b80 Mon Sep 17 00:00:00 2001
From: David von Oheimb <dev@ddvo.net>
Date: Sat, 9 Jun 2018 12:22:44 +0200
Subject: [PATCH] version 1.0.5 (correction of mistake in packaging version
 1.0.4 that prevented it from running)

---
 chrome/content/duplicateContactsManager.js  | 11 ++++++++
 chrome/content/duplicateContactsManager.xul | 28 +++++++++++++++++++++
 chrome/content/duplicateEntriesWindow.js    |  4 ++-
 chrome/content/duplicateEntriesWindow.xul   |  9 ++++---
 install.rdf                                 |  4 +--
 zip.sh                                      |  3 ++-
 6 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 chrome/content/duplicateContactsManager.js
 create mode 100644 chrome/content/duplicateContactsManager.xul

diff --git a/chrome/content/duplicateContactsManager.js b/chrome/content/duplicateContactsManager.js
new file mode 100644
index 0000000..f680f20
--- /dev/null
+++ b/chrome/content/duplicateContactsManager.js
@@ -0,0 +1,11 @@
+var DuplicateContactsManager = {
+	manageDuplicatesIsRunning: false,
+	menuButtonAction: function() {
+		this.manageDuplicates();
+	},
+	manageDuplicates: function() {
+		this.manageDuplicatesIsRunning = true;
+		var dupwindow = window.open('chrome://duplicatecontactsmanager/content/duplicateEntriesWindow.xul', "Duplicate Contacts Manager", "chrome,centerscreen");
+		dupwindow.focus();
+	}
+}
diff --git a/chrome/content/duplicateContactsManager.xul b/chrome/content/duplicateContactsManager.xul
new file mode 100644
index 0000000..4a60b90
--- /dev/null
+++ b/chrome/content/duplicateContactsManager.xul
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay SYSTEM "chrome://duplicatecontactsmanager/locale/duplicateContactsManager.dtd">
+<?xml-stylesheet type="text/css" href="chrome://duplicatecontactsmanager/skin/duplicateContactsManager.css"?>
+
+<overlay id="duplicateContactsManager.overlay.menuitem"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="init();">
+
+	<!--<script type="application/x-javascript" src="chrome://duplicatecontactsmanager/content/windowsregistry.js"/>-->
+	<script type="application/x-javascript" src="chrome://duplicatecontactsmanager/content/duplicateContactsManager.js"/>
+	<script type="application/x-javascript" src="chrome://duplicatecontactsmanager/content/duplicateEntriesWindow.js"/>
+	<command id="cmd_handle_duplicates" disabled="false"/>
+	<menu id="tasksMenu">
+		<menupopup id="taskPopup">
+			<menuitem id="duplicateContactsManagerMenu_manageDuplicates"
+				label="&abookmenu.items.handleduplicates.label;"
+				oncommand="DuplicateContactsManager.manageDuplicates();"
+				accesskey="&abookmenu.items.handleduplicates.accesskey;" />
+		</menupopup>
+	</menu>
+	<!-- Thunderbird address book -->
+	<toolbarpalette id="AddressBookToolbarPalette">
+		<toolbarbutton id="duplicatecontactsmanager-toolbarbutton-1"
+		label="&abooktoolbar.label;"
+		tooltiptext="&abooktoolbar.tooltip;"
+		oncommand="DuplicateContactsManager.manageDuplicates();"
+		class="toolbarbutton-1 chromeclass-toolbar-additional custombutton" />
+	</toolbarpalette>
+</overlay>
diff --git a/chrome/content/duplicateEntriesWindow.js b/chrome/content/duplicateEntriesWindow.js
index a5c68e6..0341fc5 100644
--- a/chrome/content/duplicateEntriesWindow.js
+++ b/chrome/content/duplicateEntriesWindow.js
@@ -4,12 +4,14 @@
 // This file includes UTF-8 encoding. Please make sure your text editor can deal with this prior to saving any changes!
 
 /* Change history:
+ * Version 1.0.5:
+ * - correction of mistake in packaging version 1.0.4 that prevented it from running
  * Version 1.0.4:
  * - various small UI improvments: indication for card matching, layout, language, doc
  * Version 1.0.3:
  * - fixed syntax error in de-DE locale that lead to obscure initialization error
  * - minor improvements of localization in the extension and of the entry in the TB add-ons list
- * Version 1.0.2 and 1.0.2:
+ * Version 1.0.1 and 1.0.2:
  * - improved label of DCM menu entry for address book window
  * Version 1.0:
  * - major speedup in particular when searching for duplicates in large address books
diff --git a/chrome/content/duplicateEntriesWindow.xul b/chrome/content/duplicateEntriesWindow.xul
index ddfdc3d..bcab8ee 100644
--- a/chrome/content/duplicateEntriesWindow.xul
+++ b/chrome/content/duplicateEntriesWindow.xul
@@ -2,6 +2,7 @@
 <!DOCTYPE overlay SYSTEM "chrome://duplicatecontactsmanager/locale/duplicateContactsManager.dtd">
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?>
 <?xml-stylesheet href="chrome://duplicatecontactsmanager/skin/duplicateContactsManager.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/content/bindings.css" type="text/css"?>
 <window
     id="handleDuplicates-window"
     title="&handleDuplicates.windowtitle;"
@@ -35,25 +36,25 @@
 				disabled="true"
 				visibility="hidden"
 				accesskey="&handleDuplicates.keepnextbutton.accesskey;"
-				oncommand="DuplicateEntriesWindow.keepAndSearchNextDuplicate();" />
+				oncommand="DuplicateEntriesWindow.keepAndSearchNextDuplicate()" />
 			<button	id="applynextbutton"
 				class="dialog"
 				label="&handleDuplicates.applynextbutton.label;"
 				disabled="true"
 				visibility="hidden"
 				accesskey="&handleDuplicates.applynextbutton.accesskey;"
-				oncommand="DuplicateEntriesWindow.applyAndSearchNextDuplicate();" />
+				oncommand="DuplicateEntriesWindow.applyAndSearchNextDuplicate()" />
 			<spacer flex="3" />
 			<button	id="stopbutton" style="display: none"
 				class="dialog"
 				label="&handleDuplicates.stopbutton.label;"
 				disabled="false"
-				oncommand="DuplicateEntriesWindow.endSearch();" />
+				oncommand="DuplicateEntriesWindow.endSearch()" />
 			<button	id="quitbutton"
 				class="dialog"
 				label="&handleDuplicates.quitbutton.label;"
 				disabled="false"
-				oncommand="window.close();" />
+				oncommand="window.close()" />
 		</hbox>
 		<hbox id="statusBar">
 			<hbox id="statusText" flex="3">
diff --git a/install.rdf b/install.rdf
index 95eb348..e169191 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:name>Duplicate Contacts Manager</em:name>
 		<em:id>duplicateContactsManager@ddvo.net</em:id>
-		<em:version>1.0.4</em:version>
+		<em:version>1.0.5</em:version>
 		<em:description>Facilitates handling of redundant entries in address books.</em:description>
 		<em:creator>Marian Steinbach and David von Oheimb</em:creator>
 		<em:contributor>François Godin (Copelnug)</em:contributor>
@@ -22,7 +22,7 @@
 		<Description>
 			<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
 			<em:minVersion>3.0</em:minVersion>
-			<em:maxVersion>61.*</em:maxVersion>
+			<em:maxVersion>60.*</em:maxVersion>
 		</Description>
 		</em:targetApplication>
                 <em:localized>
diff --git a/zip.sh b/zip.sh
index 9ba1e44..fbf633e 100755
--- a/zip.sh
+++ b/zip.sh
@@ -1,2 +1,3 @@
 #cd duplicateContactsManager@ddvo.net
-zip -r ../duplicatecontactsmanager-1.0.xpi . -x \*~ .git/\* .git README.md zip.sh .gitignore doc/\* chrome/content/duplicateContactsManager\* @
+zip -r ../duplicatecontactsmanager-1.0.xpi . -x \*~ .git/\* .git README.md zip.sh .gitignore doc/\*
+#chrome/content/duplicateContactsManager\* @