[telepathy-account-widgets/next] build with telepathy-glib 1.0

[Guillaume Desmottes <gdesmott src gnome org>]

commit 96c22741a03a8cb4a0d4897ba03db3e8ba0df858
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Oct 23 10:22:40 2013 +0200

    build with telepathy-glib 1.0

 configure.ac                                |    9 +++++----
 telepathy-account-widgets-uninstalled.pc.in |    2 +-
 tp-account-widgets/tpaw-account-settings.c  |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4662e6d..cc49b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,9 @@ GTK_REQUIRED=3.5.1
 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations])
 AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_4, [Prevent post 3.4 APIs])
 
-TELEPATHY_GLIB_REQUIRED=0.22.0
-AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_22, [Ignore post 0.22 deprecations])
-AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_22, [Prevent post 0.22 APIs])
+TELEPATHY_GLIB_REQUIRED=0.99.1
+AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_1_0, [Ignore post 1.0 deprecations])
+AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_1_0, [Prevent post 1.0 APIs])
 AC_DEFINE(TP_SEAL_ENABLE, 1, [Prevent to use sealed variables])
 AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, 1, [Disable single include header])
 
@@ -185,7 +185,8 @@ PKG_CHECK_MODULES(TPAW,
    libsecret-1 >= $LIBSECRET_REQUIRED
    gobject-2.0
    libxml-2.0
-   telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
+   telepathy-glib-1 >= $TELEPATHY_GLIB_REQUIRED
+   telepathy-glib-1-dbus >= $TELEPATHY_GLIB_REQUIRED
    x11
    gtk+-3.0 >= $GTK_REQUIRED
 ])
diff --git a/telepathy-account-widgets-uninstalled.pc.in b/telepathy-account-widgets-uninstalled.pc.in
index b6546bf..e91f8c5 100644
--- a/telepathy-account-widgets-uninstalled.pc.in
+++ b/telepathy-account-widgets-uninstalled.pc.in
@@ -8,6 +8,6 @@ uoa_provider= TPAW_UOA_PROVIDER@
 Name: telepathy-account-widgets (uninstalled copy)
 Description: Widgets and utility functions for configuring Telepathy accounts
 Version: @VERSION@
-Requires: pkg-config >= 0.21, glib-2.0 >= 2.33.3, gobject-2.0 >= 2.33.3, gtk+-3.0 >= 3.5.1, telepathy-glib 
> = 0.19.9, libxml-2.0, libsecret-1 >= 0.5
+Requires: pkg-config >= 0.21, glib-2.0 >= 2.33.3, gobject-2.0 >= 2.33.3, gtk+-3.0 >= 3.5.1, telepathy-glib-1 
> = 0.99.1, telepathy-glib-1-dbus >= 0.99.1, libxml-2.0, libsecret-1 >= 0.5
 Libs: ${abs_top_builddir}/tp-account-widgets/libtp-account-widgets.la
 Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
diff --git a/tp-account-widgets/tpaw-account-settings.c b/tp-account-widgets/tpaw-account-settings.c
index e0d2a12..83bbc3c 100644
--- a/tp-account-widgets/tpaw-account-settings.c
+++ b/tp-account-widgets/tpaw-account-settings.c
@@ -499,7 +499,7 @@ tpaw_account_settings_check_readyness (TpawAccountSettings *self)
   if (self->priv->protocol_obj == NULL)
     {
       self->priv->protocol_obj = g_object_ref (
-          tp_connection_manager_get_protocol_object (self->priv->manager,
+          tp_connection_manager_get_protocol (self->priv->manager,
             self->priv->protocol));
     }