Bug 901332 - Google CalDAV OAuth2 authentication dialog not shown in SeaMonkey. r=Ratty GECKO290b1_2014042307_RELBRANCH
authorPhilipp Kewisch <mozilla@kewis.ch>
Wed, 02 Apr 2014 00:30:50 +0200
branchGECKO290b1_2014042307_RELBRANCH
changeset 19451 fea21f2a0ab4c28e92b0fc4c1e4976dc5b6af1a2
parent 19450 e2d9ffed0c8e13d1daf677e82424d1af09550df0
push idunknown
push userunknown
push dateunknown
reviewersRatty
bugs901332
Bug 901332 - Google CalDAV OAuth2 authentication dialog not shown in SeaMonkey. r=Ratty a=IanN a=comm-aurora a=comm-beta CLOSED TREE
suite/mailnews/browserRequest.js
suite/mailnews/browserRequest.xul
suite/mailnews/jar.mn
suite/themes/classic/jar.mn
suite/themes/classic/mac/messenger/browserRequest.css
suite/themes/classic/messenger/browserRequest.css
suite/themes/classic/messenger/icons/insecure.png
suite/themes/classic/messenger/icons/loading.png
suite/themes/classic/messenger/icons/secure.png
suite/themes/modern/jar.mn
suite/themes/modern/messenger/browserRequest.css
suite/themes/modern/messenger/icons/insecure.png
suite/themes/modern/messenger/icons/loading.png
suite/themes/modern/messenger/icons/secure.png
copy from mail/base/content/browserRequest.js
copy to suite/mailnews/browserRequest.js
copy from mail/base/content/browserRequest.xul
copy to suite/mailnews/browserRequest.xul
--- a/mail/base/content/browserRequest.xul
+++ b/suite/mailnews/browserRequest.xul
@@ -21,14 +21,14 @@
   <script type="application/javascript" src="chrome://messenger/content/browserRequest.js"/>
 
   <keyset id="mainKeyset">
     <key id="key_close" key="w" modifiers="accel" oncommand="cancelRequest()"/>
     <key id="key_close2"  keycode="VK_ESCAPE" oncommand="cancelRequest()"/>
   </keyset>
   <hbox id="header">
   <hbox id="addressbox" flex="1" disabled="true">
-    <image id="security-button" src="chrome://messenger/skin/icons/mailicon32.png"/>
+    <image id="security-button"/>
     <description id="headerMessage"/>
   </hbox>
   </hbox>
   <browser type="content" disablehistory="true" src="about:blank" id="requestFrame" flex="1"/>
 </window>
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -11,16 +11,18 @@ messenger.jar:
 % overlay chrome://communicator/content/pref/pref-appearance.xul               chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-scripts.xul                  chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-cookies.xul                  chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://editor/content/editorTasksOverlay.xul                       chrome://messenger/content/mailTasksOverlay.xul
 % overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xul   chrome://messenger/content/mailOverlay.xul
 % overlay chrome://editor/content/composerOverlay.xul                          chrome://messenger/content/mailEditorOverlay.xul
 % overlay chrome://editor/content/EdImageOverlay.xul                           chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
 % overlay chrome://editor/content/EdLinkProps.xul                              chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
+    content/messenger/browserRequest.xul
+    content/messenger/browserRequest.js
     content/messenger/msgViewPickerOverlay.js
     content/messenger/mailViewSetup.js
     content/messenger/mailViewSetup.xul
     content/messenger/mailViewList.xul
     content/messenger/mailViewList.js
     content/messenger/mailWidgets.xml
     content/messenger/tabmail.xml
     content/messenger/tabmail.js
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -212,16 +212,17 @@ classic.jar:
   skin/classic/editor/icons/img-align-right.gif                         (editor/icons/img-align-right.gif)
   skin/classic/editor/icons/img-align-top.gif                           (editor/icons/img-align-top.gif)
   skin/classic/editor/icons/btn2.gif                                    (editor/icons/btn2.gif)
   skin/classic/editor/icons/progress-busy.gif                           (editor/icons/progress-busy.gif)
   skin/classic/editor/icons/progress-done.gif                           (editor/icons/progress-done.gif)
   skin/classic/editor/icons/progress-failed.gif                         (editor/icons/progress-failed.gif)
 #ifdef XP_MACOSX
   skin/classic/messenger/accountManage.css                              (mac/messenger/accountManage.css)
