aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorTravis Reitter <treitter@gmail.com>2010-02-12 07:09:32 +0800
committerTravis Reitter <treitter@gmail.com>2010-02-12 07:19:54 +0800
commit2aa506e8a17ef67ddf43ee716b21afc780a9d0d2 (patch)
tree53d9c41aa9ab11296b5a0a3f739ced1b21b7b87d /libempathy
parent1abde726f2920d166728b79cc6e2cdc5e72ea1df (diff)
downloadgsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.gz
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.bz2
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.lz
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.xz
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.tar.zst
gsoc2013-empathy-2aa506e8a17ef67ddf43ee716b21afc780a9d0d2.zip
Separate the accounts dialog into its own program which works with the Gnome preferences and control center.
Where available, this also supports embedding the preferences dialog in the "extensible-shell" control center (currently in development, but likely to be mainlined soon).
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-account-settings.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 58b0b85ca..40df9a802 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -1237,13 +1237,18 @@ empathy_account_settings_has_account (EmpathyAccountSettings *settings,
TpAccount *account)
{
EmpathyAccountSettingsPriv *priv;
+ const gchar *account_path;
+ const gchar *priv_account_path;
g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), FALSE);
g_return_val_if_fail (TP_IS_ACCOUNT (account), FALSE);
priv = GET_PRIV (settings);
- return (account == priv->account);
+ account_path = tp_proxy_get_object_path (TP_PROXY (account));
+ priv_account_path = tp_proxy_get_object_path (TP_PROXY (priv->account));
+
+ return (!tp_strdiff (account_path, priv_account_path));
}
gboolean