diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-08-21 16:28:04 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-09-13 17:19:18 -0400 |
| commit | b8956d60c2ea6a8836dc9e84e0c067cb19858a83 (patch) | |
| tree | 503764d44d8eb688ebf24e178b02e4591e106e0d /libempathy | |
| parent | 8c83da990d4791fc91b52856536c3d05f59bc832 (diff) | |
Fix build with UOA
Conflicts:
src/empathy-sanity-cleaning.c
telepathy-account-widgets
ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-uoa-auth-handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c index a57dd633..6d3fdcac 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 = empathy_uoa_manager_dup (); + self->priv->manager = tpaw_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, 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); |