diff options
Diffstat (limited to 'addressbook/gui/widgets')
20 files changed, 37 insertions, 38 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 1716c0c498..71c0db892c 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -8,11 +8,11 @@ */ #include <config.h> -#include "e-addressbook-model.h" +#include <gtk/gtksignal.h> #include <gnome-xml/tree.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> -#include <gnome.h> +#include "e-addressbook-model.h" #define PARENT_TYPE e_table_model_get_type() ETableModelClass *parent_class; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index e22228023f..6229eb0ccf 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -21,9 +21,6 @@ */ #include <config.h> -#include <gnome.h> - -#include "e-addressbook-view.h" #include <gal/e-table/e-table-scrolled.h> #include <gal/e-table/e-table-model.h> @@ -37,6 +34,7 @@ #include "gal-view-factory-minicard.h" #include "gal-view-minicard.h" +#include "e-addressbook-view.h" #include "e-addressbook-model.h" #include "e-minicard-view-widget.h" diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 7197d237e5..e481efec65 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -21,8 +21,8 @@ #ifndef __E_ADDRESSBOOK_VIEW_H__ #define __E_ADDRESSBOOK_VIEW_H__ -#include <gnome.h> -#include <bonobo.h> +#include <gtk/gtkobject.h> +#include <bonobo/bonobo-ui-component.h> #include "addressbook/backend/ebook/e-book.h" #ifdef __cplusplus diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index 0efc7d69ab..ab1356d1d5 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -9,14 +9,16 @@ */ #include <config.h> -#include <gnome.h> -#include <bonobo.h> -#include "addressbook/backend/ebook/e-book.h" +#include <bonobo/bonobo-generic-factory.h> +#include <bonobo/bonobo-persist.h> +#include <bonobo/bonobo-persist-stream.h> +#include <bonobo/bonobo-stream-client.h> +#include <addressbook/backend/ebook/e-book.h> +#include <addressbook/backend/ebook/e-card.h> #include "e-minicard-control.h" #include "e-minicard-widget.h" -#include "addressbook/backend/ebook/e-card.h" #if 0 enum { diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 7e3a0e511c..f04fccf860 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -21,12 +21,11 @@ */ #include <config.h> -#include <gnome.h> -#include "e-minicard-label.h" #include <gal/util/e-util.h> #include <gal/e-text/e-text.h> #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-canvas-utils.h> +#include "e-minicard-label.h" static void e_minicard_label_init (EMinicardLabel *card); static void e_minicard_label_class_init (EMinicardLabelClass *klass); diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index 15d3a63105..c4d7be3ec2 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -21,7 +21,8 @@ #ifndef __E_MINICARD_LABEL_H__ #define __E_MINICARD_LABEL_H__ -#include <gnome.h> +#include <glib.h> +#include <libgnomeui/gnome-canvas.h> #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index b3b326397f..851beb4684 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -21,9 +21,11 @@ */ #include <config.h> -#include <gnome.h> + #include <gal/widgets/e-canvas.h> + #include "e-minicard-view-widget.h" + static void e_minicard_view_widget_init (EMinicardViewWidget *widget); static void e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass); static void e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index b56a3d856e..e22d651826 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -21,10 +21,9 @@ #ifndef __E_MINICARD_VIEW_WIDGET_H__ #define __E_MINICARD_VIEW_WIDGET_H__ -#include <gnome.h> -#include "e-minicard-view.h" #include <gal/widgets/e-canvas.h> #include "addressbook/backend/ebook/e-book.h" +#include "e-minicard-view.h" #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 7afe9e6ca3..31cf0e72b3 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -21,11 +21,12 @@ */ #include <config.h> -#include <gnome.h> + #include <gal/widgets/e-canvas.h> #include "e-minicard-view.h" #include "e-minicard.h" #include "e-contact-editor.h" + static void e_minicard_view_init (EMinicardView *reflow); static void e_minicard_view_class_init (EMinicardViewClass *klass); static void e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index fc52a4d864..a82dea3f6a 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -21,7 +21,6 @@ #ifndef __E_MINICARD_VIEW_H__ #define __E_MINICARD_VIEW_H__ -#include <gnome.h> #include <gal/widgets/e-reflow-sorted.h> #include <gal/widgets/e-selection-model-simple.h> #include "addressbook/backend/ebook/e-book.h" diff --git a/addressbook/gui/widgets/e-minicard-widget-test.c b/addressbook/gui/widgets/e-minicard-widget-test.c index f6489f2a6a..9e37a5f815 100644 --- a/addressbook/gui/widgets/e-minicard-widget-test.c +++ b/addressbook/gui/widgets/e-minicard-widget-test.c @@ -49,7 +49,6 @@ #include "config.h" -#include <gnome.h> #include "e-minicard-widget.h" /* This is a horrible thing to do, but it is just a test. */ diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c index 3712d5e306..5ce6c088b2 100644 --- a/addressbook/gui/widgets/e-minicard-widget.c +++ b/addressbook/gui/widgets/e-minicard-widget.c @@ -21,7 +21,6 @@ */ #include <config.h> -#include <gnome.h> #include "e-minicard-widget.h" #include "e-minicard.h" diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h index 3eb544c15e..950afba7d8 100644 --- a/addressbook/gui/widgets/e-minicard-widget.h +++ b/addressbook/gui/widgets/e-minicard-widget.h @@ -21,9 +21,8 @@ #ifndef __E_MINICARD_WIDGET_H__ #define __E_MINICARD_WIDGET_H__ -#include <gnome.h> -#include "addressbook/backend/ebook/e-card.h" #include <gal/widgets/e-canvas.h> +#include "addressbook/backend/ebook/e-card.h" #ifdef __cplusplus extern "C" { diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 871d8aa446..787f131a44 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -21,20 +21,19 @@ */ #include <config.h> -#include <gnome.h> -#include "e-minicard.h" -#include "e-minicard-label.h" -#include "addressbook/backend/ebook/e-book.h" #include <gal/e-text/e-text.h> #include <gal/util/e-util.h> #include <gal/widgets/e-canvas-utils.h> #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-popup-menu.h> +#include "addressbook/backend/ebook/e-book.h" #include "addressbook/printing/e-contact-print.h" #include "addressbook/printing/e-contact-print-envelope.h" +#include "e-minicard.h" +#include "e-minicard-label.h" +#include "e-minicard-view.h" #include "e-contact-editor.h" #include "e-contact-save-as.h" -#include "e-minicard-view.h" static void e_minicard_init (EMinicard *card); static void e_minicard_class_init (EMinicardClass *klass); diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 34dbac0cc0..3ebbe22505 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -21,7 +21,7 @@ #ifndef __E_MINICARD_H__ #define __E_MINICARD_H__ -#include <gnome.h> +#include <libgnomeui/gnome-canvas.h> #include "addressbook/contact-editor/e-contact-editor.h" #include "addressbook/backend/ebook/e-card.h" #include "addressbook/backend/ebook/e-card-simple.h" diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c index 1d10b71f78..10e13d9bdf 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.c +++ b/addressbook/gui/widgets/gal-view-factory-minicard.c @@ -8,10 +8,11 @@ * (C) 2000, 2001 Ximian, Inc. */ #include <config.h> -#include "gal-view-factory-minicard.h" -#include "gal-view-minicard.h" +#include <glib.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> +#include "gal-view-factory-minicard.h" +#include "gal-view-minicard.h" #define GVFE_CLASS(e) ((GalViewFactoryMinicardClass *)((GtkObject *)e)->klass) diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c index 0566a85760..470a84389e 100644 --- a/addressbook/gui/widgets/test-minicard-label.c +++ b/addressbook/gui/widgets/test-minicard-label.c @@ -19,9 +19,8 @@ #include "config.h" -#include <gnome.h> -#include "e-minicard-label.h" #include <gal/widgets/e-canvas.h> +#include "e-minicard-label.h" /* This is a horrible thing to do, but it is just a test. */ GnomeCanvasItem *label; diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c index c03d11d07e..54cedd1a58 100644 --- a/addressbook/gui/widgets/test-minicard-view.c +++ b/addressbook/gui/widgets/test-minicard-view.c @@ -17,9 +17,7 @@ #include "config.h" -#include <gnome.h> #include <libgnorba/gnorba.h> -#include <bonobo.h> #include <e-util/e-canvas.h> #include "e-minicard-view.h" diff --git a/addressbook/gui/widgets/test-minicard.c b/addressbook/gui/widgets/test-minicard.c index e16ca675b3..b368ba1b87 100644 --- a/addressbook/gui/widgets/test-minicard.c +++ b/addressbook/gui/widgets/test-minicard.c @@ -19,7 +19,11 @@ #include "config.h" -#include <gnome.h> +#include <gtk/gtkmain.h> +#include <libgnomeui/gnome-app.h> +#include <libgnomeui/gnome-init.h> +#include <libgnomeui/gnome-canvas-rect-ellipse.h> + #include "e-minicard.h" /* This is a horrible thing to do, but it is just a test. */ diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c index 1a2cc9f017..0e54c57164 100644 --- a/addressbook/gui/widgets/test-reflow.c +++ b/addressbook/gui/widgets/test-reflow.c @@ -47,12 +47,12 @@ #include "config.h" -#include <gnome.h> #include <gal/widgets/e-canvas.h> #include <gal/widgets/e-reflow.h> -#include "e-minicard.h" #include <gal/widgets/e-scroll-frame.h> +#include "e-minicard.h" + /* This is a horrible thing to do, but it is just a test. */ GnomeCanvasItem *reflow; GnomeCanvasItem *rect; |