diff options
Diffstat (limited to 'widgets')
55 files changed, 96 insertions, 78 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index e8807f9f7c..95f86c42cc 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,8 @@ +2005-06-23 Kaushal Kumar <kakumar@novell.com> + + * text/Makefile.am: Set libetextincludedir to text to match + source directory name. + 2005-06-21 Kaushal Kumar <kakumar@novell.com> * table/ChangeLog: Added from gal/gal/e-table as Gal is diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index 38efcf6142..8862d05060 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ $(TZDIALOG_CFLAGS) diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 10b1930b8d..7204d60079 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -30,7 +30,7 @@ #include <gtk/gtklabel.h> #include <gnome.h> #include <glade/glade.h> -#include <widgets/misc/e-map.h> +#include <misc/e-map.h> #include "e-timezone-dialog.h" diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 9d31fafb2b..4e210ec3d2 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -34,7 +34,7 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "gal-view-collection.h" diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 44b4990925..2400d7b65c 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -37,7 +37,7 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "gal-define-views-dialog.h" #include "gal-view-instance.h" diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index 09bffc32b4..986ced2f27 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -26,7 +26,7 @@ #include <gtk/gtkobject.h> #include <widgets/menus/gal-view-collection.h> -#include <widgets/misc/e-popup-menu.h> +#include <misc/e-popup-menu.h> G_BEGIN_DECLS diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 08a6841a25..d72fed6cc3 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -29,7 +29,7 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" #include "e-util/e-util-private.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "gal-define-views-model.h" #include "gal-view-new-dialog.h" diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index abf787ea78..b259d2595d 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,9 @@ +2005-06-23 Kaushal Kumar <kakumar@novell.com> + + * Makefile.am: Use 'misc' for widgetsincludedir, instead of + 'widgets', to match source directory name and fix + evolution-exchange build. + 2005-05-31 Li Yuan <li.yuan@sun.com> * e-dateedit.c:(e_date_edit_update_date_entry): diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 73095b8432..042bdf5699 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -16,7 +16,7 @@ privlib_LTLIBRARIES = \ libemiscwidgets.la \ libefilterbar.la -widgetsincludedir = $(privincludedir)/widgets +widgetsincludedir = $(privincludedir)/misc if ENABLE_PILOT_CONDUITS pilot_sources = e-pilot-settings.c diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index 8a5e129300..8274df5556 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -32,7 +32,7 @@ #include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-popup-menu.h> -#include <widgets/misc/e-popup-menu.h> +#include <misc/e-popup-menu.h> #define ICON_SIZE 16 diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index a9a0cad6d0..6ad4df1150 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -24,7 +24,7 @@ #define _E_CALENDAR_H_ #include <gtk/gtkwidget.h> -#include <widgets/misc/e-canvas.h> +#include <misc/e-canvas.h> #include "e-calendar-item.h" #ifdef __cplusplus diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 569fe2b783..d0d1479e37 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -32,9 +32,9 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-canvas-utils.h" -#include "widgets/misc/e-hsv-utils.h" +#include "misc/e-canvas.h" +#include "misc/e-canvas-utils.h" +#include "misc/e-hsv-utils.h" #include "e-canvas-background.h" diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index 90eb9864a6..df36dd81be 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -33,7 +33,7 @@ #include "e-util/e-i18n.h" #include "e-util-marshal.h" #include "e-util/e-util.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "e-canvas.h" #include "e-canvas-utils.h" diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index f69abaf111..bbf012c511 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -25,8 +25,8 @@ #define __E_REFLOW_H__ #include <libgnomecanvas/gnome-canvas.h> -#include <widgets/misc/e-reflow-model.h> -#include <widgets/misc/e-selection-model.h> +#include <misc/e-reflow-model.h> +#include <misc/e-selection-model.h> #include <e-util/e-sorter-array.h> #ifdef __cplusplus diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 5a7bac4edc..d957da1d04 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -36,8 +36,8 @@ #include <gtk/gtkoptionmenu.h> #include <gtk/gtkmain.h> -#include <widgets/misc/e-unicode.h> -#include <widgets/misc/e-gui-utils.h> +#include <misc/e-unicode.h> +#include <misc/e-gui-utils.h> #include <libgnome/gnome-i18n.h> diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index fd5255e308..98dd6a300d 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -25,7 +25,7 @@ #define _E_SELECTION_MODEL_ARRAY_H_ #include <gtk/gtkobject.h> -#include <widgets/misc/e-selection-model.h> +#include <misc/e-selection-model.h> #include <e-util/e-bit-array.h> #ifdef __cplusplus diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h index 00b8c3a781..afd7858366 100644 --- a/widgets/misc/e-selection-model-simple.h +++ b/widgets/misc/e-selection-model-simple.h @@ -24,7 +24,7 @@ #ifndef _E_SELECTION_MODEL_SIMPLE_H_ #define _E_SELECTION_MODEL_SIMPLE_H_ -#include <widgets/misc/e-selection-model-array.h> +#include <misc/e-selection-model-array.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index 3ed243e18f..2e28a6c76a 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -26,7 +26,7 @@ #include "e-task-bar.h" -#include "widgets/misc/e-clipped-label.h" +#include "misc/e-clipped-label.h" struct _ETaskBarPrivate { diff --git a/widgets/misc/gal-combo-text.h b/widgets/misc/gal-combo-text.h index f53d924c5a..82580b6f6e 100644 --- a/widgets/misc/gal-combo-text.h +++ b/widgets/misc/gal-combo-text.h @@ -23,7 +23,7 @@ #ifndef _GAL_COMBO_TEXT_H #define _GAL_COMBO_TEXT_H -#include <widgets/misc/gal-combo-box.h> +#include <misc/gal-combo-box.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index 1fe05eed8b..d490bff763 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,9 @@ +2005-06-23 Kaushal Kumar <kakumar@novell.com> + + * Makefile.am: Set libetableincludedir to table to match + source directory name and fix evolution-exchange build + without GAL. + 2005-06-01 Kaushal Kumar <kakumar@novell.com> * e-table-item.c (eti_dispose): Don't hide the tooltip if we don't diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 8f5d699544..943633b2e4 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -77,7 +77,7 @@ libetable_la_SOURCES = \ e-tree-table-adapter.c \ e-tree.c -libetableincludedir = $(privincludedir)/e-table +libetableincludedir = $(privincludedir)/table libetableinclude_HEADERS = \ e-cell.h \ diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 4e3df61604..013574475c 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -61,7 +61,7 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "e-table-item.h" #include "e-cell-combo.h" diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index a2a4e58937..138868db12 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -29,7 +29,7 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "e-cell-date.h" diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 63cf1bbff9..899457e3dc 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -53,8 +53,8 @@ #include "e-util/e-text-event-processor.h" #include "e-util/e-text-event-processor-emacs-like.h" #include "e-util/e-util.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-canvas.h" +#include "misc/e-unicode.h" #include "e-cell-text.h" #include "e-table-item.h" diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 7ee55797b2..e90026399a 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -30,7 +30,7 @@ #include "a11y/e-table/gal-a11y-e-cell-toggle.h" #include "a11y/e-table/gal-a11y-e-cell-registry.h" #include "e-util/e-util.h" -#include "widgets/misc/e-hsv-utils.h" +#include "misc/e-hsv-utils.h" #include "e-cell-toggle.h" #include "e-table-item.h" diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 1295be52af..76e0155169 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -35,8 +35,8 @@ #include "e-util/e-i18n.h" #include "e-util/e-util-marshal.h" #include "e-util/e-util.h" -#include "widgets/misc/e-canvas-utils.h" -#include "widgets/misc/e-canvas.h" +#include "misc/e-canvas-utils.h" +#include "misc/e-canvas.h" #include "e-table-click-to-add.h" #include "e-table-defines.h" diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 025a5ce513..28e3eb0ec7 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -39,7 +39,7 @@ #include "e-util/e-i18n.h" #include "e-util/e-util-private.h" #include "e-util/e-util.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "e-table-config.h" #include "e-table-memory-store.h" diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index 8c9b34832d..73fdcf4e01 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -27,7 +27,7 @@ #include <table/e-table-sort-info.h> #include <table/e-table-specification.h> -#include <widgets/misc/gal-combo-text.h> +#include <misc/gal-combo-text.h> #include <table/e-table-without.h> #include <table/e-table-subset-variable.h> #include <table/e-table.h> diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 9241124bd6..c1c2e60400 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -35,7 +35,7 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" -#include "widgets/misc/e-canvas.h" +#include "misc/e-canvas.h" #include "e-table-col-dnd.h" #include "e-table-defines.h" diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 897f2d5b41..eed9fe0d04 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -31,9 +31,9 @@ #include "text/e-text.h" #include "e-util/e-i18n.h" #include "e-util/e-util.h" -#include "widgets/misc/e-canvas-utils.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-canvas-utils.h" +#include "misc/e-canvas.h" +#include "misc/e-unicode.h" #include "e-table-defines.h" #include "e-table-group-container.h" diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 966c1a0ef6..315ae0302a 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -28,7 +28,7 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" -#include "widgets/misc/e-canvas.h" +#include "misc/e-canvas.h" #include "e-table-item.h" #include "e-table-group-leaf.h" diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index 42d00462a5..ee0e89fc67 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -30,7 +30,7 @@ #include <table/e-table-sort-info.h> #include <table/e-table-defines.h> #include <e-util/e-util.h> -#include <widgets/misc/e-printable.h> +#include <misc/e-printable.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 6a5a81caf9..2cb6d7db6a 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -38,10 +38,10 @@ #include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-cursors.h" -#include "widgets/misc/e-gui-utils.h" -#include "widgets/misc/e-popup-menu.h" +#include "misc/e-canvas.h" +#include "misc/e-cursors.h" +#include "misc/e-gui-utils.h" +#include "misc/e-popup-menu.h" #include "e-table.h" #include "e-table-col-dnd.h" diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index ad76a9eb5d..3a5fb64ff1 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -30,7 +30,7 @@ #include <gtk/gtk.h> -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "e-table-defines.h" #include "e-table-header-utils.h" diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 5332a49720..881736e8bc 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -40,9 +40,9 @@ #include "a11y/e-table/gal-a11y-e-table-item.h" #include "e-util/e-i18n.h" #include "e-util/e-util.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-canvas-utils.h" -#include "widgets/misc/e-hsv-utils.h" +#include "misc/e-canvas.h" +#include "misc/e-canvas-utils.h" +#include "misc/e-hsv-utils.h" #include "e-cell.h" #include "e-table-item.h" diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index 92f367d78f..a0b3c29222 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -30,8 +30,8 @@ #include <table/e-table-header.h> #include <table/e-table-defines.h> #include <table/e-table-tooltip.h> -#include <widgets/misc/e-selection-model.h> -#include <widgets/misc/e-printable.h> +#include <misc/e-selection-model.h> +#include <misc/e-printable.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index 39486f76cc..ad9cdce15a 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -25,7 +25,7 @@ #define _E_TABLE_SELECTION_MODEL_H_ #include <gtk/gtkobject.h> -#include <widgets/misc/e-selection-model-array.h> +#include <misc/e-selection-model-array.h> #include <table/e-table-model.h> #include <table/e-table-header.h> diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index 385c9a4fc2..dad5caca3c 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -26,7 +26,7 @@ #include <glib-object.h> #include <libxml/tree.h> -#include <widgets/misc/e-selection-model.h> +#include <misc/e-selection-model.h> #include <table/e-table-state.h> #include <table/e-table-column-specification.h> #include <table/e-table-defines.h> diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c index cede28c0db..fb05326573 100644 --- a/widgets/table/e-table-utils.c +++ b/widgets/table/e-table-utils.c @@ -26,7 +26,7 @@ #include <libintl.h> /* This file uses dgettext() but no _() */ #include "e-util/e-util.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "e-table-utils.h" #include "e-table-header-utils.h" diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 4a545c0c4a..50e98fa15b 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -38,10 +38,10 @@ #include "a11y/e-table/gal-a11y-e-table.h" #include "e-util/e-i18n.h" #include "e-util/e-util.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-canvas-background.h" -#include "widgets/misc/e-canvas-vbox.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-canvas.h" +#include "misc/e-canvas-background.h" +#include "misc/e-canvas-vbox.h" +#include "misc/e-unicode.h" #include "e-table.h" #include "e-table-click-to-add.h" diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index a314fb8915..9a2c9575fc 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -37,7 +37,7 @@ #include <table/e-table-selection-model.h> #include <table/e-table-extras.h> #include <table/e-table-specification.h> -#include <widgets/misc/e-printable.h> +#include <misc/e-printable.h> #include <table/e-table-state.h> #include <table/e-table-sorter.h> #include <table/e-table-search.h> diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h index 830b366b2a..957a72d953 100644 --- a/widgets/table/e-tree-selection-model.h +++ b/widgets/table/e-tree-selection-model.h @@ -27,7 +27,7 @@ #include <gdk/gdktypes.h> #include <gtk/gtkobject.h> #include <e-util/e-sorter.h> -#include <widgets/misc/e-selection-model.h> +#include <misc/e-selection-model.h> #include <table/e-tree-model.h> #ifdef __cplusplus diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index c5ddbbc52c..023c0d1f44 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -35,8 +35,8 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" #include "e-util/e-util-marshal.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-canvas-background.h" +#include "misc/e-canvas.h" +#include "misc/e-canvas-background.h" #include "e-table-column-specification.h" #include "e-table-header-item.h" diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index 87846f025d..d4057b0ae6 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -28,7 +28,7 @@ #include <gtk/gtktable.h> #include <libxml/tree.h> #include <libgnomecanvas/gnome-canvas.h> -#include <widgets/misc/e-printable.h> +#include <misc/e-printable.h> #include <table/e-table-extras.h> #include <table/e-table-specification.h> diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c index 8a6cbf4d0c..30562bba5d 100644 --- a/widgets/table/table-test.c +++ b/widgets/table/table-test.c @@ -29,7 +29,7 @@ #include <gnome.h> -#include "widgets/misc/e-cursors.h" +#include "misc/e-cursors.h" #include "table-test.h" diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c index 98abc8ba08..8bba3af5a7 100644 --- a/widgets/table/test-check.c +++ b/widgets/table/test-check.c @@ -28,9 +28,9 @@ #include <gnome.h> -#include "widgets/misc/e-cursors.h" -#include "widgets/misc/e-canvas-utils.h" -#include "widgets/misc/e-canvas.h" +#include "misc/e-cursors.h" +#include "misc/e-canvas-utils.h" +#include "misc/e-canvas.h" #include "e-util/e-util.h" #include "e-table-simple.h" diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c index 75eee109fa..fa110f204c 100644 --- a/widgets/table/test-cols.c +++ b/widgets/table/test-cols.c @@ -28,9 +28,9 @@ #include <gnome.h> -#include "widgets/misc/e-canvas-utils.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-cursors.h" +#include "misc/e-canvas-utils.h" +#include "misc/e-canvas.h" +#include "misc/e-cursors.h" #include "e-util/e-util.h" #include "e-table-simple.h" diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c index 2c08410b49..7a5eb82da6 100644 --- a/widgets/table/test-table.c +++ b/widgets/table/test-table.c @@ -28,8 +28,8 @@ #include <gnome.h> -#include "widgets/misc/e-cursors.h" -#include "widgets/misc/e-canvas.h" +#include "misc/e-cursors.h" +#include "misc/e-canvas.h" #include "e-table-simple.h" #include "e-table-header.h" diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am index 7e1980e73a..e2c3c080ef 100644 --- a/widgets/text/Makefile.am +++ b/widgets/text/Makefile.am @@ -22,7 +22,7 @@ libetext_la_SOURCES = \ e-text-model-uri.c \ e-text.c -libetextincludedir = $(privincludedir)/e-text +libetextincludedir = $(privincludedir)/text libetextinclude_HEADERS = \ e-entry.h \ diff --git a/widgets/text/e-completion-match.c b/widgets/text/e-completion-match.c index df64bc8bd2..b9f5d5ec31 100644 --- a/widgets/text/e-completion-match.c +++ b/widgets/text/e-completion-match.c @@ -25,7 +25,7 @@ #include <string.h> -#include "widgets/misc/e-unicode.h" +#include "misc/e-unicode.h" #include "e-completion-match.h" diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c index d00b2e1665..9b37664648 100644 --- a/widgets/text/e-entry.c +++ b/widgets/text/e-entry.c @@ -38,8 +38,8 @@ #include "e-util/e-i18n.h" #include "e-util/e-util.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-canvas-utils.h" +#include "misc/e-canvas.h" +#include "misc/e-canvas-utils.h" #include "e-completion-view.h" #include "e-entry.h" diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c index 9d55035376..b1d7621bfe 100644 --- a/widgets/text/e-text-model-test.c +++ b/widgets/text/e-text-model-test.c @@ -24,7 +24,7 @@ #include <gnome.h> #include "e-util/e-util.h" -#include "widgets/misc/e-canvas.h" +#include "misc/e-canvas.h" #include "e-text-model.h" #include "e-text-model-uri.h" diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c index f80f361768..56cd7a974c 100644 --- a/widgets/text/e-text-test.c +++ b/widgets/text/e-text-test.c @@ -23,8 +23,8 @@ #include <gnome.h> -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-canvas.h" +#include "misc/e-unicode.h" #include "e-text.h" diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index d1bf3eb59e..8e39c7e5d2 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -49,9 +49,9 @@ #include <libart_lgpl/art_rgb_bitmap_affine.h> #include "a11y/e-text/gal-a11y-e-text.h" -#include "widgets/misc/e-canvas.h" -#include "widgets/misc/e-canvas-utils.h" -#include "widgets/misc/e-unicode.h" +#include "misc/e-canvas.h" +#include "misc/e-canvas-utils.h" +#include "misc/e-unicode.h" #include "e-util/e-i18n.h" #include "e-util/e-text-event-processor-emacs-like.h" #include "e-util/e-util.h" diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index 633db2c659..b72a299195 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -41,7 +41,7 @@ #include <e-util/e-text-event-processor.h> #include <text/e-text-model.h> -#include <widgets/misc/e-canvas.h> +#include <misc/e-canvas.h> G_BEGIN_DECLS |