diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-06-04 03:14:03 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-06-04 03:14:03 +0800 |
| commit | 2a39437ee94059a79d3dc1bf0c97a3aeaff23f53 (patch) | |
| tree | 657e23e83bad7ff98e891f45043a41b09ff57647 /e-util | |
| parent | eecffa7af35a3eb0742bff4d10be55c3a70f2876 (diff) | |
| download | gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.gz gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.tar.zst gsoc2013-evolution-2a39437ee94059a79d3dc1bf0c97a3aeaff23f53.zip | |
Adapt to single-include E-D-S libraries.
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/Makefile.am | 2 | ||||
| -rw-r--r-- | e-util/e-categories-config.c | 4 | ||||
| -rw-r--r-- | e-util/e-plugin.c | 4 | ||||
| -rw-r--r-- | e-util/e-source-util.h | 2 | ||||
| -rw-r--r-- | e-util/e-util.c | 3 | ||||
| -rw-r--r-- | e-util/e-util.h | 9 |
6 files changed, 9 insertions, 15 deletions
diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 0c7f7b3250..7f6ef95782 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -5,7 +5,7 @@ ruledir = $(privdatadir) include $(top_srcdir)/glib-gen.mak glib_enum_headers=e-util-enums.h glib_enum_output=e-util-enumtypes -glib_enum_define=E +glib_enum_define=E_UTIL glib_enum_prefix=e ENUM_GENERATED = e-util-enumtypes.h e-util-enumtypes.c diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c index 9beeb92df2..519fc5db32 100644 --- a/e-util/e-categories-config.c +++ b/e-util/e-categories-config.c @@ -29,8 +29,8 @@ #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserver/e-categories.h> -#include <libedataserverui/e-categories-dialog.h> + +#include <libedataserverui/libedataserverui.h> #include "e-util/e-util.h" diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index fd11abaf62..9519074179 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -25,9 +25,7 @@ #include <glib/gi18n.h> -#include <libebackend/e-module.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-xml-utils.h> +#include <libebackend/libebackend.h> #include "e-plugin.h" #include "e-util-private.h" diff --git a/e-util/e-source-util.h b/e-util/e-source-util.h index 589e91b13c..304a55f696 100644 --- a/e-util/e-source-util.h +++ b/e-util/e-source-util.h @@ -25,7 +25,7 @@ #ifndef E_SOURCE_UTIL_H #define E_SOURCE_UTIL_H -#include <libedataserver/e-source.h> +#include <libedataserver/libedataserver.h> #include <e-util/e-activity.h> #include <libevolution-utils/e-alert-sink.h> diff --git a/e-util/e-util.c b/e-util/e-util.c index 38c1b85244..f3b71c58f6 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -51,8 +51,7 @@ #endif #include <camel/camel.h> -#include <libedataserver/e-data-server-util.h> -#include <libedataserver/e-categories.h> +#include <libedataserver/libedataserver.h> #include "filter/e-filter-option.h" diff --git a/e-util/e-util.h b/e-util/e-util.h index af2232489e..be3150bc80 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -28,16 +28,13 @@ #include <limits.h> #include <gconf/gconf-client.h> +#include <libedataserver/libedataserver.h> + #include <libevolution-utils/evolution-util.h> + #include <e-util/e-marshal.h> #include <e-util/e-util-enums.h> -#include <libedataserver/e-source-registry.h> - -/* e_get_user_data_dir() used to live here, so #include its new home - * for backward-compatibility (not that we really care about that). */ -#include <libedataserver/e-data-server-util.h> - G_BEGIN_DECLS typedef enum { |