diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-03-25 22:10:36 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-08 18:41:30 +0800 |
| commit | ad4626eb7c092ecdd14db38b425d9ebf592278f3 (patch) | |
| tree | 464c2e3852bef28cfb2c67081980f7a0d7ee6ad8 | |
| parent | 9a3d387881cfba1efee65c7fc3d9e4e53971d517 (diff) | |
| download | gsoc2013-empathy-ad4626eb7c092ecdd14db38b425d9ebf592278f3.tar gsoc2013-empathy-ad4626eb7c092ecdd14db38b425d9ebf592278f3.tar.gz gsoc2013-empathy-ad4626eb7c092ecdd14db38b425d9ebf592278f3.tar.bz2 gsoc2013-empathy-ad4626eb7c092ecdd14db38b425d9ebf592278f3.tar.lz gsoc2013-empathy-ad4626eb7c092ecdd14db38b425d9ebf592278f3.tar.xz gsoc2013-empathy-ad4626eb7c092ecdd14db38b425d9ebf592278f3.tar.zst gsoc2013-empathy-ad4626eb7c092ecdd14db38b425d9ebf592278f3.zip | |
Disconnect other psyke accounts when creating a new one
| -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 |