[empathy/mc5] Move back the account assistant to src/

[Sjoerd Simons <sjoerds src gnome org>]

commit 3ac8eb4e2f6909d6c54718d6910b156359e10b42
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sat Aug 1 19:11:33 2009 +0200

    Move back the account assistant to src/

 libempathy-gtk/Makefile.am                         |    2 --
 src/Makefile.am                                    |    1 +
 .../empathy-account-assistant.c                    |    2 +-
 .../empathy-account-assistant.h                    |    0
 tests/Makefile.am                                  |    5 +++++
 tests/test-empathy-account-assistant.c             |    2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index aeada22..70e11e4 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -24,7 +24,6 @@ BUILT_SOURCES = 					\
 lib_LTLIBRARIES = libempathy-gtk.la
 
 libempathy_gtk_handwritten_source =            	\
-	empathy-account-assistant.c		\
 	empathy-account-chooser.c		\
 	empathy-account-widget.c		\
 	empathy-account-widget-irc.c		\
@@ -87,7 +86,6 @@ libempathy_gtk_la_LDFLAGS =                \
        -export-symbols-regex ^empathy_
 
 libempathy_gtk_headers =			\
-	empathy-account-assistant.h		\
 	empathy-account-chooser.h		\
 	empathy-account-widget.h		\
 	empathy-account-widget-irc.h		\
diff --git a/src/Makefile.am b/src/Makefile.am
index d0b86ed..9ac6b9b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,7 @@ BUILT_SOURCES= \
 empathy_handwritten_source = \
 	empathy.c							\
 	empathy-about-dialog.c empathy-about-dialog.h			\
+	empathy-account-assistant.c empathy-account-assistant.h		\
 	empathy-accounts-dialog.c empathy-accounts-dialog.h		\
 	empathy-call-window.c empathy-call-window.h			\
 	empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h			\
diff --git a/libempathy-gtk/empathy-account-assistant.c b/src/empathy-account-assistant.c
similarity index 98%
rename from libempathy-gtk/empathy-account-assistant.c
rename to src/empathy-account-assistant.c
index 2efe0f0..6d3c27a 100644
--- a/libempathy-gtk/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n.h>
 
 #include "empathy-account-assistant.h"
-#include "empathy-ui-utils.h"
+#include <libempathy-gtk/empathy-ui-utils.h>
 
 G_DEFINE_TYPE (EmpathyAccountAssistant, empathy_account_assistant,
     GTK_TYPE_ASSISTANT)
diff --git a/libempathy-gtk/empathy-account-assistant.h b/src/empathy-account-assistant.h
similarity index 100%
rename from libempathy-gtk/empathy-account-assistant.h
rename to src/empathy-account-assistant.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index eb5dba5..8ffdae7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,6 +37,11 @@ test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c
 test_empathy_protocol_chooser_SOURCES = test-empathy-protocol-chooser.c
 test_empathy_account_assistant_SOURCES = test-empathy-account-assistant.c
 
+test_empathy_account_assistant_CFLAGS = -I$(top_srcdir)/src
+test_empathy_account_assistant_LDADD = 			\
+	$(top_builddir)/src/empathy-account-assistant.o	\
+	$(LDADD)
+
 check_PROGRAMS = check-main
 TESTS = check-main
 check_main_SOURCES =                             \
diff --git a/tests/test-empathy-account-assistant.c b/tests/test-empathy-account-assistant.c
index 5add958..f1f519d 100644
--- a/tests/test-empathy-account-assistant.c
+++ b/tests/test-empathy-account-assistant.c
@@ -3,7 +3,7 @@
 #include <gtk/gtk.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-account-assistant.h>
+#include "empathy-account-assistant.h"
 
 int main (int argc, char **argv)
 {