From 2aa506e8a17ef67ddf43ee716b21afc780a9d0d2 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Thu, 11 Feb 2010 15:09:32 -0800 Subject: 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). --- libempathy/empathy-account-settings.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libempathy/empathy-account-settings.c') 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 -- cgit v1.2.3