Moved empathy-accounts-dialog from libempathy-gtk to src. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

svn path=/trunk/; revision=1234

11 files changed, 16 insertions, 29 deletions

diff --git a/docs/libempathy-gtk/libempathy-gtk-docs.sgml b/docs/libempathy-gtk/libempathy-gtk-docs.sgml
index 6256b3e92..c194bd06b 100644
--- a/docs/libempathy-gtk/libempathy-gtk-docs.sgml
+++ b/docs/libempathy-gtk/libempathy-gtk-docs.sgml
@@ -17,7 +17,6 @@
     <chapter id="libempathy_api">
       <title>libempathy-gtk API reference</title>
     <xi:include href="xml/empathy-account-chooser.xml"/>
-    <xi:include href="xml/empathy-accounts-dialog.xml"/>
     <xi:include href="xml/empathy-account-widget.xml"/>
     <xi:include href="xml/empathy-account-widget-irc.xml"/>
     <xi:include href="xml/empathy-avatar-chooser.xml"/>
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 225c25ec0..fe914877d 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -20,7 +20,6 @@ libempathy_gtk_la_SOURCES =             	\
 	empathy-chat.c				\
 	empathy-irc-network-dialog.c		\
 	empathy-spell-dialog.c			\
-	empathy-accounts-dialog.c		\
 	empathy-chat-view.c			\
 	empathy-log-window.c			\
 	empathy-theme-boxes.c			\
@@ -69,7 +68,6 @@ libempathy_gtk_headers =			\
 	empathy-chat.h				\
 	empathy-irc-network-dialog.h		\
 	empathy-spell-dialog.h			\
-	empathy-accounts-dialog.h		\
 	empathy-chat-view.h			\
 	empathy-log-window.h			\
 	empathy-theme-boxes.h			\
@@ -108,7 +106,6 @@ glade_DATA = 					\
 	empathy-contact-widget.glade		\
 	empathy-contact-dialogs.glade		\
 	empathy-presence-chooser.glade		\
-	empathy-accounts-dialog.glade		\
 	empathy-account-widget-generic.glade	\
 	empathy-account-widget-jabber.glade	\
 	empathy-account-widget-msn.glade	\
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index ed3c2af71..e9103a495 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -411,19 +411,6 @@
 
 
 
-;; From empathy-accounts-dialog.h
-
-(define-function accounts_dialog_show
-  (c-name "empathy_accounts_dialog_show")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkWindow*" "parent")
-    '("McAccount*" "selected_account")
-  )
-)
-
-
-
 ;; From empathy-chat-view.h
 
 (define-function chat_view_get_type
diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index 262942888..782741db7 100644
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -3,7 +3,6 @@ headers
 #include <Python.h>
 #include <pygobject.h>
 #include "empathy-account-chooser.h"
-#include "empathy-accounts-dialog.h"
 #include "empathy-account-widget.h"
 #include "empathy-account-widget-irc.h"
 #include "empathy-avatar-chooser.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index dc87087ec..5e41a5293 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,9 +31,12 @@ empathy_SOURCES =							\
 	empathy-main-window.c empathy-main-window.h			\
 	empathy-preferences.c empathy-preferences.h			\
 	empathy-call-window.c empathy-call-window.h			\
-	ephy-spinner.c ephy-spinner.h
+	ephy-spinner.c ephy-spinner.h					\
+	empathy-accounts-dialog.c empathy-accounts-dialog.h
+
+empathy_accounts_SOURCES = empathy-accounts.c				\
+	empathy-accounts-dialog.c empathy-accounts-dialog.h
 
-empathy_accounts_SOURCES = empathy-accounts.c
 empathy_logs_SOURCES = empathy-logs.c
 
 gladedir = $(datadir)/empathy
@@ -44,7 +47,8 @@ glade_DATA = 					\
 	empathy-chatrooms-window.glade		\
 	empathy-chat-window.glade		\
 	empathy-new-chatroom-dialog.glade	\
-	empathy-status-icon.glade
+	empathy-status-icon.glade		\
+	empathy-accounts-dialog.glade
 
 dist_man_MANS =			\
 	empathy.1		\
diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 8e62f1ad9..f542a9ee2 100644
--- a/libempathy-gtk/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -40,12 +40,12 @@
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
+#include <libempathy-gtk/empathy-profile-chooser.h>
+#include <libempathy-gtk/empathy-account-widget.h>
+#include <libempathy-gtk/empathy-account-widget-irc.h>
+#include <libempathy-gtk/empathy-account-widget-sip.h>
 
 #include "empathy-accounts-dialog.h"
-#include "empathy-profile-chooser.h"
-#include "empathy-account-widget.h"
-#include "empathy-account-widget-irc.h"
-#include "empathy-account-widget-sip.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <libempathy/empathy-debug.h>
@@ -1021,7 +1021,7 @@ empathy_accounts_dialog_show (GtkWindow *parent,
 	dialog = g_new0 (EmpathyAccountsDialog, 1);
 
 	filename = empathy_file_lookup ("empathy-accounts-dialog.glade",
-					"libempathy-gtk");
+					"src");
 	glade = empathy_glade_get_file (filename,
 				       "accounts_dialog",
 				       NULL,
diff --git a/libempathy-gtk/empathy-accounts-dialog.glade b/src/empathy-accounts-dialog.glade
index 9678092f2..9678092f2 100644
--- a/libempathy-gtk/empathy-accounts-dialog.glade
+++ b/src/empathy-accounts-dialog.glade
diff --git a/libempathy-gtk/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index 369b2f75b..369b2f75b 100644
--- a/libempathy-gtk/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 98af6fc53..4e75b9ab5 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -29,7 +29,8 @@
 #include <gtk/gtk.h>
 
 #include <libempathy/empathy-debug.h>
-#include <libempathy-gtk/empathy-accounts-dialog.h>
+
+#include "empathy-accounts-dialog.h"
 
 static void
 destroy_cb (GtkWidget *dialog,
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index ea67634b2..156d2e7cc 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -44,11 +44,11 @@
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-conf.h>
-#include <libempathy-gtk/empathy-accounts-dialog.h>
 #include <libempathy-gtk/empathy-log-window.h>
 #include <libempathy-gtk/empathy-new-message-dialog.h>
 #include <libempathy-gtk/empathy-gtk-enum-types.h>
 
+#include "empathy-accounts-dialog.h"
 #include "empathy-main-window.h"
 #include "ephy-spinner.h"
 #include "empathy-preferences.h"
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index b0f31c9da..9a06ed587 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -40,11 +40,11 @@
 #include <libempathy-gtk/empathy-presence-chooser.h>
 #include <libempathy-gtk/empathy-conf.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-accounts-dialog.h>
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-new-message-dialog.h>
 #include <libempathy-gtk/empathy-contact-dialogs.h>
 
+#include "empathy-accounts-dialog.h"
 #include "empathy-status-icon.h"
 #include "empathy-preferences.h"