From 4503c052d04822edb3105e639b824ed88013a810 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 6 Jun 2008 15:12:53 +0000
Subject: ** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and

2008-06-06  Matthew Barnes  <mbarnes@redhat.com>

	** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
	   GTK_DISABLE_SINGLE_INCLUDES defined.  (#536637)


svn path=/trunk/; revision=35606
---
 addressbook/printing/e-contact-print-style-editor.h    | 2 +-
 addressbook/printing/e-contact-print.c                 | 3 ---
 addressbook/printing/e-contact-print.h                 | 3 +--
 addressbook/printing/test-contact-print-style-editor.c | 2 +-
 addressbook/printing/test-print.c                      | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'addressbook/printing')

diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
index 69998dde10..c814d45a37 100644
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ b/addressbook/printing/e-contact-print-style-editor.h
@@ -21,7 +21,7 @@
 #ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
 #define __E_CONTACT_PRINT_STYLE_EDITOR_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 
 #ifdef __cplusplus
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index d2ca1a6e64..3582ac6ba5 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -26,8 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
-
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
@@ -36,7 +34,6 @@
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 
-#include <gtk/gtk.h>
 #include <libedataserver/e-flag.h>
 #include <libedataserver/e-xml-utils.h>
 
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
index fbafb136aa..3f4eb427e4 100644
--- a/addressbook/printing/e-contact-print.h
+++ b/addressbook/printing/e-contact-print.h
@@ -22,8 +22,7 @@
 #ifndef E_CONTACT_PRINT_H
 #define E_CONTACT_PRINT_H
 
-#include <glib.h>
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
 #include <libebook/e-book.h>
 #include "e-contact-print-types.h"
 
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
index b10d1433d0..26eddcfae0 100644
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ b/addressbook/printing/test-contact-print-style-editor.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <bonobo/bonobo-main.h>
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index 7fc367d24d..c97a846eec 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <glade/glade.h>
-- 
cgit