diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2009-11-02 18:41:20 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2009-11-02 18:41:20 +0800 |
| commit | 8c4fe70aad3622138957c49732fa612b1e2e9eb7 (patch) | |
| tree | 2f80938787489bc774bf8849a14a2ad24354f978 /tests | |
| parent | 1b4acf8fcf47d928f525a4640f27323e13fd25ea (diff) | |
| parent | b6bb173fe0840ec0857a145e265853e2a9083ee6 (diff) | |
| download | gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.gz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.bz2 gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.lz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.xz gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.tar.zst gsoc2013-empathy-8c4fe70aad3622138957c49732fa612b1e2e9eb7.zip | |
Merge branch 'accountz'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check-empathy-chatroom-manager.c | 2 | ||||
| -rw-r--r-- | tests/check-empathy-helpers.c | 2 | ||||
| -rw-r--r-- | tests/check-empathy-helpers.h | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/tests/check-empathy-chatroom-manager.c b/tests/check-empathy-chatroom-manager.c index 5a3384fe4..dd0d93f52 100644 --- a/tests/check-empathy-chatroom-manager.c +++ b/tests/check-empathy-chatroom-manager.c @@ -5,6 +5,7 @@ #include <gconf/gconf.h> #include <gconf/gconf-client.h> +#include <telepathy-glib/account-manager.h> #include <telepathy-glib/util.h> #include <check.h> @@ -13,7 +14,6 @@ #include "check-empathy-helpers.h" #include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-account-manager.h> #define CHATROOM_SAMPLE "chatrooms-sample.xml" #define CHATROOM_FILE "chatrooms.xml" diff --git a/tests/check-empathy-helpers.c b/tests/check-empathy-helpers.c index 5fb8b4a35..d176d0abe 100644 --- a/tests/check-empathy-helpers.c +++ b/tests/check-empathy-helpers.c @@ -24,7 +24,7 @@ #include <gconf/gconf.h> #include <gconf/gconf-client.h> -#include <libempathy/empathy-account-manager.h> +#include <telepathy-glib/account-manager.h> #include "check-helpers.h" #include "check-empathy-helpers.h" diff --git a/tests/check-empathy-helpers.h b/tests/check-empathy-helpers.h index 5544b80aa..665e7e256 100644 --- a/tests/check-empathy-helpers.h +++ b/tests/check-empathy-helpers.h @@ -20,12 +20,13 @@ #define __CHECK_EMPATHY_HELPERS_H__ #include <glib.h> -#include <libempathy/empathy-account.h> + +#include <telepathy-glib/account.h> gchar * get_xml_file (const gchar *filename); gchar * get_user_xml_file (const gchar *filename); void copy_xml_file (const gchar *orig, const gchar *dest); -EmpathyAccount * get_test_account (void); -void destroy_test_account (EmpathyAccount *account); +TpAccount * get_test_account (void); +void destroy_test_account (TpAccount *account); #endif /* #ifndef __CHECK_EMPATHY_HELPERS_H__ */ |