# HG changeset patch # User Wolfgang Rosenauer # Date 1349344434 -7200 # Node ID 55cd16b450d288432c0dfacb61ea6561c8166a2a # Parent 65364282c9bcb21465cb86dab2a009a3a140311a signature update diff -r 65364282c9bc -r 55cd16b450d2 firefox-kde.patch --- a/firefox-kde.patch Thu Oct 04 06:53:33 2012 +0200 +++ b/firefox-kde.patch Thu Oct 04 11:53:54 2012 +0200 @@ -1428,42 +1428,11 @@ new file mode 100644 --- /dev/null +++ b/browser/components/shell/src/nsKDEShellService.cpp -@@ -0,0 +1,264 @@ +@@ -0,0 +1,234 @@ +/* -*- 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 ***** */ ++/* 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 "nsKDEShellService.h" +#include "nsShellService.h" @@ -1490,6 +1459,7 @@ + +NS_IMETHODIMP +nsKDEShellService::IsDefaultBrowser(bool aStartupCheck, ++ bool aForAllTypes, + bool* aIsDefaultBrowser) + { + *aIsDefaultBrowser = false;