--- a/src/puresize.h	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/puresize.h	Mon Aug 13 09:02:59 2007 +0200
@@ -24,22 +24,18 @@
 #ifndef PURESIZE_H
 #define PURESIZE_H
 
-/* If RAW_PURESIZE is already defined then the user overrode it at
+/* If PURESIZE is already defined then the user overrode it at
    configure time. */
-#ifndef RAW_PURESIZE
+#ifndef PURESIZE
 
 /* Basic amount of purespace to use, in the absence of extra
    things configured in. */
 
-/* This computation is Barbra Streisand, BS
 #if (LONGBITS == 64)
-# define BASE_PURESIZE 944000
+# define BASE_PURESIZE 912000
 #else
-# define BASE_PURESIZE 527000
+# define BASE_PURESIZE 552000
 #endif
-*/
-
-#define BASE_PURESIZE 1400000
 
 /* If any particular systems need to change the base puresize, they
    should define SYSTEM_PURESIZE_EXTRA.  Note that this can be
@@ -54,54 +50,26 @@
 
 /* Extra amount of purespace needed for menubars. */
 
-#ifdef HAVE_DIALOGS
-# if (LONGBITS == 64)
-#  define DIALOG_PURESIZE_EXTRA 43000
-# else
-#  define DIALOG_PURESIZE_EXTRA 1800
-# endif
-#else
-# define DIALOG_PURESIZE_EXTRA 0
-#endif
-
 #ifdef HAVE_MENUBARS
 # if (LONGBITS == 64)
 #  define MENUBAR_PURESIZE_EXTRA 43000
 # else
-#  define MENUBAR_PURESIZE_EXTRA 36000
+#  define MENUBAR_PURESIZE_EXTRA 35000
 # endif
 #else
 # define MENUBAR_PURESIZE_EXTRA 0
 #endif
 
-#ifdef HAVE_SCROLLBARS
-# if (LONGBITS == 64)
-#  define SCROLLBAR_PURESIZE_EXTRA 4000
-# else
-#  define SCROLLBAR_PURESIZE_EXTRA 1800
-# endif
-#else
-# define SCROLLBAR_PURESIZE_EXTRA 0
-#endif
+/* Scrollbar purespace needed is only about 2K so there's no sense
+   worrying about it separately. */
 
-#ifdef HAVE_TOOLBARS
-# if (LONGBITS == 64)
-#  define TOOLBAR_PURESIZE_EXTRA 4000
-# else
-#  define TOOLBAR_PURESIZE_EXTRA 8400
-# endif
-#else
-# define TOOLBAR_PURESIZE_EXTRA 0
-#endif
-
-/* Extra amount of purespace needed for X11, separate from menubars
-   and scrollbars. */
+/* Extra amount of purespace needed for X11, separate from menubars. */
 
 #ifdef HAVE_X_WINDOWS
 # if (LONGBITS == 64)
 #  define X11_PURESIZE_EXTRA 95000
 # else
-#  define X11_PURESIZE_EXTRA 50000
+#  define X11_PURESIZE_EXTRA 63000
 # endif
 #else
 # define X11_PURESIZE_EXTRA 0
@@ -125,7 +93,7 @@
 # if (LONGBITS == 64)
 #  define TOOLTALK_PURESIZE_EXTRA 100000
 # else
-#  define TOOLTALK_PURESIZE_EXTRA 8300
+#  define TOOLTALK_PURESIZE_EXTRA 69000
 # endif
 #else
 # define TOOLTALK_PURESIZE_EXTRA 0
@@ -142,26 +110,17 @@
 /* Extra amount of purespace needed for Sunpro builds. */
 
 #ifdef SUNPRO
-# define SUNPRO_PURESIZE_EXTRA 135000
+# define SUNPRO_PURESIZE_EXTRA 40000
 #else
 # define SUNPRO_PURESIZE_EXTRA 0
 #endif
 
-#define RAW_PURESIZE ((BASE_PURESIZE) +					\
-		      (DIALOG_PURESIZE_EXTRA) +				\
-		      (MENUBAR_PURESIZE_EXTRA) +			\
-		      (SCROLLBAR_PURESIZE_EXTRA) +			\
-		      (TOOLBAR_PURESIZE_EXTRA) +			\
-		      (X11_PURESIZE_EXTRA) +				\
-		      (SYSTEM_PURESIZE_EXTRA) +				\
-		      (MULE_PURESIZE_EXTRA) +				\
-		      (TOOLTALK_PURESIZE_EXTRA) +			\
-		      (ENERGIZE_PURESIZE_EXTRA) +			\
-		      (SUNPRO_PURESIZE_EXTRA))
+#define PURESIZE ((BASE_PURESIZE) + (MENUBAR_PURESIZE_EXTRA) +		  \
+		  (X11_PURESIZE_EXTRA) +				  \
+		  (SYSTEM_PURESIZE_EXTRA) + (MULE_PURESIZE_EXTRA) +	  \
+		  (TOOLTALK_PURESIZE_EXTRA) + (ENERGIZE_PURESIZE_EXTRA) + \
+		  (SUNPRO_PURESIZE_EXTRA))
 
-#endif /* !RAW_PURESIZE */
-
-#include <puresize_adjust.h>
-#define PURESIZE ((RAW_PURESIZE) + (PURESIZE_ADJUSTMENT))
+#endif /* !PURESIZE */
 
 #endif /* PURESIZE_H */