From e5cf725c52f786e3025e9e7455f3a34bf30fe446 Mon Sep 17 00:00:00 2001 From: Benjamin Otte <otte@redhat.com> Date: Wed, 13 Oct 2010 17:39:07 +0200 Subject: e-table: Fix includes to only ever include libgnomecanvas.h --- widgets/table/e-cell-checkbox.c | 2 +- widgets/table/e-cell-hbox.h | 2 +- widgets/table/e-cell-pixbuf.c | 2 +- widgets/table/e-cell-popup.h | 2 +- widgets/table/e-cell-text.c | 3 +-- widgets/table/e-cell-text.h | 2 +- widgets/table/e-cell-toggle.c | 2 +- widgets/table/e-cell-toggle.h | 2 +- widgets/table/e-cell-tree.c | 2 +- widgets/table/e-cell-tree.h | 2 +- widgets/table/e-cell-vbox.h | 2 +- widgets/table/e-table-click-to-add.c | 4 +--- widgets/table/e-table-click-to-add.h | 2 +- widgets/table/e-table-field-chooser-item.c | 5 +---- widgets/table/e-table-field-chooser-item.h | 2 +- widgets/table/e-table-field-chooser.c | 2 +- widgets/table/e-table-field-chooser.h | 2 +- widgets/table/e-table-group-container.c | 2 +- widgets/table/e-table-group-container.h | 2 +- widgets/table/e-table-group-leaf.c | 2 +- widgets/table/e-table-group-leaf.h | 2 +- widgets/table/e-table-group.c | 2 +- widgets/table/e-table-group.h | 2 +- widgets/table/e-table-header-item.c | 5 +---- widgets/table/e-table-header-item.h | 2 +- widgets/table/e-table-item.h | 2 +- widgets/table/e-table.c | 3 +-- widgets/table/e-table.h | 2 +- widgets/table/e-tree.c | 2 +- widgets/table/e-tree.h | 2 +- 30 files changed, 30 insertions(+), 40 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index 94dd8f36b2..441f6723f3 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -25,7 +25,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include "e-util/e-util.h" diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h index fda96de9e2..42b1c60e61 100644 --- a/widgets/table/e-cell-hbox.h +++ b/widgets/table/e-cell-hbox.h @@ -24,7 +24,7 @@ #ifndef _E_CELL_HBOX_H_ #define _E_CELL_HBOX_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index cea43ed53f..f37d4b8757 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -25,7 +25,7 @@ #include <stdio.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <glib/gi18n.h> #include <gtk/gtk.h> diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index 4ea1127da6..99b9bd8fb6 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -32,7 +32,7 @@ #ifndef _E_CELL_POPUP_H_ #define _E_CELL_POPUP_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-cell.h> #define E_CELL_POPUP_TYPE (e_cell_popup_get_type ()) diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 1a0e53bcfc..bfe07c0c7d 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -42,8 +42,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include "gal-a11y-e-cell-registry.h" #include "gal-a11y-e-cell-text.h" diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index c53a374aba..758e6d77af 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -39,7 +39,7 @@ #define E_CELL_TEXT_H #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-cell.h> /* Standard GObject macros */ diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 2ae69c2ba4..4a45ac614c 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -26,7 +26,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include "art/empty.xpm" diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h index dee110bc34..be693b2e28 100644 --- a/widgets/table/e-cell-toggle.h +++ b/widgets/table/e-cell-toggle.h @@ -26,7 +26,7 @@ #ifndef E_CELL_TOGGLE_H #define E_CELL_TOGGLE_H -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <table/e-cell.h> diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index 7733b2af17..6fe64135c1 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -36,7 +36,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include "gal-a11y-e-cell-registry.h" #include "gal-a11y-e-cell-tree.h" diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h index 465af77ca2..860d68fc13 100644 --- a/widgets/table/e-cell-tree.h +++ b/widgets/table/e-cell-tree.h @@ -31,7 +31,7 @@ #ifndef _E_CELL_TREE_H_ #define _E_CELL_TREE_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h index 7762e62869..52550a952f 100644 --- a/widgets/table/e-cell-vbox.h +++ b/widgets/table/e-cell-vbox.h @@ -29,7 +29,7 @@ #ifndef _E_CELL_VBOX_H_ #define _E_CELL_VBOX_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index a68e7f755f..b3294ff293 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -24,9 +24,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include <libgnomecanvas/gnome-canvas-util.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include "gal-a11y-e-table-click-to-add.h" diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h index 17ac7f7fe3..782cc6285a 100644 --- a/widgets/table/e-table-click-to-add.h +++ b/widgets/table/e-table-click-to-add.h @@ -24,7 +24,7 @@ #define _E_TABLE_CLICK_TO_ADD_H_ #include <libxml/tree.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-table-header.h> #include <table/e-table-sort-info.h> #include <table/e-table-item.h> diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 20048007d7..3c28434205 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -25,10 +25,7 @@ #include <string.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> -#include <libgnomecanvas/gnome-canvas-util.h> -#include <libgnomecanvas/gnome-canvas-polygon.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <glib/gi18n.h> diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h index 9040d7db39..5e38ba7037 100644 --- a/widgets/table/e-table-field-chooser-item.h +++ b/widgets/table/e-table-field-chooser-item.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_FIELD_CHOOSER_ITEM_H_ #define _E_TABLE_FIELD_CHOOSER_ITEM_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <libxml/tree.h> #include <table/e-table-header.h> diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 54dcdb6e35..cad87e7483 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -23,7 +23,7 @@ #include <config.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <glib/gi18n.h> #include "e-util/e-util.h" diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h index 7cc6e45568..01cbc39c64 100644 --- a/widgets/table/e-table-field-chooser.h +++ b/widgets/table/e-table-field-chooser.h @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <table/e-table-header.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 898672430c..39e7f0b812 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -24,7 +24,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include "text/e-text.h" #include <glib/gi18n.h> diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h index 911b7f3290..b0d819be2b 100644 --- a/widgets/table/e-table-group-container.h +++ b/widgets/table/e-table-group-container.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_GROUP_CONTAINER_H_ #define _E_TABLE_GROUP_CONTAINER_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-table-model.h> #include <table/e-table-header.h> #include <table/e-table-group.h> diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 37f28f217f..a874e44601 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -24,7 +24,7 @@ #include <config.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <glib/gi18n.h> #include "e-util/e-util.h" diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h index d34f0343b0..55efc2d655 100644 --- a/widgets/table/e-table-group-leaf.h +++ b/widgets/table/e-table-group-leaf.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_GROUP_LEAF_H_ #define _E_TABLE_GROUP_LEAF_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-table-group.h> #include <table/e-table-subset.h> #include <table/e-table-item.h> diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index c7a867a84a..c69b23d4d5 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -23,7 +23,7 @@ #include <config.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include "e-util/e-util.h" diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index 79093416c6..157c70756a 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_GROUP_H_ #define _E_TABLE_GROUP_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-table-model.h> #include <table/e-table-header.h> #include <table/e-table-sort-info.h> diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 0f7444285a..cf4cc9468a 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -27,10 +27,7 @@ #include <glib.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> -#include <libgnomecanvas/gnome-canvas-util.h> -#include <libgnomecanvas/gnome-canvas-polygon.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdkkeysyms.h> diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h index 6eb29df602..49755dcff0 100644 --- a/widgets/table/e-table-header-item.h +++ b/widgets/table/e-table-header-item.h @@ -26,7 +26,7 @@ #include <table/e-table.h> #include <table/e-tree.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <libxml/tree.h> #include <table/e-table-header.h> #include <table/e-table-sort-info.h> diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index 4f0e7bbc4e..277e2d3c8e 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -25,7 +25,7 @@ #ifndef _E_TABLE_ITEM_H_ #define _E_TABLE_ITEM_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <table/e-table-model.h> #include <table/e-table-header.h> #include <table/e-table-defines.h> diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 0db8f8e170..6f17c67610 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -33,8 +33,7 @@ #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include "gal-a11y-e-table.h" #include <glib/gi18n.h> diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 1c20b2d12b..1da89f9e2f 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_H_ #define _E_TABLE_H_ -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <gtk/gtk.h> #include <libxml/tree.h> #include <table/e-table-model.h> diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index b9f1437b49..a64ed709c0 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -28,7 +28,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomecanvas/gnome-canvas-rect-ellipse.h> +#include <libgnomecanvas/libgnomecanvas.h> #include "gal-a11y-e-tree.h" #include <glib/gi18n.h> diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index c528e937ab..345aa34336 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -25,7 +25,7 @@ #include <gtk/gtk.h> #include <libxml/tree.h> -#include <libgnomecanvas/gnome-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <misc/e-printable.h> #include <table/e-table-extras.h> -- cgit v1.2.3