[empathy] UOA: Fix build failure

[Guillaume Desmottes <gdesmott src gnome org>]

commit 00fe6300fe015f7ac6caaedf297103d20f038165
Author: Tim Lunn <tim feathertop org>
Date:   Tue Sep 3 11:39:46 2013 +1000

    UOA: Fix build failure
    
    This was a regression caused by c689cd6a91cb2a31ce0d03f47e59ca4e3f368e9c
    
    https://bugzilla.gnome.org/show_bug.cgi?id=707338

 libempathy/empathy-uoa-auth-handler.c |    2 +-
 src/empathy-sanity-cleaning.c         |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c
index d5a6577..5048013 100644
--- a/libempathy/empathy-uoa-auth-handler.c
+++ b/libempathy/empathy-uoa-auth-handler.c
@@ -340,7 +340,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, EMPATHY_UOA_SERVICE_TYPE);
+    l = ag_account_list_services_by_type (account, TPAW_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 6ad0990..e43c155 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -29,9 +29,9 @@
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-service.h>
 #include <tp-account-widgets/tpaw-keyring.h>
+#include <tp-account-widgets/tpaw-uoa-utils.h>
 
 #include "empathy-pkg-kit.h"
-#include "empathy-uoa-utils.h"
 #endif
 
 #include "empathy-gsettings.h"
@@ -501,7 +501,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, EMPATHY_UOA_SERVICE_TYPE);
+  l = ag_account_list_services_by_type (ag_account, TPAW_UOA_SERVICE_TYPE);
   if (l == NULL)
     {
       const gchar *packages[2];