mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:f6d567a99b67
+:2c74c5927ea2
 return NS_OK;
 bool hasMore;
 @@ -921,17 +940,17 @@ static nsresult pref_LoadPrefsInDirList(
-nsCAutoString leaf;
+nsAutoCString leaf;
 path->GetNativeLeafName(leaf);
 // Do we care if a file provided by this process fails to load?
 if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi")))
 ReadExtensionPrefs(path);
 +
 CXXFLAGS += $(TK_CFLAGS)
 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
-@@ -35,16 +35,20 @@
+@@ -36,16 +36,20 @@
 #ifdef XP_WIN
 #include <shlobj.h>
 #ifdef DOWNLOAD_SCANNER
 #include "nsDownloadScanner.h"
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 #endif
-@@ -2233,16 +2237,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2253,16 +2257,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 // Master pref to control this function.
 bool showTaskbarAlert = true;
 if (pref)
 +        if( nsKDEUtils::kdeSupport()) {
 +          nsTArray<nsCString> command;
 +          command.AppendElement( NS_LITERAL_CSTRING( "DOWNLOADFINISHED" ));
 +          nsAutoString displayName;
 +          GetDisplayName( displayName );
-+          command.AppendElement( nsCAutoString( ToNewUTF8String( displayName )));
++          command.AppendElement( nsAutoCString( ToNewUTF8String( displayName )));
 +          nsKDEUtils::command( command );
 +        } else {
 +        // begin non-KDE block
 int32_t alertInterval = 2000;
 if (pref)
 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
 int64_t goat = PR_Now() - mStartTime;
 showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2266,19 +2279,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2286,19 +2299,20 @@ nsDownload::SetState(DownloadState aStat
 // If downloads are automatically removed per the user's
 // retention policy, there's no reason to make the text clickable
 // because if it is, they'll click open the download manager and
 // the items they downloaded will have been removed.
 alerts->ShowAlertNotification(
 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
-@@ -45,29 +45,33 @@ toolkit.jar:
+@@ -46,29 +46,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)
 +#    PrefWindow I   (June 4, 1999)
 +#
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -13,16 +13,19 @@
+@@ -14,16 +14,18 @@
-#include "prnetdb.h"
 #include "prenv.h"
 #include "nsPrintfCString.h"
 #include "nsNetUtil.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIGSettingsService.h"
 #include "nsInterfaceHashtable.h"
 #include "mozilla/Attributes.h"
+#include "nsIURI.h"
 +#include "nsVoidArray.h"
 +#include "nsKDEUtils.h"
-+
 class nsUnixSystemProxySettings MOZ_FINAL : public nsISystemProxySettings {
 public:
 NS_DECL_ISUPPORTS
 NS_DECL_NSISYSTEMPROXYSETTINGS
 nsUnixSystemProxySettings() {}
 nsresult Init();
-@@ -34,16 +37,17 @@ private:
+@@ -35,16 +37,17 @@ private:
 nsCOMPtr<nsIGSettingsService> mGSettings;
 nsCOMPtr<nsIGSettingsCollection> mProxySettings;
 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
 bool IsProxyMode(const char* aMode);
 nsresult SetProxyResultFromGConf(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_IMETHODIMP
+nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
+{
+// dbus prevents us from being threadsafe, but this routine should not block anyhow
+@@ -499,16 +502,19 @@ nsUnixSystemProxySettings::GetProxyFromG
 nsresult
-nsUnixSystemProxySettings::Init()
+nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
+const nsACString & aScheme,
+const nsACString & aHost,
+const int32_t      aPort,
+nsACString & aResult)
 {
-// If this is a GNOME session, load gconf and try to use its preferences.
++  if( nsKDEUtils::kdeSupport()) {
-@@ -496,16 +500,19 @@ nsUnixSystemProxySettings::GetProxyForUR
++    return GetProxyFromKDE(aScheme, aHost, aPort, aResult);
-nsCAutoString host;
-rv = aURI->GetHost(host);
-NS_ENSURE_SUCCESS(rv, rv);
-int32_t port;
-rv = aURI->GetPort(&port);
-NS_ENSURE_SUCCESS(rv, rv);
-+  if( nsKDEUtils::kdeSupport())
-+    return GetProxyFromKDE(scheme, host, port, aResult);
 +
 if (mProxySettings) {
-rv = GetProxyFromGSettings(scheme, host, port, aResult);
+nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
-if (rv == NS_OK)
+if (NS_SUCCEEDED(rv))
 return rv;
 }
 if (mGConf)
-return GetProxyFromGConf(scheme, host, port, aResult);
+return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
-@@ -531,8 +538,34 @@ static const mozilla::Module::ContractID
+@@ -534,8 +540,34 @@ static const mozilla::Module::ContractID
 static const mozilla::Module kUnixProxyModule = {
 mozilla::Module::kVersion,
 kUnixProxyCIDs,
 kUnixProxyContracts
 +nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,
 +                                           const nsACString& aHost,
 +                                           PRInt32 aPort,
 +                                           nsACString& aResult)
 +{
-+  nsCAutoString url;
++  nsAutoCString url;
 +  url = aScheme;
 +  url += "://";
 +  url += aHost;
 +  if( aPort >= 0 )
 +  {
 +//#endif
 +        if( char* eol = strchr( buf, '\n' ))
 +            *eol = '\0';
 +        command_done = ( strcmp( buf, "\\1" ) == 0 );
 +        command_failed = ( strcmp( buf, "\\0" ) == 0 );
-+        nsCAutoString line( buf );
++        nsAutoCString line( buf );
 +        line.ReplaceSubstring( "\\n", "\n" );
 +        line.ReplaceSubstring( "\\" "\\", "\\" ); //  \\ -> \ , i.e. unescape
 +        if( p->output && !( command_done || command_failed ))
 +            p->output->AppendElement( nsCString( buf )); // TODO utf8?
 +        }
 +    for ( PRUint32 i = 0; i < length; i++ )
 +        {
 +        nsCOMPtr<nsISupportsCString> str = do_QueryElementAt( command, i );
 +        if( str )
 +            {
-+            nsCAutoString s;
++            nsAutoCString s;
 +            str->GetData( s );
 +            in.AppendElement( s );
 +            }
 +        }
 +
 +#include "nsKDERegistry.h"
 +#include "nsString.h"
 +#include "nsVoidArray.h"
 +#include "nsKDEUtils.h"
 +
-+/* static */ PRBool
++/* static */ bool
 +nsCommonRegistry::HandlerExists(const char *aProtocolScheme)
 +{
 +    if( nsKDEUtils::kdeSupport())
 +        return nsKDERegistry::HandlerExists( aProtocolScheme );
 +    return nsGNOMERegistry::HandlerExists( aProtocolScheme );
 +class nsMIMEInfoBase;
 +
 +class nsCommonRegistry
 +{
 + public:
-+  static PRBool HandlerExists(const char *aProtocolScheme);
++  static bool HandlerExists(const char *aProtocolScheme);
 +
 +  static nsresult LoadURL(nsIURI *aURL);
 +
 +  static void GetAppDescForScheme(const nsACString& aScheme,
 +                                  nsAString& aDesc);
 +};
 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
 new file mode 100644
 --- /dev/null
 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,90 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "nsILocalFile.h"
 +#include "nsMIMEInfoUnix.h"
 +#include "nsAutoPtr.h"
 +#include "nsKDEUtils.h"
 +
-+/* static */ PRBool
++/* static */ bool
 +nsKDERegistry::HandlerExists(const char *aProtocolScheme)
 +{
 +    nsTArray<nsCString> command;
 +    command.AppendElement( NS_LITERAL_CSTRING( "HANDLEREXISTS" ));
-+    command.AppendElement( nsCAutoString( aProtocolScheme ));
++    command.AppendElement( nsAutoCString( aProtocolScheme ));
 +    return nsKDEUtils::command( command );
 +}
 +
 +/* static */ nsresult
 +nsKDERegistry::LoadURL(nsIURI *aURL)
 +    nsTArray<nsCString> command;
 +    command.AppendElement( NS_LITERAL_CSTRING( "OPEN" ));
 +    nsCString url;
 +    aURL->GetSpec( url );
 +    command.AppendElement( url );
-+    return nsKDEUtils::command( command );
++    bool rv = nsKDEUtils::command( command );
++    if (!rv)
++      return NS_ERROR_FAILURE;
++
++    return NS_OK;
 +}
 +
 +/* static */ void
 +nsKDERegistry::GetAppDescForScheme(const nsACString& aScheme,
 +                                     nsAString& aDesc)
 +#include "nsIURI.h"
 +#include "nsCOMPtr.h"
 +#include "nsTArray.h"
 +
 +class nsMIMEInfoBase;
-+class nsCAutoString;
++class nsAutoCString;
 +class nsCString;
 +
 +class nsKDERegistry
 +{
 + public:
-+  static PRBool HandlerExists(const char *aProtocolScheme);
++  static bool HandlerExists(const char *aProtocolScheme);
 +
 +  static nsresult LoadURL(nsIURI *aURL);
 +
 +  static void GetAppDescForScheme(const nsACString& aScheme,
 +                                  nsAString& aDesc);
 #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
 if (NS_FAILED(rv)){
 HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr);
 if (action) {
-nsCAutoString spec;
+nsAutoCString spec;
 aURI->GetAsciiSpec(spec);
 if (hildon_uri_open(spec.get(), action, nullptr))
 @@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
 return rv;
 {
 *_retval = false;
 -  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
 +  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
 if (!mimeInfo) {
-nsCAutoString ext;
+nsAutoCString ext;
 nsresult rv = GetPrimaryExtension(ext);
 if (NS_SUCCEEDED(rv)) {
 -      mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
 +      mimeInfo = nsCommonRegistry::GetFromExtension(ext);
 }
 +
 +    return LaunchWithIProcess(mDefaultApplication, nativePath);
 +  }
 +
 nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-nsCAutoString uriSpec;
+nsAutoCString uriSpec;
 if (giovfs) {
 // 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);
 // If we haven't got an app we try to get a valid one by searching for the
 // extension mapped type
 -  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
 +  nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromExtension(nativePath);
 if (mimeInfo) {
-nsCAutoString type;
+nsAutoCString type;
 mimeInfo->GetType(type);
 if (giovfs) {
 nsCOMPtr<nsIGIOMimeApp> app;
 if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
 return app->Launch(uriSpec);
 if (aFilter.EqualsLiteral("..apps")) {
 // No platform specific thing we can do here, really....
 -    return NS_OK;
 +    // Unless it's KDE.
 +    if( mMode != modeOpen || !nsKDEUtils::kdeSupport())
-+        return NS_OK;
++      return NS_OK;
 }
-nsCAutoString filter, name;
+nsAutoCString filter, name;
 CopyUTF16toUTF8(aFilter, filter);
 CopyUTF16toUTF8(aTitle, name);
 mFilters.AppendElement(filter);
 mFilterNames.AppendElement(name);
 while (mRunning) {
 g_main_context_iteration(nullptr, TRUE);
 }
-@@ -587,8 +594,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -588,8 +595,235 @@ nsFilePicker::Done(GtkWidget* file_choos
 if (mCallback) {
 mCallback->Done(result);
 mCallback = nullptr;
 } else {
 mResult = result;
 +                arg = "GETDIRECTORYFILENAME";
 +                break;
 +            }
 +        }
 +
-+  nsCAutoString directory;
++  nsAutoCString directory;
 +  if (mDisplayDirectory) {
 +    mDisplayDirectory->GetNativePath(directory);
 +  } else if (mPrevDisplayDirectory) {
 +    mPrevDisplayDirectory->GetNativePath(directory);
 +  }
 +
-+    nsCAutoString startdir;
++    nsAutoCString startdir;
 +  if (!directory.IsEmpty()) {
 +    startdir = directory;
 +  }
 +  if (mMode == nsIFilePicker::modeSave) {
 +    if( !startdir.IsEmpty())
 +      startdir = ToNewUTF8String(mDefault);
 +  }
 +  if( startdir.IsEmpty())
 +      startdir = ".";
 +
-+    nsCAutoString filters;
++    nsAutoCString filters;
 +    PRInt32 count = mFilters.Length();
 +    if( count == 0 ) //just in case
 +        filters = "*";
 +    else
 +        {
 +            filters += kdeMakeFilter( i );
 +            }
 +        }
 +
 +    nsTArray<nsCString> command;
-+    command.AppendElement( nsCAutoString( arg ));
++    command.AppendElement( nsAutoCString( arg ));
 +    command.AppendElement( startdir );
 +    if( mMode != nsIFilePicker::modeGetFolder )
 +        {
 +        command.AppendElement( filters );
-+        nsCAutoString selected;
++        nsAutoCString selected;
 +        selected.AppendInt( mSelectedType );
 +        command.AppendElement( selected );
 +        }
 +    command.AppendElement( title );
 +    if( mMode == nsIFilePicker::modeOpenMultiple )
 +        command.AppendElement( NS_LITERAL_CSTRING( "MULTIPLE" ));
 +    if( PRInt32 xid = windowToXid( mParentWidget ))
 +        {
 +        command.AppendElement( NS_LITERAL_CSTRING( "PARENT" ));
-+        nsCAutoString parent;
++        nsAutoCString parent;
 +        parent.AppendInt( xid );
 +        command.AppendElement( parent );
 +        }
 +
 +    nsTArray<nsCString> output;
 +    command.AppendElement( NS_LITERAL_CSTRING( "APPSDIALOG" ));
 +    command.AppendElement( title );
 +    if( PRInt32 xid = windowToXid( mParentWidget ))
 +        {
 +        command.AppendElement( NS_LITERAL_CSTRING( "PARENT" ));
-+        nsCAutoString parent;
++        nsAutoCString parent;
 +        parent.AppendInt( xid );
 +        command.AppendElement( parent );
 +        }
 +
 +    nsTArray<nsCString> output;
 if (directive->regfunc) {
 if (GeckoProcessType_Default != XRE_GetProcessType())
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -161,17 +161,17 @@ include $(topsrcdir)/ipc/chromium/chromi
 DEFINES		+= -D_IMPL_NS_COM
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring lib64,$(libdir)))
 DEFINES     += -DHAVE_USR_LIB64_DIR
 ifdef MOZ_PLATFORM_MAEMO
 CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS)
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -49,16 +49,17 @@
+@@ -50,16 +50,17 @@
 #include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsISimpleEnumerator.h"
 #include "private/pprio.h"
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1760,44 +1761,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1752,44 +1753,51 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 -    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 -    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
 -    if (!giovfs && !gnomevfs)
 -        return NS_ERROR_FAILURE;
 -
-+    nsCAutoString url;
++    nsAutoCString url;
 bool isDirectory;
 if (NS_FAILED(IsDirectory(&isDirectory)))
 return NS_ERROR_FAILURE;
 if (isDirectory) {
 -            /* Fallback to GnomeVFS */
 -            return gnomevfs->ShowURIForInput(mPath);
 +        url = mPath;
 } else {
 nsCOMPtr<nsIFile> parentDir;
-nsCAutoString dirPath;
+nsAutoCString dirPath;
 if (NS_FAILED(GetParent(getter_AddRefs(parentDir))))
 return NS_ERROR_FAILURE;
 if (NS_FAILED(parentDir->GetNativePath(dirPath)))
 return NS_ERROR_FAILURE;
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -1823,16 +1831,23 @@ nsLocalFile::Launch()
+@@ -1815,16 +1823,23 @@ nsLocalFile::Launch()
 if (nullptr == connection)
 return NS_ERROR_FAILURE;
 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)

changeset 568	2c74c5927ea2
parent 546	2c9448fe783c
child 589	b3ff3d8ebf9d