aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Barisione <marco.barisione@collabora.co.uk>2013-05-08 21:49:45 +0800
committerMarco Barisione <marco.barisione@collabora.co.uk>2013-08-20 18:03:05 +0800
commitc07fb4e3252593b3be0b7d7b1a802a0639334c10 (patch)
tree1ca65e022497c86da356554ec290402104dc90fd
parentdc1515185c316d2e333ff38e879993a0af70accb (diff)
downloadgsoc2013-empathy-c07fb4e3252593b3be0b7d7b1a802a0639334c10.tar.gz
gsoc2013-empathy-c07fb4e3252593b3be0b7d7b1a802a0639334c10.tar.zst
gsoc2013-empathy-c07fb4e3252593b3be0b7d7b1a802a0639334c10.zip
account-settings: use TpAccount's functions for schemes instead of Empathy's
https://bugzilla.gnome.org/show_bug.cgi?id=699492
-rw-r--r--tp-account-widgets/tpaw-account-settings.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/tp-account-widgets/tpaw-account-settings.c b/tp-account-widgets/tpaw-account-settings.c
index 23c2ab9d1..3d27a9951 100644
--- a/tp-account-widgets/tpaw-account-settings.c
+++ b/tp-account-widgets/tpaw-account-settings.c
@@ -458,6 +458,12 @@ tpaw_account_settings_get_password_cb (GObject *source,
g_signal_emit (self, signals[PASSWORD_RETRIEVED], 0);
}
+static gboolean
+account_has_uri_scheme_tel (TpAccount *account)
+{
+ return tp_account_associated_with_uri_scheme (account, "tel");
+}
+
static GVariant * tpaw_account_settings_dup (
TpawAccountSettings *settings,
const gchar *param);
@@ -499,7 +505,7 @@ tpaw_account_settings_check_readyness (TpawAccountSettings *self)
priv->icon_name =
g_strdup (tp_account_get_icon_name (priv->account));
- priv->uri_scheme_tel = empathy_account_has_uri_scheme_tel (priv->account);
+ priv->uri_scheme_tel = account_has_uri_scheme_tel (priv->account);
}
if (priv->protocol_obj == NULL)
@@ -846,7 +852,7 @@ tpaw_account_settings_discard_changes (TpawAccountSettings *settings)
priv->password = g_strdup (priv->password_original);
if (priv->account != NULL)
- priv->uri_scheme_tel = empathy_account_has_uri_scheme_tel (priv->account);
+ priv->uri_scheme_tel = account_has_uri_scheme_tel (priv->account);
else
priv->uri_scheme_tel = FALSE;
}
@@ -1269,7 +1275,7 @@ update_account_uri_schemes (TpawAccountSettings *self)
{
TpawAccountSettingsPriv *priv = GET_PRIV (self);
- if (priv->uri_scheme_tel == empathy_account_has_uri_scheme_tel (
+ if (priv->uri_scheme_tel == account_has_uri_scheme_tel (
priv->account))
return;