119574 r=rods sr=attinasi a=asa. XP printprogress should not come up. I added new prefs to

keep the dialog from being put up.

modules/libpref/src/mac/MANIFEST

@@ -1 +1,2 @@
 macprefs.js
+macxprefs.js

modules/libpref/src/mac/macxprefs.js

@@ -0,0 +1,42 @@
+/* -*- 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);
+

modules/libpref/src/nsPrefService.cpp

@@ -524,6 +524,9 @@ JSBool pref_InitInitialObjects()
 #endif
 #ifdef XP_MAC
       , "macprefs.js"
+#if defined (TARGET_CARBON)
+      , "macxprefs.js"
+#endif
 #elif defined(XP_WIN)
       , "winpref.js"
 #elif defined(XP_UNIX)