diff options
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-account-widget-skype.c b/libempathy-gtk/empathy-account-widget-skype.c index 9b8e6270f..2b6a769e8 100644 --- a/libempathy-gtk/empathy-account-widget-skype.c +++ b/libempathy-gtk/empathy-account-widget-skype.c @@ -962,12 +962,16 @@ static gboolean is_other_psyke_account (TpAccount *ours, TpAccount *other) { - if (ours == NULL) - return TRUE; + gboolean paths_diff; - return (tp_strdiff ( + if (ours == NULL) + paths_diff = TRUE; + else + paths_diff = tp_strdiff ( tp_proxy_get_object_path (ours), - tp_proxy_get_object_path (other)) && + tp_proxy_get_object_path (other)); + + return (paths_diff && tp_account_is_enabled (other) && !tp_strdiff (tp_account_get_connection_manager (other), "psyke")); } |