diff options
| -rw-r--r-- | libempathy-gtk/empathy-account-widget-skype.c | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-account-widget-skype.c b/libempathy-gtk/empathy-account-widget-skype.c index 82b2b0c57..9b8e6270f 100644 --- a/libempathy-gtk/empathy-account-widget-skype.c +++ b/libempathy-gtk/empathy-account-widget-skype.c @@ -962,6 +962,9 @@ static gboolean is_other_psyke_account (TpAccount *ours, TpAccount *other) { + if (ours == NULL) + return TRUE; + return (tp_strdiff ( tp_proxy_get_object_path (ours), tp_proxy_get_object_path (other)) && diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 03fe0e29e..c78bcb7b8 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -866,7 +866,9 @@ static void account_widget_apply_clicked_cb (GtkWidget *button, EmpathyAccountWidget *self) { - account_widget_apply_and_log_in (self); + empathy_accounts_dialog_skype_disable_other_accounts (NULL, NULL); + + account_widget_apply_and_log_in (self); } static void |