diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-09-14 05:32:42 +0800 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-09-16 22:39:21 +0800 |
| commit | 149a905bd95e78f8ba6c1bc35444fba3aabbe28a (patch) | |
| tree | 0e43d3063a7c433845b2ea1365f0017902259653 /ubuntu-online-accounts/cc-plugins/app-plugin | |
| parent | 6f4863853b0d09071ec20a9d106c2df152066b76 (diff) | |
| download | gsoc2013-empathy-149a905bd95e78f8ba6c1bc35444fba3aabbe28a.tar gsoc2013-empathy-149a905bd95e78f8ba6c1bc35444fba3aabbe28a.tar.gz gsoc2013-empathy-149a905bd95e78f8ba6c1bc35444fba3aabbe28a.tar.bz2 gsoc2013-empathy-149a905bd95e78f8ba6c1bc35444fba3aabbe28a.tar.lz gsoc2013-empathy-149a905bd95e78f8ba6c1bc35444fba3aabbe28a.tar.xz gsoc2013-empathy-149a905bd95e78f8ba6c1bc35444fba3aabbe28a.tar.zst gsoc2013-empathy-149a905bd95e78f8ba6c1bc35444fba3aabbe28a.zip | |
Fix UOA build
Diffstat (limited to 'ubuntu-online-accounts/cc-plugins/app-plugin')
| -rw-r--r-- | ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am index 801c2d8a1..16fcd41b4 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am @@ -6,6 +6,7 @@ INCLUDES = \ -I$(top_srcdir)/libempathy \ -I$(top_srcdir)/libempathy-gtk \ -DLOCALEDIR=\""$(datadir)/locale"\" \ + $(TPAW_CFLAGS) \ $(UOA_CFLAGS) \ $(WARN_CFLAGS) \ $(ERROR_CFLAGS) \ @@ -23,6 +24,7 @@ libempathy_la_SOURCES = \ empathy-app-plugin-widget.h libempathy_la_LDFLAGS = -module -avoid-version libempathy_la_LIBADD = \ + $(TPAW_LIBS) \ $(UOA_LIBS) \ $(top_builddir)/libempathy/libempathy.la \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la 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 6895a04d5..addd737e6 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 "empathy-contact.h" -#include "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); |