empathy_account_settings_get_tp_protocol: return a TpProtocol

https://bugzilla.gnome.org/show_bug.cgi?id=677465

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 014d5a3db81cf906b2dc39431db2d4d49481777d..83a225350e3489104abdc08953219c861be1debc 100644 (file)
--- 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 4d979568674212d3defbed1ded65180f30941d26..7e3a745be1cac0f2b5ab9c4c5ba8afe81685f52c 100644 (file)
--- 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 10ed3684f9d61aeb80d29ed31031ef69319d696a..25816131c1d9a1d19431226d8327ce4da85eaac3 100644 (file)
--- 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);