+  skin/classic/messenger/browserRequest.css                             (mac/messenger/browserRequest.css)
   skin/classic/messenger/filterDialog.css                               (mac/messenger/filterDialog.css)
   skin/classic/messenger/mailWindow1.css                                (mac/messenger/mailWindow1.css)
   skin/classic/messenger/messageHeader.css                              (mac/messenger/messageHeader.css)
   skin/classic/messenger/primaryToolbar.css                             (mac/messenger/primaryToolbar.css)
   skin/classic/messenger/searchDialog.css                               (mac/messenger/searchDialog.css)
   skin/classic/messenger/icons/messengericons.png                       (mac/messenger/icons/messengericons.png)
   skin/classic/messenger/icons/messengericons-small.png                 (mac/messenger/icons/messengericons-small.png)
   skin/classic/messenger/icons/spin-buttons.png                         (mac/messenger/icons/spin-buttons.png)
@@ -234,16 +235,17 @@ classic.jar:
   skin/classic/messenger/addressbook/icons/addressbookicons.png         (mac/messenger/addressbook/icons/addressbookicons.png)
   skin/classic/messenger/addressbook/icons/addressbookicons-small.png   (mac/messenger/addressbook/icons/addressbookicons-small.png)
   skin/classic/messenger/messengercompose/messengercompose.css          (mac/messenger/messengercompose/messengercompose.css)
   skin/classic/messenger/smime/msgCompSMIMEOverlay.css                  (mac/messenger/smime/msgCompSMIMEOverlay.css)
   skin/classic/messenger/smime/icons/smimeicons.png                     (mac/messenger/smime/icons/smimeicons.png)
   skin/classic/messenger/smime/icons/smimeicons-small.png               (mac/messenger/smime/icons/smimeicons-small.png)
 #else
   skin/classic/messenger/accountManage.css                              (messenger/accountManage.css)
+  skin/classic/messenger/browserRequest.css                             (messenger/browserRequest.css)
   skin/classic/messenger/filterDialog.css                               (messenger/filterDialog.css)
   skin/classic/messenger/mailWindow1.css                                (messenger/mailWindow1.css)
   skin/classic/messenger/messageHeader.css                              (messenger/messageHeader.css)
   skin/classic/messenger/primaryToolbar.css                             (messenger/primaryToolbar.css)
   skin/classic/messenger/searchDialog.css                               (messenger/searchDialog.css)
   skin/classic/messenger/icons/messengericons.png                       (messenger/icons/messengericons.png)
   skin/classic/messenger/icons/messengericons-small.png                 (messenger/icons/messengericons-small.png)
   skin/classic/messenger/icons/twisty-clsd.png                          (messenger/icons/twisty-clsd.png)
@@ -316,18 +318,20 @@ classic.jar:
   skin/classic/messenger/icons/folder-template.png                      (messenger/icons/folder-template.png)
   skin/classic/messenger/icons/folder-template-share-open.png           (messenger/icons/folder-template-share-open.png)
   skin/classic/messenger/icons/folder-template-share.png                (messenger/icons/folder-template-share.png)
   skin/classic/messenger/icons/folder-trash-open.png                    (messenger/icons/folder-trash-open.png)
   skin/classic/messenger/icons/folder-trash.png                         (messenger/icons/folder-trash.png)
   skin/classic/messenger/icons/folder-trash-share-open.png              (messenger/icons/folder-trash-share-open.png)
   skin/classic/messenger/icons/folder-trash-share.png                   (messenger/icons/folder-trash-share.png)
   skin/classic/messenger/icons/info.png                                 (messenger/icons/info.png)
+  skin/classic/messenger/icons/insecure.png                             (messenger/icons/insecure.png)
   skin/classic/messenger/icons/junk.png                                 (messenger/icons/junk.png)
   skin/classic/messenger/icons/junkcol.png                              (messenger/icons/junkcol.png)
+  skin/classic/messenger/icons/loading.png                              (messenger/icons/loading.png)
   skin/classic/messenger/icons/local-mailhost.png                       (messenger/icons/local-mailhost.png)
   skin/classic/messenger/icons/message-mail-attach-del.png              (messenger/icons/message-mail-attach-del.png)
   skin/classic/messenger/icons/message-mail-attach-fwd-offl-reply.png   (messenger/icons/message-mail-attach-fwd-offl-reply.png)
   skin/classic/messenger/icons/message-mail-attach-fwd-offl.png         (messenger/icons/message-mail-attach-fwd-offl.png)
   skin/classic/messenger/icons/message-mail-attach-fwd-reply.png        (messenger/icons/message-mail-attach-fwd-reply.png)
   skin/classic/messenger/icons/message-mail-attach-fwd.png              (messenger/icons/message-mail-attach-fwd.png)
   skin/classic/messenger/icons/message-mail-attach-offl-reply.png       (messenger/icons/message-mail-attach-offl-reply.png)
   skin/classic/messenger/icons/message-mail-attach-offl.png             (messenger/icons/message-mail-attach-offl.png)
