aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2009-08-02 01:11:33 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-22 21:13:12 +0800
commit3ac8eb4e2f6909d6c54718d6910b156359e10b42 (patch)
tree5a111ce92b3c1ddf52a67d6a5950e71a909f54e9
parent73a995007e5a417b0e1e0ebf13bdcfdf4dae7c7c (diff)
downloadgsoc2013-empathy-3ac8eb4e2f6909d6c54718d6910b156359e10b42.tar
gsoc2013-empathy-3ac8eb4e2f6909d6c54718d6910b156359e10b42.tar.gz
gsoc2013-empathy-3ac8eb4e2f6909d6c54718d6910b156359e10b42.tar.bz2
gsoc2013-empathy-3ac8eb4e2f6909d6c54718d6910b156359e10b42.tar.lz
gsoc2013-empathy-3ac8eb4e2f6909d6c54718d6910b156359e10b42.tar.xz
gsoc2013-empathy-3ac8eb4e2f6909d6c54718d6910b156359e10b42.tar.zst
gsoc2013-empathy-3ac8eb4e2f6909d6c54718d6910b156359e10b42.zip
Move back the account assistant to src/
-rw-r--r--libempathy-gtk/Makefile.am2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/empathy-account-assistant.c (renamed from libempathy-gtk/empathy-account-assistant.c)2
-rw-r--r--src/empathy-account-assistant.h (renamed from libempathy-gtk/empathy-account-assistant.h)0
-rw-r--r--tests/Makefile.am5
-rw-r--r--tests/test-empathy-account-assistant.c2
6 files changed, 8 insertions, 4 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index aeada220b..70e11e412 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 d0b86edfc..9ac6b9bb3 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
index 2efe0f086..6d3c27aa2 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
index 38a96f8f0..38a96f8f0 100644
--- a/libempathy-gtk/empathy-account-assistant.h
+++ b/src/empathy-account-assistant.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index eb5dba529..8ffdae723 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 5add95881..f1f519d77 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)
{