From debbdd9c75634da8e0ed0fd7a8c25175358ad6a1 Mon Sep 17 00:00:00 2001
From: Jose Dapena Paz <jdapena@igalia.com>
Date: Wed, 9 Sep 2009 15:09:49 +0200
Subject: [PATCH] Fix dbus tests using the new library.

---
 tests/dbus_api/Makefile.am            |    5 +++--
 tests/dbus_api/test_top_application.c |    3 ++-
 tests/dbus_api/test_update_account.c  |    1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/dbus_api/Makefile.am b/tests/dbus_api/Makefile.am
index acdd8bd..3cbdd30 100644
--- a/tests/dbus_api/Makefile.am
+++ b/tests/dbus_api/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES=\
 	@CHECK_CFLAGS@ \
+	$(LIBMODEST_DBUS_CLIENT_CFLAGS) \
 	$(MODEST_GSTUFF_CFLAGS)\
 	$(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
 	$(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
@@ -11,13 +12,13 @@ INCLUDES=\
 
 objects=\
 	@CHECK_LIBS@ \
+	$(LIBMODEST_DBUS_CLIENT_LIBS) \
 	$(MODEST_GSTUFF_LIBS) \
 	$(MODEST_PLATFORM_LIBS)	\
 	$(MODEST_TOOLKIT_LIBS) \
 	$(MODEST_HILDON_HELP_LIBS) \
 	$(MODEST_HILDON_NOTIFY_LIBS) \
-	$(MODEST_OGS_LIBS) \
-	${top_srcdir}/libmodest-dbus-client/libmodest-dbus-client-1.0.la
+	$(MODEST_OGS_LIBS)
 
 noinst_PROGRAMS = \
 	test_mail_to \
diff --git a/tests/dbus_api/test_top_application.c b/tests/dbus_api/test_top_application.c
index 7db8cc0..4a2e07b 100644
--- a/tests/dbus_api/test_top_application.c
+++ b/tests/dbus_api/test_top_application.c
@@ -1,4 +1,5 @@
-#include <src/dbus_api/modest-dbus-api.h>
+#include <libmodest-dbus-client/libmodest-dbus-client.h>
+#include <libmodest-dbus-client/libmodest-dbus-api.h>
 #include <libosso.h>
 #include <stdio.h>
 
diff --git a/tests/dbus_api/test_update_account.c b/tests/dbus_api/test_update_account.c
index 1d9e1f2..29c62fe 100644
--- a/tests/dbus_api/test_update_account.c
+++ b/tests/dbus_api/test_update_account.c
@@ -1,3 +1,4 @@
+#include <libmodest-dbus-client/libmodest-dbus-api.h>
 #include <libmodest-dbus-client/libmodest-dbus-client.h>
 #include <stdio.h>
 
-- 
1.7.9.5