From acbe2814111cb6aa3bd30ead883bbea6743a9373 Mon Sep 17 00:00:00 2001 From: "bnesse%netscape.com" Date: Tue, 25 Jun 2002 20:05:48 +0000 Subject: [PATCH] Fix for bug 153622. Remove macxprefs (no longer used) from the build. r=ccarlen, sr=sfraser. git-svn-id: svn://10.0.0.236/trunk@124013 18797224-902f-48f8-a5cc-f745e15eee43 --- .../embedding/config/basebrowser-mac-macho | 1 - mozilla/modules/libpref/src/mac/MANIFEST | 1 - mozilla/modules/libpref/src/mac/macxprefs.js | 42 ------------------- mozilla/modules/libpref/src/nsPrefService.cpp | 5 +-- mozilla/xpinstall/packager/mac/browser.jst | 1 + 5 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 mozilla/modules/libpref/src/mac/macxprefs.js diff --git a/mozilla/embedding/config/basebrowser-mac-macho b/mozilla/embedding/config/basebrowser-mac-macho index 234c9bce86b..a9d15638c25 100644 --- a/mozilla/embedding/config/basebrowser-mac-macho +++ b/mozilla/embedding/config/basebrowser-mac-macho @@ -223,7 +223,6 @@ components/libstrres.dylib ; required prefs files defaults/pref/all.js defaults/pref/macprefs.js -defaults/pref/macxprefs.js ; uriloader components/liburiloader.dylib diff --git a/mozilla/modules/libpref/src/mac/MANIFEST b/mozilla/modules/libpref/src/mac/MANIFEST index ec4b71cb37c..97567d7668f 100644 --- a/mozilla/modules/libpref/src/mac/MANIFEST +++ b/mozilla/modules/libpref/src/mac/MANIFEST @@ -1,2 +1 @@ macprefs.js -macxprefs.js \ No newline at end of file diff --git a/mozilla/modules/libpref/src/mac/macxprefs.js b/mozilla/modules/libpref/src/mac/macxprefs.js deleted file mode 100644 index d2b737d245c..00000000000 --- a/mozilla/modules/libpref/src/mac/macxprefs.js +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * 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 NPL, 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 NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -// Mac OSX specific preference defaults - -pref("print.show_print_progress", false); - diff --git a/mozilla/modules/libpref/src/nsPrefService.cpp b/mozilla/modules/libpref/src/nsPrefService.cpp index a0f4ba5e6e3..e8c21906bde 100644 --- a/mozilla/modules/libpref/src/nsPrefService.cpp +++ b/mozilla/modules/libpref/src/nsPrefService.cpp @@ -513,11 +513,8 @@ JSBool pref_InitInitialObjects() PRBool hasMoreElements; static const char* specialFiles[] = { -#ifdef XP_MAC +#if defined(XP_MAC) || defined(XP_MACOSX) "macprefs.js" -#if defined (TARGET_CARBON) - , "macxprefs.js" -#endif #elif defined(XP_WIN) "winpref.js" #elif defined(XP_UNIX) diff --git a/mozilla/xpinstall/packager/mac/browser.jst b/mozilla/xpinstall/packager/mac/browser.jst index 1faf52f58a5..7414e05586c 100644 --- a/mozilla/xpinstall/packager/mac/browser.jst +++ b/mozilla/xpinstall/packager/mac/browser.jst @@ -7,6 +7,7 @@ function upgradeCleanup() deleteThisFile("Components", "ucth.shlb"); deleteThisFile("Program", "defaults/pref/config.js"); deleteThisFile("Program", "defaults/pref/initpref.js"); + deleteThisFile("Program", "defaults/pref/macxprefs.js"); deleteThisFile("Program", "defaults/wallet/URLFieldSchema.tbl"); deleteThisFile("Program", "Essential Files/PSM.shlb"); deleteThisFolder("Program", "psmdata");