Revert "Fix build with UOA"

This reverts commit b8956d60c2ea6a8836dc9e84e0c067cb19858a83.

7 files changed, 31 insertions, 34 deletions

diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c
index 6d3fdcac..a57dd633 100644
--- a/libempathy/empathy-uoa-auth-handler.c
+++ b/libempathy/empathy-uoa-auth-handler.c
@@ -50,7 +50,7 @@ empathy_uoa_auth_handler_init (EmpathyUoaAuthHandler *self)
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_UOA_AUTH_HANDLER, EmpathyUoaAuthHandlerPriv);
 
-  self->priv->manager = tpaw_uoa_manager_dup ();
+  self->priv->manager = empathy_uoa_manager_dup ();
 }
 
 static void
@@ -338,7 +338,7 @@ empathy_uoa_auth_handler_start (EmpathyUoaAuthHandler *self,
 
   account = ag_manager_get_account (self->priv->manager, id);
   if (account != NULL)
-    l = ag_account_list_services_by_type (account, TPAW_UOA_SERVICE_TYPE);
+    l = ag_account_list_services_by_type (account, EMPATHY_UOA_SERVICE_TYPE);
   if (l == NULL)
     {
       DEBUG ("Couldn't find IM service for AgAccountId %u", id);
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index 1e367561..f7ac7d99 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -502,7 +502,7 @@ uoa_plugin_installed (AgManager *manager,
   protocol = tp_account_get_protocol_name (account);
   ag_account = ag_manager_create_account (manager, protocol);
 
-  l = ag_account_list_services_by_type (ag_account, TPAW_UOA_SERVICE_TYPE);
+  l = ag_account_list_services_by_type (ag_account, EMPATHY_UOA_SERVICE_TYPE);
   if (l == NULL)
     {
       const gchar *packages[2];
@@ -537,7 +537,7 @@ migrate_accounts_to_uoa (SanityCtx *ctx)
 
   DEBUG ("Start migrating accounts to UOA");
 
-  manager = tpaw_uoa_manager_dup ();
+  manager = empathy_uoa_manager_dup ();
 
   accounts = tp_account_manager_dup_valid_accounts (ctx->am);
   for (l = accounts; l != NULL; l = g_list_next (l))
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
index 7feafdd8..f76c2fa5 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES =					\
 	-I$(top_builddir)			\
 	-I$(top_srcdir)				\
 	-DLOCALEDIR=\""$(datadir)/locale"\"	\
-	$(TPAW_CFLAGS)				\
 	$(UOA_CFLAGS)				\
 	$(WARN_CFLAGS)				\
 	$(ERROR_CFLAGS)				\
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
index 8b9dacfb..f9081592 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
@@ -30,7 +30,7 @@
 #include <libaccounts-glib/ag-service.h>
 #include <libaccounts-glib/ag-account-service.h>
 
-#include <tp-account-widgets/tpaw-account-widget.h>
+#include <libempathy-gtk/empathy-account-widget.h>
 
 G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX)
 
@@ -52,9 +52,9 @@ struct _EmpathyAccountsPluginWidgetPriv
 {
   AgAccount *account;
 
-  TpawAccountSettings *settings;
+  EmpathyAccountSettings *settings;
 
-  TpawAccountWidget *account_widget;
+  EmpathyAccountWidget *account_widget;
   GtkWidget *done_button;
 };
 
@@ -96,7 +96,7 @@ empathy_accounts_plugin_widget_set_property (GObject *object,
     }
 }
 
-static TpawAccountSettings *
+static EmpathyAccountSettings *
 create_account_settings (AgAccount *account)
 {
   AgService *service;
@@ -104,7 +104,7 @@ create_account_settings (AgAccount *account)
   AgAccountService *account_service;
   GVariant *v;
   gchar *manager = NULL, *protocol = NULL;
-  TpawAccountSettings *settings;
+  EmpathyAccountSettings *settings;
 
   g_assert (account->id == 0);
 
@@ -127,13 +127,13 @@ create_account_settings (AgAccount *account)
   g_return_val_if_fail (manager != NULL, NULL);
   g_return_val_if_fail (protocol != NULL, NULL);
 
-  settings = tpaw_account_settings_new (manager, protocol, NULL,
+  settings = empathy_account_settings_new (manager, protocol, NULL,
       ag_service_get_display_name (service));
 
-  tpaw_account_settings_set_storage_provider (settings,
+  empathy_account_settings_set_storage_provider (settings,
       EMPATHY_UOA_PROVIDER);
 
-  tpaw_account_settings_set_icon_name_async (settings,
+  empathy_account_settings_set_icon_name_async (settings,
     ag_service_get_icon_name (service), NULL, NULL);
 
   g_free (manager);
@@ -155,13 +155,13 @@ response_cb (GtkWidget *widget,
     }
   if (response == GTK_RESPONSE_OK)
     {
-      tpaw_account_widget_apply_and_log_in (self->priv->account_widget);
+      empathy_account_widget_apply_and_log_in (self->priv->account_widget);
 
       /* Rely on account_widget_close_cb to fire the 'done' signal */
     }
   else
     {
-      tpaw_account_widget_discard_pending_changes (
+      empathy_account_widget_discard_pending_changes (
           self->priv->account_widget);
 
       g_signal_emit (self, signals[SIG_DONE], 0);
@@ -222,7 +222,7 @@ create_top_bar (EmpathyAccountsPluginWidget *self)
 }
 
 static void
-account_widget_handle_apply_cb (TpawAccountWidget *widget,
+account_widget_handle_apply_cb (EmpathyAccountWidget *widget,
     gboolean valid,
     EmpathyAccountsPluginWidget *self)
 {
@@ -230,7 +230,7 @@ account_widget_handle_apply_cb (TpawAccountWidget *widget,
 }
 
 static void
-account_widget_close_cb (TpawAccountWidget *widget,
+account_widget_close_cb (EmpathyAccountWidget *widget,
     GtkResponseType response,
     EmpathyAccountsPluginWidget *self)
 {
@@ -251,10 +251,10 @@ add_account_widget (EmpathyAccountsPluginWidget *self)
   /* Use the simple widget only when creating the account */
   simple = (self->priv->account->id == 0);
 
-  self->priv->account_widget = tpaw_account_widget_new_for_protocol (
-      self->priv->settings, NULL, simple);
+  self->priv->account_widget = empathy_account_widget_new_for_protocol (
+      self->priv->settings, simple);
 
-  tpaw_account_widget_hide_buttons (self->priv->account_widget);
+  empathy_account_widget_hide_buttons (self->priv->account_widget);
 
   gtk_widget_set_valign (GTK_WIDGET (self->priv->account_widget),
       GTK_ALIGN_CENTER);
@@ -263,7 +263,7 @@ add_account_widget (EmpathyAccountsPluginWidget *self)
       GTK_WIDGET (self->priv->account_widget));
   gtk_widget_show (GTK_WIDGET (self->priv->account_widget));
 
-  if (!tpaw_account_settings_is_valid (self->priv->settings))
+  if (!empathy_account_settings_is_valid (self->priv->settings))
     {
       gtk_widget_set_sensitive (self->priv->done_button, FALSE);
     }
@@ -279,7 +279,7 @@ maybe_add_account_widget (EmpathyAccountsPluginWidget *self)
 {
   g_return_if_fail (self->priv->settings != NULL);
 
-  if (tpaw_account_settings_is_ready (self->priv->settings))
+  if (empathy_account_settings_is_ready (self->priv->settings))
     {
       add_account_widget (self);
     }
@@ -324,7 +324,7 @@ manager_prepared_cb (GObject *source,
       if (G_VALUE_HOLDS_UINT (value) &&
           g_value_get_uint (value) == self->priv->account->id)
         {
-          self->priv->settings = tpaw_account_settings_new_for_account (
+          self->priv->settings = empathy_account_settings_new_for_account (
               account);
           maybe_add_account_widget (self);
           break;
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
index 6f79f87c..939912aa 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
@@ -20,11 +20,10 @@
 
 #include "config.h"
 
-#include <tp-account-widgets/tpaw-uoa-utils.h>
-
 #include "empathy-accounts-plugin.h"
 
-#include "empathy-client-factory.h"
+#include <libempathy/empathy-client-factory.h>
+#include <libempathy/empathy-uoa-utils.h>
 
 #include "empathy-accounts-plugin-widget.h"
 
@@ -44,7 +43,7 @@ empathy_accounts_plugin_build_widget (ApPlugin *plugin)
   GtkWidget *widget;
 
   account = ap_plugin_get_account (plugin);
-  tpaw_uoa_manager_set_default (ag_account_get_manager (account));
+  empathy_uoa_manager_set_default (ag_account_get_manager (account));
 
   widget = empathy_accounts_plugin_widget_new (account);
 
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am
index 40ab1668..e3351266 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am
@@ -4,7 +4,6 @@ INCLUDES =					\
 	-I$(top_builddir)			\
 	-I$(top_srcdir)				\
 	-DLOCALEDIR=\""$(datadir)/locale"\"	\
-	$(TPAW_CFLAGS)				\
 	$(UOA_CFLAGS)				\
 	$(WARN_CFLAGS)				\
 	$(ERROR_CFLAGS)				\
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
index addd737e..768f0965 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
@@ -27,9 +27,9 @@
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-provider.h>
 
-#include <tp-account-widgets/tpaw-user-info.h>
+#include <libempathy/empathy-contact.h>
+#include <libempathy-gtk/empathy-user-info.h>
 
-#include "empathy-contact.h"
 #include "empathy-app-plugin-widget.h"
 
 G_DEFINE_TYPE (EmpathyAppPluginWidget, empathy_app_plugin_widget, GTK_TYPE_BOX)
@@ -101,12 +101,12 @@ response_cb (GtkWidget *widget,
 {
   if (self->priv->user_info != NULL)
     {
-      TpawUserInfo *user_info = (TpawUserInfo *) self->priv->user_info;
+      EmpathyUserInfo *user_info = (EmpathyUserInfo *) self->priv->user_info;
 
       if (response == GTK_RESPONSE_OK)
-        tpaw_user_info_apply_async (user_info, NULL, NULL);
+        empathy_user_info_apply_async (user_info, NULL, NULL);
       else
-        tpaw_user_info_discard (user_info);
+        empathy_user_info_discard (user_info);
     }
 
   g_signal_emit (self, signals[SIG_DONE], 0);
@@ -208,7 +208,7 @@ manager_prepared_cb (GObject *source,
           GtkWidget *alig;
 
           alig = gtk_alignment_new (0.5, 0, 0, 0);
-          self->priv->user_info = tpaw_user_info_new (account);
+          self->priv->user_info = empathy_user_info_new (account);
           gtk_container_add (GTK_CONTAINER (alig), self->priv->user_info);
           gtk_widget_show (self->priv->user_info);