mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:a704b2a17e39
+:a2bdff616a0e
 # HG changeset patch
-# Parent  2b183c17f6e4693372442af1a8ee0be364f8cba0
+# Parent  214f99f3ce4f1f8ae9b3d18da44e5d66b3105663
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 https://bugzilla.novell.com/show_bug.cgi?id=170055
 +                    .getService(Components.interfaces.nsIScriptSecurityManager);
 +        if (this.type == "child" && window.opener &&
 +            secMan.isSystemPrincipal(window.opener.document.nodePrincipal)) {
 +          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
 +                               .getService(Components.interfaces.nsIPrefBranch);
-+          var instantApply = psvc.getBoolPref("browser.preferences.instantApply");
++          var pdocEl = window.opener.document.documentElement;
-+          if (instantApply) {
++          if (pdocEl.instantApply) {
 +            var panes = this.preferencePanes;
 +            for (var i = 0; i < panes.length; ++i)
 +              panes[i].writePreferences(true);
 +          }
 +          else {
 #include "mozilla/Attributes.h"
 #include "nsIURI.h"
 +#include "nsVoidArray.h"
 +#include "nsKDEUtils.h"
-class nsUnixSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
+class nsUnixSystemProxySettings final : public nsISystemProxySettings {
 public:
 NS_DECL_ISUPPORTS
 NS_DECL_NSISYSTEMPROXYSETTINGS
 nsUnixSystemProxySettings()
 +}
 +
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -45,17 +45,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
 GENERATED_SOURCES += [
 'moc_nsNativeAppSupportQt.cpp',
 ]
 SOURCES += [
 'nsNativeAppSupportQt.cpp',
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '/dom/base',
 '/dom/ipc',
-'/netwerk/base/src',
+'/netwerk/base',
 '/netwerk/protocol/http',
-+    '/toolkit/xre'
++    '/toolkit/xre',
 ]
 if CONFIG['MOZ_ENABLE_DBUS']:
 CXXFLAGS += CONFIG['TK_CFLAGS']
 CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
 +
 +#endif //nsKDERegistry_h__
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -7,33 +7,36 @@
+@@ -7,32 +7,35 @@
 #ifdef MOZ_WIDGET_QT
 #if (MOZ_ENABLE_CONTENTACTION)
 #include <contentaction/contentaction.h>
 #include "nsContentHandlerApp.h"
 #endif
 -#include "nsGNOMERegistry.h"
 +#include "nsCommonRegistry.h"
 #include "nsIGIOService.h"
 #include "nsNetCID.h"
 #include "nsIIOService.h"
-#include "nsIGnomeVFSService.h"
 #include "nsAutoPtr.h"
 #ifdef MOZ_ENABLE_DBUS
 #include "nsDBusHandlerApp.h"
 #endif
 #ifdef MOZ_WIDGET_QT
 rv = nsMIMEInfoQt::LoadUriInternal(aURI);
 }
 #endif
 return rv;
-@@ -46,24 +49,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
+@@ -45,24 +48,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
 // 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;
-if (mClass ==  eProtocolInfo) {
+if (mClass == eProtocolInfo) {
 -    *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
 +    *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get());
 } else {
 -    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
 +    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
 *_retval = true;
 }
 if (*_retval)
 return NS_OK;
-@@ -98,16 +101,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;
 }
 +
 +    return LaunchWithIProcess(mDefaultApplication, nativePath);
 +  }
 +
 nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-nsAutoCString uriSpec;
