From 61ae36351b24cc676f60483d576706bf827f2987 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 17 Jan 2012 11:07:19 -0500 Subject: Introduce libemail-engine and libemail-utils. These libraries are bound for E-D-S so they live at the lowest layer of Evolution for now -- even libeutil can link to them (but please don't). This is the first step toward moving mail handing to a D-Bus service. --- widgets/misc/Makefile.am | 1 + widgets/misc/e-signature-combo-box.h | 4 ++-- widgets/misc/e-signature-editor.c | 2 +- widgets/misc/e-signature-editor.h | 2 +- widgets/misc/e-signature-manager.h | 2 +- widgets/misc/e-signature-preview.c | 3 ++- widgets/misc/e-signature-preview.h | 2 +- widgets/misc/e-signature-tree-view.h | 4 ++-- widgets/table/Makefile.am | 1 + widgets/text/Makefile.am | 1 + 10 files changed, 13 insertions(+), 9 deletions(-) (limited to 'widgets') diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 24495ed2cb..d0bef3fa28 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -157,6 +157,7 @@ libemiscwidgets_la_LIBADD = \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/a11y/libevolution-a11y.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(MATH_LIB) \ diff --git a/widgets/misc/e-signature-combo-box.h b/widgets/misc/e-signature-combo-box.h index dd81eb55c3..5a571499df 100644 --- a/widgets/misc/e-signature-combo-box.h +++ b/widgets/misc/e-signature-combo-box.h @@ -23,8 +23,8 @@ #define E_SIGNATURE_COMBO_BOX_H #include -#include -#include +#include +#include /* Standard GObject macros */ #define E_TYPE_SIGNATURE_COMBO_BOX \ diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c index 16efaa6d34..d968debe8f 100644 --- a/widgets/misc/e-signature-editor.c +++ b/widgets/misc/e-signature-editor.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include enum { diff --git a/widgets/misc/e-signature-editor.h b/widgets/misc/e-signature-editor.h index 6d9f4a9b61..0d07cb840e 100644 --- a/widgets/misc/e-signature-editor.h +++ b/widgets/misc/e-signature-editor.h @@ -23,8 +23,8 @@ #define E_SIGNATURE_EDITOR_H #include -#include #include +#include /* Standard GObject macros */ #define E_TYPE_SIGNATURE_EDITOR \ diff --git a/widgets/misc/e-signature-manager.h b/widgets/misc/e-signature-manager.h index 88ee391564..a5516214a2 100644 --- a/widgets/misc/e-signature-manager.h +++ b/widgets/misc/e-signature-manager.h @@ -23,9 +23,9 @@ #define E_SIGNATURE_MANAGER_H #include -#include #include #include +#include /* Standard GObject macros */ #define E_TYPE_SIGNATURE_MANAGER \ diff --git a/widgets/misc/e-signature-preview.c b/widgets/misc/e-signature-preview.c index a2c2352efb..6de03c0881 100644 --- a/widgets/misc/e-signature-preview.c +++ b/widgets/misc/e-signature-preview.c @@ -29,7 +29,8 @@ #include #include #include -#include "e-util/e-signature-utils.h" + +#include enum { PROP_0, diff --git a/widgets/misc/e-signature-preview.h b/widgets/misc/e-signature-preview.h index 1a884b8563..f13ecf8ec4 100644 --- a/widgets/misc/e-signature-preview.h +++ b/widgets/misc/e-signature-preview.h @@ -22,8 +22,8 @@ #ifndef E_SIGNATURE_PREVIEW_H #define E_SIGNATURE_PREVIEW_H -#include #include +#include /* Standard GObject macros */ #define E_TYPE_SIGNATURE_PREVIEW \ diff --git a/widgets/misc/e-signature-tree-view.h b/widgets/misc/e-signature-tree-view.h index 50d1e11905..6842340d8a 100644 --- a/widgets/misc/e-signature-tree-view.h +++ b/widgets/misc/e-signature-tree-view.h @@ -23,8 +23,8 @@ #define E_SIGNATURE_TREE_VIEW_H #include -#include -#include +#include +#include /* Standard GObject macros */ #define E_TYPE_SIGNATURE_TREE_VIEW \ diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 36af5ec2bf..001a2fd1e7 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -172,6 +172,7 @@ libetable_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(MATH_LIB) diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am index d7c62af74e..0928da099f 100644 --- a/widgets/text/Makefile.am +++ b/widgets/text/Makefile.am @@ -35,6 +35,7 @@ libetext_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(REGEX_LIBS) \ -- cgit