diff options
340 files changed, 1679 insertions, 829 deletions
@@ -1,3 +1,33 @@ +2005-06-17 Kaushal Kumar <kakumar@novell.com> + + * Retired GAL from Head. The relevant files have moved inside + evolution. Thanks to JP Rosevear for performing the cvs surgery. The + files have been moved in the following order. + + evolution/e-util <- gal/gal/util + evolution/a11y <- gal/gal/a11y + evolution/a11y/e-table <- gal/gal/a11y/e-table + evolution/a11y/e-text <- gal/gal/a11y/e-text + evolution/widgets/table <- gal/gal/e-table + evolution/widgets/text <- gal/gal/e-text + evolution/widgets/misc <- gal/gal/widgets + evolution/widgets/misc/pixmaps <- gal/gal/widgets/pixmaps + evolution/widgets/menus <- gal/gal/menus + + Following is the summary of changes done to fix the build:- + - New files added to cvs repository, + - a11y/e-table/Makefile.am + - a11y/e-text/Makefile.am + - widgets/table/Makefile.am + - widgets/text/Makefile.am + - widgets/misc/pixmaps/Makefile.am + - iconv-detect.h + - iconv-detect.c + - Updated configure.in. + - Updated all the relevant Makefile.am files. + - Updated the include paths to replace all gal references. + - Updated the marshal list to suit gal files requirements. + 2005-06-16 Harish Krishnaswamy <kharish@novell.com> * configure.in : add mono to the plugins list diff --git a/Makefile.am b/Makefile.am index c2b5584aad..6d172a22a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ EXTRA_DIST = \ NEWS \ NEWS-1.0 \ marshal.mk \ + iconv-detect.c \ plugin.mk \ server.mk \ intltool-merge.in \ @@ -52,7 +53,7 @@ SUBDIRS = \ help \ po -DISTCLEANFILES = intltool-extract intltool-merge intltool-update $(pkgconfig_DATA) +DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.c $(pkgconfig_DATA) # CDE Stuff diff --git a/a11y/Makefile.am b/a11y/Makefile.am index c98e486e7f..96a9014b70 100644 --- a/a11y/Makefile.am +++ b/a11y/Makefile.am @@ -1,16 +1,28 @@ -SUBDIRS = . calendar widgets addressbook +SUBDIRS = e-text e-table . calendar widgets addressbook # for debug #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror privlib_LTLIBRARIES = libevolution-a11y.la -INCLUDES = \ - -I$(top_srcdir)/a11y \ - $(A11Y_CFLAGS) +INCLUDES = \ + -I$(top_srcdir)/a11y \ + $(A11Y_CFLAGS) -libevolution_a11y_la_SOURCES = \ - ea-factory.h \ - ea-cell-table.h \ - ea-cell-table.c +libevolution_a11y_la_SOURCES = \ + ea-factory.h \ + ea-cell-table.h \ + ea-cell-table.c \ + gal-a11y-util.c +libevolution_a11yincludedir = $(privincludedir)/a11y + +libevolution_a11yinclude_HEADERS = \ + gal-a11y-util.h \ + gal-a11y-factory.h + +libevolution_a11y_la_LIBADD = \ + e-text/libgal-a11y-etext.la \ + e-table/libgal-a11y-etable.la \ + $(EXTRA_GNOME_LIBS) \ + $(REGEX_LIBS) diff --git a/a11y/addressbook/Makefile.am b/a11y/addressbook/Makefile.am index dfabdf27ba..5a39f32581 100644 --- a/a11y/addressbook/Makefile.am +++ b/a11y/addressbook/Makefile.am @@ -3,6 +3,7 @@ privlib_LTLIBRARIES = libevolution-addressbook-a11y.la INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-a11y\" \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_srcdir)/a11y \ -I$(top_srcdir)/a11y/addressbook \ -I$(top_srcdir)/shell \ diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c index 1abe1f2a4d..f218022ef9 100644 --- a/a11y/addressbook/ea-addressbook.c +++ b/a11y/addressbook/ea-addressbook.c @@ -23,7 +23,7 @@ * */ -#include <gal/e-text/e-text.h> +#include <text/e-text.h> #include "ea-factory.h" #include "ea-addressbook.h" #include "addressbook/ea-minicard.h" diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c index cbd53f4ebd..41330b6ffd 100644 --- a/a11y/calendar/ea-cal-view-event.c +++ b/a11y/calendar/ea-cal-view-event.c @@ -27,7 +27,7 @@ #include "ea-calendar-helpers.h" #include "ea-day-view.h" #include "ea-week-view.h" -#include <gal/e-text/e-text.h> +#include <text/e-text.h> #include <libgnome/gnome-i18n.h> static void ea_cal_view_event_class_init (EaCalViewEventClass *klass); diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c index ff3a502a67..089b634732 100644 --- a/a11y/calendar/ea-calendar-helpers.c +++ b/a11y/calendar/ea-calendar-helpers.c @@ -29,7 +29,7 @@ #include "e-day-view.h" #include "e-week-view.h" -#include <gal/e-text/e-text.h> +#include <text/e-text.h> #include <libgnomecanvas/gnome-canvas-pixbuf.h> /** diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c index 614f81e4c8..809a9f75df 100644 --- a/a11y/calendar/ea-calendar.c +++ b/a11y/calendar/ea-calendar.c @@ -23,7 +23,7 @@ * */ -#include <gal/e-text/e-text.h> +#include <text/e-text.h> #include <libgnomecanvas/gnome-canvas-pixbuf.h> #include "ea-calendar-helpers.h" #include "ea-factory.h" diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c index 3b36ac246d..32a46028a8 100644 --- a/a11y/calendar/ea-week-view.c +++ b/a11y/calendar/ea-week-view.c @@ -29,7 +29,7 @@ #include "ea-calendar-helpers.h" #include "ea-gnome-calendar.h" #include "calendar-commands.h" -#include <gal/e-text/e-text.h> +#include <text/e-text.h> #include <libgnome/gnome-i18n.h> static void ea_week_view_class_init (EaWeekViewClass *klass); diff --git a/a11y/e-table/Makefile.am b/a11y/e-table/Makefile.am new file mode 100644 index 0000000000..2864265080 --- /dev/null +++ b/a11y/e-table/Makefile.am @@ -0,0 +1,49 @@ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets/ \ + $(EXTRA_GNOME_CFLAGS) \ + $(GNOME_BONOBO_CFLAGS) \ + $(GNOME_INCLUDEDIR) \ + $(ICONV_CFLAGS) \ + $(GNOME_FULL_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-table\" + +noinst_LTLIBRARIES = libgal-a11y-etable.la + +libgal_a11y_etable_la_SOURCES = \ + gal-a11y-e-tree.c \ + gal-a11y-e-tree-factory.c \ + gal-a11y-e-cell.c \ + gal-a11y-e-cell-text.c \ + gal-a11y-e-cell-tree.c \ + gal-a11y-e-cell-toggle.c \ + gal-a11y-e-cell-popup.c \ + gal-a11y-e-cell-registry.c \ + gal-a11y-e-cell-vbox.c \ + gal-a11y-e-table.c \ + gal-a11y-e-table-item.c \ + gal-a11y-e-table-item-factory.c \ + gal-a11y-e-table-click-to-add.c \ + gal-a11y-e-table-column-header.c \ + gal-a11y-e-table-click-to-add-factory.c \ + gal-a11y-e-table-factory.c + +libgal_a11y_etableincludedir = $(privincludedir)/a11y/e-table + +libgal_a11y_etableinclude_HEADERS = \ + gal-a11y-e-tree.h \ + gal-a11y-e-tree-factory.h \ + gal-a11y-e-cell.h \ + gal-a11y-e-cell-text.h \ + gal-a11y-e-cell-tree.h \ + gal-a11y-e-cell-toggle.h \ + gal-a11y-e-cell-popup.h \ + gal-a11y-e-cell-registry.h \ + gal-a11y-e-cell-vbox.h \ + gal-a11y-e-table.h \ + gal-a11y-e-table-item.h \ + gal-a11y-e-table-click-to-add-factory.h \ + gal-a11y-e-table-click-to-add.h \ + gal-a11y-e-table-column-header.h \ + gal-a11y-e-table-item-factory.h \ + gal-a11y-e-table-factory.h diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c index d819a2fcc8..8d5e40d70e 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.c +++ b/a11y/e-table/gal-a11y-e-cell-popup.c @@ -28,9 +28,9 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-table/e-cell-popup.h" -#include "gal/util/e-i18n.h" +#include "a11y/gal-a11y-util.h" +#include "table/e-cell-popup.h" +#include "e-util/e-i18n.h" #include "gal-a11y-e-cell-popup.h" #include "gal-a11y-e-cell-registry.h" diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h index 4162ed21cc..8131857cf6 100644 --- a/a11y/e-table/gal-a11y-e-cell-popup.h +++ b/a11y/e-table/gal-a11y-e-cell-popup.h @@ -27,8 +27,8 @@ #define __GAL_A11Y_E_CELL_POPUP_H__ #include <glib-object.h> -#include <gal/e-table/e-table-item.h> -#include <gal/a11y/e-table/gal-a11y-e-cell.h> +#include <table/e-table-item.h> +#include <a11y/e-table/gal-a11y-e-cell.h> #include <atk/atkgobjectaccessible.h> #define GAL_A11Y_TYPE_E_CELL_POPUP (gal_a11y_e_cell_popup_get_type ()) diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h index eecd41139c..602d6be41e 100644 --- a/a11y/e-table/gal-a11y-e-cell-registry.h +++ b/a11y/e-table/gal-a11y-e-cell-registry.h @@ -11,8 +11,8 @@ #include <glib-object.h> #include <atk/atkobject.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-cell.h> +#include <table/e-table-item.h> +#include <table/e-cell.h> #define GAL_A11Y_TYPE_E_CELL_REGISTRY (gal_a11y_e_cell_registry_get_type ()) #define GAL_A11Y_E_CELL_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_REGISTRY, GalA11yECellRegistry)) diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c index 37785bfbf5..e1a485cd55 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.c +++ b/a11y/e-table/gal-a11y-e-cell-text.c @@ -12,9 +12,9 @@ #include <atk/atk.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-table/e-cell-text.h" -#include "gal/util/e-i18n.h" +#include "a11y/gal-a11y-util.h" +#include "table/e-cell-text.h" +#include "e-util/e-i18n.h" #include "gal-a11y-e-cell-text.h" diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h index b2cfef2bd4..1398325429 100644 --- a/a11y/e-table/gal-a11y-e-cell-text.h +++ b/a11y/e-table/gal-a11y-e-cell-text.h @@ -10,9 +10,9 @@ #define __GAL_A11Y_E_CELL_TEXT_H__ #include <glib-object.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-cell-text.h> -#include <gal/a11y/e-table/gal-a11y-e-cell.h> +#include <table/e-table-item.h> +#include <table/e-cell-text.h> +#include <a11y/e-table/gal-a11y-e-cell.h> #define GAL_A11Y_TYPE_E_CELL_TEXT (gal_a11y_e_cell_text_get_type ()) #define GAL_A11Y_E_CELL_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellText)) diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c index 4c9e47bbaf..7706062908 100644 --- a/a11y/e-table/gal-a11y-e-cell-toggle.c +++ b/a11y/e-table/gal-a11y-e-cell-toggle.c @@ -1,8 +1,8 @@ #include <gtk/gtk.h> -#include "gal/e-table/e-cell-toggle.h" -#include "gal/e-table/e-table-model.h" -#include "gal/util/e-i18n.h" +#include "table/e-cell-toggle.h" +#include "table/e-table-model.h" +#include "e-util/e-i18n.h" #include "gal-a11y-e-cell-toggle.h" diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c index 64ebfffb89..068658cafa 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.c +++ b/a11y/e-table/gal-a11y-e-cell-tree.c @@ -10,11 +10,11 @@ #include <atk/atk.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-table/e-cell-tree.h" -#include "gal/e-table/e-table.h" -#include "gal/e-table/e-tree-table-adapter.h" -#include "gal/util/e-i18n.h" +#include "a11y/gal-a11y-util.h" +#include "table/e-cell-tree.h" +#include "table/e-table.h" +#include "table/e-tree-table-adapter.h" +#include "e-util/e-i18n.h" #include "gal-a11y-e-cell-tree.h" #include "gal-a11y-e-cell-registry.h" diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h index 355670b5a4..8f621cba1d 100644 --- a/a11y/e-table/gal-a11y-e-cell-tree.h +++ b/a11y/e-table/gal-a11y-e-cell-tree.h @@ -10,8 +10,8 @@ #define __GAL_A11Y_E_CELL_TREE_H__ #include <glib-object.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-cell-tree.h> +#include <table/e-table-item.h> +#include <table/e-cell-tree.h> #include "gal-a11y-e-cell.h" #define GAL_A11Y_TYPE_E_CELL_TREE (gal_a11y_e_cell_tree_get_type ()) diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c index 6363b8c5c1..0a5125338c 100644 --- a/a11y/e-table/gal-a11y-e-cell-vbox.c +++ b/a11y/e-table/gal-a11y-e-cell-vbox.c @@ -23,7 +23,7 @@ #include <atk/atk.h> -#include "gal/e-table/e-cell-vbox.h" +#include "table/e-cell-vbox.h" #include "gal-a11y-e-cell-registry.h" #include "gal-a11y-e-cell-vbox.h" diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c index 08273637fc..85d577f8e5 100644 --- a/a11y/e-table/gal-a11y-e-cell.c +++ b/a11y/e-table/gal-a11y-e-cell.c @@ -12,10 +12,10 @@ #include <gtk/gtk.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-table/e-table.h" -#include "gal/e-table/e-tree.h" -#include "gal/util/e-i18n.h" +#include "a11y/gal-a11y-util.h" +#include "table/e-table.h" +#include "table/e-tree.h" +#include "e-util/e-i18n.h" #include "gal-a11y-e-cell.h" #include "gal-a11y-e-cell-vbox.h" diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h index 53a6c0089d..b3f5ef3277 100644 --- a/a11y/e-table/gal-a11y-e-cell.h +++ b/a11y/e-table/gal-a11y-e-cell.h @@ -10,8 +10,8 @@ #define __GAL_A11Y_E_CELL_H__ #include <glib-object.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-cell.h> +#include <table/e-table-item.h> +#include <table/e-cell.h> #define GAL_A11Y_TYPE_E_CELL (gal_a11y_e_cell_get_type ()) #define GAL_A11Y_E_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL, GalA11yECell)) diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c index c959003a8b..ab98b4a10b 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c @@ -8,8 +8,8 @@ #include <atk/atk.h> -#include "gal/e-table/e-table.h" -#include "gal/e-table/e-table-click-to-add.h" +#include "table/e-table.h" +#include "table/e-table-click-to-add.h" #include "gal-a11y-e-table.h" #include "gal-a11y-e-table-click-to-add.h" diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c index 5d7eba16e3..9d96f3cf18 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.c +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c @@ -9,11 +9,11 @@ #include <atk/atk.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-table/e-table-click-to-add.h" -#include "gal/e-table/e-table-group.h" -#include "gal/e-table/e-table-group-leaf.h" -#include "gal/util/e-i18n.h" +#include "a11y/gal-a11y-util.h" +#include "table/e-table-click-to-add.h" +#include "table/e-table-group.h" +#include "table/e-table-group-leaf.h" +#include "e-util/e-i18n.h" #include "gal-a11y-e-table-click-to-add.h" #include "gal-a11y-e-table-click-to-add-factory.h" diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.h b/a11y/e-table/gal-a11y-e-table-click-to-add.h index ea31ff6ef6..6160eadf47 100644 --- a/a11y/e-table/gal-a11y-e-table-click-to-add.h +++ b/a11y/e-table/gal-a11y-e-table-click-to-add.h @@ -4,7 +4,7 @@ #define __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__ #include <glib-object.h> -#include <gal/e-table/e-table-item.h> +#include <table/e-table-item.h> #include <atk/atkgobjectaccessible.h> #define GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD (gal_a11y_e_table_click_to_add_get_type ()) diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c index 3891c884e0..3303978a65 100644 --- a/a11y/e-table/gal-a11y-e-table-column-header.c +++ b/a11y/e-table/gal-a11y-e-table-column-header.c @@ -8,8 +8,8 @@ #include <glib/gi18n.h> #include <atk/atkobject.h> #include <atk/atkregistry.h> -#include "gal/e-table/e-table-header-item.h" -#include "gal/a11y/gal-a11y-util.h" +#include "table/e-table-header-item.h" +#include "a11y/gal-a11y-util.h" #include "gal-a11y-e-table-column-header.h" static GObjectClass *parent_class; diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c index f773471772..959de7e718 100644 --- a/a11y/e-table/gal-a11y-e-table-item-factory.c +++ b/a11y/e-table/gal-a11y-e-table-item-factory.c @@ -8,8 +8,8 @@ #include <atk/atk.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 "gal-a11y-e-table.h" #include "gal-a11y-e-table-item.h" diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index 3ba5a0067a..a5ed0c331e 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -13,13 +13,13 @@ #include <atk/atk.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-table/e-table-click-to-add.h" -#include "gal/e-table/e-table-subset.h" -#include "gal/e-table/e-table.h" -#include "gal/e-table/e-tree.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-selection-model.h" +#include "a11y/gal-a11y-util.h" +#include "table/e-table-click-to-add.h" +#include "table/e-table-subset.h" +#include "table/e-table.h" +#include "table/e-tree.h" +#include "widgets/misc/e-canvas.h" +#include "widgets/misc/e-selection-model.h" #include "gal-a11y-e-table-item.h" #include "gal-a11y-e-table-item-factory.h" diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h index 0317132804..4af38acfb4 100644 --- a/a11y/e-table/gal-a11y-e-table-item.h +++ b/a11y/e-table/gal-a11y-e-table-item.h @@ -10,7 +10,7 @@ #define __GAL_A11Y_E_TABLE_ITEM_H__ #include <glib-object.h> -#include <gal/e-table/e-table-item.h> +#include <table/e-table-item.h> #include <atk/atkgobjectaccessible.h> #define GAL_A11Y_TYPE_E_TABLE_ITEM (gal_a11y_e_table_item_get_type ()) diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c index fc5033c31d..de4a58a50b 100644 --- a/a11y/e-table/gal-a11y-e-table.c +++ b/a11y/e-table/gal-a11y-e-table.c @@ -8,12 +8,12 @@ #include <config.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-table/e-table.h" -#include "gal/e-table/e-table-click-to-add.h" -#include "gal/e-table/e-table-group.h" -#include "gal/e-table/e-table-group-container.h" -#include "gal/e-table/e-table-group-leaf.h" +#include "a11y/gal-a11y-util.h" +#include "table/e-table.h" +#include "table/e-table-click-to-add.h" +#include "table/e-table-group.h" +#include "table/e-table-group-container.h" +#include "table/e-table-group-leaf.h" #include "gal-a11y-e-table.h" #include "gal-a11y-e-table-factory.h" diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c index b4b6f5b45d..f175f78564 100644 --- a/a11y/e-table/gal-a11y-e-tree.c +++ b/a11y/e-table/gal-a11y-e-tree.c @@ -6,9 +6,9 @@ #include <config.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-table/e-table-item.h" -#include "gal/e-table/e-tree.h" +#include "a11y/gal-a11y-util.h" +#include "table/e-table-item.h" +#include "table/e-tree.h" #include "gal-a11y-e-table-item.h" #include "gal-a11y-e-tree.h" diff --git a/a11y/e-text/Makefile.am b/a11y/e-text/Makefile.am new file mode 100644 index 0000000000..bfbddff088 --- /dev/null +++ b/a11y/e-text/Makefile.am @@ -0,0 +1,22 @@ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets/ \ + $(EXTRA_GNOME_CFLAGS) \ + $(GNOME_BONOBO_CFLAGS) \ + $(GNOME_INCLUDEDIR) \ + $(ICONV_CFLAGS) \ + $(GNOME_FULL_CFLAGS) \ + $(GNOME_EXTRA_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-text\" + +noinst_LTLIBRARIES = libgal-a11y-etext.la + +libgal_a11y_etext_la_SOURCES = \ + gal-a11y-e-text-factory.c \ + gal-a11y-e-text.c + +libgal_a11y_etextincludedir = $(privincludedir)/a11y/e-text + +libgal_a11y_etextinclude_HEADERS = \ + gal-a11y-e-text-factory.h \ + gal-a11y-e-text.h diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c index 24e3c28116..732bc57af4 100644 --- a/a11y/e-text/gal-a11y-e-text-factory.c +++ b/a11y/e-text/gal-a11y-e-text-factory.c @@ -7,7 +7,7 @@ */ #include <config.h> -#include "gal/e-text/e-text.h" +#include "text/e-text.h" #include "gal-a11y-e-text-factory.h" #include "gal-a11y-e-text.h" diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c index 1ad9c33665..d23deef07d 100644 --- a/a11y/e-text/gal-a11y-e-text.c +++ b/a11y/e-text/gal-a11y-e-text.c @@ -12,9 +12,9 @@ #include <gtk/gtk.h> -#include "gal/a11y/gal-a11y-util.h" -#include "gal/e-text/e-text.h" -#include "gal/e-text/e-text-model-repos.h" +#include "a11y/gal-a11y-util.h" +#include "text/e-text.h" +#include "text/e-text-model-repos.h" #include "gal-a11y-e-text.h" #include "gal-a11y-e-text-factory.h" diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h index a4b204d296..fce1ca64e4 100644 --- a/a11y/e-text/gal-a11y-e-text.h +++ b/a11y/e-text/gal-a11y-e-text.h @@ -10,7 +10,7 @@ #define __GAL_A11Y_E_TEXT_H__ #include <glib-object.h> -#include <gal/e-table/e-table-item.h> +#include <table/e-table-item.h> #define GAL_A11Y_TYPE_E_TEXT (gal_a11y_e_text_get_type ()) #define GAL_A11Y_E_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TEXT, GalA11yEText)) diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am index 6e8e0e4a1d..21bb621394 100644 --- a/a11y/widgets/Makefile.am +++ b/a11y/widgets/Makefile.am @@ -6,6 +6,7 @@ privlib_LTLIBRARIES = libevolution-widgets-a11y.la INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-a11y\" \ + -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/a11y \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c index 9601d0b259..4dd4bfab4c 100644 --- a/a11y/widgets/ea-calendar-cell.c +++ b/a11y/widgets/ea-calendar-cell.c @@ -24,7 +24,7 @@ */ #include <gtk/gtk.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "ea-calendar-cell.h" #include "ea-calendar-item.h" #include "ea-factory.h" diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c index 82af38ecbc..b3c90532f2 100644 --- a/a11y/widgets/ea-calendar-item.c +++ b/a11y/widgets/ea-calendar-item.c @@ -28,9 +28,9 @@ #include <string.h> #include <libgnomecanvas/gnome-canvas.h> #include <glib/gdate.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "ea-calendar-item.h" #include "ea-calendar-cell.h" #include "ea-cell-table.h" diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index a2798ec665..42f0f1713e 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_builddir) \ -I$(top_srcdir)/shell \ -I$(top_builddir)/shell \ diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index fdcb4c9c9d..eaf289ae2d 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -43,7 +43,7 @@ #include <bonobo/bonobo-i18n.h> #include <gtk/gtkimage.h> #include <gconf/gconf-client.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #ifdef ENABLE_SMIME #include "smime/gui/component.h" diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index e2933c2de6..ac6e9cfac5 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -36,8 +36,8 @@ #include <libebook/e-destination.h> #include <libebook/e-book.h> #include <libgnome/gnome-i18n.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 <gtk/gtkwidget.h> #include <gtk/gtkvbox.h> #include <gtk/gtkmain.h> diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 7a7d6d801e..7ce078ff17 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -38,7 +38,7 @@ #include <bonobo/bonobo-generic-factory.h> #include <bonobo/bonobo-ui-util.h> #include <bonobo/bonobo-exception.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <libedataserverui/e-source-selector.h> #include <libedataserverui/e-passwords.h> diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index c43937752f..642bc1edf1 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -1,10 +1,11 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/addressbook/gui/merging \ - -I$(top_srcdir)/widgets/e-table \ + -I$(top_srcdir)/widgets/table \ -I$(top_builddir)/shell \ -I$(top_srcdir)/camel \ -I$(top_builddir)/camel \ diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 1fc4994594..de2f7eccc8 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -27,7 +27,7 @@ #include <glib.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include <gtk/gtkcombo.h> #include <gtk/gtkentry.h> #include <gtk/gtkstock.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c798267789..145437bf33 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -41,8 +41,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <libedataserverui/e-categories-dialog.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/e-text/e-entry.h> +#include <widgets/misc/e-gui-utils.h> +#include <text/e-entry.h> #include <libebook/e-address-western.h> #include <libedataserverui/e-source-option-menu.h> diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index de604ea6f5..10069eaca1 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index c4a5acd170..357c9d8ebf 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -33,7 +33,7 @@ #include <libedataserverui/e-source-option-menu.h> -#include <gal/e-table/e-table-scrolled.h> +#include <table/e-table-scrolled.h> #include <libgnomevfs/gnome-vfs-ops.h> #include "shell/evolution-shell-component-utils.h" diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index af1f8e1163..14f9a9ac47 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -23,7 +23,7 @@ #include <libgnomeui/gnome-app.h> #include <libgnomeui/gnome-app-helper.h> #include <glade/glade.h> -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> #include <libedataserverui/e-name-selector.h> #include "addressbook/gui/contact-editor/eab-editor.h" diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h index f7d2c50ced..55fe251ad2 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h @@ -2,7 +2,7 @@ #ifndef _E_CONTACT_LIST_MODEL_H_ #define _E_CONTACT_LIST_MODEL_H_ -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> #include <libebook/e-contact.h> #include <libebook/e-destination.h> diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index da204a4f06..db15e8602c 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -6,6 +6,7 @@ INCLUDES = \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index da029adb19..36bebc2cbc 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -14,7 +14,7 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> #include <gnome.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include "eab-gui-util.h" #define PARENT_TYPE G_TYPE_OBJECT diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 96a7ceaa91..0eb5d92a3e 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -12,7 +12,7 @@ #include "eab-gui-util.h" #include "e-minicard.h" -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include "addressbook/printing/e-contact-print.h" #include "addressbook/printing/e-contact-print-envelope.h" diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index 1321b27bb4..2eda094e60 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -2,7 +2,7 @@ #ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ -#include <gal/widgets/e-reflow-model.h> +#include <widgets/misc/e-reflow-model.h> #include <libebook/e-contact.h> #include "e-addressbook-model.h" diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h index cf139e2bee..8af5a95950 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h @@ -2,7 +2,7 @@ #ifndef _EAB_TABLE_ADAPTER_H_ #define _EAB_TABLE_ADAPTER_H_ -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> #include <libebook/e-book.h> #include <libebook/e-book-view.h> diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 37f93743e2..c7798d5176 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -27,12 +27,12 @@ #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> #include <gtk/gtkscrolledwindow.h> -#include <gal/e-table/e-table-scrolled.h> -#include <gal/e-table/e-table-model.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/menus/gal-view-factory-etable.h> -#include <gal/menus/gal-view-etable.h> -#include <gal/util/e-xml-utils.h> +#include <table/e-table-scrolled.h> +#include <table/e-table-model.h> +#include <widgets/misc/e-gui-utils.h> +#include <widgets/menus/gal-view-factory-etable.h> +#include <widgets/menus/gal-view-etable.h> +#include <e-util/e-xml-utils.h> #include <libgnomeui/gnome-dialog-util.h> #include <libgnomeprint/gnome-print.h> @@ -51,7 +51,7 @@ #include <libedataserver/e-categories.h> #ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW -#include <gal/widgets/e-treeview-selection-model.h> +#include <widgets/misc/e-treeview-selection-model.h> #include "gal-view-factory-treeview.h" #include "gal-view-treeview.h" #endif diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index a55406915e..cbea110b5e 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -22,7 +22,7 @@ #include <gtk/gtkvbox.h> #include <bonobo/bonobo-ui-component.h> -#include <gal/menus/gal-view-instance.h> +#include <widgets/menus/gal-view-instance.h> #include <libebook/e-book.h> #include "e-addressbook-model.h" #include "eab-contact-display.h" diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index df1465349e..3071e3737e 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -27,10 +27,10 @@ #include <gtk/gtksignal.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> -#include <gal/e-text/e-text.h> -#include <gal/widgets/e-canvas.h> -#include <gal/widgets/e-canvas-utils.h> +#include <e-util/e-util.h> +#include <text/e-text.h> +#include <widgets/misc/e-canvas.h> +#include <widgets/misc/e-canvas-utils.h> #include <gdk/gdkkeysyms.h> static void e_minicard_label_init (EMinicardLabel *card); diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 5490db25cd..c5bb37b81f 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -22,8 +22,8 @@ #include <config.h> #include <gtk/gtksignal.h> -#include <gal/widgets/e-canvas-background.h> -#include <gal/widgets/e-canvas.h> +#include <widgets/misc/e-canvas-background.h> +#include <widgets/misc/e-canvas.h> #include <libgnome/gnome-i18n.h> #include "eab-marshal.h" diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index ef8401b88c..daa23e769c 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -20,7 +20,7 @@ #ifndef __E_MINICARD_VIEW_WIDGET_H__ #define __E_MINICARD_VIEW_WIDGET_H__ -#include <gal/widgets/e-canvas.h> +#include <widgets/misc/e-canvas.h> #include <libebook/e-book.h> #include "e-minicard-view.h" diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index e66bb6047a..3dce38ab49 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -30,7 +30,7 @@ #include <gtk/gtkselection.h> #include <gtk/gtkdnd.h> #include <gdk/gdkkeysyms.h> -#include <gal/widgets/e-canvas.h> +#include <widgets/misc/e-canvas.h> #include <libgnome/gnome-i18n.h> #include <string.h> diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index 50964568cf..58987a4d99 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -22,8 +22,8 @@ #include "e-minicard.h" -#include <gal/widgets/e-reflow.h> -#include <gal/widgets/e-selection-model-simple.h> +#include <widgets/misc/e-reflow.h> +#include <widgets/misc/e-selection-model-simple.h> #include <libebook/e-book.h> #include "e-addressbook-reflow-adapter.h" diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index efd434d8e9..3b64ebf66c 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -28,10 +28,10 @@ #include <libgnome/gnome-i18n.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <libgnomecanvas/gnome-canvas-pixbuf.h> -#include <gal/e-text/e-text.h> -#include <gal/util/e-util.h> -#include <gal/widgets/e-canvas-utils.h> -#include <gal/widgets/e-canvas.h> +#include <text/e-text.h> +#include <e-util/e-util.h> +#include <widgets/misc/e-canvas-utils.h> +#include <widgets/misc/e-canvas.h> #include <libebook/e-book.h> #include "eab-marshal.h" #include "eab-gui-util.h" diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 460168797e..0fab34effb 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -27,7 +27,7 @@ #include <string.h> #include <libedataserverui/e-source-selector.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "eab-gui-util.h" #include "util/eab-book-util.h" #include <libebook/e-destination.h> diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c index 77497767ca..b015f865f5 100644 --- a/addressbook/gui/widgets/eab-vcard-control.c +++ b/addressbook/gui/widgets/eab-vcard-control.c @@ -31,7 +31,7 @@ #include <bonobo/bonobo-persist.h> #include <bonobo/bonobo-persist-stream.h> #include <bonobo/bonobo-stream-client.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <libebook/e-book.h> #include <libebook/e-contact.h> diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h index 02eea99e47..b1313858eb 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.h +++ b/addressbook/gui/widgets/gal-view-factory-minicard.h @@ -11,7 +11,7 @@ #define _GAL_VIEW_FACTORY_MINICARD_H_ #include <gtk/gtkobject.h> -#include <gal/menus/gal-view-factory.h> +#include <widgets/menus/gal-view-factory.h> #define GAL_TYPE_VIEW_FACTORY_MINICARD (gal_view_factory_minicard_get_type ()) #define GAL_VIEW_FACTORY_MINICARD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_FACTORY_MINICARD, GalViewFactoryMinicard)) diff --git a/addressbook/gui/widgets/gal-view-factory-treeview.h b/addressbook/gui/widgets/gal-view-factory-treeview.h index 4795c6d3aa..f510079281 100644 --- a/addressbook/gui/widgets/gal-view-factory-treeview.h +++ b/addressbook/gui/widgets/gal-view-factory-treeview.h @@ -11,7 +11,7 @@ #define _GAL_VIEW_FACTORY_TREEVIEW_H_ #include <gtk/gtkobject.h> -#include <gal/menus/gal-view-factory.h> +#include <widgets/menus/gal-view-factory.h> #define GAL_TYPE_VIEW_FACTORY_TREEVIEW (gal_view_factory_treeview_get_type ()) #define GAL_VIEW_FACTORY_TREEVIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_TYPE_VIEW_FACTORY_TREEVIEW, GalViewFactoryTreeView)) diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 7f07d2d81d..05937ea990 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -10,7 +10,7 @@ #include <config.h> #include "gal-view-minicard.h" #include <libxml/parser.h> -#include <gal/util/e-xml-utils.h> +#include <e-util/e-xml-utils.h> #define PARENT_TYPE gal_view_get_type () #define d(x) x diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h index e586012f73..7cde291e16 100644 --- a/addressbook/gui/widgets/gal-view-minicard.h +++ b/addressbook/gui/widgets/gal-view-minicard.h @@ -10,7 +10,7 @@ #ifndef _GAL_VIEW_MINICARD_H_ #define _GAL_VIEW_MINICARD_H_ -#include <gal/menus/gal-view.h> +#include <widgets/menus/gal-view.h> #include <e-minicard-view-widget.h> #define GAL_TYPE_VIEW_MINICARD (gal_view_minicard_get_type ()) diff --git a/addressbook/gui/widgets/gal-view-treeview.c b/addressbook/gui/widgets/gal-view-treeview.c index e18ae6341b..a62ab23af3 100644 --- a/addressbook/gui/widgets/gal-view-treeview.c +++ b/addressbook/gui/widgets/gal-view-treeview.c @@ -10,7 +10,7 @@ #include <config.h> #include "gal-view-treeview.h" #include <libxml/parser.h> -#include <gal/util/e-xml-utils.h> +#include <e-util/e-xml-utils.h> #define PARENT_TYPE gal_view_get_type () #define d(x) x diff --git a/addressbook/gui/widgets/gal-view-treeview.h b/addressbook/gui/widgets/gal-view-treeview.h index a0313856a6..aeea2e564f 100644 --- a/addressbook/gui/widgets/gal-view-treeview.h +++ b/addressbook/gui/widgets/gal-view-treeview.h @@ -10,7 +10,7 @@ #ifndef _GAL_VIEW_TREEVIEW_H_ #define _GAL_VIEW_TREEVIEW_H_ -#include <gal/menus/gal-view.h> +#include <widgets/menus/gal-view.h> #include <gtk/gtktreeview.h> #define GAL_TYPE_VIEW_TREEVIEW (gal_view_treeview_get_type ()) diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c index 081c061f3e..ae3256b7b8 100644 --- a/addressbook/gui/widgets/test-reflow.c +++ b/addressbook/gui/widgets/test-reflow.c @@ -54,9 +54,9 @@ #include <gtk/gtkvbox.h> #include <libgnomeui/gnome-canvas-rect-ellipse.h> #include <libgnomeui/gnome-init.h> -#include <gal/widgets/e-canvas.h> -#include <gal/widgets/e-reflow.h> -#include <gal/widgets/e-scroll-frame.h> +#include <widgets/misc/e-canvas.h> +#include <widgets/misc/e-reflow.h> +#include <widgets/misc/e-scroll-frame.h> #include "e-minicard.h" diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index f0a7eff6d6..be414e602d 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -40,7 +40,7 @@ #include <libgnomeprintui/gnome-print-job-preview.h> #include <libebook/e-book.h> #include <libebook/e-contact.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <e-util/e-print.h> #define SCALE 5 diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index 85c21832e9..20d642de8e 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -19,6 +19,7 @@ libeabutil_la_SOURCES = \ libeabutil_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la MARSHAL_GENERATED = eab-marshal.c eab-marshal.h diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index cab9ee58ff..d8d21b0f5b 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -32,7 +32,7 @@ #include <string.h> #include <time.h> #include <libgnomeui/gnome-dialog.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <widgets/e-timezone-dialog/e-timezone-dialog.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h index 6d1de25590..5febd7d833 100644 --- a/calendar/gui/calendar-view-factory.h +++ b/calendar/gui/calendar-view-factory.h @@ -21,7 +21,7 @@ #ifndef CALENDAR_VIEW_FACTORY_H #define CALENDAR_VIEW_FACTORY_H -#include <gal/menus/gal-view-factory.h> +#include <widgets/menus/gal-view-factory.h> #include "gnome-cal.h" G_BEGIN_DECLS diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h index 8b85966a90..bac7d8e246 100644 --- a/calendar/gui/calendar-view.h +++ b/calendar/gui/calendar-view.h @@ -21,7 +21,7 @@ #ifndef CALENDAR_VIEW_H #define CALENDAR_VIEW_H -#include <gal/menus/gal-view.h> +#include <widgets/menus/gal-view.h> #include "gnome-cal.h" G_BEGIN_DECLS diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 11cdf3bd6d..a83d4ee7a2 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_builddir) \ -I$(top_srcdir)/calendar \ -I$(top_srcdir)/calendar/cal-client \ diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index 7290110a8d..263a415f41 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -35,7 +35,7 @@ #include <libgnome/gnome-i18n.h> #include <glade/glade.h> #include <libgnomeui/gnome-stock-icons.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include <widgets/misc/e-dateedit.h> #include <e-util/e-dialog-utils.h> #include <e-util/e-dialog-widgets.h> diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 6a5915c89c..f82c9320b5 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -42,13 +42,13 @@ #include <gtk/gtksignal.h> #include <gtk/gtkvscrollbar.h> #include <gtk/gtkwindow.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/e-table/e-table-memory-store.h> -#include <gal/e-table/e-cell-checkbox.h> -#include <gal/e-table/e-cell-toggle.h> -#include <gal/e-table/e-cell-text.h> -#include <gal/e-table/e-cell-combo.h> -#include <gal/widgets/e-popup-menu.h> +#include <widgets/misc/e-gui-utils.h> +#include <table/e-table-memory-store.h> +#include <table/e-cell-checkbox.h> +#include <table/e-cell-toggle.h> +#include <table/e-cell-text.h> +#include <table/e-cell-combo.h> +#include <widgets/misc/e-popup-menu.h> #include <widgets/misc/e-cell-date-edit.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-exec.h> diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h index d5e2fc4960..8a2eec933e 100644 --- a/calendar/gui/e-cal-model.h +++ b/calendar/gui/e-cal-model.h @@ -22,7 +22,7 @@ #ifndef E_CAL_MODEL_H #define E_CAL_MODEL_H -#include <gal/e-table/e-table-model.h> +#include <table/e-table-model.h> #include <libecal/e-cal.h> #include "e-cell-date-edit-text.h" diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index a3d50bb475..675aac86f7 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -34,11 +34,11 @@ #include <sys/stat.h> #include <unistd.h> #include <gnome.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/e-table/e-cell-checkbox.h> -#include <gal/e-table/e-cell-toggle.h> -#include <gal/e-table/e-cell-text.h> -#include <gal/e-table/e-cell-combo.h> +#include <widgets/misc/e-gui-utils.h> +#include <table/e-cell-checkbox.h> +#include <table/e-cell-toggle.h> +#include <table/e-cell-text.h> +#include <table/e-cell-combo.h> #include <e-util/e-dialog-utils.h> #include <widgets/misc/e-cell-date-edit.h> #include <widgets/misc/e-cell-percent.h> diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h index 48af37831a..e9fcb06af6 100644 --- a/calendar/gui/e-calendar-table.h +++ b/calendar/gui/e-calendar-table.h @@ -25,7 +25,7 @@ #define _E_CALENDAR_TABLE_H_ #include <gtk/gtktable.h> -#include <gal/e-table/e-table-scrolled.h> +#include <table/e-table-scrolled.h> #include <widgets/misc/e-cell-date-edit.h> #include "e-activity-handler.h" #include "e-cal-model.h" diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index 635aaf0032..b72330d75c 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -37,7 +37,7 @@ #include <libgnomeui/gnome-messagebox.h> #include <libgnomeui/gnome-stock-icons.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <e-util/e-time-utils.h> #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h index ab00c0b39c..2ca74b7756 100644 --- a/calendar/gui/e-cell-date-edit-text.h +++ b/calendar/gui/e-cell-date-edit-text.h @@ -30,7 +30,7 @@ #define _E_CELL_DATE_EDIT_TEXT_H_ #include <libical/ical.h> -#include <gal/e-table/e-cell-text.h> +#include <table/e-cell-text.h> G_BEGIN_DECLS diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index ae57439a10..eefbeef5e5 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -37,7 +37,7 @@ #include <gtk/gtkradiomenuitem.h> #include <gtk/gtkcheckmenuitem.h> #include <libgnome/gnome-i18n.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include "e-day-view-time-item.h" #include "calendar-config.h" #include <libecal/e-cal-time-util.h> diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 9dbfd5990a..dc24ba258e 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -42,11 +42,11 @@ #include <gtk/gtksignal.h> #include <gtk/gtkvscrollbar.h> #include <gtk/gtkwindow.h> -#include <gal/e-text/e-text.h> -#include <gal/widgets/e-canvas-utils.h> -#include <gal/widgets/e-popup-menu.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/widgets/e-unicode.h> +#include <text/e-text.h> +#include <widgets/misc/e-canvas-utils.h> +#include <widgets/misc/e-popup-menu.h> +#include <widgets/misc/e-gui-utils.h> +#include <widgets/misc/e-unicode.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-exec.h> diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 5f92ab6a63..74b68d7153 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -54,8 +54,8 @@ #include <libgnome/gnome-i18n.h> #include <libgnomecanvas/gnome-canvas-widget.h> -#include <gal/widgets/e-canvas.h> -#include <gal/widgets/e-canvas-utils.h> +#include <widgets/misc/e-canvas.h> +#include <widgets/misc/e-canvas-utils.h> #include <widgets/misc/e-dateedit.h> #include <e-util/e-gui-utils.h> diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index b3ff09f18f..5a4b94ff1e 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -28,9 +28,9 @@ #include <gtk/gtktable.h> #include <gtk/gtkwidget.h> #include <libgnomecanvas/gnome-canvas.h> -#include <gal/e-text/e-text.h> -#include <gal/e-table/e-table-model.h> -#include <gal/e-table/e-table.h> +#include <text/e-text.h> +#include <table/e-table-model.h> +#include <table/e-table.h> #include "e-meeting-store.h" #include "e-meeting-list-view.h" diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 3845b62bba..22d94983ac 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -28,10 +28,10 @@ #include <gnome.h> #include <libgnomevfs/gnome-vfs-ops.h> -#include <gal/e-table/e-table-scrolled.h> -#include <gal/menus/gal-view-instance.h> -#include <gal/menus/gal-view-factory-etable.h> -#include <gal/menus/gal-view-etable.h> +#include <table/e-table-scrolled.h> +#include <widgets/menus/gal-view-instance.h> +#include <widgets/menus/gal-view-factory-etable.h> +#include <widgets/menus/gal-view-etable.h> #include "e-util/e-error.h" #include "e-util/e-categories-config.h" diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 4bb3fe089a..5b3312e696 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -36,7 +36,7 @@ #include "e-week-view-event-item.h" #include <gtk/gtksignal.h> -#include <gal/e-text/e-text.h> +#include <text/e-text.h> static void e_week_view_event_item_set_arg (GtkObject *o, GtkArg *arg, diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 36e81049e1..4f6d3b2f2a 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -46,10 +46,10 @@ #include <libgnome/gnome-util.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <libgnomecanvas/gnome-canvas-pixbuf.h> -#include <gal/e-text/e-text.h> -#include <gal/widgets/e-canvas-utils.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/widgets/e-unicode.h> +#include <text/e-text.h> +#include <widgets/misc/e-canvas-utils.h> +#include <widgets/misc/e-gui-utils.h> +#include <widgets/misc/e-unicode.h> #include <e-util/e-categories-config.h> #include <e-util/e-dialog-utils.h> #include "dialogs/delete-comp.h" diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 0a038e4539..abd3cbb4a3 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -47,9 +47,9 @@ #include "e-util/e-config-listener.h" #include "shell/e-user-creatable-items-handler.h" #include <libecal/e-cal-time-util.h> -#include <gal/menus/gal-view-factory-etable.h> -#include <gal/menus/gal-view-etable.h> -#include <gal/menus/gal-define-views-dialog.h> +#include <widgets/menus/gal-view-factory-etable.h> +#include <widgets/menus/gal-view-etable.h> +#include <widgets/menus/gal-define-views-dialog.h> #include "widgets/menus/gal-view-menus.h" #include "e-util/e-error.h" #include "e-comp-editor-registry.h" diff --git a/calendar/gui/print.c b/calendar/gui/print.c index fceb6c06ef..0fdd717abb 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -44,7 +44,7 @@ #include <libgnomeprintui/gnome-print-paper-selector.h> #include <libgnomeprintui/gnome-print-preview.h> #include <libgnomeprintui/gnome-print-dialog.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <e-util/e-dialog-widgets.h> #include <e-util/e-time-utils.h> #include <e-util/e-print.h> diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index d61a804fae..c9d80ee535 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -51,7 +51,7 @@ #include <gconf/gconf.h> #include <gconf/gconf-client.h> -#include <gal/e-text/e-entry.h> +#include <text/e-entry.h> #include "e-util/e-error.h" diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 190502bcaf..5f7bd99f8d 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -85,7 +85,7 @@ #include <glade/glade.h> #include <libedataserver/e-iconv.h> -#include <gal/e-text/e-entry.h> +#include <text/e-entry.h> #include "e-util/e-dialog-utils.h" #include "e-util/e-signature-list.h" diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c index 10ed5b922e..cab5c4e2da 100644 --- a/composer/evolution-composer.c +++ b/composer/evolution-composer.c @@ -29,8 +29,8 @@ #include <gtk/gtksignal.h> #include <bonobo/bonobo-item-handler.h> #include <bonobo/bonobo-generic-factory.h> -#include <gal/util/e-util.h> -#include <gal/widgets/e-gui-utils.h> +#include <e-util/e-util.h> +#include <widgets/misc/e-gui-utils.h> #include "evolution-composer.h" #include "mail/mail-config.h" #include "e-util/e-account-list.h" diff --git a/configure.in b/configure.in index c0130a4a3b..86e4f155af 100644 --- a/configure.in +++ b/configure.in @@ -111,6 +111,108 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) AC_SUBST(NO_UNDEFINED) AC_SUBST(SOEXT) +dnl ****************************** +dnl iconv checking +dnl ****************************** +have_iconv=no +AC_ARG_WITH(libiconv, [ --with-libiconv Prefix where libiconv is in +stalled]) +case $withval in +/*) + ICONV_CFLAGS="-I$withval/include" + ICONV_LIBS="-L$withval/lib" + ;; +esac + +save_CFLAGS="$CFLAGS" +save_LIBS="$LIBS" +CFLAGS="$CFLAGS $ICONV_CFLAGS" +LIBS="$LIBS $ICONV_LIBS -liconv" +AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([ +#include <iconv.h> +], [ + iconv_t cd; + cd = iconv_open ("UTF-8", "ISO-8859-1"); +], ac_cv_libiconv=yes, ac_cv_libiconv=no)) +if test $ac_cv_libiconv = yes; then + ICONV_LIBS="$ICONV_LIBS -liconv" + have_iconv=yes +else + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" + AC_CHECK_FUNC(iconv, have_iconv=yes, have_iconv=no) +fi + +if test $have_iconv = yes; then + if test $ac_cv_libiconv = no; then + AC_CHECK_FUNCS(gnu_get_libc_version) + fi + AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([ +#include <iconv.h> +#include <stdlib.h> +#include <string.h> +#ifdef HAVE_GNU_GET_LIBC_VERSION +#include <gnu/libc-version.h> +#endif + +int main (int argc, char **argv) +{ + const char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C"; + const char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E"; + char *transbuf = malloc (10), *trans = transbuf; + iconv_t cd; + size_t jp_len = strlen (jp), utf8_len = 10; + size_t utf8_real_len = strlen (utf8); + +#ifdef HAVE_GNU_GET_LIBC_VERSION + /* glibc 2.1.2's iconv is broken in hard to test ways. */ + if (!strcmp (gnu_get_libc_version (), "2.1.2")) + exit (1); +#endif + + cd = iconv_open ("UTF-8", "ISO-2022-JP"); + if (cd == (iconv_t) -1) + exit (1); + if (iconv (cd, &jp, &jp_len, &trans, &utf8_len) == -1 || jp_len != 0 +) + exit (1); + if (memcmp (utf8, transbuf, utf8_real_len) != 0) + exit (1); + + exit (0); +}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv +_libiconv_utf8=no; have_iconv=no])) +fi + +if test "$have_iconv" = no; then + AC_MSG_ERROR([You need to install a working iconv implementation, su +ch as ftp://ftp.gnu.org/pub/gnu/libiconv]) +fi +AC_SUBST(ICONV_CFLAGS) +AC_SUBST(ICONV_LIBS) + +CFLAGS="$CFLAGS -I$srcdir" + +AC_MSG_CHECKING(preferred charset formats for system iconv) +AC_TRY_RUN([ +#define CONFIGURE_IN +#include "iconv-detect.c" +],[ + AC_MSG_RESULT(found) +],[ + AC_MSG_RESULT(not found) + AC_WARN([ + *** The iconv-detect program was unable to determine the + *** preferred charset formats recognized by your system + *** iconv library. It is suggested that you install a + *** working iconv library such as the one found at + *** ftp://ftp.gnu.org/pub/gnu/libiconv + ]) +]) + +CFLAGS="$save_CFLAGS" +LIBS="$save_LIBS" + dnl alloca() AC_CHECK_HEADERS(alloca.h) @@ -1133,8 +1235,6 @@ fi dnl --- Required version numbers -GAL_REQUIRED=2.5.1 -GAL_PACKAGE=2.6 GTKHTML_REQUIRED=3.7.0 GTKHTML_PACKAGE=3.8 EDS_REQUIRED=1.3.1 @@ -1142,8 +1242,6 @@ EDS_PACKAGE=1.2 BONOBOUI_REQUIRED=2.4.2 GNOME_VFS_REQUIRED=2.4 -AC_SUBST(GAL_REQUIRED) -AC_SUBST(GAL_PACKAGE) AC_SUBST(GTKHTML_REQUIRED) AC_SUBST(GTKHTML_PACKAGE) AC_SUBST(EDS_REQUIRED) @@ -1153,7 +1251,7 @@ AC_SUBST(GNOME_VFS_REQUIRED) dnl --- Flags to get all the GNOME stuff -FULL_GNOME_DEPS="glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED" +FULL_GNOME_DEPS="glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0" EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS) AC_SUBST(GNOME_FULL_CFLAGS) @@ -1165,6 +1263,10 @@ AC_CHECK_HEADERS(libgnomeui/gnome-icon-lookup.h) AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h) CPPFLAGS="$CPPFLAGS_save" +PKG_CHECK_MODULES(EXTRA_GNOME, libgnomeprint-2.2 >= 2.2.0 libgnomeprintui-2.2 >= 2.2.1 libglade-2.0 libgnomeui-2.0 libgnomecanvas-2.0 >= 2.2.0.2 libxml-2.0) +AC_SUBST(EXTRA_GNOME_LIBS) +AC_SUBST(EXTRA_GNOME_CFLAGS) + dnl --- Flags for the various libraries we build EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE) @@ -1198,11 +1300,11 @@ EVO_SET_COMPILE_FLAGS(CERT_UI, glib-2.0 gobject-2.0 gthread-2.0, AC_SUBST(CERT_UI_CFLAGS) AC_SUBST(CERT_UI_LIBS) -EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gal-$GAL_PACKAGE >= $GAL_REQUIRED) +EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED) AC_SUBST(E_NAME_CFLAGS) AC_SUBST(E_NAME_LIBS) -EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 libgnomeprintui-2.2 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 libgnomeprintui-2.2 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) @@ -1210,7 +1312,7 @@ EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE >= $EDS_REQUIRED, $GNOME_FU AC_SUBST(TZDIALOG_CFLAGS) AC_SUBST(TZDIALOG_LIBS) -EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libedataserverui-$EDS_PACKAGE) +EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 libedataserverui-$EDS_PACKAGE) AC_SUBST(E_WIDGETS_CFLAGS) AC_SUBST(E_WIDGETS_LIBS) @@ -1218,19 +1320,19 @@ EVO_SET_COMPILE_FLAGS(IMPORTERS, camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE AC_SUBST(IMPORTERS_CFLAGS) AC_SUBST(IMPORTERS_LIBS) -EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED) +EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED) AC_SUBST(LIBFILTER_CFLAGS) AC_SUBST(LIBFILTER_LIBS) dnl --- evolution (shell) flags -EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED) +EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED) AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) dnl --- evolution-addressbook flags -EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-$EDS_PACKAGE" +EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-$EDS_PACKAGE" EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) @@ -1256,7 +1358,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP >= $LIBSOUP_REQUIRED) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED) +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) @@ -1268,7 +1370,7 @@ fi dnl --- evolution-mail flags -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gal-$GAL_PACKAGE >= $GAL_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED) +EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED) AC_SUBST(EVOLUTION_MAIL_CFLAGS) AC_SUBST(EVOLUTION_MAIL_LIBS) @@ -1568,6 +1670,8 @@ a11y/Makefile a11y/addressbook/Makefile a11y/calendar/Makefile a11y/widgets/Makefile +a11y/e-table/Makefile +a11y/e-text/Makefile addressbook/Makefile addressbook/conduit/Makefile addressbook/gui/Makefile @@ -1613,6 +1717,8 @@ widgets/Makefile widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile +widgets/text/Makefile +widgets/table/Makefile calendar/Makefile calendar/importers/Makefile calendar/common/Makefile diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 2dbd2d7962..599f93a051 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -1,15 +1,27 @@ eutilincludedir = $(privincludedir)/e-util econdincludedir = $(privincludedir)/e-conduit +if OS_WIN32 +PLATFORM_SOURCES = e-win32-reloc.c +endif + INCLUDES = \ -I$(top_srcdir) \ + -I$(top_builddir) \ + -DEVOLUTION_PREFIX=\""$(prefix)"\" \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \ -DEVOLUTION_PLUGINDIR=\""$(plugindir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DGAL_IMAGESDIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=\"e-utils\" \ $(GNOME_PILOT_CFLAGS) \ + $(EXTRA_GNOME_CFLAGS) \ + $(GNOME_FULL_CFLAGS) \ + $(GNOME_INCLUDEDIR) \ + $(ICONV_CFLAGS) \ $(E_UTIL_CFLAGS) privlib_LTLIBRARIES = libeutil.la libeconduit.la @@ -19,7 +31,6 @@ eutilinclude_HEADERS = \ e-account.h \ e-bconf-map.h \ e-categories-config.h \ - e-categories-master-list-wombat.h \ e-component-listener.h \ e-config.h \ e-config-listener.h \ @@ -50,7 +61,16 @@ eutilinclude_HEADERS = \ e-signature-list.h \ e-time-utils.h \ e-uid.h \ - md5-utils.h + md5-utils.h \ + e-bit-array.h \ + e-iconv.h \ + e-sorter.h \ + e-sorter-array.h \ + e-text-event-processor-emacs-like.h \ + e-text-event-processor-types.h \ + e-text-event-processor.h \ + e-util.h \ + e-xml-utils.h libeutil_la_SOURCES = \ $(MARSHAL_GENERATED) \ @@ -59,7 +79,6 @@ libeutil_la_SOURCES = \ e-account.c \ e-bconf-map.c \ e-categories-config.c \ - e-categories-master-list-wombat.c \ e-component-listener.c \ e-config.c \ e-config-listener.c \ @@ -92,7 +111,18 @@ libeutil_la_SOURCES = \ e-uid.c \ eggtrayicon.c \ eggtrayicon.h \ - md5-utils.c + md5-utils.c \ + e-bit-array.c \ + e-i18n.h \ + e-iconv.c \ + e-sorter.c \ + e-sorter-array.c \ + e-text-event-processor-emacs-like.c \ + e-text-event-processor.c \ + e-util.c \ + e-util-private.h \ + e-xml-utils.c \ + $(PLATFORM_SOURCES) MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h @EVO_MARSHAL_RULE@ diff --git a/e-util/e-categories-master-list-wombat.h b/e-util/e-categories-master-list-wombat.h index 024d7644e7..f11763aed5 100644 --- a/e-util/e-categories-master-list-wombat.h +++ b/e-util/e-categories-master-list-wombat.h @@ -2,7 +2,7 @@ #ifndef _E_CATEGORIES_MASTER_LIST_WOMBAT_H_ #define _E_CATEGORIES_MASTER_LIST_WOMBAT_H_ -#include <gal/widgets/e-categories-master-list-array.h> +#include <widgets/misc/e-categories-master-list-array.h> G_BEGIN_DECLS diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 67a9a5adf8..0dcf9c91a0 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -36,7 +36,7 @@ #include <stdio.h> #include <time.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "e-mktemp.h" diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h index 227e437443..a668de948c 100644 --- a/e-util/e-sorter-array.h +++ b/e-util/e-sorter-array.h @@ -26,7 +26,7 @@ #include <glib.h> #include <glib-object.h> -#include <gal/util/e-sorter.h> +#include <e-util/e-sorter.h> G_BEGIN_DECLS diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h index 1fd74dacfe..98a1cb535e 100644 --- a/e-util/e-text-event-processor-emacs-like.h +++ b/e-util/e-text-event-processor-emacs-like.h @@ -24,7 +24,7 @@ #ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ #define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ -#include <gal/util/e-text-event-processor.h> +#include <e-util/e-text-event-processor.h> #ifdef __cplusplus extern "C" { diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c index 9a9dfb3368..733ecae11e 100644 --- a/e-util/e-text-event-processor.c +++ b/e-util/e-text-event-processor.c @@ -24,7 +24,7 @@ #include <config.h> #include "e-i18n.h" -#include "e-marshal.h" +#include "e-util-marshal.h" #include "e-text-event-processor.h" #include "e-util.h" @@ -81,7 +81,7 @@ e_text_event_processor_class_init (ETextEventProcessorClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextEventProcessorClass, command), NULL, NULL, - e_marshal_NONE__POINTER, + e_util_marshal_NONE__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index 21f2550fde..ed99b2204c 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -26,7 +26,7 @@ #include <glib.h> #include <gtk/gtkobject.h> -#include <gal/util/e-text-event-processor-types.h> +#include <e-util/e-text-event-processor-types.h> #ifdef __cplusplus extern "C" { diff --git a/e-util/e-time-utils.c b/e-util/e-time-utils.c index 8f05427a81..541a8cd0df 100644 --- a/e-util/e-time-utils.c +++ b/e-util/e-time-utils.c @@ -17,7 +17,7 @@ #include <time.h> #include <sys/time.h> -#include <gal/widgets/e-unicode.h> +#include <widgets/misc/e-unicode.h> #ifdef __linux__ #undef _GNU_SOURCE @@ -27,7 +27,7 @@ #include <ctype.h> #include <glib.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "e-time-utils.h" diff --git a/e-util/e-util-marshal.list b/e-util/e-util-marshal.list index 463afd8129..b478efb1ce 100644 --- a/e-util/e-util-marshal.list +++ b/e-util/e-util-marshal.list @@ -1,2 +1,52 @@ +BOOLEAN:INT,INT,OBJECT,INT,INT,UINT +BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT +BOOLEAN:NONE +BOOLEAN:OBJECT +BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN +BOOLEAN:POINTER,POINTER,INT,INT,INT +BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT +BOOLEAN:STRING,INT +DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN +INT:BOXED +INT:INT +INT:INT,INT,BOXED +INT:INT,POINTER,INT,BOXED +INT:OBJECT,BOXED +INT:POINTER +NONE:BOXED +NONE:BOXED,INT +NONE:BOXED,INT,INT +NONE:DOUBLE +NONE:INT +NONE:INT,INT +NONE:INT,INT,BOXED +NONE:INT,INT,OBJECT +NONE:INT,INT,OBJECT,BOXED,UINT,UINT +NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT +NONE:INT,INT,OBJECT,POINTER,UINT,UINT +NONE:INT,INT,OBJECT,UINT +NONE:INT,INT,STRING,STRING +NONE:INT,INT,STRING,STRING,POINTER +NONE:INT,POINTER +NONE:INT,POINTER,INT,BOXED +NONE:INT,POINTER,INT,OBJECT +NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT +NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT +NONE:INT,POINTER,INT,OBJECT,UINT +NONE:INT,STRING NONE:NONE NONE:OBJECT +NONE:OBJECT,OBJECT +NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN +NONE:POINTER +NONE:POINTER,BOOLEAN +NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN +NONE:POINTER,INT +NONE:POINTER,INT,INT +NONE:POINTER,INT,INT,INT +NONE:POINTER,INT,INT,INT,INT +NONE:POINTER,INT,OBJECT +NONE:POINTER,POINTER +NONE:POINTER,POINTER,INT +OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN +POINTER:NONE diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h index 10a1194a9b..13066d9f36 100644 --- a/e-util/e-util-private.h +++ b/e-util/e-util-private.h @@ -32,11 +32,11 @@ const char *_gal_get_localedir (void) G_GNUC_CONST; const char *_gal_get_gladedir (void) G_GNUC_CONST; const char *_gal_get_imagesdir (void) G_GNUC_CONST; -#undef GAL_LOCALEDIR -#define GAL_LOCALEDIR _gal_get_localedir () +#undef EVOLUTION_LOCALEDIR +#define EVOLUTION_LOCALEDIR _gal_get_localedir () -#undef GAL_GLADEDIR -#define GAL_GLADEDIR _gal_get_gladedir () +#undef EVOLUTION_GLADEDIR +#define EVOLUTION_GLADEDIR _gal_get_gladedir () #undef GAL_IMAGESDIR #define GAL_IMAGESDIR _gal_get_imagesdir () diff --git a/e-util/e-util.c b/e-util/e-util.c index 1a4fd13fd2..28f2596583 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -346,8 +346,7 @@ e_read_uri(const char *uri) /* Include build marshalers */ -#include "e-marshal.h" -#include "e-marshal.c" +#include "e-util-marshal.h" gchar** e_strsplit (const gchar *string, @@ -1232,7 +1231,7 @@ e_gettext (const char *msgid) static gboolean initialized = FALSE; if (!initialized) { - bindtextdomain (E_I18N_DOMAIN, GAL_LOCALEDIR); + bindtextdomain (E_I18N_DOMAIN, EVOLUTION_LOCALEDIR); bind_textdomain_codeset (E_I18N_DOMAIN, "UTF-8"); initialized = TRUE; } diff --git a/e-util/e-util.h b/e-util/e-util.h index d9d51967d1..6fe75746c2 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -33,7 +33,7 @@ extern "C" { #pragma } #endif /* __cplusplus */ -#include <gal/util/e-marshal.h> +#include <e-util/e-util-marshal.h> #define E_MAKE_TYPE(l,str,t,ci,i,parent) \ GType l##_get_type(void)\ diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c index 20db453381..d737001ce1 100644 --- a/e-util/e-win32-reloc.c +++ b/e-util/e-win32-reloc.c @@ -65,10 +65,10 @@ replace_prefix (const char *runtime_prefix, const char *configure_time_path) { if (runtime_prefix && - strncmp (configure_time_path, GAL_PREFIX "/", - strlen (GAL_PREFIX) + 1) == 0) { + strncmp (configure_time_path, EVOLUTION_PREFIX "/", + strlen (EVOLUTION_PREFIX) + 1) == 0) { return g_strconcat (runtime_prefix, - configure_time_path + strlen (GAL_PREFIX), + configure_time_path + strlen (EVOLUTION_PREFIX), NULL); } else return g_strdup (configure_time_path); @@ -88,10 +88,10 @@ setup (void) gnome_win32_get_prefixes (hmodule, &full_prefix, &cp_prefix); - localedir = replace_prefix (cp_prefix, GAL_LOCALEDIR); + localedir = replace_prefix (cp_prefix, EVOLUTION_LOCALEDIR); g_free (cp_prefix); - gladedir = replace_prefix (full_prefix, GAL_GLADEDIR); + gladedir = replace_prefix (full_prefix, EVOLUTION_GLADEDIR); imagesdir = replace_prefix (full_prefix, GAL_IMAGESDIR); g_free (full_prefix); diff --git a/evolution-plugin.pc.in b/evolution-plugin.pc.in index 59aecc25c7..4cf88fd8a9 100644 --- a/evolution-plugin.pc.in +++ b/evolution-plugin.pc.in @@ -14,6 +14,6 @@ errordir=@privdatadir@/errors Name: evolution-plugin Description: libraries needed for Evolution plugin development Version: @VERSION@ -Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= @BONOBOUI_REQUIRED@ gal-@GAL_PACKAGE@ >= @GAL_REQUIRED@ camel-provider-1.2 +Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= @BONOBOUI_REQUIRED@ camel-provider-1.2 Libs: -L${privlibdir} -leutil Cflags: -I${privincludedir} diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in index 5d47d32782..bf4d61baae 100644 --- a/evolution-shell.pc.in +++ b/evolution-shell.pc.in @@ -18,6 +18,6 @@ IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@ Name: evolution-shell Description: libraries needed for Evolution shell components Version: @VERSION@ -Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= @BONOBOUI_REQUIRED@ gal-@GAL_PACKAGE@ >= @GAL_REQUIRED@ +Requires: libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= @BONOBOUI_REQUIRED@ Libs: -L${privlibdir} -leshell Cflags: -I${privincludedir} diff --git a/filter/rule-context.c b/filter/rule-context.c index 2587b65150..ffab5bf655 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -34,7 +34,7 @@ #include <gtk/gtk.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-xml-utils.h> +#include <e-util/e-xml-utils.h> #include "e-util/e-error.h" #include "rule-context.h" diff --git a/iconv-detect.c b/iconv-detect.c new file mode 100644 index 0000000000..899d07f239 --- /dev/null +++ b/iconv-detect.c @@ -0,0 +1,186 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Authors: Jeffrey Stedfast <fejj@ximian.com> + * + * Copyright 2002 Ximian, Inc. (www.ximian.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. + * + */ + + +#include <stdio.h> +#include <iconv.h> + +enum { + ISO_UNSUPPORTED = 0, + + /* iso-8859-1 */ + ISO_DASH_D_DASH_D_LOWER = (1 << 0), + ISO_DASH_D_DASH_D = (1 << 1), + ISO_D_DASH_D = (1 << 2), + ISO_D_D = (1 << 3), + ISO_UNDER_D_DASH_D = (1 << 4), + NO_ISO_D_DASH_D = (1 << 5), + + /* iso-10646-1 */ + /*ISO_DASH_D_DASH_D_LOWER = (1 << 0),*/ + /*ISO_DASH_D_DASH_D = (1 << 1),*/ + /*ISO_D_DASH_D = (1 << 2),*/ + ISO_DASH_D_LOWER = (1 << 3), + ISO_DASH_D = (1 << 4), + ISO_D = (1 << 5), + UCS4 = (1 << 6), + + /* iso-2022-jp */ + ISO_DASH_D_DASH_S_LOWER = (1 << 0), + ISO_DASH_D_DASH_S = (1 << 1), + ISO_D_DASH_S = (1 << 2), +}; + + +typedef struct { + char *charset; + char *format; + int id; +} CharInfo; + + +static CharInfo iso8859_tests[] = { + { "iso-8859-1", "iso-%d-%d", ISO_DASH_D_DASH_D_LOWER }, + { "ISO-8859-1", "ISO-%d-%d", ISO_DASH_D_DASH_D }, + { "ISO8859-1", "ISO%d-%d", ISO_D_DASH_D }, + { "ISO88591", "ISO%d%d", ISO_D_D }, + { "ISO_8859-1", "ISO_%d-%d", ISO_UNDER_D_DASH_D }, + { "8859-1", "%d-%d", NO_ISO_D_DASH_D }, +}; + +static int num_iso8859_tests = sizeof (iso8859_tests) / sizeof (CharInfo); + +static CharInfo iso2022_tests[] = { + { "iso-2022-jp", "iso-%d-%s", ISO_DASH_D_DASH_S_LOWER }, + { "ISO-2022-JP", "ISO-%d-%s", ISO_DASH_D_DASH_S }, + { "ISO2022-JP", "ISO%d-%s", ISO_D_DASH_S }, +}; + +static int num_iso2022_tests = sizeof (iso2022_tests) / sizeof (CharInfo); + +static CharInfo iso10646_tests[] = { + { "iso-10646-1", "iso-%d-%d", ISO_DASH_D_DASH_D_LOWER }, + { "ISO-10646-1", "ISO-%d-%d", ISO_DASH_D_DASH_D }, + { "ISO10646-1", "ISO%d-%d", ISO_D_DASH_D }, + { "iso-10646", "iso-%d", ISO_DASH_D_LOWER }, + { "ISO-10646", "ISO-%d", ISO_DASH_D }, + { "ISO10646", "ISO%d", ISO_D }, + { "UCS-4BE", "UCS-4BE", UCS4 }, +}; + +static int num_iso10646_tests = sizeof (iso10646_tests) / sizeof (CharInfo); + + +int main (int argc, char **argv) +{ + unsigned int bits, iso8859, iso2022, iso10646; + CharInfo *info; + iconv_t cd; + FILE *fp; + int i; + + fp = fopen ("iconv-detect.h", "w"); + if (fp == NULL) + exit (255); + + fprintf (fp, "/* This is an auto-generated header, DO NOT EDIT! */\n\n"); + + iso8859 = ISO_UNSUPPORTED; + info = iso8859_tests; + /*printf ("#define DEFAULT_ISO_FORMAT(iso,codepage)\t");*/ + for (i = 0; i < num_iso8859_tests; i++) { + cd = iconv_open (info[i].charset, "UTF-8"); + if (cd != (iconv_t) -1) { + iconv_close (cd); + /*printf ("(\"%s\", (iso), (codepage))\n", info[i].format);*/ + fprintf (stderr, "System prefers %s\n", info[i].charset); + iso8859 = info[i].id; + break; + } + } + + if (iso8859 == ISO_UNSUPPORTED) { + fprintf (stderr, "System doesn't support any ISO-8859-1 formats\n"); + fprintf (fp, "#define ICONV_ISO_D_FORMAT \"%s\"\n", info[0].format); +#ifdef CONFIGURE_IN + exit (1); +#endif + } else { + fprintf (fp, "#define ICONV_ISO_D_FORMAT \"%s\"\n", info[i].format); + } + + iso2022 = ISO_UNSUPPORTED; + info = iso2022_tests; + /*printf ("#define ISO_2022_FORMAT(iso,codepage)\t");*/ + for (i = 0; i < num_iso2022_tests; i++) { + cd = iconv_open (info[i].charset, "UTF-8"); + if (cd != (iconv_t) -1) { + iconv_close (cd); + /*printf ("(\"%s\", (iso), (codepage))\n", info[i].format);*/ + fprintf (stderr, "System prefers %s\n", info[i].charset); + iso2022 = info[i].id; + break; + } + } + + if (iso2022 == ISO_UNSUPPORTED) { + fprintf (stderr, "System doesn't support any ISO-2022 formats\n"); + fprintf (fp, "#define ICONV_ISO_S_FORMAT \"%s\"\n", info[0].format); +#ifdef CONFIGURE_IN + exit (3); +#endif + } else { + fprintf (fp, "#define ICONV_ISO_S_FORMAT \"%s\"\n", info[i].format); + } + + iso10646 = ISO_UNSUPPORTED; + info = iso10646_tests; + /*printf ("#define ISO_10646_FORMAT(iso,codepage)\t");*/ + for (i = 0; i < num_iso10646_tests; i++) { + cd = iconv_open (info[i].charset, "UTF-8"); + if (cd != (iconv_t) -1) { + iconv_close (cd); + /*if (info[i].id < ISO_DASH_D_LOWER) + printf ("(\"%s\", (iso), (codepage))\n", info[i].format); + else + printf ("(\"%s\", (iso))\n", info[i].format);*/ + fprintf (stderr, "System prefers %s\n", info[i].charset); + iso10646 = info[i].id; + break; + } + } + + /* we don't need a printf format for iso-10646 because there is only 1 */ + if (iso10646 == ISO_UNSUPPORTED) { + fprintf (stderr, "System doesn't support any ISO-10646-1 formats\n"); + fprintf (fp, "#define ICONV_10646 \"%s\"\n", info[0].charset); +#ifdef CONFIGURE_IN + exit (2); +#endif + } else { + fprintf (fp, "#define ICONV_10646 \"%s\"\n", info[i].charset); + } + + fclose (fp); + + exit (0); +} diff --git a/iconv-detect.h b/iconv-detect.h new file mode 100644 index 0000000000..46f476d5bc --- /dev/null +++ b/iconv-detect.h @@ -0,0 +1,5 @@ +/* This is an auto-generated header, DO NOT EDIT! */ + +#define ICONV_ISO_D_FORMAT "iso-%d-%d" +#define ICONV_ISO_S_FORMAT "iso-%d-%s" +#define ICONV_10646 "iso-10646" diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h index f33a934e71..99cf676b2c 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -35,7 +35,7 @@ extern "C" { #include <glade/glade.h> #include <gtk/gtktreeview.h> -#include <gal/e-table/e-table.h> +#include <table/e-table.h> #include "evolution-config-control.h" diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index de1cbd57fb..5106ca5529 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -39,7 +39,7 @@ #include <bonobo/bonobo-generic-factory.h> #include <libedataserver/e-iconv.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include <gtk/gtktreemodel.h> #include <gtk/gtkliststore.h> diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 38bcb99a4b..dc5581f08b 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -27,7 +27,7 @@ #include <string.h> #include <gtk/gtkdialog.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <libgnome/gnome-i18n.h> #include "mail-mt.h" diff --git a/mail/em-config.c b/mail/em-config.c index 1728fffb81..9e3e60e9ef 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -61,7 +61,7 @@ #include <gconf/gconf.h> #include <gconf/gconf-client.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> static GObjectClass *emp_parent; diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index 337ec3555b..97f165e1b4 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -30,7 +30,7 @@ #include <gtk/gtklabel.h> #include <gtk/gtkhbox.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <libgnome/gnome-i18n.h> #include "mail-component.h" diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index c0ba28d7f4..ffa0ff3bda 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -29,8 +29,8 @@ #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> -#include <gal/widgets/e-gui-utils.h> +#include <e-util/e-util.h> +#include <widgets/misc/e-gui-utils.h> #include <gtk/gtkentry.h> #include <gtk/gtkbox.h> diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 40cf8de1e9..266928eb5c 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -36,7 +36,7 @@ #include <e-util/e-mktemp.h> -#include <gal/util/e-xml-utils.h> +#include <e-util/e-xml-utils.h> #include <libgnome/gnome-i18n.h> #include <camel/camel-file-utils.h> diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index e60d0e9a21..70c1037279 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -40,9 +40,9 @@ #include <gconf/gconf-client.h> -#include <gal/menus/gal-view-etable.h> -#include <gal/menus/gal-view-factory-etable.h> -#include <gal/menus/gal-view-instance.h> +#include <widgets/menus/gal-view-etable.h> +#include <widgets/menus/gal-view-factory-etable.h> +#include <widgets/menus/gal-view-instance.h> #include "widgets/menus/gal-view-menus.h" #include <camel/camel-mime-message.h> diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index c835dd1541..f04b7ee416 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -66,7 +66,7 @@ #include <camel/camel-string-utils.h> /* should this be in e-util rather than gal? */ -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <libedataserver/e-msgport.h> #include <e-util/e-gui-utils.h> diff --git a/mail/em-menu.c b/mail/em-menu.c index e5a5087c61..e896f40836 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -61,7 +61,7 @@ #include <gconf/gconf.h> #include <gconf/gconf-client.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> static void emp_standard_menu_factory(EMenu *emp, void *data); diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 94db5d7325..8b01766350 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -53,9 +53,9 @@ #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <libedataserver/e-iconv.h> -#include <gal/util/e-xml-utils.h> +#include <e-util/e-xml-utils.h> #include "e-util/e-bconf-map.h" #include "e-util/e-account-list.h" diff --git a/mail/em-popup.c b/mail/em-popup.c index ecda95612c..c419e8a1d4 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -63,7 +63,7 @@ #include <gconf/gconf.h> #include <gconf/gconf-client.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> static void emp_standard_menu_factory(EPopup *emp, void *data); diff --git a/mail/em-utils.c b/mail/em-utils.c index 3f05696302..38b89078ec 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -58,7 +58,7 @@ #include <e-util/e-dialog-utils.h> #include "e-util/e-error.h" -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "em-utils.h" #include "em-composer-utils.h" diff --git a/mail/mail-component.c b/mail/mail-component.c index a63fe06ff3..8ad596cc2d 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -73,8 +73,8 @@ #include <e-util/e-mktemp.h> -#include <gal/e-table/e-tree.h> -#include <gal/e-table/e-tree-memory.h> +#include <table/e-tree.h> +#include <table/e-tree-memory.h> #include <libgnome/gnome-i18n.h> #include <camel/camel-file-utils.h> diff --git a/mail/mail-config.c b/mail/mail-config.c index 413048ccaa..1ce5111cd4 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -51,8 +51,8 @@ #include <bonobo/bonobo-moniker-util.h> #include <bonobo/bonobo-exception.h> -#include <gal/util/e-util.h> -#include <gal/widgets/e-gui-utils.h> +#include <e-util/e-util.h> +#include <widgets/misc/e-gui-utils.h> #include <e-util/e-account-list.h> #include <e-util/e-signature-list.h> diff --git a/mail/mail-mt.c b/mail/mail-mt.c index bd2990bf6b..dcf7723a23 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -16,7 +16,7 @@ #include <gtk/gtkstock.h> #include <gtk/gtkmessagedialog.h> #include <libgnome/gnome-i18n.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include "libedataserver/e-msgport.h" #include "e-util/e-error.h" diff --git a/mail/mail-offline-handler.c b/mail/mail-offline-handler.c index c79b8ae36a..3095124ad1 100644 --- a/mail/mail-offline-handler.c +++ b/mail/mail-offline-handler.c @@ -38,7 +38,7 @@ #include <gtk/gtkmain.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #define PARENT_TYPE bonobo_object_get_type () diff --git a/mail/mail-ops.c b/mail/mail-ops.c index d66cb5d22a..e7770fc017 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -35,7 +35,7 @@ #include <string.h> #include <errno.h> #include <libgnome/gnome-exec.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <libgnome/gnome-i18n.h> #include <camel/camel-mime-filter-from.h> diff --git a/mail/message-list.c b/mail/message-list.c index 573151743f..cdb3963153 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -42,16 +42,16 @@ #include <libgnome/gnome-i18n.h> #include <atk/atkutil.h> -#include <gal/util/e-util.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/e-table/e-cell-text.h> -#include <gal/e-table/e-cell-toggle.h> -#include <gal/e-table/e-cell-checkbox.h> -#include <gal/e-table/e-cell-tree.h> -#include <gal/e-table/e-cell-date.h> -#include <gal/e-table/e-cell-size.h> -#include <gal/e-table/e-tree-memory.h> -#include <gal/e-table/e-tree-memory-callbacks.h> +#include <e-util/e-util.h> +#include <widgets/misc/e-gui-utils.h> +#include <table/e-cell-text.h> +#include <table/e-cell-toggle.h> +#include <table/e-cell-checkbox.h> +#include <table/e-cell-tree.h> +#include <table/e-cell-date.h> +#include <table/e-cell-size.h> +#include <table/e-tree-memory.h> +#include <table/e-tree-memory-callbacks.h> #include <camel/camel-exception.h> #include <camel/camel-file-utils.h> diff --git a/mail/message-list.h b/mail/message-list.h index bbb4db3f69..e53fca65db 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -27,8 +27,8 @@ #include <gtk/gtkobject.h> #include <gtk/gtkwidget.h> -#include <gal/e-table/e-table-simple.h> -#include <gal/e-table/e-tree-scrolled.h> +#include <table/e-table-simple.h> +#include <table/e-tree-scrolled.h> #ifdef __cplusplus extern "C" { diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index fd86bf537d..54364bfd59 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -37,7 +37,7 @@ #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include <gal/util/e-xml-utils.h> +#include <e-util/e-xml-utils.h> #include <gtk/gtk.h> #include <libgnome/gnome-i18n.h> diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 7fcb1c0666..d02370dbf9 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -50,7 +50,7 @@ #include "importer/evolution-importer-client.h" #include <glade/glade.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include <e-util/e-gtk-utils.h> #include <e-util/e-dialog-utils.h> diff --git a/shell/e-shell.c b/shell/e-shell.c index 3c229f9e11..5726535bad 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -66,7 +66,7 @@ #include <libedataserverui/e-passwords.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <gconf/gconf-client.h> diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c index b5224bdc3c..cb7efafda6 100644 --- a/shell/evolution-config-control.c +++ b/shell/evolution-config-control.c @@ -28,7 +28,7 @@ #include "e-shell-marshal.h" -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <gtk/gtksignal.h> diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c index 5f99384dce..4e6a0ab85b 100644 --- a/shell/importer/evolution-importer-listener.c +++ b/shell/importer/evolution-importer-listener.c @@ -27,7 +27,7 @@ #include "evolution-importer-listener.h" #include <bonobo/bonobo-object.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "GNOME_Evolution_Importer.h" #define PARENT_TYPE BONOBO_OBJECT_TYPE diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c index 03ff54fea6..312552f934 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -27,7 +27,7 @@ #include "evolution-importer.h" #include <bonobo/bonobo-object.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "GNOME_Evolution_Importer.h" diff --git a/shell/main.c b/shell/main.c index 60ba5d1054..33066453b7 100644 --- a/shell/main.c +++ b/shell/main.c @@ -73,7 +73,7 @@ #include "e-config-upgrade.h" #include "Evolution-DataServer.h" -#include <gal/widgets/e-cursors.h> +#include <widgets/misc/e-cursors.h> #include "e-util/e-error.h" #include <fcntl.h> diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index d5a5f2b6e1..6581b420cd 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -63,7 +63,7 @@ #include <time.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> /* for e_utf8_strftime, what about e_time_format_time? */ +#include <e-util/e-util.h> /* for e_utf8_strftime, what about e_time_format_time? */ #include "e-cert.h" #include "e-cert-trust.h" diff --git a/tools/Makefile.am b/tools/Makefile.am index 22a9f9de26..3cdfc5c7dd 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -32,6 +32,7 @@ killev_SOURCES = \ killev.c killev_LDADD = \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(E_UTIL_LIBS) diff --git a/tools/evolution-launch-composer.c b/tools/evolution-launch-composer.c index 8c89dbe480..65745d95b6 100644 --- a/tools/evolution-launch-composer.c +++ b/tools/evolution-launch-composer.c @@ -26,7 +26,7 @@ #include <Evolution-Composer.h> #include <string.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include <bonobo-activation/bonobo-activation.h> #include <gtk/gtkmain.h> diff --git a/widgets/Makefile.am b/widgets/Makefile.am index 4154550db6..8be8fa19bf 100644 --- a/widgets/Makefile.am +++ b/widgets/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = \ e-timezone-dialog \ + table \ + text \ misc \ menus diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am index 30f1734fe8..459eb25afe 100644 --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -2,10 +2,49 @@ privlib_LTLIBRARIES = libmenus.la INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/menus \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DG_LOG_DOMAIN=\"menus\" \ + $(EXTRA_GNOME_CFLAGS) \ + $(GNOME_INCLUDEDIR) \ + $(ICONV_CFLAGS) \ $(GNOME_FULL_CFLAGS) -libmenus_la_SOURCES = \ - gal-view-menus.c \ +libmenus_la_SOURCES = \ + gal-view-menus.c \ + gal-define-views-dialog.c \ + gal-define-views-model.c \ + gal-view-collection.c \ + gal-view-etable.c \ + gal-view-factory-etable.c \ + gal-view-factory.c \ + gal-view-instance-save-as-dialog.c \ + gal-view-instance.c \ + gal-view-new-dialog.c \ + gal-view.c \ gal-view-menus.h + +glade_DATA = \ + gal-define-views.glade \ + gal-view-new-dialog.glade \ + gal-view-instance-save-as-dialog.glade + +libmenusincludedir = $(privincludedir)/menus + +libmenusinclude_HEADERS = \ + gal-define-views-dialog.h \ + gal-define-views-model.h \ + gal-view-collection.h \ + gal-view-etable.h \ + gal-view-factory-etable.h \ + gal-view-factory.h \ + gal-view-instance-save-as-dialog.h \ + gal-view-instance.h \ + gal-view-new-dialog.h \ + gal-view.h + +icons = +EXTRA_DIST = \ + $(icons) \ + $(glade_DATA) diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index 43edcef690..a4dd6cde7d 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -25,10 +25,10 @@ #include <gtk/gtk.h> -#include "gal/e-table/e-table-scrolled.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/util/e-util-private.h" +#include "table/e-table-scrolled.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "e-util/e-util-private.h" #include "gal-define-views-dialog.h" #include "gal-define-views-model.h" @@ -244,7 +244,7 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog) GladeXML *gui; GtkWidget *widget; GtkWidget *etable; - gchar *filename = g_build_filename (GAL_GLADEDIR, + gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, "gal-define-views.glade", NULL); diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index 03a047b9fe..52636f7444 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -26,8 +26,8 @@ #include <gtk/gtkdialog.h> #include <glade/glade.h> -#include <gal/e-table/e-table-model.h> -#include <gal/menus/gal-view-collection.h> +#include <table/e-table-model.h> +#include <widgets/menus/gal-view-collection.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 318992cc56..f526419398 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -27,8 +27,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 "gal-define-views-model.h" diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h index 6ea2b28cbc..65345b706b 100644 --- a/widgets/menus/gal-define-views-model.h +++ b/widgets/menus/gal-define-views-model.h @@ -24,9 +24,9 @@ #ifndef _GAL_DEFINE_VIEWS_MODEL_H_ #define _GAL_DEFINE_VIEWS_MODEL_H_ -#include <gal/e-table/e-table-model.h> -#include <gal/menus/gal-view.h> -#include <gal/menus/gal-view-collection.h> +#include <table/e-table-model.h> +#include <widgets/menus/gal-view.h> +#include <widgets/menus/gal-view-collection.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 826951b9e3..9d31fafb2b 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -31,10 +31,10 @@ #include <libxml/parser.h> #include <libgnome/gnome-util.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" -#include "gal/widgets/e-unicode.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" +#include "widgets/misc/e-unicode.h" #include "gal-view-collection.h" diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index 9ba5eab71f..8f127a45c4 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -25,7 +25,7 @@ #define _GAL_VIEW_SET_H_ #include <gtk/gtkobject.h> -#include <gal/menus/gal-view-factory.h> +#include <widgets/menus/gal-view-factory.h> G_BEGIN_DECLS diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index 3f23981fe7..f35d94e5db 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -23,7 +23,7 @@ #include <config.h> -#include "gal/e-table/e-table-config.h" +#include "table/e-table-config.h" #include "gal-view-etable.h" diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index 65879663fa..971db2b8d6 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -25,11 +25,11 @@ #define _GAL_VIEW_ETABLE_H_ #include <gtk/gtkobject.h> -#include <gal/menus/gal-view.h> -#include <gal/e-table/e-table-state.h> -#include <gal/e-table/e-table-specification.h> -#include <gal/e-table/e-table.h> -#include <gal/e-table/e-tree.h> +#include <widgets/menus/gal-view.h> +#include <table/e-table-state.h> +#include <table/e-table-specification.h> +#include <table/e-table.h> +#include <table/e-tree.h> G_BEGIN_DECLS diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c index 3de27833ec..bdeb1e1e71 100644 --- a/widgets/menus/gal-view-factory-etable.c +++ b/widgets/menus/gal-view-factory-etable.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 "gal-view-etable.h" #include "gal-view-factory-etable.h" diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h index 542aa255fc..92adb69cf4 100644 --- a/widgets/menus/gal-view-factory-etable.h +++ b/widgets/menus/gal-view-factory-etable.h @@ -25,8 +25,8 @@ #define _GAL_VIEW_FACTORY_ETABLE_H_ #include <gtk/gtkobject.h> -#include <gal/menus/gal-view-factory.h> -#include <gal/e-table/e-table-specification.h> +#include <widgets/menus/gal-view-factory.h> +#include <table/e-table-specification.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c index 3a644606f6..6441d9ee24 100644 --- a/widgets/menus/gal-view-factory.c +++ b/widgets/menus/gal-view-factory.c @@ -23,7 +23,7 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "gal-view-factory.h" diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index 5fff83e048..cc36fbdf8c 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -25,7 +25,7 @@ #define _GAL_VIEW_FACTORY_H_ #include <gtk/gtkobject.h> -#include <gal/menus/gal-view.h> +#include <widgets/menus/gal-view.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index d2ce6e9ac3..eb01386418 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -25,9 +25,9 @@ #include <gtk/gtk.h> -#include "gal/e-table/e-table-scrolled.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util-private.h" +#include "table/e-table-scrolled.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util-private.h" #include "gal-define-views-model.h" #include "gal-view-instance-save-as-dialog.h" @@ -191,7 +191,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog) GladeXML *gui; GtkWidget *widget; GtkWidget *table; - gchar *filename = g_build_filename (GAL_GLADEDIR, + gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, "gal-view-instance-save-as-dialog.glade", NULL); diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index 53d99d0789..8187d32420 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -26,9 +26,9 @@ #include <gtk/gtkdialog.h> #include <glade/glade.h> -#include <gal/e-table/e-table-model.h> -#include <gal/menus/gal-view-collection.h> -#include <gal/menus/gal-view-instance.h> +#include <table/e-table-model.h> +#include <widgets/menus/gal-view-collection.h> +#include <widgets/menus/gal-view-instance.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index 5cc3c696a3..44b4990925 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -34,10 +34,10 @@ #include <libgnome/gnome-util.h> #include <glib/gstdio.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/util/e-xml-utils.h" -#include "gal/widgets/e-unicode.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "e-util/e-xml-utils.h" +#include "widgets/misc/e-unicode.h" #include "gal-define-views-dialog.h" #include "gal-view-instance.h" diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index 05723a2ea6..09bffc32b4 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -25,8 +25,8 @@ #define _GAL_VIEW_INSTANCE_H_ #include <gtk/gtkobject.h> -#include <gal/menus/gal-view-collection.h> -#include <gal/widgets/e-popup-menu.h> +#include <widgets/menus/gal-view-collection.h> +#include <widgets/misc/e-popup-menu.h> G_BEGIN_DECLS diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c index 762f845d20..f9402c762f 100644 --- a/widgets/menus/gal-view-menus.c +++ b/widgets/menus/gal-view-menus.c @@ -22,9 +22,9 @@ #include <libgnomeui/gnome-dialog.h> #include <libgnome/gnome-i18n.h> #include <bonobo/bonobo-ui-util.h> -#include <gal/util/e-util.h> -#include <gal/util/e-xml-utils.h> -#include <gal/menus/gal-define-views-dialog.h> +#include <e-util/e-util.h> +#include <e-util/e-xml-utils.h> +#include <widgets/menus/gal-define-views-dialog.h> #include <bonobo/bonobo-ui-util.h> #include <e-util/e-list.h> diff --git a/widgets/menus/gal-view-menus.h b/widgets/menus/gal-view-menus.h index e4de898187..1e857d8e2b 100644 --- a/widgets/menus/gal-view-menus.h +++ b/widgets/menus/gal-view-menus.h @@ -4,7 +4,7 @@ #include <libxml/tree.h> #include <bonobo/bonobo-ui-component.h> -#include <gal/menus/gal-view-instance.h> +#include <widgets/menus/gal-view-instance.h> #include <glib-object.h> diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 7de74c69a8..08a6841a25 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -25,11 +25,11 @@ #include <gtk/gtk.h> -#include "gal/e-table/e-table-scrolled.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/util/e-util-private.h" -#include "gal/widgets/e-unicode.h" +#include "table/e-table-scrolled.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "e-util/e-util-private.h" +#include "widgets/misc/e-unicode.h" #include "gal-define-views-model.h" #include "gal-view-new-dialog.h" @@ -88,7 +88,7 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog) { GladeXML *gui; GtkWidget *widget; - gchar *filename = g_build_filename (GAL_GLADEDIR, + gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, "gal-view-new-dialog.glade", NULL); diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c index c375b4323f..36c325aefd 100644 --- a/widgets/menus/gal-view.c +++ b/widgets/menus/gal-view.c @@ -23,7 +23,7 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "gal-view.h" diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 03ab98864f..73095b8432 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -1,11 +1,16 @@ INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/a11y/widgets/ \ + -I$(top_srcdir)/a11y/widgets \ + -I$(top_srcdir)/widgets/ \ -DMAP_DIR=\""$(imagesdir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ - $(E_WIDGETS_CFLAGS) + $(E_WIDGETS_CFLAGS) \ + $(EXTRA_GNOME_CFLAGS) \ + $(ICONV_CFLAGS) + privlib_LTLIBRARIES = \ libemiscwidgets.la \ @@ -21,7 +26,11 @@ pilot_sources = pilot_headers = endif -glade_DATA = e-send-options.glade +glade_DATA = e-send-options.glade \ + gal-categories.glade + +libemiscwidgets_la_LDFLAGS = $(ICONV_LIBS) + widgetsinclude_HEADERS = \ $(pilot_headers) \ @@ -47,7 +56,25 @@ widgetsinclude_HEADERS = \ e-task-bar.h \ e-task-widget.h \ e-send-options.h \ - e-url-entry.h + e-url-entry.h \ + e-canvas-background.h \ + e-canvas-utils.h \ + e-canvas-vbox.h \ + e-canvas.h \ + e-cursors.h \ + e-gui-utils.h \ + e-hsv-utils.h \ + e-popup-menu.h \ + e-printable.h \ + e-reflow-model.h \ + e-reflow.h \ + e-selection-model-array.h \ + e-selection-model-simple.h \ + e-selection-model.h \ + e-unicode.h \ + e-colors.h \ + gal-combo-box.h \ + gal-combo-text.h libemiscwidgets_la_SOURCES = \ $(MARSHAL_GENERATED) \ @@ -75,13 +102,34 @@ libemiscwidgets_la_SOURCES = \ e-task-bar.c \ e-task-widget.c \ e-send-options.c \ - e-url-entry.c + e-url-entry.c \ + e-canvas-background.c \ + e-canvas-utils.c \ + e-canvas-vbox.c \ + e-canvas.c \ + e-cursors.c \ + e-gui-utils.c \ + e-hsv-utils.c \ + e-popup-menu.c \ + e-printable.c \ + e-reflow-model.c \ + e-reflow.c \ + e-selection-model-array.c \ + e-selection-model-simple.c \ + e-selection-model.c \ + e-unicode.c \ + e-colors.c \ + gal-combo-box.c \ + gal-combo-text.c MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h @EVO_MARSHAL_RULE@ libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/table/libetable.la \ + $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ + $(top_builddir)/a11y/libevolution-a11y.la \ $(E_WIDGETS_LIBS) libefilterbar_la_SOURCES = \ @@ -156,4 +204,6 @@ EXTRA_DIST = \ ChangeLog.pre-1-4 dist-hook: + -mkdir $(distdir)/pixmaps + cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index cdbe7518b5..8a5e129300 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -32,7 +32,7 @@ #include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-popup-menu.h> -#include <gal/widgets/e-popup-menu.h> +#include <widgets/misc/e-popup-menu.h> #define ICON_SIZE 16 diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index c3134c07fe..010d5f6c7a 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -44,7 +44,7 @@ #include <gtk/gtksignal.h> #include <gdk/gdkkeysyms.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> static const int e_calendar_item_days_in_month[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index 1fe6d2500c..a9a0cad6d0 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -24,7 +24,7 @@ #define _E_CALENDAR_H_ #include <gtk/gtkwidget.h> -#include <gal/widgets/e-canvas.h> +#include <widgets/misc/e-canvas.h> #include "e-calendar-item.h" #ifdef __cplusplus diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index ad9f2b002b..569fe2b783 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -30,11 +30,11 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.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 "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-canvas-background.h" @@ -512,7 +512,7 @@ ecb_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECanvasBackgroundClass, style_set), NULL, NULL, - e_marshal_NONE__OBJECT, + e_util_marshal_NONE__OBJECT, G_TYPE_NONE, 1, GTK_TYPE_STYLE); } diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index 4c7969ff66..8ec99ca0af 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -28,8 +28,8 @@ #include <gdk/gdkkeysyms.h> #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-canvas.h" #include "e-canvas-utils.h" diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index d7c2832e9b..18903a325e 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -25,7 +25,7 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-canvas.h" @@ -105,7 +105,7 @@ e_canvas_class_init (ECanvasClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECanvasClass, reflow), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); } diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 12167e3185..5f27f0349a 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -40,8 +40,8 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <gal/e-table/e-table-item.h> -#include <gal/e-table/e-cell-text.h> +#include <table/e-table-item.h> +#include <table/e-cell-text.h> #include <libgnomeui/gnome-messagebox.h> #include <libgnome/gnome-i18n.h> diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h index 6f1dacbb58..dba88b8f65 100644 --- a/widgets/misc/e-cell-date-edit.h +++ b/widgets/misc/e-cell-date-edit.h @@ -30,7 +30,7 @@ #define _E_CELL_DATE_EDIT_H_ #include <time.h> -#include <gal/e-table/e-cell-popup.h> +#include <table/e-cell-popup.h> #define E_CELL_DATE_EDIT_TYPE (e_cell_date_edit_get_type ()) #define E_CELL_DATE_EDIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_DATE_EDIT_TYPE, ECellDateEdit)) diff --git a/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h index 6207e0c878..c738631ebf 100644 --- a/widgets/misc/e-cell-percent.h +++ b/widgets/misc/e-cell-percent.h @@ -29,7 +29,7 @@ #ifndef _E_CELL_PERCENT_H_ #define _E_CELL_PERCENT_H_ -#include <gal/e-table/e-cell-text.h> +#include <table/e-cell-text.h> #define E_CELL_PERCENT_TYPE (e_cell_percent_get_type ()) #define E_CELL_PERCENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_PERCENT_TYPE, ECellPercent)) diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index ddd4e3f4dc..739146710b 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -58,7 +58,7 @@ #include <atk/atkrelation.h> #include <atk/atkrelationset.h> #include <libgnome/gnome-i18n.h> -#include <gal/util/e-util.h> +#include <e-util/e-util.h> #include "e-util/e-time-utils.h" #include "e-calendar.h" diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index 499ef97554..fb850bc597 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -28,11 +28,11 @@ #include "e-clipped-label.h" -#include <gal/e-table/e-table-scrolled.h> -#include <gal/e-table/e-table-memory-store.h> -#include <gal/e-table/e-cell-pixbuf.h> -#include <gal/e-table/e-cell-vbox.h> -#include <gal/e-table/e-cell-text.h> +#include <table/e-table-scrolled.h> +#include <table/e-table-memory-store.h> +#include <table/e-cell-pixbuf.h> +#include <table/e-cell-vbox.h> +#include <table/e-cell-text.h> #include <gdk-pixbuf/gdk-pixbuf.h> diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index d4f2da36c9..d8c1f115d4 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -25,7 +25,9 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util-marshal.h" + +#include "e-util/e-util.h" #include "e-printable.h" @@ -59,7 +61,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, print_page), NULL, NULL, - e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_util_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); @@ -69,7 +71,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, data_left), NULL, NULL, - e_marshal_BOOLEAN__NONE, + e_util_marshal_BOOLEAN__NONE, G_TYPE_BOOLEAN, 0, G_TYPE_NONE); e_printable_signals [RESET] = @@ -78,7 +80,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, reset), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0, G_TYPE_NONE); e_printable_signals [HEIGHT] = @@ -87,7 +89,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, height), NULL, NULL, - e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_util_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_DOUBLE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); @@ -97,7 +99,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, will_fit), NULL, NULL, - e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_util_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_BOOLEAN, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index 340cd04736..7e3eadd3f3 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -23,7 +23,9 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util-marshal.h" + +#include "e-util/e-util.h" #include "e-reflow-model.h" @@ -162,7 +164,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_reflow_model_signals [COMPARISON_CHANGED] = @@ -171,7 +173,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, comparison_changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_reflow_model_signals [MODEL_ITEMS_INSERTED] = @@ -180,7 +182,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_items_inserted), NULL, NULL, - e_marshal_NONE__INT_INT, + e_util_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_reflow_model_signals [MODEL_ITEM_CHANGED] = @@ -189,7 +191,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_item_changed), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); e_reflow_model_signals [MODEL_ITEM_REMOVED] = @@ -198,7 +200,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_item_removed), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); klass->set_width = NULL; diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index afbc3ca781..90eb9864a6 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -29,10 +29,11 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "gal/e-text/e-text.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-unicode.h" +#include "text/e-text.h" +#include "e-util/e-i18n.h" +#include "e-util-marshal.h" +#include "e-util/e-util.h" +#include "widgets/misc/e-unicode.h" #include "e-canvas.h" #include "e-canvas-utils.h" @@ -1473,7 +1474,7 @@ e_reflow_class_init (EReflowClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowClass, selection_event), NULL, NULL, - e_marshal_INT__OBJECT_BOXED, + e_util_marshal_INT__OBJECT_BOXED, G_TYPE_INT, 2, G_TYPE_OBJECT, GDK_TYPE_EVENT); @@ -1483,7 +1484,7 @@ e_reflow_class_init (EReflowClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowClass, column_width_changed), NULL, NULL, - e_marshal_NONE__DOUBLE, + e_util_marshal_NONE__DOUBLE, G_TYPE_NONE, 1, G_TYPE_DOUBLE); } diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index b37e028340..f69abaf111 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -25,9 +25,9 @@ #define __E_REFLOW_H__ #include <libgnomecanvas/gnome-canvas.h> -#include <gal/widgets/e-reflow-model.h> -#include <gal/widgets/e-selection-model.h> -#include <gal/util/e-sorter-array.h> +#include <widgets/misc/e-reflow-model.h> +#include <widgets/misc/e-selection-model.h> +#include <e-util/e-sorter-array.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 72a4494dc4..5a7bac4edc 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -36,8 +36,8 @@ #include <gtk/gtkoptionmenu.h> #include <gtk/gtkmain.h> -#include <gal/widgets/e-unicode.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-unicode.h> +#include <widgets/misc/e-gui-utils.h> #include <libgnome/gnome-i18n.h> diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index 782dd30d69..07e60a8065 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.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-selection-model-array.h" diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index a533030f92..fd5255e308 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -25,8 +25,8 @@ #define _E_SELECTION_MODEL_ARRAY_H_ #include <gtk/gtkobject.h> -#include <gal/widgets/e-selection-model.h> -#include <gal/util/e-bit-array.h> +#include <widgets/misc/e-selection-model.h> +#include <e-util/e-bit-array.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c index ea03b74b75..ad33815135 100644 --- a/widgets/misc/e-selection-model-simple.c +++ b/widgets/misc/e-selection-model-simple.c @@ -23,7 +23,7 @@ #include <config.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-selection-model-array.h" #include "e-selection-model-simple.h" diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h index 6b4f84b4f9..00b8c3a781 100644 --- a/widgets/misc/e-selection-model-simple.h +++ b/widgets/misc/e-selection-model-simple.h @@ -24,7 +24,7 @@ #ifndef _E_SELECTION_MODEL_SIMPLE_H_ #define _E_SELECTION_MODEL_SIMPLE_H_ -#include <gal/widgets/e-selection-model-array.h> +#include <widgets/misc/e-selection-model-array.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c index 8ab880f848..9ddbc5339d 100644 --- a/widgets/misc/e-selection-model.c +++ b/widgets/misc/e-selection-model.c @@ -25,8 +25,9 @@ #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-marshal.h" +#include "e-util/e-util.h" #include "e-selection-model.h" @@ -155,7 +156,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESelectionModelClass, cursor_changed), NULL, NULL, - e_marshal_NONE__INT_INT, + e_util_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_selection_model_signals [CURSOR_ACTIVATED] = @@ -164,7 +165,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESelectionModelClass, cursor_activated), NULL, NULL, - e_marshal_NONE__INT_INT, + e_util_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_selection_model_signals [SELECTION_CHANGED] = @@ -173,7 +174,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESelectionModelClass, selection_changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_selection_model_signals [SELECTION_ROW_CHANGED] = @@ -182,7 +183,7 @@ e_selection_model_class_init (ESelectionModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ESelectionModelClass, selection_row_changed), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); klass->cursor_changed = NULL; diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index a78bdfd9c3..775d514d61 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -25,7 +25,7 @@ #define _E_SELECTION_MODEL_H_ #include <gtk/gtkobject.h> -#include <gal/util/e-sorter.h> +#include <e-util/e-sorter.h> #include <gdk/gdkevents.h> #ifdef __cplusplus diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index 1d41c28e25..510f2c9849 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -40,8 +40,8 @@ #include <gtk/gtk.h> #include <libxml/xmlmemory.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-iconv.h" +#include "e-util/e-i18n.h" +#include "e-util/e-iconv.h" #include "e-unicode.h" diff --git a/widgets/misc/e-util-marshal.list b/widgets/misc/e-util-marshal.list index 787be7d723..b478efb1ce 100644 --- a/widgets/misc/e-util-marshal.list +++ b/widgets/misc/e-util-marshal.list @@ -1,4 +1,52 @@ -NONE:NONE +BOOLEAN:INT,INT,OBJECT,INT,INT,UINT +BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT +BOOLEAN:NONE +BOOLEAN:OBJECT +BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN +BOOLEAN:POINTER,POINTER,INT,INT,INT +BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT +BOOLEAN:STRING,INT +DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN +INT:BOXED +INT:INT +INT:INT,INT,BOXED +INT:INT,POINTER,INT,BOXED +INT:OBJECT,BOXED +INT:POINTER +NONE:BOXED +NONE:BOXED,INT +NONE:BOXED,INT,INT +NONE:DOUBLE NONE:INT +NONE:INT,INT +NONE:INT,INT,BOXED +NONE:INT,INT,OBJECT +NONE:INT,INT,OBJECT,BOXED,UINT,UINT +NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT +NONE:INT,INT,OBJECT,POINTER,UINT,UINT +NONE:INT,INT,OBJECT,UINT +NONE:INT,INT,STRING,STRING +NONE:INT,INT,STRING,STRING,POINTER +NONE:INT,POINTER +NONE:INT,POINTER,INT,BOXED +NONE:INT,POINTER,INT,OBJECT +NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT +NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT +NONE:INT,POINTER,INT,OBJECT,UINT +NONE:INT,STRING +NONE:NONE +NONE:OBJECT +NONE:OBJECT,OBJECT +NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN NONE:POINTER -BOOLEAN:OBJECT,BOXED +NONE:POINTER,BOOLEAN +NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN +NONE:POINTER,INT +NONE:POINTER,INT,INT +NONE:POINTER,INT,INT,INT +NONE:POINTER,INT,INT,INT,INT +NONE:POINTER,INT,OBJECT +NONE:POINTER,POINTER +NONE:POINTER,POINTER,INT +OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN +POINTER:NONE diff --git a/widgets/misc/gal-combo-box.c b/widgets/misc/gal-combo-box.c index c27ead20bf..62c8d98c08 100644 --- a/widgets/misc/gal-combo-box.c +++ b/widgets/misc/gal-combo-box.c @@ -29,7 +29,8 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util-marshal.h" +#include "e-util/e-util.h" #include "gal-combo-box.h" @@ -136,7 +137,7 @@ gal_combo_box_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GalComboBoxClass, pop_down_widget), NULL, NULL, - e_marshal_POINTER__NONE, + e_util_marshal_POINTER__NONE, G_TYPE_POINTER, 0, G_TYPE_NONE); gal_combo_box_signals [POP_DOWN_DONE] = g_signal_new ( @@ -145,7 +146,7 @@ gal_combo_box_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GalComboBoxClass, pop_down_done), NULL, NULL, - e_marshal_BOOLEAN__OBJECT, + e_util_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1, G_TYPE_OBJECT); gal_combo_box_signals [PRE_POP_DOWN] = g_signal_new ( @@ -154,7 +155,7 @@ gal_combo_box_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GalComboBoxClass, pre_pop_down), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); gal_combo_box_signals [POST_POP_HIDE] = g_signal_new ( @@ -163,7 +164,7 @@ gal_combo_box_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GalComboBoxClass, post_pop_hide), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); } diff --git a/widgets/misc/gal-combo-text.c b/widgets/misc/gal-combo-text.c index 41d61145b6..e9e825d396 100644 --- a/widgets/misc/gal-combo-text.c +++ b/widgets/misc/gal-combo-text.c @@ -26,7 +26,7 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "gal-combo-text.h" diff --git a/widgets/misc/gal-combo-text.h b/widgets/misc/gal-combo-text.h index c507651dd1..f53d924c5a 100644 --- a/widgets/misc/gal-combo-text.h +++ b/widgets/misc/gal-combo-text.h @@ -23,7 +23,7 @@ #ifndef _GAL_COMBO_TEXT_H #define _GAL_COMBO_TEXT_H -#include <gal/widgets/gal-combo-box.h> +#include <widgets/misc/gal-combo-box.h> #ifdef __cplusplus extern "C" { diff --git a/widgets/misc/pixmaps/Makefile.am b/widgets/misc/pixmaps/Makefile.am new file mode 100644 index 0000000000..5092e20ba3 --- /dev/null +++ b/widgets/misc/pixmaps/Makefile.am @@ -0,0 +1,9 @@ +pixmaps = \ + cursor_cross.xpm \ + cursor_hand_closed.xpm \ + cursor_hand_open.xpm \ + cursor_zoom_in.xpm \ + cursor_zoom_out.xpm + +EXTRA_DIST = \ + $(pixmaps) diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c index 9bb6fe1cf2..492cb65c3c 100644 --- a/widgets/misc/test-color.c +++ b/widgets/misc/test-color.c @@ -24,7 +24,7 @@ #include <gnome.h> -#include "gal/util/e-i18n.h" +#include "e-util/e-i18n.h" #include "color-palette.h" #include "e-colors.h" 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" diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am new file mode 100644 index 0000000000..7e1980e73a --- /dev/null +++ b/widgets/text/Makefile.am @@ -0,0 +1,37 @@ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ + $(GNOME_INCLUDEDIR) \ + $(ICONV_CFLAGS) \ + $(EXTRA_GNOME_CFLAGS) \ + $(GNOME_FULL_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-text\" + + +privlib_LTLIBRARIES = libetext.la + +libetext_la_SOURCES = \ + e-entry.c \ + e-completion-match.c \ + e-completion.c \ + e-completion-callbacks.c \ + e-completion-view.c \ + e-table-text-model.c \ + e-text-model-repos.c \ + e-text-model.c \ + e-text-model-uri.c \ + e-text.c + +libetextincludedir = $(privincludedir)/e-text + +libetextinclude_HEADERS = \ + e-entry.h \ + e-completion-match.h \ + e-completion.h \ + e-completion-callbacks.h \ + e-completion-view.h \ + e-table-text-model.h \ + e-text-model-repos.h \ + e-text-model.h \ + e-text-model-uri.h \ + e-text.h diff --git a/widgets/text/e-completion-callbacks.c b/widgets/text/e-completion-callbacks.c index a7c3c48d97..b819513141 100644 --- a/widgets/text/e-completion-callbacks.c +++ b/widgets/text/e-completion-callbacks.c @@ -28,7 +28,7 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-completion-callbacks.h" diff --git a/widgets/text/e-completion-match.c b/widgets/text/e-completion-match.c index 180a16e657..df64bc8bd2 100644 --- a/widgets/text/e-completion-match.c +++ b/widgets/text/e-completion-match.c @@ -25,7 +25,7 @@ #include <string.h> -#include "gal/widgets/e-unicode.h" +#include "widgets/misc/e-unicode.h" #include "e-completion-match.h" diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c index 13c9ca2860..e7606fc805 100644 --- a/widgets/text/e-completion-view.c +++ b/widgets/text/e-completion-view.c @@ -28,10 +28,10 @@ #include <gdk/gdkkeysyms.h> -#include "gal/e-table/e-table-scrolled.h" -#include "gal/e-table/e-table-simple.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-marshal.h" +#include "table/e-table-scrolled.h" +#include "table/e-table-simple.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util-marshal.h" #include "e-completion-view.h" @@ -220,7 +220,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionViewClass, nonempty), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_completion_view_signals[E_COMPLETION_VIEW_ADDED] = @@ -229,7 +229,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionViewClass, added), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_completion_view_signals[E_COMPLETION_VIEW_FULL] = @@ -238,7 +238,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionViewClass, full), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_completion_view_signals[E_COMPLETION_VIEW_BROWSE] = @@ -247,7 +247,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionViewClass, browse), NULL, NULL, - e_marshal_NONE__POINTER, + e_util_marshal_NONE__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -257,7 +257,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionViewClass, unbrowse), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE] = @@ -266,7 +266,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionViewClass, activate), NULL, NULL, - e_marshal_NONE__POINTER, + e_util_marshal_NONE__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/widgets/text/e-completion-view.h b/widgets/text/e-completion-view.h index 25b2eff645..5e2d6f8532 100644 --- a/widgets/text/e-completion-view.h +++ b/widgets/text/e-completion-view.h @@ -26,7 +26,7 @@ #define E_COMPLETION_VIEW_H #include <gtk/gtk.h> -#include <gal/e-table/e-table.h> +#include <table/e-table.h> #include "e-completion.h" G_BEGIN_DECLS diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c index 5146170ccc..7c45c8e0ec 100644 --- a/widgets/text/e-completion.c +++ b/widgets/text/e-completion.c @@ -29,8 +29,8 @@ #include <gtk/gtk.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-completion.h" @@ -89,7 +89,7 @@ e_completion_class_init (ECompletionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionClass, completion_started), NULL, NULL, - e_marshal_NONE__POINTER_INT_INT, + e_util_marshal_NONE__POINTER_INT_INT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT); @@ -99,7 +99,7 @@ e_completion_class_init (ECompletionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionClass, completion_found), NULL, NULL, - e_marshal_NONE__POINTER, + e_util_marshal_NONE__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); @@ -109,7 +109,7 @@ e_completion_class_init (ECompletionClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECompletionClass, completion_finished), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); object_class->dispose = e_completion_dispose; diff --git a/widgets/text/e-entry-test.c b/widgets/text/e-entry-test.c index c5e5687396..42a24bd567 100644 --- a/widgets/text/e-entry-test.c +++ b/widgets/text/e-entry-test.c @@ -25,8 +25,8 @@ #include <gnome.h> -#include "gal/util/e-i18n.h" -#include "gal/util/e-util-private.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util-private.h" #include "e-entry.h" @@ -60,7 +60,7 @@ int main( int argc, char *argv[] ) GtkWidget *app; GtkWidget *entry; - /* bindtextdomain (PACKAGE, GAL_LOCALEDIR); + /* bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); textdomain (PACKAGE);*/ gnome_init( "EEntry Test", VERSION, argc, argv); diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c index 8b41d952f0..d00b2e1665 100644 --- a/widgets/text/e-entry.c +++ b/widgets/text/e-entry.c @@ -36,10 +36,10 @@ #include <libxml/parser.h> #include <libgnomecanvas/gnome-canvas.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 "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 "e-completion-view.h" #include "e-entry.h" @@ -1200,7 +1200,7 @@ e_entry_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EEntryClass, changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_entry_signals[E_ENTRY_ACTIVATE] = @@ -1209,7 +1209,7 @@ e_entry_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EEntryClass, activate), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_entry_signals[E_ENTRY_POPULATE_POPUP] = @@ -1218,7 +1218,7 @@ e_entry_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EEntryClass, populate_popup), NULL, NULL, - e_marshal_NONE__POINTER_INT_OBJECT, + e_util_marshal_NONE__POINTER_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, GTK_TYPE_MENU); e_entry_signals[E_ENTRY_COMPLETION_POPUP] = diff --git a/widgets/text/e-entry.h b/widgets/text/e-entry.h index 6e71364ee1..30b83c10d0 100644 --- a/widgets/text/e-entry.h +++ b/widgets/text/e-entry.h @@ -28,7 +28,7 @@ #include <libgnomecanvas/gnome-canvas.h> #include <gtk/gtktable.h> #include <libxml/tree.h> -#include <gal/e-text/e-text.h> +#include <text/e-text.h> #include "e-completion.h" G_BEGIN_DECLS diff --git a/widgets/text/e-table-text-model.c b/widgets/text/e-table-text-model.c index ba71bcf002..7ecaa2f543 100644 --- a/widgets/text/e-table-text-model.c +++ b/widgets/text/e-table-text-model.c @@ -27,7 +27,7 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-table-text-model.h" diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h index 46e82de1c4..3ed771996d 100644 --- a/widgets/text/e-table-text-model.h +++ b/widgets/text/e-table-text-model.h @@ -24,8 +24,8 @@ #ifndef E_TABLE_TEXT_MODEL_H #define E_TABLE_TEXT_MODEL_H -#include <gal/e-text/e-text-model.h> -#include <gal/e-table/e-table-model.h> +#include <text/e-text-model.h> +#include <table/e-table-model.h> G_BEGIN_DECLS diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c index 1fec3a182d..9d55035376 100644 --- a/widgets/text/e-text-model-test.c +++ b/widgets/text/e-text-model-test.c @@ -23,8 +23,8 @@ #include <gnome.h> -#include "gal/util/e-util.h" -#include "gal/widgets/e-canvas.h" +#include "e-util/e-util.h" +#include "widgets/misc/e-canvas.h" #include "e-text-model.h" #include "e-text-model-uri.h" diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c index d919b8cc94..6736b41cde 100644 --- a/widgets/text/e-text-model-uri.c +++ b/widgets/text/e-text-model-uri.c @@ -30,7 +30,7 @@ #include <gtk/gtkmain.h> #include <libgnome/gnome-url.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-text-model-uri.h" diff --git a/widgets/text/e-text-model-uri.h b/widgets/text/e-text-model-uri.h index 64cd7b2a57..db9a09b16f 100644 --- a/widgets/text/e-text-model-uri.h +++ b/widgets/text/e-text-model-uri.h @@ -24,7 +24,7 @@ #ifndef E_TEXT_MODEL_URI_H #define E_TEXT_MODEL_URI_H -#include <gal/e-text/e-text-model.h> +#include <text/e-text-model.h> G_BEGIN_DECLS diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 72562eaa49..eb7b728c19 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -30,7 +30,7 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util/e-util.h" #include "e-text-model.h" #include "e-text-model-repos.h" @@ -98,7 +98,7 @@ e_text_model_class_init (ETextModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextModelClass, changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_text_model_signals[E_TEXT_MODEL_REPOSITION] = @@ -107,7 +107,7 @@ e_text_model_class_init (ETextModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextModelClass, reposition), NULL, NULL, - e_marshal_NONE__POINTER_POINTER, + e_util_marshal_NONE__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); @@ -117,7 +117,7 @@ e_text_model_class_init (ETextModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextModelClass, object_activated), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); @@ -127,7 +127,7 @@ e_text_model_class_init (ETextModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextModelClass, cancel_completion), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); /* No default signal handlers. */ diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c index 2c9a8c2dec..f80f361768 100644 --- a/widgets/text/e-text-test.c +++ b/widgets/text/e-text-test.c @@ -23,8 +23,8 @@ #include <gnome.h> -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-unicode.h" +#include "widgets/misc/e-canvas.h" +#include "widgets/misc/e-unicode.h" #include "e-text.h" diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 7bafb5d58c..d1bf3eb59e 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -48,13 +48,13 @@ #include <libart_lgpl/art_rgb.h> #include <libart_lgpl/art_rgb_bitmap_affine.h> -#include "gal/a11y/e-text/gal-a11y-e-text.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-canvas-utils.h" -#include "gal/widgets/e-unicode.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-text-event-processor-emacs-like.h" -#include "gal/util/e-util.h" +#include "a11y/e-text/gal-a11y-e-text.h" +#include "widgets/misc/e-canvas.h" +#include "widgets/misc/e-canvas-utils.h" +#include "widgets/misc/e-unicode.h" +#include "e-util/e-i18n.h" +#include "e-util/e-text-event-processor-emacs-like.h" +#include "e-util/e-util.h" #include "e-text.h" @@ -3413,7 +3413,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_text_signals[E_TEXT_ACTIVATE] = @@ -3422,7 +3422,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, activate), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_text_signals[E_TEXT_KEYPRESS] = @@ -3431,7 +3431,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, keypress), NULL, NULL, - e_marshal_NONE__INT_INT, + e_util_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); e_text_signals[E_TEXT_POPULATE_POPUP] = @@ -3440,7 +3440,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, populate_popup), NULL, NULL, - e_marshal_NONE__POINTER_INT_OBJECT, + e_util_marshal_NONE__POINTER_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, GTK_TYPE_MENU); g_object_class_install_property (gobject_class, PROP_MODEL, diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index 4eb3fa830b..633db2c659 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -39,9 +39,9 @@ #include <gtk/gtkmenu.h> -#include <gal/util/e-text-event-processor.h> -#include <gal/e-text/e-text-model.h> -#include <gal/widgets/e-canvas.h> +#include <e-util/e-text-event-processor.h> +#include <text/e-text-model.h> +#include <widgets/misc/e-canvas.h> G_BEGIN_DECLS |