diff options
Diffstat (limited to 'widgets/table')
126 files changed, 535 insertions, 376 deletions
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am new file mode 100644 index 0000000000..8f5d699544 --- /dev/null +++ b/widgets/table/Makefile.am @@ -0,0 +1,159 @@ +glade_DATA = \ + e-table-config.glade \ + e-table-config-no-group.glade \ + e-table-field-chooser.glade + +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ + $(EXTRA_GNOME_CFLAGS) \ + $(GNOME_BONOBO_CFLAGS) \ + $(GNOME_INCLUDEDIR) \ + $(ICONV_CFLAGS) \ + $(GNOME_FULL_CFLAGS) \ + -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \ + -DG_LOG_DOMAIN=\"e-table\" + +privlib_LTLIBRARIES = libetable.la + +libetable_la_SOURCES = \ + e-cell.c \ + e-cell-checkbox.c \ + e-cell-combo.c \ + e-cell-date.c \ + e-cell-float.c \ + e-cell-number.c \ + e-cell-pixbuf.c \ + e-cell-popup.c \ + e-cell-progress.c \ + e-cell-size.c \ + e-cell-spin-button.c \ + e-cell-text.c \ + e-cell-toggle.c \ + e-cell-tree.c \ + e-cell-vbox.c \ + e-table-click-to-add.c \ + e-table-col.c \ + e-table-column-specification.c \ + e-table-config.c \ + e-table-extras.c \ + e-table-field-chooser-dialog.c \ + e-table-field-chooser-item.c \ + e-table-field-chooser.c \ + e-table-group.c \ + e-table-group-container.c \ + e-table-group-leaf.c \ + e-table-header.c \ + e-table-header-item.c \ + e-table-header-utils.c \ + e-table-item.c \ + e-table-memory-callbacks.c \ + e-table-memory-store.c \ + e-table-memory.c \ + e-table-model.c \ + e-table-one.c \ + e-table-scrolled.c \ + e-table-search.c \ + e-table-selection-model.c \ + e-table-simple.c \ + e-table-sort-info.c \ + e-table-sorted.c \ + e-table-sorted-variable.c \ + e-table-sorter.c \ + e-table-sorting-utils.c \ + e-table-specification.c \ + e-table-state.c \ + e-table-subset.c \ + e-table-subset-variable.c \ + e-table-utils.c \ + e-table-without.c \ + e-table.c \ + e-tree-memory-callbacks.c \ + e-tree-memory.c \ + e-tree-model.c \ + e-tree-scrolled.c \ + e-tree-selection-model.c \ + e-tree-sorted.c \ + e-tree-table-adapter.c \ + e-tree.c + +libetableincludedir = $(privincludedir)/e-table + +libetableinclude_HEADERS = \ + e-cell.h \ + e-cell-checkbox.h \ + e-cell-combo.h \ + e-cell-date.h \ + e-cell-float.h \ + e-cell-number.h \ + e-cell-pixbuf.h \ + e-cell-popup.h \ + e-cell-progress.h \ + e-cell-size.h \ + e-cell-spin-button.h \ + e-cell-text.h \ + e-cell-toggle.h \ + e-cell-tree.h \ + e-cell-vbox.h \ + e-table-click-to-add.h \ + e-table-col-dnd.h \ + e-table-col.h \ + e-table-column-specification.h \ + e-table-config.h \ + e-table-defines.h \ + e-table-extras.h \ + e-table-field-chooser-dialog.h \ + e-table-field-chooser-item.h \ + e-table-field-chooser.h \ + e-table-group.h \ + e-table-group-container.h \ + e-table-group-leaf.h \ + e-table-header.h \ + e-table-header-item.h \ + e-table-header-utils.h \ + e-table-item.h \ + e-table-memory-callbacks.h \ + e-table-memory-store.h \ + e-table-memory.h \ + e-table-model.h \ + e-table-one.h \ + e-table-scrolled.h \ + e-table-search.h \ + e-table-selection-model.h \ + e-table-simple.h \ + e-table-sort-info.h \ + e-table-sorted.h \ + e-table-sorted-variable.h \ + e-table-sorter.h \ + e-table-sorting-utils.h \ + e-table-specification.h \ + e-table-state.h \ + e-table-subset.h \ + e-table-subset-variable.h \ + e-table-tooltip.h \ + e-table-utils.h \ + e-table-without.h \ + e-table.h \ + e-tree-memory-callbacks.h \ + e-tree-memory.h \ + e-tree-model.h \ + e-tree-scrolled.h \ + e-tree-selection-model.h \ + e-tree-sorted.h \ + e-tree-table-adapter.h \ + e-tree.h + +icons = \ + add-col.xpm \ + arrow-down.xpm \ + arrow-up.xpm \ + add-col.xpm \ + check-empty.xpm \ + check-filled.xpm \ + remove-col.xpm \ + tree-expanded.xpm \ + tree-unexpanded.xpm + +EXTRA_DIST = \ + $(icons) \ + $(glade_DATA) diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index 5310d27fc0..cdeb1814de 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-item.h" #include "e-cell-checkbox.h" diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h index ab56af27ab..7cdf4c0b8c 100644 --- a/widgets/table/e-cell-checkbox.h +++ b/widgets/table/e-cell-checkbox.h @@ -23,7 +23,7 @@ #ifndef _E_CELL_CHECKBOX_H_ #define _E_CELL_CHECKBOX_H_ -#include <gal/e-table/e-cell-toggle.h> +#include <table/e-cell-toggle.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 0688f7068f..4e3df61604 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -59,9 +59,9 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-unicode.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "widgets/misc/e-unicode.h" #include "e-table-item.h" #include "e-cell-combo.h" diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h index 23d5ac26a4..dfcd7a7817 100644 --- a/widgets/table/e-cell-combo.h +++ b/widgets/table/e-cell-combo.h @@ -31,7 +31,7 @@ #ifndef _E_CELL_COMBO_H_ #define _E_CELL_COMBO_H_ -#include <gal/e-table/e-cell-popup.h> +#include <table/e-cell-popup.h> #define E_CELL_COMBO_TYPE (e_cell_combo_get_type ()) #define E_CELL_COMBO(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_COMBO_TYPE, ECellCombo)) diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index 4366b8cd81..a2a4e58937 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -27,9 +27,9 @@ #include <unistd.h> #include <string.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-unicode.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "widgets/misc/e-unicode.h" #include "e-cell-date.h" diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h index 96d5faa5c3..24554f6a59 100644 --- a/widgets/table/e-cell-date.h +++ b/widgets/table/e-cell-date.h @@ -23,7 +23,7 @@ #ifndef _E_CELL_DATE_H_ #define _E_CELL_DATE_H_ -#include <gal/e-table/e-cell-text.h> +#include <table/e-cell-text.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-float.c b/widgets/table/e-cell-float.c index be2b47bd5d..ce7f5e0630 100644 --- a/widgets/table/e-cell-float.c +++ b/widgets/table/e-cell-float.c @@ -29,8 +29,8 @@ #include <sys/time.h> #include <unistd.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-cell-float.h" diff --git a/widgets/table/e-cell-float.h b/widgets/table/e-cell-float.h index 36874406b2..8285c314e7 100644 --- a/widgets/table/e-cell-float.h +++ b/widgets/table/e-cell-float.h @@ -27,7 +27,7 @@ #ifndef _E_CELL_FLOAT_H_ #define _E_CELL_FLOAT_H_ -#include <gal/e-table/e-cell-text.h> +#include <table/e-cell-text.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c index d8890af4b2..b2ab40590d 100644 --- a/widgets/table/e-cell-number.c +++ b/widgets/table/e-cell-number.c @@ -25,8 +25,8 @@ #include <sys/time.h> #include <unistd.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-cell-number.h" diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h index 3cce1ec412..dcd7856b20 100644 --- a/widgets/table/e-cell-number.h +++ b/widgets/table/e-cell-number.h @@ -23,7 +23,7 @@ #ifndef _E_CELL_NUMBER_H_ #define _E_CELL_NUMBER_H_ -#include <gal/e-table/e-cell-text.h> +#include <table/e-cell-text.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index 03c476185f..1b1924f297 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -27,7 +27,7 @@ #include <libgnomecanvas/gnome-canvas.h> -#include "gal/util/e-i18n.h" +#include "e-util/e-i18n.h" #include "e-cell-pixbuf.h" diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h index 2f12521d58..be17dc523c 100644 --- a/widgets/table/e-cell-pixbuf.h +++ b/widgets/table/e-cell-pixbuf.h @@ -23,7 +23,7 @@ #ifndef _E_CELL_PIXBUF_H_ #define _E_CELL_PIXBUF_H_ -#include <gal/e-table/e-table.h> +#include <table/e-table.h> #define E_CELL_PIXBUF_TYPE (e_cell_pixbuf_get_type ()) #define E_CELL_PIXBUF(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_PIXBUF_TYPE, ECellPixbuf)) diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 42b04f3984..613b11dae2 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -32,9 +32,9 @@ #include <gdk/gdkkeysyms.h> -#include "gal/a11y/e-table/gal-a11y-e-cell-popup.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" -#include "gal/util/e-util.h" +#include "a11y/e-table/gal-a11y-e-cell-popup.h" +#include "a11y/e-table/gal-a11y-e-cell-registry.h" +#include "e-util/e-util.h" #include "e-cell-popup.h" #include "e-table-item.h" diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index 26a7429127..24b36e42f4 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -33,7 +33,7 @@ #define _E_CELL_POPUP_H_ #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> #define E_CELL_POPUP_TYPE (e_cell_popup_get_type ()) #define E_CELL_POPUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_POPUP_TYPE, ECellPopup)) diff --git a/widgets/table/e-cell-progress.c b/widgets/table/e-cell-progress.c index cf07db84dc..10ce1c8291 100644 --- a/widgets/table/e-cell-progress.c +++ b/widgets/table/e-cell-progress.c @@ -34,7 +34,7 @@ #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-cell-progress.h" #include "e-table-item.h" diff --git a/widgets/table/e-cell-progress.h b/widgets/table/e-cell-progress.h index 01a0d0b504..d2d534e7a6 100644 --- a/widgets/table/e-cell-progress.h +++ b/widgets/table/e-cell-progress.h @@ -27,7 +27,7 @@ #include <libgnomecanvas/gnome-canvas.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index 7651a0bdfc..e403bbc468 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -26,7 +26,7 @@ #include <sys/time.h> #include <unistd.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-cell-size.h" diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h index 744cc00a98..74c66e9fc4 100644 --- a/widgets/table/e-cell-size.h +++ b/widgets/table/e-cell-size.h @@ -23,7 +23,7 @@ #ifndef _E_CELL_SIZE_H_ #define _E_CELL_SIZE_H_ -#include <gal/e-table/e-cell-text.h> +#include <table/e-cell-text.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-spin-button.c b/widgets/table/e-cell-spin-button.c index 59ee3d98a3..c6112bf3b8 100644 --- a/widgets/table/e-cell-spin-button.c +++ b/widgets/table/e-cell-spin-button.c @@ -31,11 +31,11 @@ #include <gtk/gtk.h> -#include "gal/e-table/e-cell-float.h" -#include "gal/e-table/e-cell-number.h" -#include "gal/e-table/e-table-item.h" -#include "gal/e-table/e-table-model.h" -#include "gal/util/e-util.h" +#include "table/e-cell-float.h" +#include "table/e-cell-number.h" +#include "table/e-table-item.h" +#include "table/e-table-model.h" +#include "e-util/e-util.h" #include "e-cell-spin-button.h" @@ -152,7 +152,7 @@ e_cell_spin_button_class_init (GObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECellSpinButtonClass, step), NULL, NULL, - e_marshal_NONE__POINTER_INT_INT_INT, + e_util_marshal_NONE__POINTER_INT_INT_INT, G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); diff --git a/widgets/table/e-cell-spin-button.h b/widgets/table/e-cell-spin-button.h index 4326c0429c..ff88dc4c37 100644 --- a/widgets/table/e-cell-spin-button.h +++ b/widgets/table/e-cell-spin-button.h @@ -32,7 +32,7 @@ #include <glib.h> #include <gtk/gtktypeutils.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> #define E_CELL_SPIN_BUTTON_TYPE (e_cell_spin_button_get_type ()) #define E_CELL_SPIN_BUTTON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_SPIN_BUTTON_TYPE, ECellSpinButton)) diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 1ecd71f638..63cf1bbff9 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -46,15 +46,15 @@ #include <libgnomecanvas/gnome-canvas.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-text.h" -#include "gal/e-text/e-text.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-text-event-processor.h" -#include "gal/util/e-text-event-processor-emacs-like.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-unicode.h" +#include "a11y/e-table/gal-a11y-e-cell-registry.h" +#include "a11y/e-table/gal-a11y-e-cell-text.h" +#include "text/e-text.h" +#include "e-util/e-i18n.h" +#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 "e-cell-text.h" #include "e-table-item.h" @@ -1717,7 +1717,7 @@ e_cell_text_class_init (GObjectClass *object_class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ECellTextClass, text_inserted), NULL, NULL, - e_marshal_VOID__POINTER_INT_INT_INT_INT, + e_util_marshal_VOID__POINTER_INT_INT_INT_INT, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); @@ -1728,7 +1728,7 @@ e_cell_text_class_init (GObjectClass *object_class) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ECellTextClass, text_deleted), NULL, NULL, - e_marshal_VOID__POINTER_INT_INT_INT_INT, + e_util_marshal_VOID__POINTER_INT_INT_INT_INT, G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index 0ef32b9ede..da9e837ab1 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -38,7 +38,7 @@ #define _E_CELL_TEXT_H_ #include <gtk/gtkmenu.h> #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 395ec05f6b..7ee55797b2 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -27,10 +27,10 @@ #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include "gal/a11y/e-table/gal-a11y-e-cell-toggle.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-hsv-utils.h" +#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 "e-cell-toggle.h" #include "e-table-item.h" diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h index 71d9de3883..8d0247cf21 100644 --- a/widgets/table/e-cell-toggle.h +++ b/widgets/table/e-cell-toggle.h @@ -26,7 +26,7 @@ #include <libgnomecanvas/gnome-canvas.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index 95e7764cdf..c632a16966 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -37,9 +37,9 @@ #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas.h> -#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-tree.h" -#include "gal/util/e-util.h" +#include "a11y/e-table/gal-a11y-e-cell-registry.h" +#include "a11y/e-table/gal-a11y-e-cell-tree.h" +#include "e-util/e-util.h" #include "e-cell-tree.h" #include "e-table-item.h" diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h index dfdd6f0191..a9d4fa990d 100644 --- a/widgets/table/e-cell-tree.h +++ b/widgets/table/e-cell-tree.h @@ -31,7 +31,7 @@ #define _E_CELL_TREE_H_ #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index 7ab1b561a2..91a25ec8c4 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -35,9 +35,9 @@ #include <gtk/gtk.h> -#include "gal/a11y/e-table/gal-a11y-e-cell-registry.h" -#include "gal/a11y/e-table/gal-a11y-e-cell-vbox.h" -#include "gal/util/e-util.h" +#include "a11y/e-table/gal-a11y-e-cell-registry.h" +#include "a11y/e-table/gal-a11y-e-cell-vbox.h" +#include "e-util/e-util.h" #include "e-cell-vbox.h" #include "e-table-item.h" diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h index f08e106128..99763219a6 100644 --- a/widgets/table/e-cell-vbox.h +++ b/widgets/table/e-cell-vbox.h @@ -31,7 +31,7 @@ #define _E_CELL_VBOX_H_ #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index e3fe5af23a..b27badc348 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -24,7 +24,7 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-cell.h" diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index 2ba74c01f5..fabe7bf372 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -28,8 +28,8 @@ #include <gdk/gdktypes.h> #include <libgnomeprint/gnome-print.h> #include <libgnomeprint/gnome-font.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-tooltip.h> +#include <table/e-table-model.h> +#include <table/e-table-tooltip.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 01eb6ab671..1295be52af 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -30,13 +30,13 @@ #include <libgnomecanvas/gnome-canvas-util.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include "gal/a11y/e-table/gal-a11y-e-table-click-to-add.h" -#include "gal/e-text/e-text.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-marshal.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-canvas-utils.h" -#include "gal/widgets/e-canvas.h" +#include "a11y/e-table/gal-a11y-e-table-click-to-add.h" +#include "text/e-text.h" +#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 "e-table-click-to-add.h" #include "e-table-defines.h" @@ -532,7 +532,7 @@ etcta_class_init (ETableClickToAddClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClickToAddClass, cursor_change), NULL, NULL, - e_marshal_VOID__INT_INT, + e_util_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); etcta_signals [STYLE_SET] = @@ -541,7 +541,7 @@ etcta_class_init (ETableClickToAddClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClickToAddClass, style_set), NULL, NULL, - e_marshal_NONE__OBJECT, + e_util_marshal_NONE__OBJECT, G_TYPE_NONE, 1, GTK_TYPE_STYLE); gal_a11y_e_table_click_to_add_init (); diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h index 42ffd42d07..26c2f638df 100644 --- a/widgets/table/e-table-click-to-add.h +++ b/widgets/table/e-table-click-to-add.h @@ -26,10 +26,10 @@ #include <libxml/tree.h> #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-table-header.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-table-selection-model.h> +#include <table/e-table-header.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-item.h> +#include <table/e-table-selection-model.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index ccc6665547..67400b19de 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -23,8 +23,8 @@ #include <config.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-table-col.h" diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h index 8f2369c76a..8e02f05bdb 100644 --- a/widgets/table/e-table-col.h +++ b/widgets/table/e-table-col.h @@ -25,7 +25,7 @@ #define _E_TABLE_COL_H_ #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c index a8f8f3fb54..1d4d1d218a 100644 --- a/widgets/table/e-table-column-specification.c +++ b/widgets/table/e-table-column-specification.c @@ -28,8 +28,8 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-table-column-specification.h" diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c index 54fdb1525a..ae1171fb3d 100644 --- a/widgets/table/e-table-column.c +++ b/widgets/table/e-table-column.c @@ -72,14 +72,14 @@ e_table_column_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableColumn, structure_change), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); etc_signals [DIMENSION_CHANGE] = g_signal_new ("dimension_change", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableColumn, dimension_change), - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); } diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index a3a833580e..af83f40c6a 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -27,8 +27,8 @@ #include <gtk/gtk.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-table-config-field.h" diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h index bb8f540c4a..887ae894de 100644 --- a/widgets/table/e-table-config-field.h +++ b/widgets/table/e-table-config-field.h @@ -25,8 +25,8 @@ #define _E_TABLE_CONFIG_FIELD_H_ #include <gtk/gtkvbox.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-specification.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-specification.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 3c508565ce..025a5ce513 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -36,10 +36,10 @@ #include <libgnomeui/gnome-propertybox.h> #include <glade/glade.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util-private.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-unicode.h" +#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 "e-table-config.h" #include "e-table-memory-store.h" @@ -1078,14 +1078,14 @@ setup_gui (ETableConfig *config) if (e_table_sort_info_get_can_group (config->state->sort_info)) { gchar *filename = - g_build_filename (GAL_GLADEDIR, + g_build_filename (EVOLUTION_GLADEDIR, "e-table-config.glade", NULL); gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); g_free (filename); } else { gchar *filename = - g_build_filename (GAL_GLADEDIR, + g_build_filename (EVOLUTION_GLADEDIR, "e-table-config-no-group.glade", NULL); gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index cad376b955..8c9b34832d 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -25,12 +25,12 @@ #ifndef _E_TABLE_CONFIG_H_ #define _E_TABLE_CONFIG_H_ -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-specification.h> -#include <gal/widgets/gal-combo-text.h> -#include <gal/e-table/e-table-without.h> -#include <gal/e-table/e-table-subset-variable.h> -#include <gal/e-table/e-table.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-specification.h> +#include <widgets/misc/gal-combo-text.h> +#include <table/e-table-without.h> +#include <table/e-table-subset-variable.h> +#include <table/e-table.h> #include <gtk/gtkwindow.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index de91862bea..e8529914e8 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -28,7 +28,7 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-cell-checkbox.h" #include "e-cell-date.h" diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h index bd478e0bd8..4bda69eceb 100644 --- a/widgets/table/e-table-extras.h +++ b/widgets/table/e-table-extras.h @@ -25,7 +25,7 @@ #define _E_TABLE_EXTRAS_H_ #include <glib-object.h> -#include <gal/e-table/e-cell.h> +#include <table/e-cell.h> #include <gdk-pixbuf/gdk-pixbuf.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index f079703441..8c3c9eb883 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -25,8 +25,8 @@ #include <gtk/gtk.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-table-field-chooser-dialog.h" diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h index 83fd5d3738..901ef30a04 100644 --- a/widgets/table/e-table-field-chooser-dialog.h +++ b/widgets/table/e-table-field-chooser-dialog.h @@ -25,8 +25,8 @@ #define __E_TABLE_FIELD_CHOOSER_DIALOG_H__ #include <gtk/gtkdialog.h> -#include <gal/e-table/e-table-field-chooser.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-table-field-chooser.h> +#include <table/e-table-header.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 86f3f87d2c..9241124bd6 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -32,10 +32,10 @@ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" -#include "gal/widgets/e-canvas.h" +#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 "e-table-col-dnd.h" #include "e-table-defines.h" diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h index 2ed37d37f1..e0dbbd373c 100644 --- a/widgets/table/e-table-field-chooser-item.h +++ b/widgets/table/e-table-field-chooser-item.h @@ -26,7 +26,7 @@ #include <libgnomecanvas/gnome-canvas.h> #include <libxml/tree.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 333827fd48..fe6eb3c46c 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -26,9 +26,9 @@ #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/util/e-util-private.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "e-util/e-util-private.h" #include "e-table-field-chooser.h" #include "e-table-field-chooser-item.h" @@ -155,7 +155,7 @@ e_table_field_chooser_init (ETableFieldChooser *etfc) { GladeXML *gui; GtkWidget *widget; - gchar *filename = g_build_filename (GAL_GLADEDIR, + gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, "e-table-field-chooser.glade", NULL); gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h index 65efeeedbe..216cc9d090 100644 --- a/widgets/table/e-table-field-chooser.h +++ b/widgets/table/e-table-field-chooser.h @@ -26,7 +26,7 @@ #include <glade/glade.h> #include <gtk/gtkvbox.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 30e7bed520..897f2d5b41 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -28,12 +28,12 @@ #include <libgnome/libgnome.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "gal/e-text/e-text.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-canvas-utils.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-unicode.h" +#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 "e-table-defines.h" #include "e-table-group-container.h" diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h index d1809e48fd..6adbeab005 100644 --- a/widgets/table/e-table-group-container.h +++ b/widgets/table/e-table-group-container.h @@ -25,10 +25,10 @@ #define _E_TABLE_GROUP_CONTAINER_H_ #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-header.h> -#include <gal/e-table/e-table-group.h> -#include <gal/e-table/e-table-item.h> +#include <table/e-table-model.h> +#include <table/e-table-header.h> +#include <table/e-table-group.h> +#include <table/e-table-item.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 597cfe0724..966c1a0ef6 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -26,9 +26,9 @@ #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-canvas.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "widgets/misc/e-canvas.h" #include "e-table-item.h" #include "e-table-group-leaf.h" diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h index 74fdfd8c03..31e37984ab 100644 --- a/widgets/table/e-table-group-leaf.h +++ b/widgets/table/e-table-group-leaf.h @@ -25,9 +25,9 @@ #define _E_TABLE_GROUP_LEAF_H_ #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-table-group.h> -#include <gal/e-table/e-table-subset.h> -#include <gal/e-table/e-table-item.h> +#include <table/e-table-group.h> +#include <table/e-table-subset.h> +#include <table/e-table-item.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 4dca53c3f9..008ec07d0a 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-group.h" #include "e-table-group-container.h" @@ -650,7 +650,7 @@ etg_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, cursor_change), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); etg_signals [CURSOR_ACTIVATED] = @@ -659,7 +659,7 @@ etg_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, cursor_activated), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); etg_signals [DOUBLE_CLICK] = @@ -668,7 +668,7 @@ etg_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, double_click), NULL, NULL, - e_marshal_NONE__INT_INT_BOXED, + e_util_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -678,7 +678,7 @@ etg_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, right_click), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); etg_signals [CLICK] = @@ -687,7 +687,7 @@ etg_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, click), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -697,7 +697,7 @@ etg_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, key_press), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -707,7 +707,7 @@ etg_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableGroupClass, start_drag), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); } diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h index 2ecd34efe1..42d00462a5 100644 --- a/widgets/table/e-table-group.h +++ b/widgets/table/e-table-group.h @@ -25,12 +25,12 @@ #define _E_TABLE_GROUP_H_ #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-header.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-defines.h> -#include <gal/util/e-util.h> -#include <gal/widgets/e-printable.h> +#include <table/e-table-model.h> +#include <table/e-table-header.h> +#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> G_BEGIN_DECLS diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 393f24c25c..6a5a81caf9 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -34,14 +34,14 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdkkeysyms.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-marshal.h" -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-cursors.h" -#include "gal/widgets/e-gui-utils.h" -#include "gal/widgets/e-popup-menu.h" +#include "e-util/e-i18n.h" +#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 "e-table.h" #include "e-table-col-dnd.h" @@ -1872,7 +1872,7 @@ ethi_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableHeaderItemClass, button_pressed), NULL, NULL, - e_marshal_NONE__BOXED, + e_util_marshal_NONE__BOXED, G_TYPE_NONE, 1, GDK_TYPE_EVENT); } diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h index 955cb402c3..39bdb45276 100644 --- a/widgets/table/e-table-header-item.h +++ b/widgets/table/e-table-header-item.h @@ -25,12 +25,12 @@ #ifndef _E_TABLE_HEADER_ITEM_H_ #define _E_TABLE_HEADER_ITEM_H_ -#include <gal/e-table/e-table.h> -#include <gal/e-table/e-tree.h> +#include <table/e-table.h> +#include <table/e-tree.h> #include <libgnomecanvas/gnome-canvas.h> #include <libxml/tree.h> -#include <gal/e-table/e-table-header.h> -#include <gal/e-table/e-table-sort-info.h> +#include <table/e-table-header.h> +#include <table/e-table-sort-info.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index de5e00549c..ad76a9eb5d 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 "gal/widgets/e-unicode.h" +#include "widgets/misc/e-unicode.h" #include "e-table-defines.h" #include "e-table-header-utils.h" diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h index 38defa9261..0b3fbc5bce 100644 --- a/widgets/table/e-table-header-utils.h +++ b/widgets/table/e-table-header-utils.h @@ -26,7 +26,7 @@ #ifndef E_TABLE_HEADER_UTILS_H #define E_TABLE_HEADER_UTILS_H -#include <gal/e-table/e-table-col.h> +#include <table/e-table-col.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index 0dac60d73a..2acfb1c446 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -29,7 +29,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-defines.h" #include "e-table-header.h" @@ -305,7 +305,7 @@ e_table_header_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableHeaderClass, request_width), (GSignalAccumulator) NULL, NULL, - e_marshal_INT__INT, + e_util_marshal_INT__INT, G_TYPE_INT, 1, G_TYPE_INT); klass->structure_change = NULL; diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h index 3a9ae6a0bf..2f1f768e1a 100644 --- a/widgets/table/e-table-header.h +++ b/widgets/table/e-table-header.h @@ -27,8 +27,8 @@ #include <glib-object.h> #include <gdk/gdk.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-col.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-col.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index e42452e6a5..5332a49720 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -36,13 +36,13 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#include "gal/a11y/e-table/gal-a11y-e-table-item-factory.h" -#include "gal/a11y/e-table/gal-a11y-e-table-item.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-canvas-utils.h" -#include "gal/widgets/e-hsv-utils.h" +#include "a11y/e-table/gal-a11y-e-table-item-factory.h" +#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 "e-cell.h" #include "e-table-item.h" @@ -3036,7 +3036,7 @@ eti_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, cursor_change), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); eti_signals [CURSOR_ACTIVATED] = @@ -3045,7 +3045,7 @@ eti_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, cursor_activated), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); eti_signals [DOUBLE_CLICK] = @@ -3054,7 +3054,7 @@ eti_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, double_click), NULL, NULL, - e_marshal_NONE__INT_INT_BOXED, + e_util_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3064,7 +3064,7 @@ eti_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, start_drag), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3074,7 +3074,7 @@ eti_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, right_click), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3084,7 +3084,7 @@ eti_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, click), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3094,7 +3094,7 @@ eti_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, key_press), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3104,7 +3104,7 @@ eti_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableItemClass, style_set), NULL, NULL, - e_marshal_NONE__OBJECT, + e_util_marshal_NONE__OBJECT, G_TYPE_NONE, 1, GTK_TYPE_STYLE); eti_signals[SELECTION_MODEL_REMOVED] = diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index e5b5322019..92f367d78f 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -26,12 +26,12 @@ #define _E_TABLE_ITEM_H_ #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-header.h> -#include <gal/e-table/e-table-defines.h> -#include <gal/e-table/e-table-tooltip.h> -#include <gal/widgets/e-selection-model.h> -#include <gal/widgets/e-printable.h> +#include <table/e-table-model.h> +#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> G_BEGIN_DECLS diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index f5803366b5..fe25b3742b 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -23,7 +23,7 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-memory-callbacks.h" diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h index 599ffa01f3..648b27ec72 100644 --- a/widgets/table/e-table-memory-callbacks.h +++ b/widgets/table/e-table-memory-callbacks.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_MEMORY_CALLBACKS_H_ #define _E_TABLE_MEMORY_CALLBACKS_H_ -#include <gal/e-table/e-table-memory.h> +#include <table/e-table-memory.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index bd29ef8d48..00a1ff17af 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -25,7 +25,7 @@ #include <string.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-memory-store.h" diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h index 54306da236..95420786b9 100644 --- a/widgets/table/e-table-memory-store.h +++ b/widgets/table/e-table-memory-store.h @@ -24,8 +24,8 @@ #ifndef _E_TABLE_MEMORY_STORE_H_ #define _E_TABLE_MEMORY_STORE_H_ -#include <gal/e-table/e-table-memory.h> -#include <gal/e-table/e-table-memory-callbacks.h> +#include <table/e-table-memory.h> +#include <table/e-table-memory-callbacks.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 62f7850eca..cb0223c788 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -33,8 +33,8 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-table-memory.h" diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h index c1b3cd45f8..4754c06915 100644 --- a/widgets/table/e-table-memory.h +++ b/widgets/table/e-table-memory.h @@ -25,7 +25,7 @@ #define _E_TABLE_MEMORY_H_ #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index b2291fb171..f600c0832d 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -25,8 +25,8 @@ #include <glib-object.h> -#include "gal/util/e-marshal.h" -#include "gal/util/e-util.h" +#include "e-util/e-util-marshal.h" +#include "e-util/e-util.h" #include "e-table-model.h" @@ -325,7 +325,7 @@ e_table_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_cell_changed), (GSignalAccumulator) NULL, NULL, - e_marshal_VOID__INT_INT, + e_util_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_table_model_signals [MODEL_ROWS_INSERTED] = @@ -334,7 +334,7 @@ e_table_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_rows_inserted), (GSignalAccumulator) NULL, NULL, - e_marshal_VOID__INT_INT, + e_util_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_table_model_signals [MODEL_ROWS_DELETED] = @@ -343,7 +343,7 @@ e_table_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableModelClass, model_rows_deleted), (GSignalAccumulator) NULL, NULL, - e_marshal_VOID__INT_INT, + e_util_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); klass->column_count = NULL; diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index 2d71a6e505..7bcbc37853 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -23,7 +23,7 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-one.h" diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h index 1c8147d779..8758969513 100644 --- a/widgets/table/e-table-one.h +++ b/widgets/table/e-table-one.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_ONE_H_ #define _E_TABLE_ONE_H_ -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c index 548fafa90f..77db176540 100644 --- a/widgets/table/e-table-scrolled.c +++ b/widgets/table/e-table-scrolled.c @@ -32,7 +32,7 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-i18n.h" +#include "e-util/e-i18n.h" #include "e-table.h" #include "e-table-scrolled.h" diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h index 40de97e99e..4f73c10c19 100644 --- a/widgets/table/e-table-scrolled.h +++ b/widgets/table/e-table-scrolled.h @@ -25,8 +25,8 @@ #define _E_TABLE_SCROLLED_H_ #include <gtk/gtkscrolledwindow.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table.h> +#include <table/e-table-model.h> +#include <table/e-table.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index d49f993d08..162f148ac0 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -25,7 +25,7 @@ #include <string.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-search.h" @@ -131,7 +131,7 @@ e_table_search_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableSearchClass, search), (GSignalAccumulator) NULL, NULL, - e_marshal_BOOLEAN__STRING_INT, + e_util_marshal_BOOLEAN__STRING_INT, G_TYPE_BOOLEAN, 2, G_TYPE_STRING, G_TYPE_INT); e_table_search_signals [SEARCH_ACCEPT] = diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 521e8eb413..bdce7741c3 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -27,8 +27,8 @@ #include <gdk/gdkkeysyms.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-table-selection-model.h" diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index f3889d6f1b..39486f76cc 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -25,9 +25,9 @@ #define _E_TABLE_SELECTION_MODEL_H_ #include <gtk/gtkobject.h> -#include <gal/widgets/e-selection-model-array.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-header.h> +#include <widgets/misc/e-selection-model-array.h> +#include <table/e-table-model.h> +#include <table/e-table-header.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c index 53ef4abe43..cdca4bbb44 100644 --- a/widgets/table/e-table-simple.c +++ b/widgets/table/e-table-simple.c @@ -24,7 +24,7 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-simple.h" diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h index 39800c3118..34905c48ce 100644 --- a/widgets/table/e-table-simple.h +++ b/widgets/table/e-table-simple.h @@ -25,7 +25,7 @@ #ifndef _E_TABLE_SIMPLE_H_ #define _E_TABLE_SIMPLE_H_ -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index d37cb2bf91..cfb7d2dda6 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -25,8 +25,8 @@ #include <string.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-table-sort-info.h" diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index 5b3237ae42..9b0e772f94 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-sorted-variable.h" #include "e-table-sorting-utils.h" diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h index 546d04b240..f6a1cf1f6d 100644 --- a/widgets/table/e-table-sorted-variable.h +++ b/widgets/table/e-table-sorted-variable.h @@ -25,10 +25,10 @@ #define _E_TABLE_SORTED_VARIABLE_H_ #include <glib-object.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-subset-variable.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-table-model.h> +#include <table/e-table-subset-variable.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index 462045b563..c2c39517fa 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-sorted.h" #include "e-table-sorting-utils.h" diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h index e1265b0a08..2a94850728 100644 --- a/widgets/table/e-table-sorted.h +++ b/widgets/table/e-table-sorted.h @@ -25,10 +25,10 @@ #define _E_TABLE_SORTED_H_ #include <glib-object.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-subset.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-table-model.h> +#include <table/e-table-subset.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index a38647a48a..0e74b6b2cf 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -26,8 +26,8 @@ #include <stdlib.h> #include <string.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-table-sorter.h" diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h index 67be48715a..4ef4387124 100644 --- a/widgets/table/e-table-sorter.h +++ b/widgets/table/e-table-sorter.h @@ -25,11 +25,11 @@ #define _E_TABLE_SORTER_H_ #include <glib-object.h> -#include <gal/util/e-sorter.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-subset-variable.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-header.h> +#include <e-util/e-sorter.h> +#include <table/e-table-model.h> +#include <table/e-table-subset-variable.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index 9a7a1f9b26..7ac671fd84 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -25,7 +25,7 @@ #include <string.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-sorting-utils.h" diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h index 794ead0ac9..b3955c420a 100644 --- a/widgets/table/e-table-sorting-utils.h +++ b/widgets/table/e-table-sorting-utils.h @@ -28,10 +28,10 @@ extern "C" { #endif /* __cplusplus */ -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-tree-model.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-table-model.h> +#include <table/e-tree-model.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-header.h> gboolean e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info, ETableHeader *full_header, int col); diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index 31a58e5401..6033bda9bd 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -31,8 +31,8 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-table-specification.h" diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h index 961752b9b8..385c9a4fc2 100644 --- a/widgets/table/e-table-specification.h +++ b/widgets/table/e-table-specification.h @@ -26,10 +26,10 @@ #include <glib-object.h> #include <libxml/tree.h> -#include <gal/widgets/e-selection-model.h> -#include <gal/e-table/e-table-state.h> -#include <gal/e-table/e-table-column-specification.h> -#include <gal/e-table/e-table-defines.h> +#include <widgets/misc/e-selection-model.h> +#include <table/e-table-state.h> +#include <table/e-table-column-specification.h> +#include <table/e-table-defines.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index fe581af0bd..1cb9e369c7 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -29,8 +29,8 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-table-state.h" diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h index 47e0c7b9b8..2853e2a98f 100644 --- a/widgets/table/e-table-state.h +++ b/widgets/table/e-table-state.h @@ -26,7 +26,7 @@ #include <glib-object.h> #include <libxml/tree.h> -#include <gal/e-table/e-table-sort-info.h> +#include <table/e-table-sort-info.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index 6cc28e540b..5b015ca164 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-subset-variable.h" diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h index 2dc0914f9b..cda9573745 100644 --- a/widgets/table/e-table-subset-variable.h +++ b/widgets/table/e-table-subset-variable.h @@ -25,7 +25,7 @@ #define _E_TABLE_SUBSET_VARIABLE_H_ #include <glib-object.h> -#include <gal/e-table/e-table-subset.h> +#include <table/e-table-subset.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index 200dec6d9a..3f5f57bc56 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -26,7 +26,7 @@ #include <stdlib.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-subset.h" diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h index 505aa6c305..e95b7bb525 100644 --- a/widgets/table/e-table-subset.h +++ b/widgets/table/e-table-subset.h @@ -26,7 +26,7 @@ #define _E_TABLE_SUBSET_H_ #include <glib-object.h> -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h index 5648fc2f06..de1e424bc2 100644 --- a/widgets/table/e-table-tree.h +++ b/widgets/table/e-table-tree.h @@ -24,7 +24,7 @@ #ifndef _E_TABLE_TREE_H_ #define _E_TABLE_TREE_H_ -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c index af4e32de33..cede28c0db 100644 --- a/widgets/table/e-table-utils.c +++ b/widgets/table/e-table-utils.c @@ -25,8 +25,8 @@ #include <libintl.h> /* This file uses dgettext() but no _() */ -#include "gal/util/e-util.h" -#include "gal/widgets/e-unicode.h" +#include "e-util/e-util.h" +#include "widgets/misc/e-unicode.h" #include "e-table-utils.h" #include "e-table-header-utils.h" diff --git a/widgets/table/e-table-utils.h b/widgets/table/e-table-utils.h index 3c7fd937b6..a439cf3bd4 100644 --- a/widgets/table/e-table-utils.h +++ b/widgets/table/e-table-utils.h @@ -24,10 +24,10 @@ #ifndef _E_TABLE_UTILS_H_ #define _E_TABLE_UTILS_H_ -#include <gal/e-table/e-table-header.h> -#include <gal/e-table/e-table-state.h> -#include <gal/e-table/e-table-specification.h> -#include <gal/e-table/e-table-extras.h> +#include <table/e-table-header.h> +#include <table/e-table-state.h> +#include <table/e-table-specification.h> +#include <table/e-table-extras.h> G_BEGIN_DECLS diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 8fb12844b1..6f43105703 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-without.h" diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h index 6bcbdcdc65..dce6c06e08 100644 --- a/widgets/table/e-table-without.h +++ b/widgets/table/e-table-without.h @@ -25,7 +25,7 @@ #define _E_TABLE_WITHOUT_H_ #include <gtk/gtkobject.h> -#include <gal/e-table/e-table-subset.h> +#include <table/e-table-subset.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index e1802f73be..4a545c0c4a 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -35,13 +35,13 @@ #include <libgnomecanvas/gnome-canvas.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "gal/a11y/e-table/gal-a11y-e-table.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-canvas-background.h" -#include "gal/widgets/e-canvas-vbox.h" -#include "gal/widgets/e-unicode.h" +#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 "e-table.h" #include "e-table-click-to-add.h" @@ -3106,7 +3106,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, cursor_change), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); et_signals [CURSOR_ACTIVATED] = @@ -3115,7 +3115,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, cursor_activated), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); et_signals [SELECTION_CHANGE] = @@ -3124,7 +3124,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, selection_change), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); et_signals [DOUBLE_CLICK] = @@ -3133,7 +3133,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, double_click), NULL, NULL, - e_marshal_NONE__INT_INT_BOXED, + e_util_marshal_NONE__INT_INT_BOXED, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3143,7 +3143,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, right_click), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3153,7 +3153,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, click), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3163,7 +3163,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, key_press), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3173,7 +3173,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, start_drag), NULL, NULL, - e_marshal_INT__INT_INT_BOXED, + e_util_marshal_INT__INT_INT_BOXED, G_TYPE_INT, 3, G_TYPE_INT, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3183,7 +3183,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, state_change), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); et_signals [WHITE_SPACE_EVENT] = @@ -3192,7 +3192,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, white_space_event), NULL, NULL, - e_marshal_INT__BOXED, + e_util_marshal_INT__BOXED, G_TYPE_INT, 1, GDK_TYPE_EVENT); et_signals[TABLE_DRAG_BEGIN] = @@ -3201,7 +3201,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_begin), NULL, NULL, - e_marshal_NONE__INT_INT_OBJECT, + e_util_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3212,7 +3212,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_end), NULL, NULL, - e_marshal_NONE__INT_INT_OBJECT, + e_util_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3223,7 +3223,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_get), NULL, NULL, - e_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT, + e_util_marshal_NONE__INT_INT_OBJECT_BOXED_UINT_UINT, G_TYPE_NONE, 6, G_TYPE_INT, G_TYPE_INT, @@ -3237,7 +3237,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_delete), NULL, NULL, - e_marshal_NONE__INT_INT_OBJECT, + e_util_marshal_NONE__INT_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_INT, @@ -3249,7 +3249,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_leave), NULL, NULL, - e_marshal_NONE__INT_INT_OBJECT_UINT, + e_util_marshal_NONE__INT_INT_OBJECT_UINT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, @@ -3261,7 +3261,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_motion), NULL, NULL, - e_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, + e_util_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 6, G_TYPE_INT, G_TYPE_INT, @@ -3275,7 +3275,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_drop), NULL, NULL, - e_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, + e_util_marshal_BOOLEAN__INT_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 6, G_TYPE_INT, G_TYPE_INT, @@ -3289,7 +3289,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, table_drag_data_received), NULL, NULL, - e_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT, + e_util_marshal_NONE__INT_INT_OBJECT_INT_INT_BOXED_UINT_UINT, G_TYPE_NONE, 8, G_TYPE_INT, G_TYPE_INT, @@ -3308,7 +3308,7 @@ e_table_class_init (ETableClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETableClass, set_scroll_adjustments), NULL, NULL, - e_marshal_NONE__OBJECT_OBJECT, + e_util_marshal_NONE__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD, diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index f025318905..a314fb8915 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -29,18 +29,18 @@ #include <gtk/gtkdnd.h> #include <gtk/gtktable.h> #include <libxml/tree.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table-header.h> -#include <gal/e-table/e-table-group.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-table-selection-model.h> -#include <gal/e-table/e-table-extras.h> -#include <gal/e-table/e-table-specification.h> -#include <gal/widgets/e-printable.h> -#include <gal/e-table/e-table-state.h> -#include <gal/e-table/e-table-sorter.h> -#include <gal/e-table/e-table-search.h> +#include <table/e-table-model.h> +#include <table/e-table-header.h> +#include <table/e-table-group.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-item.h> +#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 <table/e-table-state.h> +#include <table/e-table-sorter.h> +#include <table/e-table-search.h> G_BEGIN_DECLS diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index 72212116ef..999d47cd78 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -25,7 +25,7 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-tree-memory-callbacks.h" diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h index 0f75fa98be..9fa70912e3 100644 --- a/widgets/table/e-tree-memory-callbacks.h +++ b/widgets/table/e-tree-memory-callbacks.h @@ -25,7 +25,7 @@ #ifndef _E_TREE_MEMORY_CALLBACKS_H_ #define _E_TREE_MEMORY_CALLBACKS_H_ -#include <gal/e-table/e-tree-memory.h> +#include <table/e-tree-memory.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 554e308def..2e87c8da86 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -33,8 +33,8 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-tree-memory.h" diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h index ce0003b60a..a51e008d1a 100644 --- a/widgets/table/e-tree-memory.h +++ b/widgets/table/e-tree-memory.h @@ -26,7 +26,7 @@ #define _E_TREE_MEMORY_H_ #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gal/e-table/e-tree-model.h> +#include <table/e-tree-model.h> G_BEGIN_DECLS diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index 32a890daae..af88c0e3cb 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -33,8 +33,8 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-tree-model.h" @@ -109,7 +109,7 @@ e_tree_model_class_init (GObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_col_changed), (GSignalAccumulator) NULL, NULL, - e_marshal_VOID__POINTER_INT, + e_util_marshal_VOID__POINTER_INT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_INT); e_tree_model_signals [NODE_INSERTED] = @@ -118,7 +118,7 @@ e_tree_model_class_init (GObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_inserted), (GSignalAccumulator) NULL, NULL, - e_marshal_VOID__POINTER_POINTER, + e_util_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); e_tree_model_signals [NODE_REMOVED] = @@ -127,7 +127,7 @@ e_tree_model_class_init (GObjectClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeModelClass, node_removed), (GSignalAccumulator) NULL, NULL, - e_marshal_VOID__POINTER_POINTER_INT, + e_util_marshal_VOID__POINTER_POINTER_INT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_INT); e_tree_model_signals [NODE_DELETED] = diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c index 8d9857058f..288769e4bc 100644 --- a/widgets/table/e-tree-scrolled.c +++ b/widgets/table/e-tree-scrolled.c @@ -32,8 +32,8 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-tree-scrolled.h" diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h index f861b71138..d7f617bffe 100644 --- a/widgets/table/e-tree-scrolled.h +++ b/widgets/table/e-tree-scrolled.h @@ -25,8 +25,8 @@ #define _E_TREE_SCROLLED_H_ #include <gtk/gtkscrolledwindow.h> -#include <gal/e-table/e-tree-model.h> -#include <gal/e-table/e-tree.h> +#include <table/e-tree-model.h> +#include <table/e-tree.h> G_BEGIN_DECLS diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index bc781daad5..5ecabb796a 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -24,9 +24,9 @@ #include <config.h> -#include "gal/e-table/e-tree-table-adapter.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" +#include "table/e-tree-table-adapter.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" #include "e-tree-selection-model.h" diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h index 44ebf08f31..830b366b2a 100644 --- a/widgets/table/e-tree-selection-model.h +++ b/widgets/table/e-tree-selection-model.h @@ -26,9 +26,9 @@ #include <gdk/gdktypes.h> #include <gtk/gtkobject.h> -#include <gal/util/e-sorter.h> -#include <gal/widgets/e-selection-model.h> -#include <gal/e-table/e-tree-model.h> +#include <e-util/e-sorter.h> +#include <widgets/misc/e-selection-model.h> +#include <table/e-tree-model.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index be7f09fa45..54ffa894b8 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -23,7 +23,7 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-tree-simple.h" diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h index f9980c9544..c270d658a3 100644 --- a/widgets/table/e-tree-simple.h +++ b/widgets/table/e-tree-simple.h @@ -24,8 +24,8 @@ #ifndef _E_TREE_SIMPLE_H_ #define _E_TREE_SIMPLE_H_ -#include <gal/e-table/e-tree-model.h> -#include <gal/e-table/e-table-simple.h> +#include <table/e-tree-model.h> +#include <table/e-table-simple.h> G_BEGIN_DECLS diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index 9943c9d7ea..61e87e36ff 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -26,7 +26,7 @@ #include <stdlib.h> #include <string.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-tree-sorted-variable.h" diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h index 35c4c22ffd..bd30136a41 100644 --- a/widgets/table/e-tree-sorted-variable.h +++ b/widgets/table/e-tree-sorted-variable.h @@ -26,9 +26,9 @@ #include <glib-object.h> #include <gal/e-tree/e-tree-model.h> -#include <gal/e-table/e-table-subset-variable.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-table-subset-variable.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 6854bd445c..56af65dd7d 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -38,8 +38,8 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-table-sorting-utils.h" #include "e-tree-sorted.h" diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h index 41f123dc0b..2bfe8da638 100644 --- a/widgets/table/e-tree-sorted.h +++ b/widgets/table/e-tree-sorted.h @@ -25,9 +25,9 @@ #define _E_TREE_SORTED_H_ #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gal/e-table/e-tree-model.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-tree-model.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 6b2f0fefd8..30cb3789b3 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -32,8 +32,8 @@ #include <libxml/tree.h> #include <libxml/parser.h> -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" #include "e-table-sorting-utils.h" #include "e-tree-table-adapter.h" diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h index 8ce1c78097..fdcbf2335c 100644 --- a/widgets/table/e-tree-table-adapter.h +++ b/widgets/table/e-tree-table-adapter.h @@ -26,10 +26,10 @@ #define _E_TREE_TABLE_ADAPTER_H_ #include <glib-object.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-tree-model.h> -#include <gal/e-table/e-table-sort-info.h> -#include <gal/e-table/e-table-header.h> +#include <table/e-table-model.h> +#include <table/e-tree-model.h> +#include <table/e-table-sort-info.h> +#include <table/e-table-header.h> G_BEGIN_DECLS diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 3286d40907..c5ddbbc52c 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -31,12 +31,12 @@ #include <gtk/gtk.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> -#include "gal/a11y/e-table/gal-a11y-e-tree.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/util/e-marshal.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-canvas-background.h" +#include "a11y/e-table/gal-a11y-e-tree.h" +#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 "e-table-column-specification.h" #include "e-table-header-item.h" @@ -3046,7 +3046,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, cursor_change), NULL, NULL, - e_marshal_NONE__INT_POINTER, + e_util_marshal_NONE__INT_POINTER, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER); et_signals [CURSOR_ACTIVATED] = @@ -3055,7 +3055,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, cursor_activated), NULL, NULL, - e_marshal_NONE__INT_POINTER, + e_util_marshal_NONE__INT_POINTER, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_POINTER); et_signals [SELECTION_CHANGE] = @@ -3064,7 +3064,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, selection_change), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); et_signals [DOUBLE_CLICK] = @@ -3073,7 +3073,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, double_click), NULL, NULL, - e_marshal_NONE__INT_POINTER_INT_BOXED, + e_util_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3083,7 +3083,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, right_click), NULL, NULL, - e_marshal_INT__INT_POINTER_INT_BOXED, + e_util_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3093,7 +3093,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, click), NULL, NULL, - e_marshal_INT__INT_POINTER_INT_BOXED, + e_util_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3103,7 +3103,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, key_press), NULL, NULL, - e_marshal_INT__INT_POINTER_INT_BOXED, + e_util_marshal_INT__INT_POINTER_INT_BOXED, G_TYPE_INT, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3113,7 +3113,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, start_drag), NULL, NULL, - e_marshal_NONE__INT_POINTER_INT_BOXED, + e_util_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT); @@ -3123,7 +3123,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, state_change), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); et_signals [WHITE_SPACE_EVENT] = @@ -3132,7 +3132,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, white_space_event), NULL, NULL, - e_marshal_INT__POINTER, + e_util_marshal_INT__POINTER, G_TYPE_INT, 1, GDK_TYPE_EVENT); et_signals[TREE_DRAG_BEGIN] = @@ -3141,7 +3141,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_begin), NULL, NULL, - e_marshal_NONE__INT_POINTER_INT_BOXED, + e_util_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3153,7 +3153,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_end), NULL, NULL, - e_marshal_NONE__INT_POINTER_INT_BOXED, + e_util_marshal_NONE__INT_POINTER_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3165,7 +3165,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_get), NULL, NULL, - e_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT, + e_util_marshal_NONE__INT_POINTER_INT_OBJECT_BOXED_UINT_UINT, G_TYPE_NONE, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3180,7 +3180,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_delete), NULL, NULL, - e_marshal_NONE__INT_POINTER_INT_OBJECT, + e_util_marshal_NONE__INT_POINTER_INT_OBJECT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER, @@ -3193,7 +3193,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_leave), NULL, NULL, - e_marshal_NONE__INT_POINTER_INT_OBJECT_UINT, + e_util_marshal_NONE__INT_POINTER_INT_OBJECT_UINT, G_TYPE_NONE, 5, G_TYPE_INT, G_TYPE_POINTER, @@ -3206,7 +3206,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_motion), NULL, NULL, - e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, + e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3221,7 +3221,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_drop), NULL, NULL, - e_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, + e_util_marshal_BOOLEAN__INT_POINTER_INT_OBJECT_INT_INT_UINT, G_TYPE_BOOLEAN, 7, G_TYPE_INT, G_TYPE_POINTER, @@ -3236,7 +3236,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, tree_drag_data_received), NULL, NULL, - e_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT, + e_util_marshal_NONE__INT_POINTER_INT_OBJECT_INT_INT_BOXED_UINT_UINT, G_TYPE_NONE, 9, G_TYPE_INT, G_TYPE_POINTER, @@ -3256,7 +3256,7 @@ e_tree_class_init (ETreeClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETreeClass, set_scroll_adjustments), NULL, NULL, - e_marshal_NONE__POINTER_POINTER, + e_util_marshal_NONE__POINTER_POINTER, G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index dd7d615982..87846f025d 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -28,19 +28,19 @@ #include <gtk/gtktable.h> #include <libxml/tree.h> #include <libgnomecanvas/gnome-canvas.h> -#include <gal/widgets/e-printable.h> +#include <widgets/misc/e-printable.h> -#include <gal/e-table/e-table-extras.h> -#include <gal/e-table/e-table-specification.h> -#include <gal/e-table/e-table-state.h> -#include <gal/e-table/e-tree-model.h> -#include <gal/e-table/e-tree-table-adapter.h> -#include <gal/e-table/e-table-item.h> +#include <table/e-table-extras.h> +#include <table/e-table-specification.h> +#include <table/e-table-state.h> +#include <table/e-tree-model.h> +#include <table/e-tree-table-adapter.h> +#include <table/e-table-item.h> #define E_TREE_USE_TREE_SELECTION #ifdef E_TREE_USE_TREE_SELECTION -#include <gal/e-table/e-tree-selection-model.h> +#include <table/e-tree-selection-model.h> #endif G_BEGIN_DECLS diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c index c087161458..8a6cbf4d0c 100644 --- a/widgets/table/table-test.c +++ b/widgets/table/table-test.c @@ -29,7 +29,7 @@ #include <gnome.h> -#include "gal/widgets/e-cursors.h" +#include "widgets/misc/e-cursors.h" #include "table-test.h" diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c index 237566ab27..98abc8ba08 100644 --- a/widgets/table/test-check.c +++ b/widgets/table/test-check.c @@ -28,10 +28,10 @@ #include <gnome.h> -#include "gal/widgets/e-cursors.h" -#include "gal/widgets/e-canvas-utils.h" -#include "gal/widgets/e-canvas.h" -#include "gal/util/e-util.h" +#include "widgets/misc/e-cursors.h" +#include "widgets/misc/e-canvas-utils.h" +#include "widgets/misc/e-canvas.h" +#include "e-util/e-util.h" #include "e-table-simple.h" #include "e-table-header.h" diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c index 70fa9d9534..75eee109fa 100644 --- a/widgets/table/test-cols.c +++ b/widgets/table/test-cols.c @@ -28,10 +28,10 @@ #include <gnome.h> -#include "gal/widgets/e-canvas-utils.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-cursors.h" -#include "gal/util/e-util.h" +#include "widgets/misc/e-canvas-utils.h" +#include "widgets/misc/e-canvas.h" +#include "widgets/misc/e-cursors.h" +#include "e-util/e-util.h" #include "e-table-simple.h" #include "e-table-header.h" diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c index 510f6ef2c8..2c08410b49 100644 --- a/widgets/table/test-table.c +++ b/widgets/table/test-table.c @@ -28,8 +28,8 @@ #include <gnome.h> -#include "gal/widgets/e-cursors.h" -#include "gal/widgets/e-canvas.h" +#include "widgets/misc/e-cursors.h" +#include "widgets/misc/e-canvas.h" #include "e-table-simple.h" #include "e-table-header.h" |