@@ -355,16 +359,17 @@ classic.jar:
   skin/classic/messenger/icons/message-news-new-attach.png              (messenger/icons/message-news-new-attach.png)
   skin/classic/messenger/icons/message-news-new-offl.png                (messenger/icons/message-news-new-offl.png)
   skin/classic/messenger/icons/message-news-new.png                     (messenger/icons/message-news-new.png)
   skin/classic/messenger/icons/message-news-offl.png                    (messenger/icons/message-news-offl.png)
   skin/classic/messenger/icons/message-news.png                         (messenger/icons/message-news.png)
   skin/classic/messenger/icons/phishing.png                             (messenger/icons/phishing.png)
   skin/classic/messenger/icons/readcol.png                              (messenger/icons/readcol.png)
   skin/classic/messenger/icons/remote-blocked.png                       (messenger/icons/remote-blocked.png)
+  skin/classic/messenger/icons/secure.png                               (messenger/icons/secure.png)
   skin/classic/messenger/icons/server-local-new.png                     (messenger/icons/server-local-new.png)
   skin/classic/messenger/icons/server-local.png                         (messenger/icons/server-local.png)
   skin/classic/messenger/icons/server-mail-new.png                      (messenger/icons/server-mail-new.png)
   skin/classic/messenger/icons/server-mail.png                          (messenger/icons/server-mail.png)
   skin/classic/messenger/icons/server-news-lock.png                     (messenger/icons/server-news-lock.png)
   skin/classic/messenger/icons/server-news-new.png                      (messenger/icons/server-news-new.png)
   skin/classic/messenger/icons/server-news.png                          (messenger/icons/server-news.png)
   skin/classic/messenger/icons/server-remote-lock-new.png               (messenger/icons/server-remote-lock-new.png)
copy from mail/themes/osx/mail/browserRequest.css
copy to suite/themes/classic/mac/messenger/browserRequest.css
copy from mail/themes/windows/mail/browserRequest.css
copy to suite/themes/classic/messenger/browserRequest.css
copy from chat/themes/away-16.png
copy to suite/themes/classic/messenger/icons/insecure.png
copy from mail/themes/windows/mail/icons/loading.png
copy to suite/themes/classic/messenger/icons/loading.png
copy from chat/themes/available-16.png
copy to suite/themes/classic/messenger/icons/secure.png
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -388,16 +388,17 @@ modern.jar:
   skin/modern/global/tree/columnpicker.gif                         (global/tree/columnpicker.gif)
   skin/modern/help/help.css                                        (help/help.css)
   skin/modern/help/helpFileLayout.css                              (/mozilla/toolkit/themes/windows/help/helpFileLayout.css)
   skin/modern/messenger/threadPaneLabels.css                       (messenger/threadPaneLabels.css)
   skin/modern/messenger/accountCentral.css                         (messenger/accountCentral.css)
   skin/modern/messenger/accountManage.css                          (messenger/accountManage.css)
   skin/modern/messenger/accountWizard.css                          (messenger/accountWizard.css)
   skin/modern/messenger/addressingWidget.css                       (messenger/addressingWidget.css)
+  skin/modern/messenger/browserRequest.css                         (messenger/browserRequest.css)
   skin/modern/messenger/dialogs.css                                (messenger/dialogs.css)
   skin/modern/messenger/filterDialog.css                           (messenger/filterDialog.css)
   skin/modern/messenger/folderMenus.css                            (messenger/folderMenus.css)
   skin/modern/messenger/folderPane.css                             (messenger/folderPane.css)
   skin/modern/messenger/folderPaneExtras.css                       (messenger/folderPaneExtras.css)
   skin/modern/messenger/threadPaneExtras.css                       (messenger/threadPaneExtras.css)
   skin/modern/messenger/messageBody.css                            (messenger/messageBody.css)
   skin/modern/messenger/virtualFolderListDialog.css                (messenger/virtualFolderListDialog.css)
