Attachment 3933 Details for Bug 21509 – firefox-kde.patch

[patch] firefox-kde.patch

firefox-kde.patch (text/plain), 15.81 KB, created by Zerg on 2009-09-23 21:23:53 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Zerg

Created: 2009-09-23 21:23:53 MSD

Size: 15.81 KB

patch

obsolete

>--- mozilla/browser/app/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200
>+++ mozilla/browser/app/Makefile.in	2009-09-14 10:04:14.000000000 +0200
>@@ -49,6 +49,7 @@ DIRS		= profile/extensions
> 
> PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
> 		  $(srcdir)/profile/channel-prefs.js \
>+		  $(srcdir)/profile/kde.js \
> 		  $(NULL)
> 
> ifndef MOZ_BRANDING_DIRECTORY
>--- mozilla/browser/components/build/nsModule.cpp.sav	2009-09-14 10:00:21.000000000 +0200
>+++ mozilla/browser/components/build/nsModule.cpp	2009-09-14 10:04:14.000000000 +0200
>@@ -46,7 +46,7 @@
> #elif defined(XP_MACOSX)
> #include "nsMacShellService.h"
> #elif defined(MOZ_WIDGET_GTK2)
>-#include "nsGNOMEShellService.h"
>+#include "nsUnixShellService.h"
> #endif
> 
> #ifndef WINCE
>@@ -88,7 +88,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindows
> #elif defined(XP_MACOSX)
> NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
> #elif defined(MOZ_WIDGET_GTK2)
>-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
>+// in nsUnixShellService
>+//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixShellService, Init)
> #endif
> 
> #ifndef WINCE
>@@ -132,7 +133,7 @@ static const nsModuleComponentInfo compo
>   { "Browser Shell Service",
>     NS_SHELLSERVICE_CID,
>     NS_SHELLSERVICE_CONTRACTID,
>-    nsGNOMEShellServiceConstructor },
>+    nsUnixShellServiceConstructor },
> 
> #endif
> 
>--- mozilla/browser/components/shell/src/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200
>+++ mozilla/browser/components/shell/src/Makefile.in	2009-09-14 10:04:14.000000000 +0200
>@@ -75,11 +75,12 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_
> CPPSRCS = nsMacShellService.cpp
> else
> ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
>-CPPSRCS = nsGNOMEShellService.cpp
>+CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp
> REQUIRES	+= \
> 		mozgnome \
> 		thebes \
> 		$(NULL)
>+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
> endif
> endif
> endif
>--- mozilla/browser/components/shell/src/nsKDEShellService.cpp.sav	2009-09-14 10:00:21.000000000 +0200
>+++ mozilla/browser/components/shell/src/nsKDEShellService.cpp	2009-09-14 10:04:14.000000000 +0200
>@@ -0,0 +1,193 @@
>+/* -*- 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
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License. You may obtain a copy of the License at
>+ * http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * The Original Code is Shell Service.
>+ *
>+ * The Initial Developer of the Original Code is mozilla.org.
>+ * Portions created by the Initial Developer are Copyright (C) 2004
>+ * the Initial Developer. All Rights Reserved.
>+ *
>+ * Contributor(s):
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 2 or later (the "GPL"), or
>+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
>+ * in which case the provisions of the GPL or the LGPL are applicable instead
>+ * of those above. If you wish to allow use of your version of this file only
>+ * under the terms of either the GPL or the LGPL, and not to allow others to
>+ * use your version of this file under the terms of the MPL, indicate your
>+ * decision by deleting the provisions above and replace them with the notice
>+ * and other provisions required by the GPL or the LGPL. If you do not delete
>+ * the provisions above, a recipient may use your version of this file under
>+ * the terms of any one of the MPL, the GPL or the LGPL.
>+ *
>+ * ***** END LICENSE BLOCK ***** */
>+
>+#include "nsKDEShellService.h"
>+#include "nsShellService.h"
>+#include "nsKDEUtils.h"
>+#include "nsCOMPtr.h"
>+#include "nsIPrefService.h"
>+#include "nsIProcess.h"
>+#include "nsILocalFile.h"
>+#include "nsServiceManagerUtils.h"
>+#include "nsComponentManagerUtils.h"
>+
>+nsresult
>+nsKDEShellService::Init()
>+    {
>+    if( !nsKDEUtils::kdeSupport())
>+        return NS_ERROR_NOT_AVAILABLE;
>+    return NS_OK;
>+    }
>+
>+NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService)
>+
>+NS_IMETHODIMP
>+nsKDEShellService::IsDefaultBrowser(PRBool aStartupCheck,
>+                                      PRBool* aIsDefaultBrowser)
>+    {
>+    *aIsDefaultBrowser = PR_FALSE;
>+    if (aStartupCheck)
>+        mCheckedThisSession = PR_TRUE;
>+    nsCStringArray command;
>+    command.AppendCString( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" ));
>+    if( nsKDEUtils::command( command ))
>+        *aIsDefaultBrowser = PR_TRUE;
>+    return NS_OK;
>+    }
>+
>+NS_IMETHODIMP
>+nsKDEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
>+                                       PRBool aForAllUsers)
>+    {
>+    nsCStringArray command;
>+    command.AppendCString( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" ));
>+    command.AppendCString( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" ));
>+    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
>+    }
>+
>+NS_IMETHODIMP
>+nsKDEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
>+{
>+  // If we've already checked, the browser has been started and this is a 
>+  // new window open, and we don't want to check again.
>+  if (mCheckedThisSession) {
>+    *aResult = PR_FALSE;
>+    return NS_OK;
>+  }
>+
>+  nsCOMPtr<nsIPrefBranch> prefs;
>+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
>+  if (pserve)
>+    pserve->GetBranch("", getter_AddRefs(prefs));
>+
>+  if (prefs)
>+    prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult);
>+
>+  return NS_OK;
>+}
>+
>+NS_IMETHODIMP
>+nsKDEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck)
>+{
>+  nsCOMPtr<nsIPrefBranch> prefs;
>+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
>+  if (pserve)
>+    pserve->GetBranch("", getter_AddRefs(prefs));
>+
>+  if (prefs)
>+    prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck);
>+
>+  return NS_OK;
>+}
>+
>+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)
>+    {
>+    nsCStringArray command;
>+    if( aApplication == APPLICATION_MAIL )
>+        command.AppendCString( NS_LITERAL_CSTRING( "OPENMAIL" ));
>+    else if( aApplication == APPLICATION_NEWS )
>+        command.AppendCString( NS_LITERAL_CSTRING( "OPENNEWS" ));
>+    else
>+        return NS_ERROR_NOT_IMPLEMENTED;
>+    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
>+    }
>+
>+NS_IMETHODIMP
>+nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI)
>+    {
>+    nsCStringArray command;
>+    command.AppendCString( NS_LITERAL_CSTRING( "RUN" ));
>+    nsCString app;
>+    nsresult rv = aApplication->GetNativePath( app );
>+    NS_ENSURE_SUCCESS( rv, rv );
>+    command.AppendCString( app );
>+    command.AppendCString( aURI );
>+    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
>+    }
>+
>+NS_IMETHODIMP
>+nsKDEShellService::GetDefaultFeedReader(nsILocalFile** _retval)
>+    {
>+    *_retval = nsnull;
>+
>+    nsCStringArray command;
>+    command.AppendCString( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" ));
>+    nsCStringArray output;
>+    if( !nsKDEUtils::command( command, &output ) || output.Count() != 1 )
>+        return NS_ERROR_FAILURE;
>+
>+    nsCString path;
>+    path = *output[ 0 ];
>+    if (path.IsEmpty())
>+        return NS_ERROR_FAILURE;
>+
>+    nsresult rv;
>+    nsCOMPtr<nsILocalFile> defaultReader =
>+        do_CreateInstance("@mozilla.org/file/local;1", &rv);
>+    NS_ENSURE_SUCCESS(rv, rv);
>+
>+    rv = defaultReader->InitWithNativePath(path);
>+    NS_ENSURE_SUCCESS(rv, rv);
>+
>+    PRBool exists;
>+    rv = defaultReader->Exists(&exists);
>+    NS_ENSURE_SUCCESS(rv, rv);
>+    if (!exists)
>+        return NS_ERROR_FAILURE;
>+
>+    NS_ADDREF(*_retval = defaultReader);
>+    return NS_OK;
>+    }
>--- mozilla/browser/components/shell/src/nsKDEShellService.h.sav	2009-09-14 10:00:21.000000000 +0200
>+++ mozilla/browser/components/shell/src/nsKDEShellService.h	2009-09-14 10:04:14.000000000 +0200
>@@ -0,0 +1,59 @@
>+/* -*- 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
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License. You may obtain a copy of the License at
>+ * http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * The Original Code is Shell Service.
>+ *
>+ * The Initial Developer of the Original Code is mozilla.org.
>+ * Portions created by the Initial Developer are Copyright (C) 2004
>+ * the Initial Developer. All Rights Reserved.
>+ *
>+ * Contributor(s):
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 2 or later (the "GPL"), or
>+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
>+ * in which case the provisions of the GPL or the LGPL are applicable instead
>+ * of those above. If you wish to allow use of your version of this file only
>+ * under the terms of either the GPL or the LGPL, and not to allow others to
>+ * use your version of this file under the terms of the MPL, indicate your
>+ * decision by deleting the provisions above and replace them with the notice
>+ * and other provisions required by the GPL or the LGPL. If you do not delete
>+ * the provisions above, a recipient may use your version of this file under
>+ * the terms of any one of the MPL, the GPL or the LGPL.
>+ *
>+ * ***** END LICENSE BLOCK ***** */
>+
>+#ifndef nskdeshellservice_h____
>+#define nskdeshellservice_h____
>+
>+#include "nsIShellService.h"
>+#include "nsStringAPI.h"
>+
>+class nsKDEShellService : public nsIShellService
>+{
>+public:
>+  nsKDEShellService() : mCheckedThisSession(PR_FALSE) { }
>+
>+  NS_DECL_ISUPPORTS
>+  NS_DECL_NSISHELLSERVICE
>+
>+  nsresult Init() NS_HIDDEN;
>+
>+private:
>+  ~nsKDEShellService() {}
>+
>+  PRPackedBool mCheckedThisSession;
>+};
>+
>+#endif // nskdeshellservice_h____
>--- mozilla/browser/components/shell/src/nsUnixShellService.cpp.sav	2009-09-14 10:00:21.000000000 +0200
>+++ mozilla/browser/components/shell/src/nsUnixShellService.cpp	2009-09-14 10:04:14.000000000 +0200
>@@ -0,0 +1,52 @@
>+/* -*- 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
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License. You may obtain a copy of the License at
>+ * http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * The Original Code is Shell Service.
>+ *
>+ * The Initial Developer of the Original Code is mozilla.org.
>+ * Portions created by the Initial Developer are Copyright (C) 2004
>+ * the Initial Developer. All Rights Reserved.
>+ *
>+ * Contributor(s):
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 2 or later (the "GPL"), or
>+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
>+ * in which case the provisions of the GPL or the LGPL are applicable instead
>+ * of those above. If you wish to allow use of your version of this file only
>+ * under the terms of either the GPL or the LGPL, and not to allow others to
>+ * use your version of this file under the terms of the MPL, indicate your
>+ * decision by deleting the provisions above and replace them with the notice
>+ * and other provisions required by the GPL or the LGPL. If you do not delete
>+ * the provisions above, a recipient may use your version of this file under
>+ * the terms of any one of the MPL, the GPL or the LGPL.
>+ *
>+ * ***** END LICENSE BLOCK ***** */
>+
>+#include "nsUnixShellService.h"
>+#include "nsGNOMEShellService.h"
>+#include "nsKDEShellService.h"
>+#include "nsKDEUtils.h"
>+#include "nsIGenericFactory.h"
>+
>+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
>+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init)
>+
>+NS_METHOD
>+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
>+{
>+    if( nsKDEUtils::kdeSupport())
>+        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
>+    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
>+}
>--- mozilla/browser/components/shell/src/nsUnixShellService.h.sav	2009-09-14 10:00:21.000000000 +0200
>+++ mozilla/browser/components/shell/src/nsUnixShellService.h	2009-09-14 10:04:14.000000000 +0200
>@@ -0,0 +1,45 @@
>+/* -*- 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
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License. You may obtain a copy of the License at
>+ * http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * The Original Code is Shell Service.
>+ *
>+ * The Initial Developer of the Original Code is mozilla.org.
>+ * Portions created by the Initial Developer are Copyright (C) 2004
>+ * the Initial Developer. All Rights Reserved.
>+ *
>+ * Contributor(s):
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 2 or later (the "GPL"), or
>+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
>+ * in which case the provisions of the GPL or the LGPL are applicable instead
>+ * of those above. If you wish to allow use of your version of this file only
>+ * under the terms of either the GPL or the LGPL, and not to allow others to
>+ * use your version of this file under the terms of the MPL, indicate your
>+ * decision by deleting the provisions above and replace them with the notice
>+ * and other provisions required by the GPL or the LGPL. If you do not delete
>+ * the provisions above, a recipient may use your version of this file under
>+ * the terms of any one of the MPL, the GPL or the LGPL.
>+ *
>+ * ***** END LICENSE BLOCK ***** */
>+
>+#ifndef nsunixshellservice_h____
>+#define nsunixshellservice_h____
>+
>+#include "nsIShellService.h"
>+
>+NS_METHOD
>+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
>+
>+#endif // nsunixshellservice_h____
>--- mozilla/browser/installer/unix/packages-static.sav	2009-09-14 10:00:21.000000000 +0200
>+++ mozilla/browser/installer/unix/packages-static	2009-09-14 10:04:14.000000000 +0200
>@@ -291,6 +291,7 @@ bin/icons/*.png
> bin/@PREF_DIR@/firefox.js
> bin/@PREF_DIR@/firefox-branding.js
> bin/@PREF_DIR@/channel-prefs.js
>+bin/@PREF_DIR@/kde.js
> bin/greprefs/all.js
> bin/greprefs/security-prefs.js
> bin/greprefs/xpinstall.js

Actions: View | Diff

Attachments on bug 21509: 3863 | 3864 | 3932 | 3933