aboutsummaryrefslogtreecommitdiffstats
path: root/modules/composer-autosave
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-10-05 19:57:30 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-10-05 19:57:30 +0800
commit4ec46cc05fcb94d181fb9c2412984a1446647c85 (patch)
treed16ce30e77dd539c03509237dd4c723d46aea97a /modules/composer-autosave
parent5ea7e23aef0c239af2600c95419ba0bda0f08b3c (diff)
parent19163c2b71e6128fc9b32287b99b1f4422324c2d (diff)
downloadgsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar
gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.gz
gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.bz2
gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.lz
gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.xz
gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.zst
gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.zip
Merge from master
Diffstat (limited to 'modules/composer-autosave')
-rw-r--r--modules/composer-autosave/Makefile.am10
-rw-r--r--modules/composer-autosave/e-composer-autosave.c3
-rw-r--r--modules/composer-autosave/e-composer-registry.c3
3 files changed, 10 insertions, 6 deletions
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index 691fbe0bb1..2d4a774c70 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -5,8 +5,9 @@ libevolution_module_composer_autosave_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
-DG_LOG_DOMAIN=\"evolution-composer-autosave\" \
- $(EVOLUTION_MAIL_CFLAGS) \
- $(GNOME_PLATFORM_CFLAGS)
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS) \
+ $(GTKHTML_CFLAGS)
libevolution_module_composer_autosave_la_SOURCES = \
evolution-composer-autosave.c \
@@ -20,8 +21,9 @@ libevolution_module_composer_autosave_la_LIBADD = \
$(top_builddir)/composer/libcomposer.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/e-util/libeutil.la \
- $(EVOLUTION_MAIL_LIBS) \
- $(GNOME_PLATFORM_LIBS)
+ $(EVOLUTION_DATA_SERVER_LIBS) \
+ $(GNOME_PLATFORM_LIBS) \
+ $(GTKHTML_LIBS)
libevolution_module_composer_autosave_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index f2578875fa..f2b39c4d68 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -20,7 +20,8 @@
#include <config.h>
#endif
-#include <e-util/e-extension.h>
+#include <libebackend/e-extension.h>
+
#include <e-util/e-alert-dialog.h>
#include <composer/e-msg-composer.h>
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index eef69f1286..9fcba43ff9 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -21,9 +21,10 @@
#endif
#include <glib/gstdio.h>
+#include <libebackend/e-extension.h>
+
#include <shell/e-shell.h>
#include <shell/e-shell-window.h>
-#include <e-util/e-extension.h>
#include <e-util/e-alert-dialog.h>
#include <composer/e-msg-composer.h>