mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:f118b88b7d7f
+:e178ad08fed6
 'nsSetDefaultBrowser.manifest',
 diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
 new file mode 100644
 --- /dev/null
 +++ b/browser/components/shell/src/nsKDEShellService.cpp
-@@ -0,0 +1,234 @@
+@@ -0,0 +1,238 @@
 +/* -*- 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 "mozilla/ArrayUtils.h"
++
++#include "nsCOMPtr.h"
 +#include "nsKDEShellService.h"
 +#include "nsShellService.h"
 +#include "nsKDEUtils.h"
-+#include "nsCOMPtr.h"
 +#include "nsIPrefService.h"
 +#include "nsIProcess.h"
 +#include "nsIFile.h"
 +#include "nsServiceManagerUtils.h"
 +#include "nsComponentManagerUtils.h"
 +#include "nsIMutableArray.h"
 +#include "nsISupportsPrimitives.h"
 +#include "nsArrayUtils.h"
 +
++using namespace mozilla;
++
 +nsresult
 +nsKDEShellService::Init()
-+    {
++{
 +    if( !nsKDEUtils::kdeSupport())
 +        return NS_ERROR_NOT_AVAILABLE;
 +    return NS_OK;
-+    }
++}
 +
-+NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService)
++NS_IMPL_ISUPPORTS(nsKDEShellService, nsIShellService)
 +
 +NS_IMETHODIMP
 +nsKDEShellService::IsDefaultBrowser(bool aStartupCheck,
 +                                    bool aForAllTypes,
 +                                    bool* aIsDefaultBrowser)
-+    {
++{
 +    *aIsDefaultBrowser = false;
 +    if (aStartupCheck)
 +        mCheckedThisSession = true;
 +
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
 +    command->AppendElement( str, false );
 +
 +    if( nsKDEUtils::command( command ))
 +        *aIsDefaultBrowser = true;
 +    return NS_OK;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes,
 +                                     bool aForAllUsers)
-+    {
++{
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
 +    if (!command)
 +        return NS_ERROR_FAILURE;
 +
 +    nsCOMPtr<nsISupportsCString> cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
 +
 +    paramstr->SetData( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" ));
 +    command->AppendElement( paramstr, false );
 +
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult)
 +{
 +  // If we've already checked, the browser has been started and this is a
 +}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement,
 +                                          PRInt32 aPosition)
-+    {
++{
 +    return NS_ERROR_NOT_IMPLEMENTED;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor)
-+    {
++{
 +    return NS_ERROR_NOT_IMPLEMENTED;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor)
-+    {
++{
 +    return NS_ERROR_NOT_IMPLEMENTED;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::OpenApplication(PRInt32 aApplication)
-+    {
++{
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
 +    if (!command)
 +        return NS_ERROR_FAILURE;
 +
 +    nsCOMPtr<nsISupportsCString> str = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
 +    else
 +        return NS_ERROR_NOT_IMPLEMENTED;
 +
 +    command->AppendElement( str, false );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI)
-+    {
++{
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
 +    if (!command)
 +        return NS_ERROR_FAILURE;
 +
 +    nsCOMPtr<nsISupportsCString> cmdstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID );
 +    appstr->SetData( app );
 +    command->AppendElement( appstr, false );
 +    uristr->SetData( aURI );
 +    command->AppendElement( uristr, false );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
++}
 +
 +NS_IMETHODIMP
 +nsKDEShellService::GetDefaultFeedReader(nsIFile** _retval)
-+    {
++{
 +    *_retval = nullptr;
 +
 +    nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
 +    if( !command )
 +        return NS_ERROR_FAILURE;
 +    if (!exists)
 +        return NS_ERROR_FAILURE;
 +
 +    NS_ADDREF(*_retval = defaultReader);
 +    return NS_OK;
-+    }
++}
 diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h
 new file mode 100644
 --- /dev/null
 +++ b/browser/components/shell/src/nsKDEShellService.h
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,60 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
 + * The contents of this file are subject to the Mozilla Public License Version
 +#ifndef nskdeshellservice_h____
 +#define nskdeshellservice_h____
 +
 +#include "nsIShellService.h"
 +#include "nsStringAPI.h"
-+
++#include "mozilla/Attributes.h"
-+class nsKDEShellService : public nsIShellService
++
++class nsKDEShellService MOZ_FINAL : public nsIShellService
 +{
 +public:
-+  nsKDEShellService() : mCheckedThisSession(PR_FALSE) { }
++  nsKDEShellService() : mCheckedThisSession(false) { }
 +
 +  NS_DECL_ISUPPORTS
 +  NS_DECL_NSISHELLSERVICE
 +
 +  nsresult Init() NS_HIDDEN;
 +
 +private:
 +  ~nsKDEShellService() {}
 +
-+  PRPackedBool mCheckedThisSession;
++  bool mCheckedThisSession;
 +};
 +
 +#endif // nskdeshellservice_h____
 diff --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp
 new file mode 100644

changeset 739	e178ad08fed6
parent 738	f118b88b7d7f
child 748	72ba5129e5fd