[empathy] empathy_account_settings_get_tp_protocol: return a TpProtocol

[Guillaume Desmottes <gdesmott src gnome org>]

commit ef7ff08c2013a8c1a564bde2c16d0e20414f93c4
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jun 5 13:45:45 2012 +0200

    empathy_account_settings_get_tp_protocol: return a TpProtocol
    
    https://bugzilla.gnome.org/show_bug.cgi?id=677465

 libempathy-gtk/empathy-account-widget.c |    4 ++--
 libempathy/empathy-account-settings.c   |    4 ++--
 libempathy/empathy-account-settings.h   |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 014d5a3..83a2253 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1819,7 +1819,7 @@ static void
 add_register_buttons (EmpathyAccountWidget *self,
     TpAccount *account)
 {
-  const TpConnectionManagerProtocol *protocol;
+  TpProtocol *protocol;
   GtkWidget *radiobutton_register;
 
   if (!self->priv->creating_account)
@@ -1829,7 +1829,7 @@ add_register_buttons (EmpathyAccountWidget *self,
   if (protocol == NULL)
     return;
 
-  if (!tp_connection_manager_protocol_can_register (protocol))
+  if (!tp_protocol_can_register (protocol))
     return;
 
   if (account_widget_get_service (self) != NO_SERVICE)
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 4d97956..7e3a745 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -1844,12 +1844,12 @@ empathy_account_settings_is_valid (EmpathyAccountSettings *settings)
   return TRUE;
 }
 
-const TpConnectionManagerProtocol *
+TpProtocol *
 empathy_account_settings_get_tp_protocol (EmpathyAccountSettings *self)
 {
   EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
 
-  return tp_connection_manager_get_protocol (priv->manager, priv->protocol);
+  return priv->protocol_obj;
 }
 
 gboolean
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index 10ed368..2581613 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -194,7 +194,7 @@ gboolean empathy_account_settings_parameter_is_valid (
 
 gboolean empathy_account_settings_is_valid (EmpathyAccountSettings *settings);
 
-const TpConnectionManagerProtocol * empathy_account_settings_get_tp_protocol (
+TpProtocol * empathy_account_settings_get_tp_protocol (
     EmpathyAccountSettings *settings);
 
 gboolean empathy_account_settings_supports_sasl (EmpathyAccountSettings *self);