1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1559294891 -7200 |
3 # Date 1559294891 -7200 |
4 # Fri May 31 11:28:11 2019 +0200 |
4 # Fri May 31 11:28:11 2019 +0200 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
6 # Parent f11c2d7239c0caa4dc74272716d9e30ced1a1ca3 |
6 # Parent 93495ad6fa0fe292eadcbfef14e0e27273528497 |
7 Description: Add KDE integration to Firefox (toolkit parts) |
7 Description: Add KDE integration to Firefox (toolkit parts) |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
9 Author: Lubos Lunak <lunak@suse.com> |
9 Author: Lubos Lunak <lunak@suse.com> |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
699 + |
699 + |
700 +</bindings> |
700 +</bindings> |
701 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
701 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
702 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
702 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
703 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
703 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
704 @@ -1042,30 +1042,60 @@ nsUnknownContentTypeDialog.prototype = { |
704 @@ -1204,36 +1204,66 @@ nsUnknownContentTypeDialog.prototype = { |
705 |
705 params.handlerApp && |
706 if (params.handlerApp && |
706 params.handlerApp.executable && |
707 params.handlerApp.executable && |
707 params.handlerApp.executable.isFile() |
708 params.handlerApp.executable.isFile()) { |
708 ) { |
709 // Remember the file they chose to run. |
709 // Remember the file they chose to run. |
710 this.chosenApp = params.handlerApp; |
710 this.chosenApp = params.handlerApp; |
711 } |
711 } |
712 } else if ("@mozilla.org/applicationchooser;1" in Cc) { |
712 } else if ("@mozilla.org/applicationchooser;1" in Cc) { |
713 - var nsIApplicationChooser = Ci.nsIApplicationChooser; |
713 - var nsIApplicationChooser = Ci.nsIApplicationChooser; |
714 - var appChooser = Cc["@mozilla.org/applicationchooser;1"] |
714 - var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance( |
715 - .createInstance(nsIApplicationChooser); |
715 - nsIApplicationChooser |
716 - appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle")); |
716 - ); |
|
717 - appChooser.init( |
|
718 - this.mDialog, |
|
719 - this.dialogElement("strings").getString("chooseAppFilePickerTitle") |
|
720 - ); |
717 - var contentTypeDialogObj = this; |
721 - var contentTypeDialogObj = this; |
718 - let appChooserCallback = function appChooserCallback_done(aResult) { |
722 - let appChooserCallback = function appChooserCallback_done(aResult) { |
719 - if (aResult) { |
723 - if (aResult) { |
720 - contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp); |
724 - contentTypeDialogObj.chosenApp = aResult.QueryInterface( |
|
725 - Ci.nsILocalHandlerApp |
|
726 - ); |
721 - } |
727 - } |
722 - contentTypeDialogObj.finishChooseApp(); |
728 - contentTypeDialogObj.finishChooseApp(); |
723 - }; |
729 - }; |
724 - appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback); |
730 - appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback); |
725 - // The finishChooseApp is called from appChooserCallback |
731 - // The finishChooseApp is called from appChooserCallback |
752 + } |
758 + } |
753 + this.finishChooseApp(); |
759 + this.finishChooseApp(); |
754 + }); |
760 + }); |
755 + } else { |
761 + } else { |
756 + var nsIApplicationChooser = Ci.nsIApplicationChooser; |
762 + var nsIApplicationChooser = Ci.nsIApplicationChooser; |
757 + var appChooser = Cc["@mozilla.org/applicationchooser;1"] |
763 + var appChooser = Cc["@mozilla.org/applicationchooser;1"].createInstance( |
758 + .createInstance(nsIApplicationChooser); |
764 + nsIApplicationChooser |
759 + appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle")); |
765 + ); |
|
766 + appChooser.init( |
|
767 + this.mDialog, |
|
768 + this.dialogElement("strings").getString("chooseAppFilePickerTitle") |
|
769 + ); |
760 + var contentTypeDialogObj = this; |
770 + var contentTypeDialogObj = this; |
761 + let appChooserCallback = function appChooserCallback_done(aResult) { |
771 + let appChooserCallback = function appChooserCallback_done(aResult) { |
762 + if (aResult) { |
772 + if (aResult) { |
763 + contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp); |
773 + contentTypeDialogObj.chosenApp = aResult.QueryInterface( |
|
774 + Ci.nsILocalHandlerApp |
|
775 + ); |
764 + } |
776 + } |
765 + contentTypeDialogObj.finishChooseApp(); |
777 + contentTypeDialogObj.finishChooseApp(); |
766 + }; |
778 + }; |
767 + appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback); |
779 + appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback); |
768 + // The finishChooseApp is called from appChooserCallback |
780 + // The finishChooseApp is called from appChooserCallback |
769 + return; |
781 + return; |
770 + } |
782 + } |
771 } else { |
783 } else { |
772 var nsIFilePicker = Ci.nsIFilePicker; |
784 var nsIFilePicker = Ci.nsIFilePicker; |
773 var fp = Cc["@mozilla.org/filepicker;1"] |
785 var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker); |
774 .createInstance(nsIFilePicker); |
786 fp.init( |
775 fp.init(this.mDialog, |
787 this.mDialog, |
776 this.dialogElement("strings").getString("chooseAppFilePickerTitle"), |
788 this.dialogElement("strings").getString("chooseAppFilePickerTitle"), |
777 nsIFilePicker.modeOpen); |
789 nsIFilePicker.modeOpen |
778 |
790 ); |
779 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
791 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
780 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
792 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
781 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
793 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
782 @@ -14,16 +14,17 @@ |
794 @@ -14,16 +14,17 @@ |
783 #include "nsPrintfCString.h" |
795 #include "nsPrintfCString.h" |