aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/printing
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/printing')
-rw-r--r--addressbook/printing/e-contact-print-envelope.c8
-rw-r--r--addressbook/printing/e-contact-print-envelope.h1
-rw-r--r--addressbook/printing/e-contact-print-style-editor.c2
-rw-r--r--addressbook/printing/e-contact-print-style-editor.h2
-rw-r--r--addressbook/printing/e-contact-print-types.h2
-rw-r--r--addressbook/printing/e-contact-print.c14
-rw-r--r--addressbook/printing/e-contact-print.h1
-rw-r--r--addressbook/printing/test-contact-print-style-editor.c5
-rw-r--r--addressbook/printing/test-print.c7
9 files changed, 25 insertions, 17 deletions
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
index d6fbfdc5db..af6c92d638 100644
--- a/addressbook/printing/e-contact-print-envelope.c
+++ b/addressbook/printing/e-contact-print-envelope.c
@@ -20,15 +20,13 @@
* Boston, MA 02111-1307, USA.
*/
-
-#include "e-contact-print-envelope.h"
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-dialog.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprint/gnome-print-master-preview.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-
+#include "addressbook/backend/ebook/e-card.h"
+#include "addressbook/backend/ebook/e-card-simple.h"
+#include "addressbook/printing/e-contact-print-envelope.h"
#define ENVELOPE_HEIGHT (72.0 * 4.0)
#define ENVELOPE_WIDTH (72.0 * 9.5)
diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h
index 45aa051401..f3f3219af1 100644
--- a/addressbook/printing/e-contact-print-envelope.h
+++ b/addressbook/printing/e-contact-print-envelope.h
@@ -23,7 +23,6 @@
#ifndef E_CONTACT_PRINT_ENVELOPE_H
#define E_CONTACT_PRINT_ENVELOPE_H
-#include <gnome.h>
#include <addressbook/backend/ebook/e-card.h>
#include "e-contact-print-types.h"
diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c
index 5eb5cadacf..3188458925 100644
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ b/addressbook/printing/e-contact-print-style-editor.c
@@ -20,8 +20,8 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
#include "e-contact-print-style-editor.h"
+
static void e_contact_print_style_editor_init (EContactPrintStyleEditor *card);
static void e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass);
static void e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
index cf0f17f889..d9211c2c51 100644
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ b/addressbook/printing/e-contact-print-style-editor.h
@@ -22,7 +22,7 @@
#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
#define __E_CONTACT_PRINT_STYLE_EDITOR_H__
-#include <gnome.h>
+#include <gtk/gtkvbox.h>
#include <glade/glade.h>
#ifdef __cplusplus
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
index e99cfe6d39..e778c58220 100644
--- a/addressbook/printing/e-contact-print-types.h
+++ b/addressbook/printing/e-contact-print-types.h
@@ -23,7 +23,7 @@
#ifndef E_CONTACT_PRINT_TYPES_H
#define E_CONTACT_PRINT_TYPES_H
-#include <gnome.h>
+#include <glib.h>
#include <libgnomeprint/gnome-font.h>
typedef struct _EContactPrintStyle EContactPrintStyle;
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 337f0f2007..32333fcab1 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -21,20 +21,24 @@
*/
-#include "e-contact-print.h"
+#include <ctype.h>
+#include <stdlib.h>
+#include <glib.h>
+#include <gnome-xml/tree.h>
+#include <gnome-xml/parser.h>
+#include <gnome-xml/xmlmemory.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnome/gnome-util.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-dialog.h>
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprint/gnome-print-master-preview.h>
#include <libgnomeprint/gnome-print-multipage.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <ctype.h>
#include <gal/widgets/e-unicode.h>
#include <addressbook/backend/ebook/e-book.h>
#include <addressbook/backend/ebook/e-card.h>
#include <addressbook/backend/ebook/e-card-simple.h>
+#include "e-contact-print.h"
#define SCALE 5
#define HYPHEN_PIXELS 20
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
index fb17271f6b..bc4c312bb0 100644
--- a/addressbook/printing/e-contact-print.h
+++ b/addressbook/printing/e-contact-print.h
@@ -23,7 +23,6 @@
#ifndef E_CONTACT_PRINT_H
#define E_CONTACT_PRINT_H
-#include <gnome.h>
#include <addressbook/backend/ebook/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 d4dccc0b87..3f40ca751d 100644
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ b/addressbook/printing/test-contact-print-style-editor.c
@@ -22,7 +22,10 @@
#include "config.h"
-#include <gnome.h>
+#include <stdlib.h>
+#include <gtk/gtkmain.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-init.h>
#include "e-contact-print-style-editor.h"
/* This is a horrible thing to do, but it is just a test. */
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index 1b73fda3da..4c6ab595c9 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -22,7 +22,12 @@
#include "config.h"
-#include <gnome.h>
+#include <stdlib.h>
+#include <gtk/gtkmain.h>
+#include <libgnome/gnome-defs.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-dialog.h>
+#include <libgnomeui/gnome-init.h>
#include <glade/glade.h>
#include "e-contact-print.h"