Switched printing and gui.

2000-05-23  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Switched printing and gui.

	* backend/ebook/e-book-view-listener.h,
	backend/ebook/e-book-view.h, backend/ebook/e-book.h,
	backend/ebook/e-card-cursor.h, backend/ebook/e-card-list.h,
	backend/ebook/e-card-simple.h, backend/ebook/e-card.h: Fixed the
	#defines to work elsewhere in evolution.

	* gui/component/Makefile.am: Added linking to libecontactprint.

	* gui/component/addressbook.c: Added a menu item to print the
	current query.

	* printing/Makefile.am: Add linking to libebook and requirements.
	Add installation of ecps files.

	* printing/e-contact-print.c, printing/e-contact-print.h: Changed
	this to use real data from an EBook.

	* printing/test-print.c: Made this pass NULL, NULL to
	e_contact_print_dialog_new so that it will compile.

svn path=/trunk/; revision=3188

7 files changed, 15 insertions, 15 deletions

diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h
index 85542217df..e479ffd99b 100644
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ b/addressbook/backend/ebook/e-book-view-listener.h
@@ -14,7 +14,7 @@
 
 #include <libgnome/gnome-defs.h>
 #include <bonobo/bonobo-object.h>
-#include <ebook/addressbook.h>
+#include <addressbook/backend/ebook/addressbook.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h
index 5ae20e1521..92fde1e37f 100644
--- a/addressbook/backend/ebook/e-book-view.h
+++ b/addressbook/backend/ebook/e-book-view.h
@@ -13,8 +13,8 @@
 
 #include <libgnome/gnome-defs.h>
 
-#include <ebook/e-card.h>
-#include <ebook/e-book-view-listener.h>
+#include <addressbook/backend/ebook/e-card.h>
+#include <addressbook/backend/ebook/e-book-view-listener.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h
index 4cab606239..a57c7263b3 100644
--- a/addressbook/backend/ebook/e-book.h
+++ b/addressbook/backend/ebook/e-book.h
@@ -13,10 +13,10 @@
 
 #include <libgnome/gnome-defs.h>
 
-#include <ebook/e-card.h>
-#include <ebook/e-card-cursor.h>
-#include <ebook/e-book-view.h>
-#include <ebook/e-book-types.h>
+#include <addressbook/backend/ebook/e-card.h>
+#include <addressbook/backend/ebook/e-card-cursor.h>
+#include <addressbook/backend/ebook/e-book-view.h>
+#include <addressbook/backend/ebook/e-book-types.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
index 67020071d1..b318e646c4 100644
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ b/addressbook/backend/ebook/e-card-cursor.h
@@ -12,8 +12,8 @@
 
 #include <libgnome/gnome-defs.h>
 #include <gtk/gtk.h>
-#include <ebook/addressbook.h>
-#include <ebook/e-card.h>
+#include <addressbook/backend/ebook/addressbook.h>
+#include <addressbook/backend/ebook/e-card.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/addressbook/backend/ebook/e-card-list.h b/addressbook/backend/ebook/e-card-list.h
index 0a4a5bf105..af791a81a0 100644
--- a/addressbook/backend/ebook/e-card-list.h
+++ b/addressbook/backend/ebook/e-card-list.h
@@ -13,7 +13,7 @@
 #include <time.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
-#include <ebook/e-card-iterator.h>
+#include <addressbook/backend/ebook/e-card-iterator.h>
 
 #define E_TYPE_CARD_LIST            (e_card_list_get_type ())
 #define E_CARD_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_LIST, ECardList))
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
index 9566248387..72351c571a 100644
--- a/addressbook/backend/ebook/e-card-simple.h
+++ b/addressbook/backend/ebook/e-card-simple.h
@@ -15,9 +15,9 @@
 #include <time.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
-#include <ebook/e-card.h>
-#include <ebook/e-card-types.h>
-#include <ebook/e-card-list.h>
+#include <addressbook/backend/ebook/e-card.h>
+#include <addressbook/backend/ebook/e-card-types.h>
+#include <addressbook/backend/ebook/e-card-list.h>
 
 #define E_TYPE_CARD_SIMPLE            (e_card_simple_get_type ())
 #define E_CARD_SIMPLE(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple))
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
index 9f10a984ed..3def0654cd 100644
--- a/addressbook/backend/ebook/e-card.h
+++ b/addressbook/backend/ebook/e-card.h
@@ -15,8 +15,8 @@
 #include <time.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
-#include <ebook/e-card-types.h>
-#include <ebook/e-card-list.h>
+#include <addressbook/backend/ebook/e-card-types.h>
+#include <addressbook/backend/ebook/e-card-list.h>
 
 #define E_TYPE_CARD            (e_card_get_type ())
 #define E_CARD(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))