@@ -476,17 +477,19 @@ modern.jar:
   skin/modern/messenger/icons/folder-template-share.gif            (messenger/icons/folder-template-share.gif)
   skin/modern/messenger/icons/folder-template.gif                  (messenger/icons/folder-template.gif)
   skin/modern/messenger/icons/folder-trash-open.gif                (messenger/icons/folder-trash-open.gif)
   skin/modern/messenger/icons/folder-trash-share-open.gif          (messenger/icons/folder-trash-share-open.gif)
   skin/modern/messenger/icons/folder-trash-share.gif               (messenger/icons/folder-trash-share.gif)
   skin/modern/messenger/icons/folder-trash.gif                     (messenger/icons/folder-trash.gif)
   skin/modern/messenger/icons/folder-search.gif                    (messenger/icons/folder-search.gif)
   skin/modern/messenger/icons/info.png                             (messenger/icons/info.png)
+  skin/modern/messenger/icons/insecure.png                         (messenger/icons/insecure.png)
   skin/modern/messenger/icons/junk.png                             (messenger/icons/junk.png)
+  skin/modern/messenger/icons/loading.png                          (messenger/icons/loading.png)
   skin/modern/messenger/icons/local-mailhost.gif                   (messenger/icons/local-mailhost.gif)
   skin/modern/messenger/icons/mast-mail.gif                        (messenger/icons/mast-mail.gif)
   skin/modern/messenger/icons/message-mail-attach-del.gif          (messenger/icons/message-mail-attach-del.gif)
   skin/modern/messenger/icons/message-mail-attach-fwd-offl-reply.png (messenger/icons/message-mail-attach-fwd-offl-reply.png)
   skin/modern/messenger/icons/message-mail-attach-fwd-offl.png     (messenger/icons/message-mail-attach-fwd-offl.png)
   skin/modern/messenger/icons/message-mail-attach-fwd-reply.png    (messenger/icons/message-mail-attach-fwd-reply.png)
   skin/modern/messenger/icons/message-mail-attach-fwd.png          (messenger/icons/message-mail-attach-fwd.png)
   skin/modern/messenger/icons/message-mail-attach-offl-reply.png   (messenger/icons/message-mail-attach-offl-reply.png)
@@ -516,16 +519,17 @@ modern.jar:
   skin/modern/messenger/icons/message-news-new-attach.gif          (messenger/icons/message-news-new-attach.gif)
   skin/modern/messenger/icons/message-news-new-attach-off.gif      (messenger/icons/message-news-new-attach-off.gif)
   skin/modern/messenger/icons/message-news-new-offl.gif            (messenger/icons/message-news-new-offl.gif)
   skin/modern/messenger/icons/message-news-offl.gif                (messenger/icons/message-news-offl.gif)
   skin/modern/messenger/icons/phishing.png                         (messenger/icons/phishing.png)
   skin/modern/messenger/icons/readcol-read.gif                     (messenger/icons/readcol-read.gif)
   skin/modern/messenger/icons/readcol-unread.gif                   (messenger/icons/readcol-unread.gif)
   skin/modern/messenger/icons/remote-blocked.png                   (messenger/icons/remote-blocked.png)
+  skin/modern/messenger/icons/secure.png                           (messenger/icons/secure.png)
   skin/modern/messenger/icons/server-local-new.gif                 (messenger/icons/server-local-new.gif)
   skin/modern/messenger/icons/server-local.gif                     (messenger/icons/server-local.gif)
   skin/modern/messenger/icons/server-mail-new.gif                  (messenger/icons/server-mail-new.gif)
   skin/modern/messenger/icons/server-mail.gif                      (messenger/icons/server-mail.gif)
   skin/modern/messenger/icons/server-news-lock.gif                 (messenger/icons/server-news-lock.gif)
   skin/modern/messenger/icons/server-news-new.gif                  (messenger/icons/server-news-new.gif)
   skin/modern/messenger/icons/server-news.gif                      (messenger/icons/server-news.gif)
   skin/modern/messenger/icons/server-remote-lock.gif               (messenger/icons/server-remote-lock.gif)
copy from mail/themes/windows/mail/browserRequest.css
copy to suite/themes/modern/messenger/browserRequest.css
copy from chat/themes/away-16.png
copy to suite/themes/modern/messenger/icons/insecure.png
copy from mail/themes/linux/mail/icons/loading.png
copy to suite/themes/modern/messenger/icons/loading.png
copy from chat/themes/available-16.png
copy to suite/themes/modern/messenger/icons/secure.png