diff -crN ./libgnomeprintui/libgnomeprintui/gnome-print-dialog.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-dialog.h
*** ./libgnomeprintui/libgnomeprintui/gnome-print-dialog.h	Wed Feb 12 19:17:19 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-dialog.h	Fri Jul  4 10:33:54 2003
***************
*** 1,4 ****
--- 1,8 ----
  /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+ 
+ #ifndef __GNOME_PRINT_DIALOG_H__
+ #define __GNOME_PRINT_DIALOG_H__
+ 
  /*
   *  gnome-print-dialog.h: A system print dialog
   *
***************
*** 25,33 ****
   *
   */
  
- #ifndef __GNOME_PRINT_DIALOG_H__
- #define __GNOME_PRINT_DIALOG_H__
- 
  #include <glib.h>
  
  G_BEGIN_DECLS
--- 29,34 ----
***************
*** 64,70 ****
  	GNOME_PRINT_RANGE_ALL = (1 << 1),
  	GNOME_PRINT_RANGE_RANGE = (1 << 2),
  	GNOME_PRINT_RANGE_SELECTION = (1 << 3),
! 	GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE  = (1 << 4),
  };
  
  /*
--- 65,71 ----
  	GNOME_PRINT_RANGE_ALL = (1 << 1),
  	GNOME_PRINT_RANGE_RANGE = (1 << 2),
  	GNOME_PRINT_RANGE_SELECTION = (1 << 3),
! 	GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE  = (1 << 4)
  };
  
  /*
***************
*** 82,88 ****
  enum GnomePrintButtons {
  	GNOME_PRINT_DIALOG_RESPONSE_PRINT = 1,
  	GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
! 	GNOME_PRINT_DIALOG_RESPONSE_CANCEL = GTK_RESPONSE_CANCEL,
  };
  
  GType gnome_print_dialog_get_type (void);
--- 83,89 ----
  enum GnomePrintButtons {
  	GNOME_PRINT_DIALOG_RESPONSE_PRINT = 1,
  	GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
! 	GNOME_PRINT_DIALOG_RESPONSE_CANCEL = GTK_RESPONSE_CANCEL
  };
  
  GType gnome_print_dialog_get_type (void);
***************
*** 105,113 ****
  GnomePrintRangeType gnome_print_dialog_get_range  (GnomePrintDialog *gpd);
  int                 gnome_print_dialog_get_range_page (GnomePrintDialog *gpd, gint *start, gint *end);
  
- #ifdef GNOME_PRINT_UNSTABLE_API
- gint                gnome_print_dialog_run (GnomePrintDialog *dialog);
- #endif
  
  G_END_DECLS
  
--- 106,111 ----
diff -crN ./libgnomeprintui/libgnomeprintui/gnome-print-unit-selector.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-unit-selector.c
*** ./libgnomeprintui/libgnomeprintui/gnome-print-unit-selector.c	Thu Mar  6 20:07:43 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-unit-selector.c	Fri Jul  4 10:32:49 2003
***************
*** 245,251 ****
  		
  		u = l->data;
  
! 		name = gnome_print_unit_get_name (u, us->plural, us->abbr, 0);
  		i = gtk_menu_item_new_with_label (name);
  		g_free (name);
  
--- 245,251 ----
  		
  		u = l->data;
  
! 		name = (gchar *)gnome_print_unit_get_name (u, us->plural, us->abbr, 0);
  		i = gtk_menu_item_new_with_label (name);
  		g_free (name);
  
diff -crN ./libgnomeprintui/libgnomeprintui/gnome-print-widget.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-widget.h
*** ./libgnomeprintui/libgnomeprintui/gnome-print-widget.h	Wed Feb 12 04:58:53 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-widget.h	Wed Nov 12 18:04:54 2003
***************
*** 34,40 ****
  #include <gtk/gtkwidget.h>
  
  typedef enum {
! 	   GNOME_PRINT_WIDGET_CHECKBUTTON,
  } GnomePrintWidgetType;
  
  #ifdef GNOME_PRINT_UNSTABLE_API
--- 34,40 ----
  #include <gtk/gtkwidget.h>
  
  typedef enum {
! 	   GNOME_PRINT_WIDGET_CHECKBUTTON
  } GnomePrintWidgetType;
  
  #ifdef GNOME_PRINT_UNSTABLE_API
diff -crN ./libgnomeprintui/libgnomeprintui/gpaui/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gpaui/Makefile.am
*** ./libgnomeprintui/libgnomeprintui/gpaui/Makefile.am	Wed Feb 12 19:17:19 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gpaui/Makefile.am	Fri Oct 17 10:01:38 2003
***************
*** 14,20 ****
--- 14,22 ----
  	-DGNOME_DISABLE_DEPRECATED
  
  
+ # ?? : BV : added @CPPFLAGS@ to avoid the overwriting of the variable
  CPPFLAGS = \
+ 	@CPPFLAGS@ \
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
  	-DBINDIR=\""$(bindir)"\" \
  	-DDATADIR=\""$(datadir)"\"