[Pkg-telepathy-commits] [empathy] 19/39: Fix build with UOA
Simon McVittie
smcv at debian.org
Wed Jan 29 12:53:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository empathy.
commit b8956d60c2ea6a8836dc9e84e0c067cb19858a83
Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date: Wed Aug 21 16:28:04 2013 +0200
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
---
libempathy/empathy-uoa-auth-handler.c | 4 +--
src/empathy-sanity-cleaning.c | 4 +--
.../cc-plugins/account-plugins/Makefile.am | 1 +
.../empathy-accounts-plugin-widget.c | 36 +++++++++++-----------
.../account-plugins/empathy-accounts-plugin.c | 7 +++--
.../cc-plugins/app-plugin/Makefile.am | 1 +
.../app-plugin/empathy-app-plugin-widget.c | 12 ++++----
7 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c
index a57dd63..6d3fdca 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);
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index f7ac7d9..1e36756 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, EMPATHY_UOA_SERVICE_TYPE);
+ l = ag_account_list_services_by_type (ag_account, TPAW_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 = empathy_uoa_manager_dup ();
+ manager = tpaw_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 f76c2fa..7feafdd 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
@@ -4,6 +4,7 @@ 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 f908159..8b9dacf 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 <libempathy-gtk/empathy-account-widget.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX)
@@ -52,9 +52,9 @@ struct _EmpathyAccountsPluginWidgetPriv
{
AgAccount *account;
- EmpathyAccountSettings *settings;
+ TpawAccountSettings *settings;
- EmpathyAccountWidget *account_widget;
+ TpawAccountWidget *account_widget;
GtkWidget *done_button;
};
@@ -96,7 +96,7 @@ empathy_accounts_plugin_widget_set_property (GObject *object,
}
}
-static EmpathyAccountSettings *
+static TpawAccountSettings *
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;
- EmpathyAccountSettings *settings;
+ TpawAccountSettings *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 = empathy_account_settings_new (manager, protocol, NULL,
+ settings = tpaw_account_settings_new (manager, protocol, NULL,
ag_service_get_display_name (service));
- empathy_account_settings_set_storage_provider (settings,
+ tpaw_account_settings_set_storage_provider (settings,
EMPATHY_UOA_PROVIDER);
- empathy_account_settings_set_icon_name_async (settings,
+ tpaw_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)
{
- empathy_account_widget_apply_and_log_in (self->priv->account_widget);
+ tpaw_account_widget_apply_and_log_in (self->priv->account_widget);
/* Rely on account_widget_close_cb to fire the 'done' signal */
}
else
{
- empathy_account_widget_discard_pending_changes (
+ tpaw_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 (EmpathyAccountWidget *widget,
+account_widget_handle_apply_cb (TpawAccountWidget *widget,
gboolean valid,
EmpathyAccountsPluginWidget *self)
{
@@ -230,7 +230,7 @@ account_widget_handle_apply_cb (EmpathyAccountWidget *widget,
}
static void
-account_widget_close_cb (EmpathyAccountWidget *widget,
+account_widget_close_cb (TpawAccountWidget *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 = empathy_account_widget_new_for_protocol (
- self->priv->settings, simple);
+ self->priv->account_widget = tpaw_account_widget_new_for_protocol (
+ self->priv->settings, NULL, simple);
- empathy_account_widget_hide_buttons (self->priv->account_widget);
+ tpaw_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 (!empathy_account_settings_is_valid (self->priv->settings))
+ if (!tpaw_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 (empathy_account_settings_is_ready (self->priv->settings))
+ if (tpaw_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 = empathy_account_settings_new_for_account (
+ self->priv->settings = tpaw_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 939912a..6f79f87 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,10 +20,11 @@
#include "config.h"
+#include <tp-account-widgets/tpaw-uoa-utils.h>
+
#include "empathy-accounts-plugin.h"
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-uoa-utils.h>
+#include "empathy-client-factory.h"
#include "empathy-accounts-plugin-widget.h"
@@ -43,7 +44,7 @@ empathy_accounts_plugin_build_widget (ApPlugin *plugin)
GtkWidget *widget;
account = ap_plugin_get_account (plugin);
- empathy_uoa_manager_set_default (ag_account_get_manager (account));
+ tpaw_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 e335126..40ab166 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am
@@ -4,6 +4,7 @@ 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 768f096..addd737 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 <libempathy/empathy-contact.h>
-#include <libempathy-gtk/empathy-user-info.h>
+#include <tp-account-widgets/tpaw-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)
{
- EmpathyUserInfo *user_info = (EmpathyUserInfo *) self->priv->user_info;
+ TpawUserInfo *user_info = (TpawUserInfo *) self->priv->user_info;
if (response == GTK_RESPONSE_OK)
- empathy_user_info_apply_async (user_info, NULL, NULL);
+ tpaw_user_info_apply_async (user_info, NULL, NULL);
else
- empathy_user_info_discard (user_info);
+ tpaw_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 = empathy_user_info_new (account);
+ self->priv->user_info = tpaw_user_info_new (account);
gtk_container_add (GTK_CONTAINER (alig), self->priv->user_info);
gtk_widget_show (self->priv->user_info);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git
More information about the Pkg-telepathy-commits
mailing list