mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:b2202fea7983
+:f118b88b7d7f
 #include "prefapi.h"
 #include "prefread.h"
 #include "prefapi_private_data.h"
-@@ -1119,16 +1120,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1134,16 +1135,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
 static nsresult pref_LoadPrefsInDirList(const char *listId)
 {
 nsresult rv;
 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
 getter_AddRefs(list));
 if (!list)
 return NS_OK;
 bool hasMore;
-@@ -1144,17 +1163,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1159,17 +1178,17 @@ static nsresult pref_LoadPrefsInDirList(
 nsAutoCString leaf;
 path->GetNativeLeafName(leaf);
 // Do we care if a file provided by this process fails to load?
 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
 {
 nsZipItemPtr<char> manifest(jarReader, name, true);
 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1248,26 +1267,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1263,26 +1282,38 @@ static nsresult pref_InitInitialObjects(
 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 -
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -42,16 +42,20 @@
+@@ -43,16 +43,20 @@
 #ifdef XP_WIN
 #include <shlobj.h>
 #include "nsWindowsHelpers.h"
 #ifdef DOWNLOAD_SCANNER
 #include "nsDownloadScanner.h"
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 using namespace mozilla::widget::android;
 #endif
-@@ -2695,16 +2699,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2722,16 +2726,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 // Master pref to control this function.
 bool showTaskbarAlert = true;
 if (pref)
 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
 int64_t goat = PR_Now() - mStartTime;
 showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2732,19 +2745,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2759,19 +2772,20 @@ nsDownload::SetState(DownloadState aStat
 // because if it is, they'll click open the download manager and
 // the items they downloaded will have been removed.
 alerts->ShowAlertNotification(
 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
 message, !removeWhenDone,
 if (fileURL &&
 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) &&
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -56,29 +56,33 @@ toolkit.jar:
+@@ -58,29 +58,33 @@ toolkit.jar:
 content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
 *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
 content/global/bindings/browser.xml         (widgets/browser.xml)
 content/global/bindings/button.xml          (widgets/button.xml)
 content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
 *+ content/global/bindings/listbox.xml         (widgets/listbox.xml)
 content/global/bindings/menu.xml            (widgets/menu.xml)
 content/global/bindings/menulist.xml        (widgets/menulist.xml)
 content/global/bindings/notification.xml    (widgets/notification.xml)
 content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
-content/global/bindings/popup.xml           (widgets/popup.xml)
+*  content/global/bindings/popup.xml           (widgets/popup.xml)
 *+ content/global/bindings/preferences.xml     (widgets/preferences.xml)
 +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
 +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
 content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
 content/global/bindings/radio.xml           (widgets/radio.xml)
 +</bindings>
 diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1334 @@
+@@ -0,0 +1,1333 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
 +  <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
 +  %preferencesDTD;
 +      <xul:hbox flex="1" class="paneDeckContainer">
 +        <xul:deck anonid="paneDeck" flex="1">
 +          <children includes="prefpane"/>
 +        </xul:deck>
 +      </xul:hbox>
-+      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons"
++      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end">
 +#ifdef XP_UNIX_GNOME
-+                >
 +        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +        <xul:spacer anonid="spacer" flex="1"/>
 +        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
 +        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
 +#elif XP_UNIX
-+                pack="end">
++        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
-+	<xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
++        <xul:spacer anonid="spacer" flex="1"/>
-+	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
-+	<xul:spacer anonid="spacer" flex="1"/>
++        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
-+	<xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
++        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
-+	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
-+	<xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
++        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
-+	<xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
 +#else
-+                pack="end">
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +        <xul:spacer anonid="spacer" flex="1"/>
 +        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
 +        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
 +            acceptButton.hidden = true;
 +            var cancelButton  = docElt.getButton("cancel");
 +#ifdef XP_MACOSX
 +            // no buttons on Mac except Help
 +            cancelButton.hidden = true;
++            // Move Help button to the end
++            document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;
 +            // Also, don't fire onDialogAccept on enter
 +            acceptButton.disabled = true;
 +#else
 +            // morph the Cancel button into the Close button
 +            cancelButton.setAttribute ("icon", "close");
 nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, int32_t aPort, nsACString& aResult);
 nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
 +  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
 };
-NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
+NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)
 NS_IMETHODIMP
 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
 {
 // dbus prevents us from being threadsafe, but this routine should not block anyhow
 nsAutoCString spec;
 aURI->GetAsciiSpec(spec);
 if (QDesktopServices::openUrl(QUrl(spec.get()))) {
 rv = NS_OK;
 }
-@@ -48,22 +51,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
+@@ -50,24 +53,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
-{
-// if mDefaultApplication is set, it means the application has been set from
 // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
 // give the GNOME answer.
 if (mDefaultApplication)
 return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
 *_retval = false;
--  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
-+  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
+if (mClass ==  eProtocolInfo) {
-if (!mimeInfo) {
+-    *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
-nsAutoCString ext;
++    *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get());
-nsresult rv = GetPrimaryExtension(ext);
+} else {
-if (NS_SUCCEEDED(rv)) {
+-    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
--      mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
++    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
-+      mimeInfo = nsCommonRegistry::GetFromExtension(ext);
+if (!mimeInfo) {
+nsAutoCString ext;
+nsresult rv = GetPrimaryExtension(ext);
+if (NS_SUCCEEDED(rv)) {
+-        mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
++        mimeInfo = nsCommonRegistry::GetFromExtension(ext);
+}
 }
+if (mimeInfo)
+*_retval = true;
 }
-if (mimeInfo)
-*_retval = true;
 if (*_retval)
 return NS_OK;
+@@ -102,16 +105,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
-@@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
 ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
 if (action.isValid()) {
 action.trigger();
 return NS_OK;
 }
 // nsGIOMimeApp->Launch wants a URI string instead of local file
 nsresult rv;
 nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
 NS_ENSURE_SUCCESS(rv, rv);
 nsCOMPtr<nsIURI> uri;
-@@ -124,17 +144,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -129,17 +149,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
 /* Fallback to GnomeVFS */
 nsCOMPtr<nsIGnomeVFSMimeApp> app;
 if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
 return app->Launch(nativePath);
 }
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsXPIDLString.h"
 #include "nsIURL.h"
 #include "nsIFileStreams.h"
-@@ -1157,26 +1157,26 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1146,26 +1146,26 @@ nsresult nsOSHelperAppService::OSProtoco
 ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
 if (action.isValid())
 *aHandlerExists = true;
 #endif
 #endif
 }
 nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
 {
-@@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1252,17 +1252,17 @@ nsOSHelperAppService::GetFromExtension(c
 mime_types_description,
 true);
 if (NS_FAILED(rv) || majorType.IsEmpty()) {
 #ifdef MOZ_WIDGET_GTK
 LOG(("Looking in GNOME registry\n"));
 nsRefPtr<nsMIMEInfoBase> gnomeInfo =
 -      nsGNOMERegistry::GetFromExtension(aFileExt);
 +      nsCommonRegistry::GetFromExtension(aFileExt);
 }
 #endif
 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
 majorType,
-@@ -1386,17 +1386,17 @@ nsOSHelperAppService::GetFromType(const
+@@ -1372,17 +1372,17 @@ nsOSHelperAppService::GetFromType(const
 #ifdef MOZ_WIDGET_GTK
 nsRefPtr<nsMIMEInfoBase> gnomeInfo;
 if (handler.IsEmpty()) {
 // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
 // GNOME versions no longer have type-to-extension mappings, so we might
 // get back a MIMEInfo without any extensions set.  In that case we'll have
 // to look in our mime.types files for the extensions.
 LOG(("Looking in GNOME registry\n"));
 -    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
 +    gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
 if (gnomeInfo && gnomeInfo->HasExtensions()) {
 LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
 CopyUTF16toUTF8(aFilter, filter);
 CopyUTF16toUTF8(aTitle, name);
 mFilters.AppendElement(filter);
 mFilterNames.AppendElement(name);
-@@ -350,16 +354,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -351,16 +355,32 @@ nsFilePicker::Show(int16_t *aReturn)
 NS_IMETHODIMP
 nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
 {
 // Can't show two dialogs concurrently with the same filepicker
 GtkWindow *parent_widget =
 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
 GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
 const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -538,8 +558,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -539,8 +559,235 @@ nsFilePicker::Done(GtkWidget* file_choos
 if (mCallback) {
 mCallback->Done(result);
 mCallback = nullptr;
 } else {
 mResult = result;
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1813,46 +1814,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1816,46 +1817,52 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -1860,16 +1867,23 @@ nsLocalFile::Reveal()
+@@ -1863,16 +1870,23 @@ nsLocalFile::Reveal()
 return NS_ERROR_FAILURE;
 #endif
 }
 NS_IMETHODIMP

changeset 738	f118b88b7d7f
parent 718	6cb1ac7cd223
child 745	3e65dc8b9b4f
child 748	72ba5129e5fd