Hello community,
here is the log from the commit of package seamonkey
checked in at Sun Aug 6 22:17:13 CEST 2006.
--------
--- seamonkey/seamonkey.changes 2006-07-29 22:47:25.000000000 +0200
+++ seamonkey/seamonkey.changes 2006-08-06 12:22:59.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Aug 6 12:21:15 CEST 2006 - aj@suse.de
+
+- Fix build (remove wrong extern "C").
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:43.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:43.000000000 +0200
@@ -14,7 +14,7 @@
License: MPL, GPL
Provides: web_browser
Version: 1.0.4
-Release: 1
+Release: 2
Summary: The successor of the Mozilla Application Suite
URL: http://www.mozilla.org/projects/seamonkey
Group: Productivity/Networking/Web/Browsers
@@ -754,6 +754,8 @@
%dir %{progdir}/components/myspell
%changelog -n seamonkey
+* Sun Aug 06 2006 - aj@suse.de
+- Fix build (remove wrong extern "C").
* Sat Jul 29 2006 - stark@suse.de
- update to 1.0.4 fixing a major regression in 1.0.3 (#195402)
* Thu Jul 27 2006 - stark@suse.de
++++++ autoconf.dif ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:44.000000000 +0200
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig 2004-02-26 06:43:35.000000000 +0100
-+++ config/autoconf.mk.in 2004-02-26 06:44:16.000000000 +0100
-@@ -31,13 +31,13 @@
+--- config/autoconf.mk.in
++++ config/autoconf.mk.in
+@@ -56,13 +56,13 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
++++++ cjk-postscript-fonts.dif ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:44.000000000 +0200
@@ -1,6 +1,6 @@
---- modules/libpref/src/init/all.js.orig 2004-01-23 11:22:44.000000000 +0100
-+++ modules/libpref/src/init/all.js 2004-01-23 11:24:10.000000000 +0100
-@@ -1819,8 +1819,10 @@
+--- modules/libpref/src/init/all.js
++++ modules/libpref/src/init/all.js
+@@ -2190,8 +2190,10 @@
pref("print.postscript.nativefont.ar", "");
pref("print.postscript.nativefont.el", "");
pref("print.postscript.nativefont.he", "");
@@ -13,7 +13,7 @@
pref("print.postscript.nativefont.th", "");
pref("print.postscript.nativefont.tr", "");
pref("print.postscript.nativefont.x-baltic", "");
-@@ -1829,8 +1831,10 @@
+@@ -2200,8 +2202,10 @@
pref("print.postscript.nativefont.x-unicode", "");
pref("print.postscript.nativefont.x-user-def", "");
pref("print.postscript.nativefont.x-western", "");
++++++ cups-paper.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:44.000000000 +0200
@@ -5,13 +5,10 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=324060
-diff -urNU6 gfx/src.old/gtk/nsDeviceContextSpecG.cpp gfx/src/gtk/nsDeviceContextSpecG.cpp
---- gfx/src.old/gtk/nsDeviceContextSpecG.cpp 2004-10-24 20:34:37.000000000 +0200
-+++ gfx/src/gtk/nsDeviceContextSpecG.cpp 2006-04-21 22:58:48.000000000 +0200
-@@ -63,12 +63,13 @@
- #include "xprintutil.h"
- #endif /* USE_XPRINT */
-
+================================================================================
+--- gfx/src/gtk/nsDeviceContextSpecG.cpp
++++ gfx/src/gtk/nsDeviceContextSpecG.cpp
+@@ -66,6 +66,7 @@
#ifdef USE_POSTSCRIPT
#include "nsPSPrinters.h"
#include "nsPaperPS.h" /* Paper size list */
@@ -19,13 +16,7 @@
#endif /* USE_POSTSCRIPT */
/* Ensure that the result is always equal to either PR_TRUE or PR_FALSE */
- #define MAKE_PR_BOOL(val) ((val)?(PR_TRUE):(PR_FALSE))
-
- #ifdef PR_LOGGING
-@@ -1207,40 +1208,44 @@
- printerFeatures.SetNumColorspaceRecords(1);
- #endif /* SET_PRINTER_FEATURES_VIA_PREFS */
-
+@@ -1210,34 +1211,38 @@
#ifdef SET_PRINTER_FEATURES_VIA_PREFS
printerFeatures.SetCanChangePaperSize(PR_TRUE);
#endif /* SET_PRINTER_FEATURES_VIA_PREFS */
@@ -85,16 +76,9 @@
}
PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS ==
- nsPSPrinterList::GetPrinterType(fullPrinterName));
- #ifdef SET_PRINTER_FEATURES_VIA_PREFS
- printerFeatures.SetSupportsSpoolerCommandChange(hasSpoolerCmd);
-diff -urNU6 gfx/src.old/ps/nsPrintJobPS.cpp gfx/src/ps/nsPrintJobPS.cpp
---- gfx/src.old/ps/nsPrintJobPS.cpp 2005-05-21 17:33:09.000000000 +0200
-+++ gfx/src/ps/nsPrintJobPS.cpp 2006-04-21 22:58:48.000000000 +0200
-@@ -361,12 +361,16 @@
- aSpec->GetPrinterName(&printerName);
- NS_ENSURE_TRUE(printerName, NS_ERROR_GFX_PRINTER_NAME_NOT_FOUND);
-
+--- gfx/src/ps/nsPrintJobPS.cpp
++++ gfx/src/ps/nsPrintJobPS.cpp
+@@ -364,6 +364,10 @@
const char *slash = strchr(printerName, '/');
mPrinterName = slash ? slash + 1 : printerName;
mJobTitle.SetIsVoid(PR_TRUE);
@@ -105,13 +89,7 @@
return NS_OK;
}
- nsresult
- nsPrintJobCUPS::SetNumCopies(int aNumCopies)
- {
-@@ -442,12 +446,17 @@
- if (dest != NULL) {
- if (!mNumCopies.IsEmpty())
- dest->num_options = (mCups.mCupsAddOption)("copies",
+@@ -445,6 +449,11 @@
mNumCopies.get(),
dest->num_options,
&dest->options);
@@ -123,16 +101,9 @@
const char *title = mJobTitle.IsVoid() ?
"Untitled Document" : mJobTitle.get();
result = (mCups.mCupsPrintFile)(printer.CStringAt(0)->get(),
- GetDestination().get(), title,
- dest->num_options, dest->options);
- }
-diff -urNU6 gfx/src.old/ps/nsPrintJobPS.h gfx/src/ps/nsPrintJobPS.h
---- gfx/src.old/ps/nsPrintJobPS.h 2005-05-21 17:33:09.000000000 +0200
-+++ gfx/src/ps/nsPrintJobPS.h 2006-04-21 22:58:48.000000000 +0200
-@@ -176,11 +176,12 @@
- nsresult Init(nsIDeviceContextSpecPS *);
-
- private:
+--- gfx/src/ps/nsPrintJobPS.h
++++ gfx/src/ps/nsPrintJobPS.h
+@@ -179,6 +179,7 @@
nsCUPSShim mCups;
nsCString mPrinterName;
nsCString mNumCopies;
@@ -140,15 +111,9 @@
nsCString mJobTitle; // IsVoid() if no title
};
#endif /* VMS */
-
- #endif /* nsPrintJobPS_h__ */
-diff -urNU6 gfx/src.old/psshared/Makefile.in gfx/src/psshared/Makefile.in
---- gfx/src.old/psshared/Makefile.in 2004-12-15 06:52:36.000000000 +0100
-+++ gfx/src/psshared/Makefile.in 2006-04-21 22:58:48.000000000 +0200
-@@ -54,19 +54,22 @@
- LIBXUL_LIBRARY = 1
-
- PACKAGE_FILE = psshared.pkg
+--- gfx/src/psshared/Makefile.in
++++ gfx/src/psshared/Makefile.in
+@@ -57,13 +57,16 @@
EXPORTS = nsCUPSShim.h \
nsPaperPS.h \
@@ -165,16 +130,9 @@
$(NULL)
EXTRA_DSO_LDOPTS = \
- $(MOZ_COMPONENT_LIBS) \
- $(NULL)
-
-diff -urNU6 gfx/src.old/psshared/nsCUPSShim.cpp gfx/src/psshared/nsCUPSShim.cpp
---- gfx/src.old/psshared/nsCUPSShim.cpp 2005-05-08 17:01:20.000000000 +0200
-+++ gfx/src/psshared/nsCUPSShim.cpp 2006-04-21 22:58:48.000000000 +0200
-@@ -42,19 +42,24 @@
- #include "prlink.h"
-
-
+--- gfx/src/psshared/nsCUPSShim.cpp
++++ gfx/src/psshared/nsCUPSShim.cpp
+@@ -45,13 +45,18 @@
// List of symbols to find in libcups. Must match symAddr[] defined in Init().
// Making this an array of arrays instead of pointers allows storing the
// whole thing in read-only memory.
@@ -194,13 +152,7 @@
};
static const int gSymNameCt = sizeof(gSymName) / sizeof(gSymName[0]);
-
- PRBool
- nsCUPSShim::Init()
-@@ -68,12 +73,17 @@
- (void **)&mCupsAddOption,
- (void **)&mCupsFreeDests,
- (void **)&mCupsGetDest,
+@@ -71,6 +76,11 @@
(void **)&mCupsGetDests,
(void **)&mCupsPrintFile,
(void **)&mCupsTempFd,
@@ -212,16 +164,9 @@
};
for (int i = gSymNameCt; i--; ) {
- *(symAddr[i]) = PR_FindSymbol(mCupsLib, gSymName[i]);
- if (! *(symAddr[i])) {
- #ifdef DEBUG
-diff -urNU6 gfx/src.old/psshared/nsCUPSShim.h gfx/src/psshared/nsCUPSShim.h
---- gfx/src.old/psshared/nsCUPSShim.h 2005-05-08 17:01:20.000000000 +0200
-+++ gfx/src/psshared/nsCUPSShim.h 2006-04-21 22:58:48.000000000 +0200
-@@ -59,12 +59,88 @@
- *instance; /* Local instance name or NULL */
- int is_default; /* Is this printer the default? */
- int num_options; /* Number of options */
+--- gfx/src/psshared/nsCUPSShim.h
++++ gfx/src/psshared/nsCUPSShim.h
+@@ -62,6 +62,82 @@
cups_option_t *options; /* Options */
} cups_dest_t;
@@ -304,13 +249,7 @@
typedef cups_dest_t* (PR_CALLBACK *CupsGetDestType)(const char *printer,
const char *instance,
int num_dests,
- cups_dest_t *dests);
- typedef int (PR_CALLBACK *CupsGetDestsType)(cups_dest_t **dests);
- typedef int (PR_CALLBACK *CupsFreeDestsType)(int num_dests,
-@@ -77,12 +153,17 @@
- typedef int (PR_CALLBACK *CupsTempFdType)(char *filename,
- int length);
- typedef int (PR_CALLBACK *CupsAddOptionType)(const char *name,
+@@ -80,6 +156,11 @@
const char *value,
int num_options,
cups_option_t **options);
@@ -322,13 +261,7 @@
struct PRLibrary;
- class NS_PSSHARED nsCUPSShim {
- public:
- nsCUPSShim() : mCupsLib(nsnull) { }
-@@ -110,12 +191,17 @@
- CupsAddOptionType mCupsAddOption;
- CupsFreeDestsType mCupsFreeDests;
- CupsGetDestType mCupsGetDest;
+@@ -113,6 +194,11 @@
CupsGetDestsType mCupsGetDests;
CupsPrintFileType mCupsPrintFile;
CupsTempFdType mCupsTempFd;
@@ -340,12 +273,8 @@
private:
PRLibrary *mCupsLib;
- };
-
-
-diff -urNU6 gfx/src.old/psshared/nsIPaperPS.h gfx/src/psshared/nsIPaperPS.h
---- gfx/src.old/psshared/nsIPaperPS.h 1970-01-01 01:00:00.000000000 +0100
-+++ gfx/src/psshared/nsIPaperPS.h 2006-04-21 23:14:50.000000000 +0200
+--- gfx/src/psshared/nsIPaperPS.h
++++ gfx/src/psshared/nsIPaperPS.h
@@ -0,0 +1,102 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */
@@ -449,9 +378,18 @@
+};
+
+#endif /* _NSIPAPERPS_H_ */
-diff -urNU6 gfx/src.old/psshared/nsPaperFactoryPS.cpp gfx/src/psshared/nsPaperFactoryPS.cpp
---- gfx/src.old/psshared/nsPaperFactoryPS.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ gfx/src/psshared/nsPaperFactoryPS.cpp 2006-04-21 23:04:01.000000000 +0200
+--- gfx/src/psshared/nsPSPrinters.h
++++ gfx/src/psshared/nsPSPrinters.h
+@@ -44,6 +44,7 @@
+ #include "prtypes.h"
+ #include "nsCUPSShim.h"
+ #include "psSharedCore.h"
++#include "nsCOMPtr.h"
+
+ class nsIPrefService;
+ class nsIPrefBranch;
+--- gfx/src/psshared/nsPaperFactoryPS.cpp
++++ gfx/src/psshared/nsPaperFactoryPS.cpp
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */
@@ -518,9 +456,8 @@
+ aPaper = newPZ;
+ return NS_OK;
+}
-diff -urNU6 gfx/src.old/psshared/nsPaperFactoryPS.h gfx/src/psshared/nsPaperFactoryPS.h
---- gfx/src.old/psshared/nsPaperFactoryPS.h 1970-01-01 01:00:00.000000000 +0100
-+++ gfx/src/psshared/nsPaperFactoryPS.h 2006-04-21 23:02:28.000000000 +0200
+--- gfx/src/psshared/nsPaperFactoryPS.h
++++ gfx/src/psshared/nsPaperFactoryPS.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */
@@ -586,13 +523,9 @@
+
+
+#endif /* nsPaperFactoryPS_h__ */
-diff -urNU6 gfx/src.old/psshared/nsPaperPS.cpp gfx/src/psshared/nsPaperPS.cpp
---- gfx/src.old/psshared/nsPaperPS.cpp 2004-09-07 19:51:50.000000000 +0200
-+++ gfx/src/psshared/nsPaperPS.cpp 2006-04-21 23:22:13.000000000 +0200
-@@ -19,12 +19,13 @@
- * The Initial Developer of the Original Code is
- * Kenneth Herron .
- * Portions created by the Initial Developer are Copyright (C) 2004
+--- gfx/src/psshared/nsPaperPS.cpp
++++ gfx/src/psshared/nsPaperPS.cpp
+@@ -22,6 +22,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
@@ -600,13 +533,7 @@
*
* 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
-@@ -34,15 +35,31 @@
- * 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.
+@@ -37,9 +38,25 @@
*
* ***** END LICENSE BLOCK ***** */
@@ -633,13 +560,7 @@
#define COUNTOF(x) (sizeof(x) / sizeof((x)[0]))
- const nsPaperSizePS_ nsPaperSizePS::mList[] =
- {
- #define SIZE_MM(x) (x)
-@@ -54,19 +71,149 @@
- { "Legal", SIZE_INCH(8.5), SIZE_INCH(14), PR_FALSE },
- { "Executive", SIZE_INCH(7.5), SIZE_INCH(10), PR_FALSE },
- #undef SIZE_INCH
+@@ -57,7 +74,15 @@
#undef SIZE_MM
};
@@ -656,12 +577,7 @@
PRBool
nsPaperSizePS::Find(const char *aName)
- {
- for (int i = mCount; i--; ) {
- if (!PL_strcasecmp(aName, mList[i].name)) {
- mCurrent = i;
- return PR_TRUE;
- }
+@@ -70,3 +95,125 @@
}
return PR_FALSE;
}
@@ -787,13 +703,9 @@
+ fabs(fmod(mPPD->sizes[mCurrent].width, HALF_INCH_PT)) > EPSILON ||
+ fabs(fmod(mPPD->sizes[mCurrent].length, HALF_INCH_PT)) > EPSILON;
+}
-diff -urNU6 gfx/src.old/psshared/nsPaperPS.h gfx/src/psshared/nsPaperPS.h
---- gfx/src.old/psshared/nsPaperPS.h 2004-12-15 06:52:36.000000000 +0100
-+++ gfx/src/psshared/nsPaperPS.h 2006-04-21 23:14:05.000000000 +0200
-@@ -37,30 +37,30 @@
- * ***** END LICENSE BLOCK ***** */
-
-
+--- gfx/src/psshared/nsPaperPS.h
++++ gfx/src/psshared/nsPaperPS.h
+@@ -40,9 +40,9 @@
#ifndef _PAPERPS_H_
#define _PAPERPS_H_
@@ -805,8 +717,7 @@
struct nsPaperSizePS_ {
const char *name;
- float width_mm;
- float height_mm;
+@@ -51,13 +51,13 @@
PRBool isMetric; // Present to the user in metric, if possible
};
@@ -823,13 +734,7 @@
/** ---------------------------------------------------
* @return PR_TRUE if the cursor points past the last item.
*/
- PRBool AtEnd() { return mCurrent >= mCount; }
-
- /** ---------------------------------------------------
-@@ -82,12 +82,18 @@
- * Point the cursor to the entry with the given paper name.
- * @return PR_TRUE if pointing to a valid entry.
- */
+@@ -85,6 +85,12 @@
PRBool Find(const char *aName);
/** ---------------------------------------------------
@@ -842,13 +747,7 @@
* @return a pointer to the name of the current paper size
*/
const char *Name() {
- NS_PRECONDITION(!AtEnd(), "Invalid current item");
- return mList[mCurrent].name;
- }
-@@ -114,15 +120,87 @@
- */
- PRBool IsMetric() {
- NS_PRECONDITION(!AtEnd(), "Invalid current item");
+@@ -117,11 +123,83 @@
return mList[mCurrent].isMetric;
}
@@ -934,14 +833,9 @@
};
#endif
-
-diff -urNU6 gfx/src.old/xlib/nsDeviceContextSpecXlib.cpp gfx/src/xlib/nsDeviceContextSpecXlib.cpp
---- gfx/src.old/xlib/nsDeviceContextSpecXlib.cpp 2004-10-24 20:34:38.000000000 +0200
-+++ gfx/src/xlib/nsDeviceContextSpecXlib.cpp 2006-04-21 22:58:48.000000000 +0200
-@@ -1209,13 +1209,17 @@
-
- #ifdef SET_PRINTER_FEATURES_VIA_PREFS
- printerFeatures.SetCanChangePaperSize(PR_TRUE);
+--- gfx/src/xlib/nsDeviceContextSpecXlib.cpp
++++ gfx/src/xlib/nsDeviceContextSpecXlib.cpp
+@@ -1212,7 +1212,11 @@
#endif /* SET_PRINTER_FEATURES_VIA_PREFS */
nsXPIDLCString papername;
if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "paper_size", getter_Copies(papername)))) {
@@ -954,13 +848,7 @@
if (paper.Find(papername)) {
DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n",
- paper.Name(), paper.Width_mm(), paper.Height_mm()));
- aPrintSettings->SetPaperSizeUnit(paper.IsMetric() ?
- (int)nsIPrintSettings::kPaperSizeMillimeters :
-@@ -1235,12 +1239,13 @@
- printerFeatures.SetPaperRecord(count++, paper.Name(),
- (int)paper.Width_mm(), (int)paper.Height_mm(), !paper.IsMetric());
- paper.Next();
+@@ -1238,6 +1242,7 @@
}
printerFeatures.SetNumPaperSizeRecords(count);
#endif /* SET_PRINTER_FEATURES_VIA_PREFS */
@@ -968,31 +856,3 @@
}
PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS ==
- nsPSPrinterList::GetPrinterType(fullPrinterName));
- #ifdef SET_PRINTER_FEATURES_VIA_PREFS
- printerFeatures.SetSupportsSpoolerCommandChange(hasSpoolerCmd);
-Index: mozilla/gfx/src/psshared/nsPSPrinters.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/psshared/nsPSPrinters.h,v
-retrieving revision 1.3
-diff -U8 -p -r1.3 nsPSPrinters.h
---- mozilla/gfx/src/psshared/nsPSPrinters.h 15 Dec 2004 05:52:36 -0000 1.3
-+++ gfx/src/psshared/nsPSPrinters.h 6 Feb 2006 13:46:54 -0000
-@@ -39,16 +39,17 @@
- #ifndef nsPSPrinters_h___
- #define nsPSPrinters_h___
-
- #include "nsString.h"
- #include "nsVoidArray.h"
- #include "prtypes.h"
- #include "nsCUPSShim.h"
- #include "psSharedCore.h"
-+#include "nsCOMPtr.h"
-
- class nsIPrefService;
- class nsIPrefBranch;
- class nsCUPSShim;
-
- class NS_PSSHARED nsPSPrinterList {
- public:
- /**
++++++ digest-mail.patch ++++++
++++ 770 lines (skipped)
++++ between seamonkey/digest-mail.patch
++++ and seamonkey/digest-mail.patch
++++++ file-saver.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:44.000000000 +0200
@@ -5,22 +5,10 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=341218
Index: widget/src/gtk2/nsFilePicker.cpp
-===================================================================
-RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/widget/src/gtk2/nsFilePicker.cpp,v
-retrieving revision 1.11
-diff -u -t -p -1 -2 -r1.11 nsFilePicker.cpp
---- widget/src/gtk2/nsFilePicker.cpp 17 Aug 2005 13:41:44 -0000 1.11
-+++ widget/src/gtk2/nsFilePicker.cpp 12 Jun 2006 08:02:15 -0000
-@@ -81,39 +81,41 @@ typedef enum
- GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
- } GtkFileChooserAction;
-
-
- typedef gchar* (*_gtk_file_chooser_get_filename_fn)(GtkFileChooser *chooser);
- typedef GSList* (*_gtk_file_chooser_get_filenames_fn)(GtkFileChooser *chooser);
- typedef GtkWidget* (*_gtk_file_chooser_dialog_new_fn)(const gchar *title,
- GtkWindow *parent,
- GtkFileChooserAction action,
+================================================================================
+--- widget/src/gtk2/nsFilePicker.cpp
++++ widget/src/gtk2/nsFilePicker.cpp
+@@ -90,6 +90,7 @@
const gchar *first_button_text,
...);
typedef void (*_gtk_file_chooser_set_select_multiple_fn)(GtkFileChooser* chooser, gboolean truth);
@@ -28,15 +16,7 @@
typedef void (*_gtk_file_chooser_set_current_name_fn)(GtkFileChooser* chooser, const gchar* name);
typedef void (*_gtk_file_chooser_set_current_folder_fn)(GtkFileChooser* chooser, const gchar* folder);
typedef void (*_gtk_file_chooser_add_filter_fn)(GtkFileChooser* chooser, GtkFileFilter* filter);
- typedef void (*_gtk_file_chooser_set_filter_fn)(GtkFileChooser* chooser, GtkFileFilter* filter);
- typedef GtkFileFilter* (*_gtk_file_chooser_get_filter_fn)(GtkFileChooser* chooser);
- typedef GSList* (*_gtk_file_chooser_list_filters_fn)(GtkFileChooser* chooser);
- typedef GtkFileFilter* (*_gtk_file_filter_new_fn)();
- typedef void (*_gtk_file_filter_add_pattern_fn)(GtkFileFilter* filter, const gchar* pattern);
- typedef void (*_gtk_file_filter_set_name_fn)(GtkFileFilter* filter, const gchar* name);
-
-
- DECL_FUNC_PTR(gtk_file_chooser_get_filename);
+@@ -105,6 +106,7 @@
DECL_FUNC_PTR(gtk_file_chooser_get_filenames);
DECL_FUNC_PTR(gtk_file_chooser_dialog_new);
DECL_FUNC_PTR(gtk_file_chooser_set_select_multiple);
@@ -44,25 +24,7 @@
DECL_FUNC_PTR(gtk_file_chooser_set_current_name);
DECL_FUNC_PTR(gtk_file_chooser_set_current_folder);
DECL_FUNC_PTR(gtk_file_chooser_add_filter);
- DECL_FUNC_PTR(gtk_file_chooser_set_filter);
- DECL_FUNC_PTR(gtk_file_chooser_get_filter);
- DECL_FUNC_PTR(gtk_file_chooser_list_filters);
- DECL_FUNC_PTR(gtk_file_filter_new);
- DECL_FUNC_PTR(gtk_file_filter_add_pattern);
- DECL_FUNC_PTR(gtk_file_filter_set_name);
-
- static GtkWindow *
- get_gtk_window_for_nsiwidget(nsIWidget *widget)
-@@ -175,24 +177,25 @@ nsFilePicker::LoadSymbolsGTK24()
- } else {
- // XXX hmm, this seems to fail when gtk 2.4 is already loaded...
- mGTK24 = LoadVersionedLibrary("gtk-2", ".4");
- if (!mGTK24) {
- return NS_ERROR_NOT_AVAILABLE;
- }
- GET_LIBGTK_FUNC(gtk_file_chooser_get_filename);
- }
-
+@@ -184,6 +186,7 @@
GET_LIBGTK_FUNC(gtk_file_chooser_get_filenames);
GET_LIBGTK_FUNC(gtk_file_chooser_dialog_new);
GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple);
@@ -70,25 +32,7 @@
GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name);
GET_LIBGTK_FUNC(gtk_file_chooser_set_current_folder);
GET_LIBGTK_FUNC(gtk_file_chooser_add_filter);
- GET_LIBGTK_FUNC(gtk_file_chooser_set_filter);
- GET_LIBGTK_FUNC(gtk_file_chooser_get_filter);
- GET_LIBGTK_FUNC(gtk_file_chooser_list_filters);
- GET_LIBGTK_FUNC(gtk_file_filter_new);
- GET_LIBGTK_FUNC(gtk_file_filter_add_pattern);
- GET_LIBGTK_FUNC(gtk_file_filter_set_name);
-
- // Woot.
- return NS_OK;
-@@ -555,43 +558,51 @@ nsFilePicker::Show(PRInt16 *aReturn)
- const char *filter_pattern = mFilters[i]->get();
- _gtk_file_filter_set_name (filter, filter_pattern);
- }
-
- _gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), filter);
-
- // Set the initially selected filter
- if (mSelectedType == i) {
- _gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(file_chooser), filter);
+@@ -564,6 +567,13 @@
}
}
@@ -102,13 +46,7 @@
gint response = gtk_dialog_run (GTK_DIALOG (file_chooser));
switch (response) {
- case GTK_RESPONSE_ACCEPT:
- ReadValuesFromFileChooser(file_chooser);
- *aReturn = nsIFilePicker::returnOK;
- if (mMode == nsIFilePicker::modeSave) {
- nsCOMPtr<nsILocalFile> file;
- GetFile(getter_AddRefs(file));
- if (file) {
+@@ -577,12 +587,13 @@
PRBool exists = PR_FALSE;
file->Exists(&exists);
if (exists) {
@@ -124,12 +62,3 @@
}
}
}
- }
- break;
-
- case GTK_RESPONSE_CANCEL:
- case GTK_RESPONSE_CLOSE:
- case GTK_RESPONSE_DELETE_EVENT:
- *aReturn = nsIFilePicker::returnCancel;
- break;
-
++++++ js-libm.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:44.000000000 +0200
@@ -1,50 +1,7 @@
Index: jslibmath.h
-===================================================================
-RCS file: /cvsroot/mozilla/js/src/jslibmath.h,v
-retrieving revision 3.16
-diff -u -r3.16 jslibmath.h
---- jslibmath.h 5 Oct 2004 10:19:07 -0000 3.16
-+++ js/src/jslibmath.h 20 Apr 2005 00:58:06 -0000
-@@ -70,7 +70,20 @@
- #define JS_USE_FDLIBM_MATH 1
-
- #elif defined(linux)
--#define JS_USE_FDLIBM_MATH 1
-+
-+#include
-+
-+/* Single Unix Specification Version 3 defines different results for
-+ some pow() corner cases than Ecma 262. This function takes care of
-+ hiding those differences. */
-+static inline double
-+sus3_pow (double x, double y)
-+{
-+ if (isnan(y) || (fabs(x) == 1.0 && isinf(y)))
-+ return strtod("NAN", NULL);
-+ return pow(x, y);
-+}
-+#define fd_pow sus3_pow
-
- #elif defined(OSF1)
- /* Want to use some fdlibm functions but fdlibm broken on OSF1/alpha. */
-@@ -101,7 +114,9 @@
- #define fd_floor floor
- #define fd_fmod fmod
- #define fd_log log
--#define fd_pow pow
-+#ifndef fd_pow
-+# define fd_pow pow
-+#endif
- #define fd_sin sin
- #define fd_sqrt sqrt
- #define fd_tan tan
-Index: js/src/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
-retrieving revision 3.95
-diff -u -r3.95 Makefile.in
---- js/src/Makefile.in 1 Jun 2005 14:26:26 -0000 3.95
-+++ js/src/Makefile.in 27 Jul 2005 05:53:00 -0000
+================================================================================
+--- js/src/Makefile.in
++++ js/src/Makefile.in
@@ -54,6 +54,12 @@
RESFILE = js$(MOZ_BITS)40.res
endif
@@ -79,3 +36,38 @@
# An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result.
# This suppresses optimization for this single compilation unit.
+--- js/src/jslibmath.h
++++ js/src/jslibmath.h
+@@ -70,7 +70,20 @@
+ #define JS_USE_FDLIBM_MATH 1
+
+ #elif defined(linux)
+-#define JS_USE_FDLIBM_MATH 1
++
++#include
++
++/* Single Unix Specification Version 3 defines different results for
++ some pow() corner cases than Ecma 262. This function takes care of
++ hiding those differences. */
++static inline double
++sus3_pow (double x, double y)
++{
++ if (isnan(y) || (fabs(x) == 1.0 && isinf(y)))
++ return strtod("NAN", NULL);
++ return pow(x, y);
++}
++#define fd_pow sus3_pow
+
+ #elif defined(OSF1)
+ /* Want to use some fdlibm functions but fdlibm broken on OSF1/alpha. */
+@@ -101,7 +114,9 @@
+ #define fd_floor floor
+ #define fd_fmod fmod
+ #define fd_log log
+-#define fd_pow pow
++#ifndef fd_pow
++# define fd_pow pow
++#endif
+ #define fd_sin sin
+ #define fd_sqrt sqrt
+ #define fd_tan tan
++++++ localize.patch ++++++
++++ 7161 lines (skipped)
++++ between seamonkey/localize.patch
++++ and seamonkey/localize.patch
++++++ mail-alert.patch ++++++
++++ 1172 lines (skipped)
++++ between seamonkey/mail-alert.patch
++++ and seamonkey/mail-alert.patch
++++++ misc.dif ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:44.000000000 +0200
@@ -18,3 +18,13 @@
#include
#include FT_GLYPH_H
#include FT_FREETYPE_H
+--- mailnews/mime/src/mimemult.cpp
++++ mailnews/mime/src/mimemult.cpp
+@@ -73,7 +73,6 @@
+ extern "C" MimeObjectClass mimeMultipartRelatedClass;
+ extern "C" MimeObjectClass mimeMultipartSignedClass;
+ extern "C" MimeObjectClass mimeInlineTextVCardClass;
+-extern "C" MimeExternalObjectClass mimeExternalObjectClass;
+
+ #if defined(DEBUG) && defined(XP_UNIX)
+ static int MimeMultipart_debug_print (MimeObject *, PRFileDesc *, PRInt32);
++++++ mozilla-default-plugin-less-annoying.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:44.000000000 +0200
@@ -1,17 +1,17 @@
---- mozilla/mozilla/modules/plugin/samples/default/unix/npshell.c.foo Tue May 7 14:18:45 2002
-+++ mozilla/mozilla/modules/plugin/samples/default/unix/npshell.c Tue May 7 14:49:55 2002
-@@ -224,7 +224,7 @@
+--- BUILD/mozilla/modules/plugin/samples/default/unix/npshell.c
++++ BUILD/mozilla/modules/plugin/samples/default/unix/npshell.c
+@@ -243,7 +243,7 @@
This->depth = ws_info->depth;
This->colormap = ws_info->colormap;
makePixmap(This);
- makeWidget(This);
+ /* makeWidget(This); */
}
- return NPERR_NO_ERROR;
- }
---- mozilla/mozilla/modules/plugin/samples/default/unix/nullplugin.c.foo Tue May 7 14:18:45 2002
-+++ mozilla/mozilla/modules/plugin/samples/default/unix/nullplugin.c Tue May 7 14:48:33 2002
-@@ -70,6 +70,8 @@
+ #endif /* #ifdef MOZ_X11 */
+
+--- BUILD/mozilla/modules/plugin/samples/default/unix/nullplugin.c
++++ BUILD/mozilla/modules/plugin/samples/default/unix/nullplugin.c
+@@ -89,6 +89,8 @@
gtk_object_remove_data(GTK_OBJECT(button), DIALOGID);
@@ -20,17 +20,17 @@
if (This->pluginsFileUrl != NULL)
{
/* Get the JavaScript command string */
-@@ -110,6 +112,7 @@
- NPN_MemFree(url);
+@@ -131,6 +133,7 @@
+ NPN_PopPopupsEnabledState(This->instance);
}
}
+#endif
destroyWidget(This);
}
-@@ -265,14 +268,14 @@
- GTK_DIALOG(dialogWindow)->action_area);
- gtk_object_set_data(GTK_OBJECT(okButton), DIALOGID, dialogWindow);
+@@ -303,14 +306,14 @@
+ GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
+ gtk_widget_grab_default(okButton);
- cancelButton= AddWidget(gtk_button_new_with_label (CANCEL_BUTTON),
- GTK_DIALOG(dialogWindow)->action_area);
@@ -45,11 +45,11 @@
+ /* gtk_signal_connect (GTK_OBJECT(cancelButton), "clicked",
+ GTK_SIGNAL_FUNC(DialogCancelClicked), This); */
- /* hookup to when the dialog is destroyed */
- gtk_signal_connect(GTK_OBJECT(dialogWindow), "destroy",
---- mozilla/mozilla/modules/plugin/samples/default/unix/nullplugin.h.foo Tue May 7 14:46:48 2002
-+++ mozilla/mozilla/modules/plugin/samples/default/unix/nullplugin.h Tue May 7 14:47:08 2002
-@@ -53,9 +53,7 @@
+ gtk_signal_connect(GTK_OBJECT(dialogWindow), "key_press_event",
+ GTK_SIGNAL_FUNC (DialogEscapePressed), NULL);
+--- BUILD/mozilla/modules/plugin/samples/default/unix/nullplugin.h
++++ BUILD/mozilla/modules/plugin/samples/default/unix/nullplugin.h
+@@ -69,9 +69,7 @@
#define JVM_MINETYPE "application/x-java-vm"
#define MESSAGE "\
This page contains information of a type (%s) that can\n\
++++++ multi-replyto.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:45.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:45.000000000 +0200
@@ -1,10 +1,7 @@
Index: mailnews/base/resources/content/msgHdrViewOverlay.js
-===================================================================
-RCS file: /cvsroot/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.js,v
-retrieving revision 1.141.2.1.2.3
-diff -u -r1.141.2.1.2.3 msgHdrViewOverlay.js
---- mailnews/base/resources/content/msgHdrViewOverlay.js 22 Dec 2005 14:40:33 -0000 1.141.2.1.2.3
-+++ mailnews/base/resources/content/msgHdrViewOverlay.js 4 Mar 2006 21:11:50 -0000
+================================================================================
+--- mailnews/base/resources/content/msgHdrViewOverlay.js
++++ mailnews/base/resources/content/msgHdrViewOverlay.js
@@ -115,7 +115,7 @@
// We also have an expanded header view. This shows many of your more common (and useful) headers.
var gExpandedHeaderList = [ {name:"subject"},
@@ -14,13 +11,8 @@
{name:"date"},
{name:"to", useToggle:true, outputFunction:OutputEmailAddresses},
{name:"cc", useToggle:true, outputFunction:OutputEmailAddresses},
-Index: mailnews/base/resources/content/msgHdrViewOverlay.xul
-===================================================================
-RCS file: /cvsroot/mozilla/mailnews/base/resources/content/msgHdrViewOverlay.xul,v
-retrieving revision 1.64.14.1
-diff -u -r1.64.14.1 msgHdrViewOverlay.xul
---- mailnews/base/resources/content/msgHdrViewOverlay.xul 22 Dec 2005 14:40:33 -0000 1.64.14.1
-+++ mailnews/base/resources/content/msgHdrViewOverlay.xul 4 Mar 2006 21:12:50 -0000
+--- mailnews/base/resources/content/msgHdrViewOverlay.xul
++++ mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -163,7 +163,7 @@
<mail-emailheaderfield id="expandedfromBox" label="&fromField.label;" collapsed="true"/>
++++++ nss-opt.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:45.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:45.000000000 +0200
@@ -5,13 +5,10 @@
CFLAGS are not taken from mozilla build
Index: security/manager/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
-retrieving revision 1.52
-diff -u -r1.52 Makefile.in
---- security/manager/Makefile.in 7 Jan 2004 13:36:50 -0000 1.52
-+++ security/manager/Makefile.in 10 Mar 2004 09:44:29 -0000
-@@ -71,7 +71,10 @@
+================================================================================
+--- security/manager/Makefile.in
++++ security/manager/Makefile.in
+@@ -99,7 +99,10 @@
ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
endif
++++++ postscript.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:45.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:45.000000000 +0200
@@ -6,16 +6,10 @@
Index: gfx/src/ps/nsPostScriptObj.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsPostScriptObj.cpp,v
-retrieving revision 1.124
-diff -u -p -6 -r1.124 nsPostScriptObj.cpp
---- gfx/src/ps/nsPostScriptObj.cpp 26 Jul 2005 15:54:18 -0000 1.124
-+++ gfx/src/ps/nsPostScriptObj.cpp 19 Apr 2006 04:07:38 -0000
-@@ -463,20 +463,23 @@ nsPostScriptObj::write_prolog(FILE *aHan
-
- // now begin prolog
- fprintf(f, "%%%%BeginProlog\n");
+================================================================================
+--- gfx/src/ps/nsPostScriptObj.cpp
++++ gfx/src/ps/nsPostScriptObj.cpp
+@@ -466,6 +466,7 @@
// Tell the printer what size paper it should use
fprintf(f,
@@ -23,7 +17,7 @@
"/setpagedevice where\n" // Test for the feature
"{ pop 2 dict\n"
" dup /PageSize [ %s %s ] put\n" // Paper dimensions
- " dup /Policies 1 dict\n"
+@@ -473,7 +474,9 @@
" dup /PageSize 3 put\n" // Select the nearest page size to fit
" put\n"
" setpagedevice\n" // Install settings
@@ -34,6 +28,3 @@
fpCString(NSTwipsToFloatPoints(paper_width)).get(),
fpCString(NSTwipsToFloatPoints(paper_height)).get());
- fprintf(f, "[");
- for (i = 0; i < 256; i++){
- if (*isotab[i] == '\0'){
++++++ ppc64.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:45.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:45.000000000 +0200
@@ -1,6 +1,6 @@
---- mozilla/security/coreconf/Linux.mk.foo 2003-10-01 13:06:30.000000000 -0400
-+++ mozilla/security/coreconf/Linux.mk 2003-10-01 13:07:22.000000000 -0400
-@@ -53,7 +53,11 @@
+--- mozilla/security/coreconf/Linux.mk
++++ mozilla/security/coreconf/Linux.mk
+@@ -55,7 +55,11 @@
ifeq ($(OS_TEST),m68k)
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = m68k
@@ -13,7 +13,7 @@
ifeq ($(OS_TEST),ppc)
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = ppc
-@@ -112,6 +116,7 @@
+@@ -119,6 +123,7 @@
endif
endif
endif
++++++ print-properties.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:45.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:45.000000000 +0200
@@ -6,18 +6,10 @@
https://bugzilla.novell.com/show_bug.cgi?id=187013
Index: idl/nsIPrintSettingsService.idl
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/idl/Attic/nsIPrintSettingsService.idl,v
-retrieving revision 1.2
-diff -p -u -d -8 -r1.2 nsIPrintSettingsService.idl
---- idl/nsIPrintSettingsService.idl 17 Apr 2004 21:52:27 -0000 1.2
-+++ gfx/idl/nsIPrintSettingsService.idl 11 May 2006 21:51:04 -0000
-@@ -67,17 +67,17 @@ interface nsIPrintSettingsService : nsIS
- * then it should use "globalPrintSettings"
- *
- * Initializes the newPrintSettings from the default printer
- *
- */
+================================================================================
+--- gfx/idl/nsIPrintSettingsService.idl
++++ gfx/idl/nsIPrintSettingsService.idl
+@@ -72,7 +72,7 @@
readonly attribute nsIPrintSettings newPrintSettings;
/**
@@ -26,17 +18,7 @@
*/
readonly attribute wstring defaultPrinterName;
- /**
- * Initializes certain settings from the native printer into the PrintSettings
- * if aPrinterName is null then it uses the default printer name if it can
- * These settings include, but are not limited to:
- * Page Orientation
-@@ -85,28 +85,31 @@ interface nsIPrintSettingsService : nsIS
- * Number of Copies
- */
- void initPrintSettingsFromPrinter(in wstring aPrinterName, in nsIPrintSettings aPrintSettings);
-
- /**
+@@ -90,18 +90,21 @@
* Reads PrintSettings values from Prefs,
* the values to be read are indicated by the "flags" arg.
*
@@ -62,24 +44,9 @@
*
*/
void initPrintSettingsFromPrefs(in nsIPrintSettings aPrintSettings, in boolean aUsePrinterNamePrefix, in unsigned long aFlags);
-
- /**
- * Writes PrintSettings values to Prefs,
- * the values to be written are indicated by the "flags" arg.
- *
-Index: gfx/src/nsPrintOptionsImpl.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/Attic/nsPrintOptionsImpl.cpp,v
-retrieving revision 1.76
-diff -p -u -d -8 -r1.76 nsPrintOptionsImpl.cpp
---- src/nsPrintOptionsImpl.cpp 9 Aug 2005 01:35:48 -0000 1.76
-+++ gfx/src/nsPrintOptionsImpl.cpp 11 May 2006 21:51:05 -0000
-@@ -597,23 +597,16 @@ nsPrintOptions::ReadPrefs(nsIPrintSettin
-
- if (aFlags & nsIPrintSettings::kInitSavePrintCommand) {
- if (GETSTRPREF(kPrintCommand, str)) {
- aPS->SetPrintCommand(str.get());
- DUMP_STR(kReadStr, kPrintCommand, str.get());
+--- gfx/src/nsPrintOptionsImpl.cpp
++++ gfx/src/nsPrintOptionsImpl.cpp
+@@ -602,13 +602,6 @@
}
}
@@ -93,17 +60,7 @@
if (aFlags & nsIPrintSettings::kInitSavePrintToFile) {
if (GETBOOLPREF(kPrintToFile, &b)) {
aPS->SetPrintToFile(b);
- DUMP_BOOL(kReadStr, kPrintToFile, b);
- }
- }
-
- if (aFlags & nsIPrintSettings::kInitSaveToFileName) {
-@@ -865,20 +858,22 @@ nsPrintOptions::WritePrefs(nsIPrintSetti
-
- if (aFlags & nsIPrintSettings::kInitSavePrintCommand) {
- if (NS_SUCCEEDED(aPS->GetPrintCommand(&uStr))) {
- DUMP_STR(kWriteStr, kPrintCommand, uStr);
- WritePrefString(uStr, GetPrefName(kPrintCommand, aPrinterName));
+@@ -870,10 +863,12 @@
}
}
@@ -118,17 +75,7 @@
}
}
- if (aFlags & nsIPrintSettings::kInitSavePrintToFile) {
- if (NS_SUCCEEDED(aPS->GetPrintToFile(&b))) {
- DUMP_BOOL(kWriteStr, kPrintToFile, b);
- mPrefBranch->SetBoolPref(GetPrefName(kPrintToFile, aPrinterName), b);
- }
-@@ -965,16 +960,22 @@ NS_IMETHODIMP nsPrintOptions::GetNativeD
-
- nsresult nsPrintOptions::_CreatePrintSettings(nsIPrintSettings **_retval)
- {
- // does not initially ref count
- nsPrintSettings * printSettings = new nsPrintSettings();
+@@ -970,6 +965,12 @@
NS_ENSURE_TRUE(printSettings, NS_ERROR_OUT_OF_MEMORY);
NS_ADDREF(*_retval = printSettings); // ref count
@@ -141,17 +88,7 @@
(void)InitPrintSettingsFromPrefs(*_retval, PR_FALSE,
nsIPrintSettings::kInitSaveAll);
- return NS_OK;
- }
-
- NS_IMETHODIMP nsPrintOptions::CreatePrintSettings(nsIPrintSettings **_retval)
- {
-@@ -1003,16 +1004,42 @@ nsPrintOptions::GetNewPrintSettings(nsIP
- NS_IMETHODIMP
- nsPrintOptions::GetDefaultPrinterName(PRUnichar * *aDefaultPrinterName)
- {
- nsresult rv;
- nsCOMPtr<nsIPrinterEnumerator> prtEnum = do_GetService(kPrinterEnumeratorCID,
+@@ -1008,6 +1009,32 @@
&rv);
NS_ENSURE_SUCCESS(rv, rv);
@@ -184,17 +121,7 @@
return prtEnum->GetDefaultPrinterName(aDefaultPrinterName);
}
- NS_IMETHODIMP
- nsPrintOptions::InitPrintSettingsFromPrinter(const PRUnichar *aPrinterName,
- nsIPrintSettings *aPrintSettings)
- {
- NS_ENSURE_ARG_POINTER(aPrintSettings);
-@@ -1124,49 +1151,50 @@ nsPrintOptions::InitPrintSettingsFromPre
- nsAutoString prtName;
- // read any non printer specific prefs
- // with empty printer name
- nsresult rv = ReadPrefs(aPS, prtName, aFlags);
- NS_ENSURE_SUCCESS(rv, rv);
+@@ -1129,8 +1156,13 @@
// Get the Printer Name from the PrintSettings
// to use as a prefix for Pref Names
@@ -210,9 +137,7 @@
// Now read any printer specific prefs
rv = ReadPrefs(aPS, prtName, aFlags);
- if (NS_SUCCEEDED(rv))
- aPS->SetIsInitializedFromPrefs(PR_TRUE);
-
+@@ -1140,9 +1172,9 @@
return NS_OK;
}
@@ -225,9 +150,7 @@
*/
nsresult
nsPrintOptions::SavePrintSettingsToPrefs(nsIPrintSettings *aPS,
- PRBool aUsePrinterNamePrefix,
- PRUint32 aFlags)
- {
+@@ -1152,16 +1184,12 @@
NS_ENSURE_ARG_POINTER(aPS);
nsAutoString prtName;
@@ -247,8 +170,3 @@
}
- //-----------------------------------------------------
- //-- Protected Methods --------------------------------
- //-----------------------------------------------------
- nsresult
- nsPrintOptions::ReadPrefString(const char * aPrefId, nsAString& aString)
++++++ system-nss.patch ++++++
++++ 697 lines (skipped)
++++ between seamonkey/system-nss.patch
++++ and seamonkey/system-nss.patch
++++++ xul-picker.patch ++++++
--- /var/tmp/diff_new_pack.Wb7ayF/_old 2006-08-06 22:16:47.000000000 +0200
+++ /var/tmp/diff_new_pack.Wb7ayF/_new 2006-08-06 22:16:47.000000000 +0200
@@ -1,5 +1,5 @@
---- widget/src/gtk2/nsWidgetFactory.cpp.orig 2004-09-02 13:26:37.397413875 +0200
-+++ widget/src/gtk2/nsWidgetFactory.cpp 2004-09-02 13:33:59.337053388 +0200
+--- widget/src/gtk2/nsWidgetFactory.cpp
++++ widget/src/gtk2/nsWidgetFactory.cpp
@@ -55,6 +55,7 @@
#include "nsIComponentRegistrar.h"
#include "nsComponentManagerUtils.h"
@@ -8,7 +8,7 @@
#include
/* from nsFilePicker.js */
-@@ -87,7 +88,7 @@
+@@ -86,7 +87,7 @@
}
nsCOMPtr<nsIFilePicker> picker;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...