Do not #include <libgnome/gnome-defs.h>. Likewise. Likewise. Likewise.

* mail-format.c: Do not #include <libgnome/gnome-defs.h>.
* mail-importer.c: Likewise.
* mail-mt.c: Likewise.
* mail-ops.c: Likewise.
* mail-search-dialogue.c: Likewise.
* mail-session.c: Likewise.
* mail-vfolder.c: Likewise.
* message-tag-followup.c: Likewise.
* main.c: Likewise, and <libgnomeui/gnome-init.h>.

* mail-callbacks.c: Do not #include <libgnome/gnome-paper.h>.
(do_mail_print): Remove the GnomePaper local variable.

svn path=/trunk/; revision=18739

11 files changed, 17 insertions, 13 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6983858f4e..db17f21f88 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,18 @@
+2002-11-13  Ettore Perazzoli  <ettore@ximian.com>
+
+	* mail-format.c: Do not #include <libgnome/gnome-defs.h>.
+	* mail-importer.c: Likewise.
+	* mail-mt.c: Likewise.
+	* mail-ops.c: Likewise.
+	* mail-search-dialogue.c: Likewise.
+	* mail-session.c: Likewise.
+	* mail-vfolder.c: Likewise.
+	* message-tag-followup.c: Likewise.
+	* main.c: Likewise, and <libgnomeui/gnome-init.h>.
+
+	* mail-callbacks.c: Do not #include <libgnome/gnome-paper.h>.
+	(do_mail_print): Remove the GnomePaper local variable.
+
 2002-11-13  Not Zed  <NotZed@Ximian.com>
 
 	* component-factory.c (owner_set_cb): destroy->weak ref.
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 9b89524424..29aa2498ef 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -32,11 +32,11 @@
 #include <time.h>
 #include <errno.h>
 #include <gtkhtml/gtkhtml.h>
-#include <libgnome/gnome-paper.h>
-#include <libgnome/gnome-paper.h>
+
 #include <libgnomeprint/gnome-print-master.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-master-preview.h>
+
 #include <bonobo/bonobo-widget.h>
 #include <bonobo/bonobo-socket.h>
 #include <gal/e-table/e-table.h>
@@ -3056,7 +3056,6 @@ do_mail_print (FolderBrowser *fb, gboolean preview)
 	GnomePrintMaster *print_master;
 	GnomePrintDialog *dialog;
 	GnomePrintConfig *config = NULL;
-	GnomePaper *paper;
 	gdouble line = 0.0;
 	struct footer_info *info;
 
diff --git a/mail/mail-format.c b/mail/mail-format.c
index ba2f4571c5..26727a2db3 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -30,7 +30,6 @@
 #include <ctype.h>
 #include <fcntl.h>
 
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 #include <gal/widgets/e-unicode.h>
diff --git a/mail/mail-importer.c b/mail/mail-importer.c
index ee785f6bbe..f6b67351d3 100644
--- a/mail/mail-importer.c
+++ b/mail/mail-importer.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <gmodule.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <evolution-storage.h>
 #include <camel/camel-folder.h>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 631f46b34c..c1d0289fb4 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -13,7 +13,6 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkstock.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <gal/widgets/e-unicode.h>
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 726474345d..dd5717757d 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -31,7 +31,6 @@
 /* #include <ctype.h> */
 #include <string.h>
 #include <errno.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-exec.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-unicode.h>
diff --git a/mail/mail-search-dialogue.c b/mail/mail-search-dialogue.c
index a49d7d61d7..c15c3fd598 100644
--- a/mail/mail-search-dialogue.c
+++ b/mail/mail-search-dialogue.c
@@ -27,7 +27,6 @@
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkbox.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 
 #include "mail-search-dialogue.h"
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 11285f8a12..f12a65a478 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -29,7 +29,6 @@
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkstock.h>
 
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-sound.h>
 #include <gal/widgets/e-unicode.h>
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index d1fdba5b24..5caca2b52d 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -13,7 +13,6 @@
 #endif
 
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 
 #include "Evolution.h"
diff --git a/mail/main.c b/mail/main.c
index f55b0a8d87..9e17423487 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -13,9 +13,7 @@
 
 #include <signal.h>
 
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-sound.h>
-#include <libgnomeui/gnome-init.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo-activation/bonobo-activation-init.h>
 #include <glade/glade.h>
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 31e0979dca..861742f16d 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -30,7 +30,6 @@
 
 #include <glade/glade.h>
 
-#include <libgnome/gnome-defs.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include <libgnomeui/gnome-pixmap.h>