diff options
Diffstat (limited to 'addressbook')
35 files changed, 54 insertions, 49 deletions
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 |