fix for Postbox Theme errorenigmail-postbox-2.0.12.2enigmail-pbx

15 files changed, 16 insertions, 2 deletions

diff --git a/package/install.rdf b/package/install.rdf
index 20b3f986..f73a4111 100644
--- a/package/install.rdf
+++ b/package/install.rdf
@@ -5,7 +5,7 @@
 
 <Description about="urn:mozilla:install-manifest">
 <em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id>
- <em:version>2.0.12.1</em:version>
+ <em:version>2.0.12.2</em:version>
 <em:type>2</em:type> <!-- type = extension -->
 <em:bootstrap>true</em:bootstrap>
 
diff --git a/ui/content/autocryptInitiateBackup.xul b/ui/content/autocryptInitiateBackup.xul
index c62b78a9..0b62c89e 100644
--- a/ui/content/autocryptInitiateBackup.xul
+++ b/ui/content/autocryptInitiateBackup.xul
@@ -21,6 +21,7 @@
 xmlns:html="http://www.w3.org/1999/xhtml"
 onwizardcancel="return onCancel();"
 onwizardnext="return onNext();"
+ theme="default-light"
 style="min-height: 500px;"
 onload="onLoad();">
 
diff --git a/ui/content/enigmailEditKeyExpiryDlg.xul b/ui/content/enigmailEditKeyExpiryDlg.xul
index 9fb8dfc5..98af4082 100644
--- a/ui/content/enigmailEditKeyExpiryDlg.xul
+++ b/ui/content/enigmailEditKeyExpiryDlg.xul
@@ -23,6 +23,7 @@
 title="&enigmail.keyExpiry.title;"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 onload="onLoad();"
+ theme="default-light"
 ondialogaccept="return onAccept();"
 minwidth="460px"
 persist="width height"
diff --git a/ui/content/enigmailEditKeyTrustDlg.xul b/ui/content/enigmailEditKeyTrustDlg.xul
index 270088da..5daad73c 100644
--- a/ui/content/enigmailEditKeyTrustDlg.xul
+++ b/ui/content/enigmailEditKeyTrustDlg.xul
@@ -20,6 +20,7 @@
 title="&enigmail.keyTrust.title;"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 onload="onLoad();"
+ theme="default-light"
 ondialogaccept="return onAccept();"
 >
 
diff --git a/ui/content/enigmailGenCardKey.xul b/ui/content/enigmailGenCardKey.xul
index aaf3d294..81c68da1 100644
--- a/ui/content/enigmailGenCardKey.xul
+++ b/ui/content/enigmailGenCardKey.xul
@@ -21,6 +21,7 @@
 windowtype="enigmail:genCardKey"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 onload="onLoad()"
+ theme="default-light"
 buttons="accept,cancel"
 minwidth="450px"
 width="600px">
diff --git a/ui/content/enigmailKeyManager.xul b/ui/content/enigmailKeyManager.xul
index 95228ea6..a042f6b3 100644
--- a/ui/content/enigmailKeyManager.xul
+++ b/ui/content/enigmailKeyManager.xul
@@ -28,6 +28,7 @@
 onload="enigmailKeyManagerLoad();"
 height="450"
 width="700"
+ theme="default-light"
 windowtype="enigmail:KeyManager"
 persist="screenX screenY width height">
 
diff --git a/ui/content/enigmailKeySelection.xul b/ui/content/enigmailKeySelection.xul
index a214dc9b..70b2a8fc 100644
--- a/ui/content/enigmailKeySelection.xul
+++ b/ui/content/enigmailKeySelection.xul
@@ -22,6 +22,7 @@
 buttons="accept,cancel,extra1"
 buttonlabelaccept="&enigmail.send.label;"
 ondialogaccept="return onAccept();"
+ theme="default-light"
 buttonlabelextra1="&enigmail.perRecipientsOption.label;"
 ondialogextra1="newRecipientRule();"
 minheight="450">
diff --git a/ui/content/enigmailKeygen.xul b/ui/content/enigmailKeygen.xul
index c96b088c..6390548d 100644
--- a/ui/content/enigmailKeygen.xul
+++ b/ui/content/enigmailKeygen.xul
@@ -20,6 +20,7 @@
 orient="vertical"
 onload="enigmailKeygenLoad()"
 onclose="return enigmailOnClose();"
