aboutsummaryrefslogtreecommitdiffstats
path: root/tests/interactive
diff options
context:
space:
mode:
Diffstat (limited to 'tests/interactive')
-rw-r--r--tests/interactive/Makefile.am3
-rw-r--r--tests/interactive/empathy-logs.c8
-rw-r--r--tests/interactive/test-empathy-account-chooser.c4
-rw-r--r--tests/interactive/test-empathy-calendar-button.c2
-rw-r--r--tests/interactive/test-empathy-contact-blocking-dialog.c6
-rw-r--r--tests/interactive/test-empathy-dual-roster-view.c8
-rw-r--r--tests/interactive/test-empathy-presence-chooser.c6
-rw-r--r--tests/interactive/test-empathy-protocol-chooser.c4
-rw-r--r--tests/interactive/test-empathy-roster-model-aggregator.c8
-rw-r--r--tests/interactive/test-empathy-roster-view.c8
-rw-r--r--tests/interactive/test-empathy-status-preset-dialog.c6
11 files changed, 32 insertions, 31 deletions
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 27fdbf7e4..4ca1989ee 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -1,6 +1,7 @@
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/libempathy \
+ -I$(top_srcdir)/libempathy-gtk \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
$(EMPATHY_CFLAGS) \
$(WARN_CFLAGS) \
diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
index 96f590a69..4a440f9ed 100644
--- a/tests/interactive/empathy-logs.c
+++ b/tests/interactive/empathy-logs.c
@@ -24,10 +24,10 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy-gtk/empathy-log-window.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
+#include "empathy-log-window.h"
+#include "empathy-ui-utils.h"
static void
destroy_cb (GtkWidget *dialog,
diff --git a/tests/interactive/test-empathy-account-chooser.c b/tests/interactive/test-empathy-account-chooser.c
index 7324cbea3..8a4d08fcf 100644
--- a/tests/interactive/test-empathy-account-chooser.c
+++ b/tests/interactive/test-empathy-account-chooser.c
@@ -2,8 +2,8 @@
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-account-chooser.h"
static void
filter_func (TpAccount *account,
diff --git a/tests/interactive/test-empathy-calendar-button.c b/tests/interactive/test-empathy-calendar-button.c
index 7fe056698..81241090f 100644
--- a/tests/interactive/test-empathy-calendar-button.c
+++ b/tests/interactive/test-empathy-calendar-button.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include "libempathy-gtk/empathy-calendar-button.h"
+#include "empathy-calendar-button.h"
static void
date_changed_cb (EmpathyCalendarButton *button,
diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c
index 87d50f8e4..d4a76933d 100644
--- a/tests/interactive/test-empathy-contact-blocking-dialog.c
+++ b/tests/interactive/test-empathy-contact-blocking-dialog.c
@@ -23,10 +23,10 @@
#include <gtk/gtk.h>
-#include "libempathy/empathy-client-factory.h"
+#include "empathy-client-factory.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-contact-blocking-dialog.h"
+#include "empathy-ui-utils.h"
+#include "empathy-contact-blocking-dialog.h"
static void
am_prepare_cb (GObject *source,
diff --git a/tests/interactive/test-empathy-dual-roster-view.c b/tests/interactive/test-empathy-dual-roster-view.c
index 30fe4aa80..d7c54a647 100644
--- a/tests/interactive/test-empathy-dual-roster-view.c
+++ b/tests/interactive/test-empathy-dual-roster-view.c
@@ -1,10 +1,10 @@
#include <config.h>
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
static void
individual_activated_cb (EmpathyRosterView *self,
diff --git a/tests/interactive/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c
index 39ad1f7b4..5710fb146 100644
--- a/tests/interactive/test-empathy-presence-chooser.c
+++ b/tests/interactive/test-empathy-presence-chooser.c
@@ -24,10 +24,10 @@
#include <gtk/gtk.h>
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-status-presets.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-presence-chooser.h"
int
main (int argc, char **argv)
diff --git a/tests/interactive/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c
index 3e3767a98..f91cb1203 100644
--- a/tests/interactive/test-empathy-protocol-chooser.c
+++ b/tests/interactive/test-empathy-protocol-chooser.c
@@ -2,8 +2,8 @@
#include <gtk/gtk.h>
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-protocol-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-protocol-chooser.h"
int
main (int argc,
diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c b/tests/interactive/test-empathy-roster-model-aggregator.c
index 3bbf9e3b3..bb3195022 100644
--- a/tests/interactive/test-empathy-roster-model-aggregator.c
+++ b/tests/interactive/test-empathy-roster-model-aggregator.c
@@ -1,10 +1,10 @@
#include <config.h>
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-aggregator.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-aggregator.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
static gboolean show_offline = FALSE;
static gboolean show_groups = FALSE;
diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c
index 0c95c445b..ff5de0fdc 100644
--- a/tests/interactive/test-empathy-roster-view.c
+++ b/tests/interactive/test-empathy-roster-view.c
@@ -1,10 +1,10 @@
#include <config.h>
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
static gboolean show_offline = FALSE;
static gboolean show_groups = FALSE;
diff --git a/tests/interactive/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c
index 50c6d115c..db9cd361d 100644
--- a/tests/interactive/test-empathy-status-preset-dialog.c
+++ b/tests/interactive/test-empathy-status-preset-dialog.c
@@ -26,10 +26,10 @@
#include <gtk/gtk.h>
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-status-presets.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-status-preset-dialog.h"
+#include "empathy-ui-utils.h"
+#include "empathy-status-preset-dialog.h"
int
main (int argc, char **argv)