diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-28 14:16:24 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-28 14:16:24 +0800 |
| commit | 0f3a239c71f4f9fab63ab32c637f4aaa4a811417 (patch) | |
| tree | 274122461501afe1015b418ca9e6c8895779f63d /libempathy-gtk/empathy-account-widget-skype.c | |
| parent | ea8d261e1ec69ee73f0f77ddff1a43146d7d4e63 (diff) | |
| download | gsoc2013-empathy-0f3a239c71f4f9fab63ab32c637f4aaa4a811417.tar gsoc2013-empathy-0f3a239c71f4f9fab63ab32c637f4aaa4a811417.tar.gz gsoc2013-empathy-0f3a239c71f4f9fab63ab32c637f4aaa4a811417.tar.bz2 gsoc2013-empathy-0f3a239c71f4f9fab63ab32c637f4aaa4a811417.tar.lz gsoc2013-empathy-0f3a239c71f4f9fab63ab32c637f4aaa4a811417.tar.xz gsoc2013-empathy-0f3a239c71f4f9fab63ab32c637f4aaa4a811417.tar.zst gsoc2013-empathy-0f3a239c71f4f9fab63ab32c637f4aaa4a811417.zip | |
Fix logic error introduced in ad4626eb
Diffstat (limited to 'libempathy-gtk/empathy-account-widget-skype.c')
| -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")); } |