+if (!giovfs) {
-if (giovfs) {
+return NS_ERROR_FAILURE;
-// 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;
-@@ -125,17 +145,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
-/* Fallback to GnomeVFS */
-nsCOMPtr<nsIGnomeVFSMimeApp> app;
-if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
-return app->Launch(nativePath);
 }
-// If we haven't got an app we try to get a valid one by searching for the
+// nsGIOMimeApp->Launch wants a URI string instead of local file
-// extension mapped type
+nsresult rv;
--  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
+nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
-+  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath);
-if (mimeInfo) {
-nsAutoCString type;
-mimeInfo->GetType(type);
-if (giovfs) {
-nsCOMPtr<nsIGIOMimeApp> app;
-if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
-return app->Launch(uriSpec);
-} else if (gnomevfs) {
 diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 @@ -10,17 +10,17 @@
 #if defined(MOZ_ENABLE_CONTENTACTION)
 if (action.isValid())
 *aHandlerExists = true;
 #endif
 #ifdef MOZ_WIDGET_GTK
-// Check the GConf registry for a protocol handler
+// Check the GNOME registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
 +  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
 #endif
 return NS_OK;
 }
 #endif
 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
 majorType,
-@@ -1372,17 +1372,17 @@ nsOSHelperAppService::GetFromType(const
+@@ -1373,17 +1373,17 @@ nsOSHelperAppService::GetFromType(const
+nsAutoString extensions, mime_types_description;
+LookUpExtensionsAndDescription(majorType,
+minorType,
+extensions,
+mime_types_description);
 #ifdef MOZ_WIDGET_GTK
-nsRefPtr<nsMIMEInfoBase> gnomeInfo;
 if (handler.IsEmpty()) {
-// No useful data yet.  Check the GNOME registry.  Unfortunately, newer
+-    nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
-// GNOME versions no longer have type-to-extension mappings, so we might
++    nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
-// get back a MIMEInfo without any extensions set.  In that case we'll have
+if (gnomeInfo) {
-// to look in our mime.types files for the extensions.
+LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "
-LOG(("Looking in GNOME registry\n"));
+"to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));
--    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
-+    gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
+NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
-if (gnomeInfo && gnomeInfo->HasExtensions()) {
+gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
-LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
 return gnomeInfo.forget();
 }
-}
-#endif
-// Now look up our extensions
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
 @@ -79,16 +79,17 @@ else:
 include('/ipc/chromium/chromium-config.mozbuild')
 +    }
 +
 diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
 --- a/widget/gtk/nsFilePicker.h
 +++ b/widget/gtk/nsFilePicker.h
-@@ -66,11 +66,17 @@ protected:
+@@ -68,11 +68,17 @@ protected:
 nsString  mDefault;
 nsString  mDefaultExtension;
 nsTArray<nsCString> mFilters;
 nsTArray<nsCString> mFilterNames;
 #define XPTONLY_XPT &nsComponentManagerImpl::XPTOnlyManifestXPT
 #else
 #define XPTONLY_MANIFEST nullptr
 #define XPTONLY_XPT nullptr
 #endif
-@@ -488,16 +489,17 @@ ParseManifest(NSLocationType aType, File
+@@ -489,16 +490,17 @@ ParseManifest(NSLocationType aType, File
-NS_NAMED_LITERAL_STRING(kPlatform, "platform");
+NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
-NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
+NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
 NS_NAMED_LITERAL_STRING(kApplication, "application");
 NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
 NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
 NS_NAMED_LITERAL_STRING(kOs, "os");
 NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
 #endif
 NS_NAMED_LITERAL_STRING(kMain, "main");
 NS_NAMED_LITERAL_STRING(kContent, "content");
-@@ -548,44 +550,49 @@ ParseManifest(NSLocationType aType, File
+@@ -549,44 +551,49 @@ ParseManifest(NSLocationType aType, File
 CopyUTF8toUTF16(s, abi);
 abi.Insert(char16_t('_'), 0);
 abi.Insert(osTarget, 0);
 }
 }
 } else {
 process = kMain;
 }
 @@ -681,25 +688,27 @@ ParseManifest(NSLocationType aType, File
+TriState stOsVersion = eUnspecified;
 TriState stOs = eUnspecified;
 TriState stABI = eUnspecified;
 TriState stProcess = eUnspecified;
 #if defined(MOZ_WIDGET_ANDROID)
 TriState stTablet = eUnspecified;
 #endif
-bool platform = false;
+int flags = 0;
-bool contentAccessible = false;
 +    TriState stDesktop = eUnspecified;
 while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) &&
 ok) {
 ToLowerCase(token);
 CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
 continue;
 }
 #if defined(MOZ_WIDGET_ANDROID)
-@@ -731,16 +740,17 @@ ParseManifest(NSLocationType aType, File
+@@ -749,16 +758,17 @@ ParseManifest(NSLocationType aType, File
 }
 if (!ok ||
 stApp == eBad ||
 stAppVersion == eBad ||
 if CONFIG['MOZ_WIDGET_GTK']:
 CXXFLAGS += CONFIG['TK_CFLAGS']
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -45,16 +45,17 @@
+@@ -44,16 +44,17 @@
+#include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsISimpleEnumerator.h"
 #include "private/pprio.h"
 #include "prlink.h"
 #ifdef MOZ_WIDGET_GTK
 #include "nsIGIOService.h"
-#include "nsIGnomeVFSService.h"
 +#include "nsKDEUtils.h"
 #endif
 #ifdef MOZ_WIDGET_COCOA
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1965,55 +1966,57 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1964,42 +1965,52 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 nsLocalFile::Reveal()
 {
 #ifdef MOZ_WIDGET_GTK
 -  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
--  nsCOMPtr<nsIGnomeVFSService> gnomevfs =
+-  if (!giovfs) {
--    do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
--  if (!giovfs && !gnomevfs) {
 -    return NS_ERROR_FAILURE;
 -  }
--
-+
 +  nsAutoCString url;
 bool isDirectory;
 if (NS_FAILED(IsDirectory(&isDirectory))) {
 return NS_ERROR_FAILURE;
 }
 +  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 if (isDirectory) {
--    if (giovfs) {
+-    return giovfs->ShowURIForInput(mPath);
--      return giovfs->ShowURIForInput(mPath);
--    } else
--      /* Fallback to GnomeVFS */
--    {
--      return gnomevfs->ShowURIForInput(mPath);
--    }
 +    url = mPath;
-} else if (giovfs &&
+} else if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
-NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
 return NS_OK;
 } else {
 nsCOMPtr<nsIFile> parentDir;
 nsAutoCString dirPath;
 if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {
 }
 if (NS_FAILED(parentDir->GetNativePath(dirPath))) {
 return NS_ERROR_FAILURE;
 }
--    if (giovfs) {
+-    return giovfs->ShowURIForInput(dirPath);
--      return giovfs->ShowURIForInput(dirPath);
--    } else {
--      return gnomevfs->ShowURIForInput(dirPath);
--    }
 +    url = dirPath;
 }
 +
 +  if(nsKDEUtils::kdeSupport()) {
 +    nsTArray<nsCString> command;
 +    command.AppendElement( NS_LITERAL_CSTRING("REVEAL") );
 +    command.AppendElement( mPath );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +  }
 +
-+  nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
++  if (!giovfs)
-+  if (!giovfs && !gnomevfs)
 +    return NS_ERROR_FAILURE;
 +
-+  if (giovfs)
++  return giovfs->ShowURIForInput(url);
-+    return giovfs->ShowURIForInput(url);
-+  else
-+    return gnomevfs->ShowURIForInput(url);
 #elif defined(MOZ_WIDGET_COCOA)
 CFURLRef url;
 if (NS_SUCCEEDED(GetCFURL(&url))) {
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -2021,16 +2024,22 @@ nsLocalFile::Reveal()
+@@ -2007,16 +2018,22 @@ nsLocalFile::Reveal()
 return NS_ERROR_FAILURE;
 #endif
 }
 NS_IMETHODIMP
 +    command.AppendElement( NS_LITERAL_CSTRING("OPEN") );
 +    command.AppendElement( mPath );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +  }
 nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-nsCOMPtr<nsIGnomeVFSService> gnomevfs =
+if (!giovfs) {
-do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+return NS_ERROR_FAILURE;
-if (giovfs) {
+}
-return giovfs->ShowURIForInput(mPath);
-} else if (gnomevfs) {
+return giovfs->ShowURIForInput(mPath);
-/* GnomeVFS fallback */
+#elif defined(MOZ_ENABLE_CONTENTACTION)
-return gnomevfs->ShowURIForInput(mPath);
+QUrl uri = QUrl::fromLocalFile(QString::fromUtf8(mPath.get()));

changeset 850	a2bdff616a0e
parent 837	a1f740acf68e
child 868	284da266ec46
child 888	b94dace970c6