+ theme="default-light"
 xmlns:html="http://www.w3.org/1999/xhtml"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/ui/content/enigmailKeyserverDlg.xul b/ui/content/enigmailKeyserverDlg.xul
index 69fadc05..b2a2b783 100644
--- a/ui/content/enigmailKeyserverDlg.xul
+++ b/ui/content/enigmailKeyserverDlg.xul
@@ -19,6 +19,7 @@
 title="&enigmail.keyserverDlg.label;"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 onload="onLoad();"
+ theme="default-light"
 ondialogaccept="return onAccept();">
 
 <script type="application/x-javascript" src="chrome://enigmail/content/enigmailKeyserverDlg.js"/>
diff --git a/ui/content/enigmailManageUidDlg.xul b/ui/content/enigmailManageUidDlg.xul
index 405ac48e..23c16ff0 100644
--- a/ui/content/enigmailManageUidDlg.xul
+++ b/ui/content/enigmailManageUidDlg.xul
@@ -18,6 +18,7 @@
 <dialog id="enigmailManageUidDlg"
 title="&enigmail.manageUidDlg.title;"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ theme="default-light"
 buttons="accept"
 onload="onLoad();">
 
diff --git a/ui/content/enigmailSetCardPin.xul b/ui/content/enigmailSetCardPin.xul
index 2ede3606..8f11298b 100644
--- a/ui/content/enigmailSetCardPin.xul
+++ b/ui/content/enigmailSetCardPin.xul
@@ -19,6 +19,7 @@
 title="&enigmail.cardPin.title;"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 onload="onLoad();"
+ theme="default-light"
 ondialogaccept="return onAccept();">
 
 <script type="application/x-javascript" src="chrome://enigmail/content/enigmailSetCardPin.js"/>
diff --git a/ui/content/enigmailSetupWizard.xul b/ui/content/enigmailSetupWizard.xul
index 2e70a840..cce669f3 100644
--- a/ui/content/enigmailSetupWizard.xul
+++ b/ui/content/enigmailSetupWizard.xul
@@ -23,6 +23,7 @@
 onwizardcancel="return onCancel();"
 minheight="500px"
 minwidth="700px"
+ theme="default-light"
 xmlns:html="http://www.w3.org/1999/xhtml"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/ui/content/enigmailSignKeyDlg.xul b/ui/content/enigmailSignKeyDlg.xul
index d99ab65e..32170d06 100644
--- a/ui/content/enigmailSignKeyDlg.xul
+++ b/ui/content/enigmailSignKeyDlg.xul
@@ -20,6 +20,7 @@
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 onload="onLoad();"
 buttons="accept,cancel"
+ theme="default-light"
 ondialogaccept="return onAccept();">
 
 
diff --git a/ui/content/enigmailSingleRcptSettings.xul b/ui/content/enigmailSingleRcptSettings.xul
index 249a8ec7..3cab976c 100644
--- a/ui/content/enigmailSingleRcptSettings.xul
+++ b/ui/content/enigmailSingleRcptSettings.xul
@@ -20,6 +20,7 @@
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 onload="enigmailDlgOnLoad();"
 minheight="200"
+ theme="default-light"
 buttons="accept,cancel,help"
 ondialogaccept="return enigmailDlgOnAccept();"
 ondialoghelp="EnigHelpWindow('editRcptRule');">
@@ -128,7 +129,7 @@
 </menulist>
 </hbox>
 </row>
-#ifndef POSTBOX 
+#ifndef POSTBOX
 <row>
 #else
 <row collapsed="true">
diff --git a/ui/content/keyDetailsDlg.xul b/ui/content/keyDetailsDlg.xul
index b93a8289..4993253d 100644
--- a/ui/content/keyDetailsDlg.xul
+++ b/ui/content/keyDetailsDlg.xul
@@ -21,6 +21,7 @@
 xmlns:html="http://www.w3.org/1999/xhtml"
 buttons="accept"
 minwidth="450px"
+ theme="default-light"
 persist="width height"
 buttonlabelaccept="&enigmail.cardDetails.closeWindow.label;"
 onload="onLoad();">