diff options
Diffstat (limited to 'tests')
22 files changed, 48 insertions, 46 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index fdd67482a..67fe5d895 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,7 +10,8 @@ EXTRA_DIST = \ AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ -DGCR_API_SUBJECT_TO_CHANGE \ $(EMPATHY_CFLAGS) \ diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c index d3b0e7a43..e6e825835 100644 --- a/tests/empathy-chatroom-manager-test.c +++ b/tests/empathy-chatroom-manager-test.c @@ -5,7 +5,7 @@ #include <telepathy-glib/telepathy-glib.h> -#include "libempathy/empathy-chatroom-manager.h" +#include "empathy-chatroom-manager.h" #include "test-helper.h" diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c index 38ea4a146..4a0f655e3 100644 --- a/tests/empathy-chatroom-test.c +++ b/tests/empathy-chatroom-test.c @@ -4,7 +4,7 @@ #include "test-helper.h" -#include "libempathy/empathy-chatroom.h" +#include "empathy-chatroom.h" #if 0 static EmpathyChatroom * diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c index 3bef1fe43..9a3c46afe 100644 --- a/tests/empathy-irc-network-manager-test.c +++ b/tests/empathy-irc-network-manager-test.c @@ -6,7 +6,7 @@ #include "test-irc-helper.h" #include "test-helper.h" -#include "libempathy/empathy-irc-network-manager.h" +#include "empathy-irc-network-manager.h" #define GLOBAL_SAMPLE "default-irc-networks-sample.xml" #define USER_SAMPLE "user-irc-networks-sample.xml" diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c index 8e9e86bc5..d22e04f05 100644 --- a/tests/empathy-irc-network-test.c +++ b/tests/empathy-irc-network-test.c @@ -5,7 +5,7 @@ #include "test-irc-helper.h" #include "test-helper.h" -#include "libempathy/empathy-irc-network.h" +#include "empathy-irc-network.h" static void test_empathy_irc_network_new (void) diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c index f959aad30..291a34de1 100644 --- a/tests/empathy-irc-server-test.c +++ b/tests/empathy-irc-server-test.c @@ -5,7 +5,7 @@ #include "test-irc-helper.h" #include "test-helper.h" -#include "libempathy/empathy-irc-server.h" +#include "empathy-irc-server.h" static void test_empathy_irc_server_new (void) diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c index 4428e3c32..0934fe4c7 100644 --- a/tests/empathy-live-search-test.c +++ b/tests/empathy-live-search-test.c @@ -7,9 +7,9 @@ #include "test-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_TESTS -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" -#include "libempathy-gtk/empathy-live-search.h" +#include "empathy-live-search.h" typedef struct { diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c index e9983c7f8..24cd5d676 100644 --- a/tests/empathy-parser-test.c +++ b/tests/empathy-parser-test.c @@ -9,9 +9,9 @@ #include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG EMPATHY_DEBUG_TESTS -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" -#include "libempathy-gtk/empathy-string-parser.h" +#include "empathy-string-parser.h" static void test_replace_match (const gchar *text, diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c index efcafcec1..03cc9d7a8 100644 --- a/tests/empathy-tls-test.c +++ b/tests/empathy-tls-test.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <string.h> -#include "libempathy/empathy-tls-verifier.h" +#include "empathy-tls-verifier.h" #include "test-helper.h" #include "mock-pkcs11.h" 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) diff --git a/tests/test-helper.c b/tests/test-helper.c index d0ff34636..f6fc0ffda 100644 --- a/tests/test-helper.c +++ b/tests/test-helper.c @@ -22,7 +22,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-ui-utils.h" #include "test-helper.h" diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h index ac51d434b..04271715b 100644 --- a/tests/test-irc-helper.h +++ b/tests/test-irc-helper.h @@ -1,9 +1,9 @@ #include <stdlib.h> #include <string.h> -#include "libempathy/empathy-irc-server.h" -#include "libempathy/empathy-irc-network.h" -#include "libempathy/empathy-irc-network-manager.h" +#include "empathy-irc-server.h" +#include "empathy-irc-network.h" +#include "empathy-irc-network-manager.h" #ifndef __CHECK_IRC_HELPER_H__ #define __CHECK_IRC_HELPER_H__ |