diff options
33 files changed, 65 insertions, 65 deletions
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index 1d7c319f74..05bd33bc7e 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -14,7 +14,7 @@ #include <gdk/gdkkeysyms.h> #include <libgnomeui/gnome-canvas.h> #include "e-cell-checkbox.h" -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-table-item.h" #include "check-empty.xpm" diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 8f31b7adf4..3f2a2e57ba 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -33,14 +33,14 @@ #include <stdio.h> #include <unicode.h> #include "e-cell-text.h" -#include "e-util/e-util.h" -#include "e-util/e-canvas.h" -#include "e-util/e-font.h" -#include "e-util/e-unicode.h" +#include "util/e-util.h" +#include "widgets/e-canvas.h" +#include "widgets/e-font.h" +#include "widgets/e-unicode.h" #include "e-table-item.h" -#include "e-text-event-processor.h" -#include "e-text.h" -#include "e-text-event-processor-emacs-like.h" +#include "e-text/e-text-event-processor.h" +#include "e-text/e-text.h" +#include "e-text/e-text-event-processor-emacs-like.h" #include "e-table-tooltip.h" #include <gdk/gdkx.h> /* for BlackPixel */ diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index e18f4b33e7..fc54f34087 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -14,7 +14,7 @@ #include <gdk/gdkkeysyms.h> #include <libgnomeui/gnome-canvas.h> #include "e-cell-toggle.h" -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-table-item.h" #define PARENT_TYPE e_cell_get_type () diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index 706551d7ad..4ecaddd49d 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -24,7 +24,7 @@ #include "e-table-sorted-variable.h" #include "e-tree-model.h" #include "e-cell-tree.h" -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-table-item.h" #include <gdk/gdkx.h> /* for BlackPixel */ diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index f5d2abf733..af8bfc3406 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -9,7 +9,7 @@ */ #include <config.h> #include "e-cell.h" -#include "e-util/e-util.h" +#include "util/e-util.h" #define PARENT_TYPE gtk_object_get_type () diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index ba38078b2c..3f8c765bcd 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -18,9 +18,9 @@ #include "e-table-click-to-add.h" #include "e-table-defines.h" #include "e-table-one.h" -#include "widgets/e-text/e-text.h" -#include "e-util/e-canvas.h" -#include "e-util/e-canvas-utils.h" +#include "e-text/e-text.h" +#include "widgets/e-canvas.h" +#include "widgets/e-canvas-utils.h" enum { CURSOR_CHANGE, diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index c6a734b3ee..fd2ff33807 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -11,7 +11,7 @@ #include <gtk/gtkobject.h> #include <gtk/gtksignal.h> #include "e-table-col.h" -#include "e-util/e-util.h" +#include "util/e-util.h" #define PARENT_TYPE (gtk_object_get_type ()) diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index d124fe5d2d..12c5ff262a 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -11,9 +11,9 @@ #include <gnome.h> #include <glade/glade.h> #include <gnome-xml/xmlmemory.h> -#include "e-util/e-util.h" -#include "e-util/e-xml-utils.h" -#include "e-util/e-canvas.h" +#include "util/e-util.h" +#include "util/e-xml-utils.h" +#include "widgets/e-canvas.h" #include "e-table.h" #include "e-table-header-item.h" #include "e-table-subset.h" diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index e23fc4c9f5..6f82393ed6 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -16,8 +16,8 @@ #include <libgnomeui/gnome-canvas-rect-ellipse.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include "e-util/e-xml-utils.h" -#include "e-util/e-canvas.h" +#include "util/e-xml-utils.h" +#include "widgets/e-canvas.h" #include "e-table-header.h" #include "e-table-col-dnd.h" diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index f042364c99..b481070566 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -15,10 +15,10 @@ #include "e-table-group-leaf.h" #include "e-table-item.h" #include <libgnomeui/gnome-canvas-rect-ellipse.h> -#include "e-util/e-util.h" -#include "e-util/e-canvas.h" -#include "e-util/e-canvas-utils.h" -#include "widgets/e-text/e-text.h" +#include "util/e-util.h" +#include "widgets/e-canvas.h" +#include "widgets/e-canvas-utils.h" +#include "e-text/e-text.h" #include "e-table-defines.h" #define TITLE_HEIGHT 16 diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 082963a616..9dbfd4232f 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -13,8 +13,8 @@ #include "e-table-group-leaf.h" #include "e-table-item.h" #include <libgnomeui/gnome-canvas-rect-ellipse.h> -#include "e-util/e-util.h" -#include "e-util/e-canvas.h" +#include "util/e-util.h" +#include "widgets/e-canvas.h" #define PARENT_TYPE e_table_group_get_type () diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 213a94969f..764a39d387 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -16,7 +16,7 @@ #include "e-table-group-leaf.h" #include "e-table-item.h" #include <libgnomeui/gnome-canvas-rect-ellipse.h> -#include "e-util/e-util.h" +#include "util/e-util.h" #define PARENT_TYPE gnome_canvas_group_get_type () diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index 9a67a7b9d3..b84ab4fd83 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -7,8 +7,8 @@ #include "e-table-header.h" #include "e-table-sort-info.h" #include "e-table-defines.h" -#include "e-util/e-util.h" -#include "e-util/e-printable.h" +#include "util/e-util.h" +#include "widgets/e-printable.h" #define E_TABLE_GROUP_TYPE (e_table_group_get_type ()) #define E_TABLE_GROUP(o) (GTK_CHECK_CAST ((o), E_TABLE_GROUP_TYPE, ETableGroup)) diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 903d6b954f..9bb8f66aec 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -15,9 +15,9 @@ #include <libgnomeui/gnome-canvas-polygon.h> #include <libgnomeui/gnome-canvas-rect-ellipse.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include "e-util/e-cursors.h" -#include "e-util/e-xml-utils.h" -#include "e-util/e-popup-menu.h" +#include "widgets/e-cursors.h" +#include "util/e-xml-utils.h" +#include "widgets/e-popup-menu.h" #include "e-table-header.h" #include "e-table-header-item.h" #include "e-table-col-dnd.h" diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 87d79ea9c5..055b1281e9 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -19,9 +19,9 @@ #include "e-table-item.h" #include "e-table-subset.h" #include "e-cell.h" -#include "e-util/e-canvas.h" -#include "e-util/e-canvas-utils.h" -#include "e-util/e-util.h" +#include "widgets/e-canvas.h" +#include "widgets/e-canvas-utils.h" +#include "util/e-util.h" #define PARENT_OBJECT_TYPE gnome_canvas_item_get_type () diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index 504563081c..6156781467 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -8,7 +8,7 @@ #include "e-table-selection-model.h" #include "e-table-defines.h" #include "e-table-tooltip.h" -#include <e-util/e-printable.h> +#include <widgets/e-printable.h> #define E_TABLE_ITEM_TYPE (e_table_item_get_type ()) #define E_TABLE_ITEM(o) (GTK_CHECK_CAST ((o), E_TABLE_ITEM_TYPE, ETableItem)) diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h index 75f9986143..867b89834c 100644 --- a/widgets/table/e-table-scrolled.h +++ b/widgets/table/e-table-scrolled.h @@ -2,11 +2,11 @@ #ifndef _E_TABLE_SCROLLED_H_ #define _E_TABLE_SCROLLED_H_ -#include "widgets/misc/e-scroll-frame.h" +#include "widgets/e-scroll-frame.h" #include "e-table-model.h" #include "e-table-header.h" #include "e-table.h" -#include "e-util/e-printable.h" +#include "widgets/e-printable.h" BEGIN_GNOME_DECLS diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 6585840a8f..665cc5a92c 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -10,7 +10,7 @@ #include <config.h> #include <gtk/gtksignal.h> #include "e-table-selection-model.h" -#include "e-util/e-util.h" +#include "util/e-util.h" #define ETSM_CLASS(e) ((ETableSelectionModelClass *)((GtkObject *)e)->klass) diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index 6d7b25ed3d..34e5d01142 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -3,9 +3,9 @@ #define _E_TABLE_SELECTION_MODEL_H_ #include <gtk/gtkobject.h> -#include "widgets/e-table/e-table-model.h" -#include "widgets/e-table/e-table-defines.h" -#include "widgets/e-table/e-table-sorter.h" +#include "e-table-model.h" +#include "e-table-defines.h" +#include "e-table-sorter.h" #define E_TABLE_SELECTION_MODEL_TYPE (e_table_selection_model_get_type ()) #define E_TABLE_SELECTION_MODEL(o) (GTK_CHECK_CAST ((o), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModel)) diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index 32ba3d9e65..ba97524e26 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -10,7 +10,7 @@ #include <config.h> #include <gtk/gtksignal.h> #include "e-table-sort-info.h" -#include "e-util/e-util.h" +#include "util/e-util.h" #define ETM_CLASS(e) ((ETableSortInfoClass *)((GtkObject *)e)->klass) diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index 7584b31a74..72817aee2f 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -11,7 +11,7 @@ #include <stdlib.h> #include <gtk/gtksignal.h> #include <string.h> -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-table-sorted-variable.h" #define PARENT_TYPE E_TABLE_SUBSET_VARIABLE_TYPE diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index c754f4cff7..817a55a939 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -8,7 +8,7 @@ */ #include <config.h> #include <stdlib.h> -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-table-sorted.h" #define PARENT_TYPE E_TABLE_SUBSET_TYPE diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index eb2391b0d0..09db5c70c7 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -11,7 +11,7 @@ #include <stdlib.h> #include <gtk/gtksignal.h> #include <string.h> -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-table-sorter.h" #define PARENT_TYPE gtk_object_get_type() diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index 11b9c79d32..62da01f7f4 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -11,7 +11,7 @@ #include <stdlib.h> #include <gtk/gtksignal.h> #include <string.h> -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-table-subset-variable.h" #define ETSSV_CLASS(e) ((ETableSubsetVariableClass *)((GtkObject *)e)->klass) diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index 1cac0f88ea..5b95f29c16 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -10,7 +10,7 @@ #include <config.h> #include <stdlib.h> #include <gtk/gtksignal.h> -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-table-subset.h" #define PARENT_TYPE E_TABLE_MODEL_TYPE diff --git a/widgets/table/e-table-text-model.h b/widgets/table/e-table-text-model.h index dcc9afde7c..23430950d1 100644 --- a/widgets/table/e-table-text-model.h +++ b/widgets/table/e-table-text-model.h @@ -20,7 +20,7 @@ #define E_TABLE_TEXT_MODEL_H #include <gnome.h> -#include "e-text-model.h" +#include "e-text/e-text-model.h" #include "e-table-model.h" diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index cbc7ec3e4d..24fe906a88 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -21,10 +21,10 @@ #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> -#include "e-util/e-util.h" -#include "e-util/e-xml-utils.h" -#include "e-util/e-canvas.h" -#include "e-util/e-canvas-vbox.h" +#include "util/e-util.h" +#include "util/e-xml-utils.h" +#include "widgets/e-canvas.h" +#include "widgets/e-canvas-vbox.h" #include "e-table.h" #include "e-table-header-item.h" #include "e-table-subset.h" diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index f42ca51069..69a4b987ac 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -11,7 +11,7 @@ #include "e-table-sort-info.h" #include "e-table-item.h" #include "e-table-selection-model.h" -#include "e-util/e-printable.h" +#include "widgets/e-printable.h" BEGIN_GNOME_DECLS diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index 2744bc1cd2..56843991b7 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -12,7 +12,7 @@ #include <config.h> #include <gtk/gtksignal.h> #include <stdlib.h> -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-tree-model.h" #define ETM_CLASS(e) ((ETreeModelClass *)((GtkObject *)e)->klass) diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index 15b54f782c..01e33894df 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -10,7 +10,7 @@ #include <config.h> #include <gtk/gtksignal.h> -#include "e-util/e-util.h" +#include "util/e-util.h" #include "e-tree-simple.h" #define PARENT_TYPE E_TREE_MODEL_TYPE diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c index 3bb022821e..3ce8a4a90e 100644 --- a/widgets/table/test-check.c +++ b/widgets/table/test-check.c @@ -13,10 +13,10 @@ #include "e-table-header.h" #include "e-table-header-item.h" #include "e-table-item.h" -#include "e-util/e-cursors.h" -#include "e-util/e-canvas-utils.h" -#include "e-util/e-canvas.h" -#include "e-util/e-util.h" +#include "widgets/e-cursors.h" +#include "widgets/e-canvas-utils.h" +#include "widgets/e-canvas.h" +#include "util/e-util.h" #include "e-cell-text.h" #include "e-cell-checkbox.h" diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c index c47a1d47d7..498d4017dc 100644 --- a/widgets/table/test-cols.c +++ b/widgets/table/test-cols.c @@ -9,10 +9,10 @@ #include <stdio.h> #include <string.h> #include <gnome.h> -#include "e-util/e-canvas-utils.h" -#include "e-util/e-canvas.h" -#include "e-util/e-cursors.h" -#include "e-util/e-util.h" +#include "widgets/e-canvas-utils.h" +#include "widgets/e-canvas.h" +#include "widgets/e-cursors.h" +#include "util/e-util.h" #include "e-table-simple.h" #include "e-table-header.h" #include "e-table-header-item.h" diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h index dcc9afde7c..23430950d1 100644 --- a/widgets/text/e-table-text-model.h +++ b/widgets/text/e-table-text-model.h @@ -20,7 +20,7 @@ #define E_TABLE_TEXT_MODEL_H #include <gnome.h> -#include "e-text-model.h" +#include "e-text/e-text-model.h" #include "e-table-model.h" |