diff options
| author | Eion Robb <eion@robbmob.com> | 2015-09-30 23:50:16 +0300 |
|---|---|---|
| committer | Eion Robb <eion@robbmob.com> | 2015-09-30 23:50:16 +0300 |
| commit | a1351946c7aa233df24a30584aa1bfa8ad71a74c (patch) | |
| tree | e7c31cff8e1a850fc8ca65e4fa8ad09098db51f8 | |
| parent | fb9f2967a0b472a728b8373fd87d8125c5959d85 (diff) | |
SkypeWeb : Fix crash on login when using an MSN account
| -rw-r--r-- | skypeweb/libskypeweb.c | 5 | ||||
| -rw-r--r-- | skypeweb/skypeweb_contacts.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/skypeweb/libskypeweb.c b/skypeweb/libskypeweb.c index 8582fc6..9c02313 100644 --- a/skypeweb/libskypeweb.c +++ b/skypeweb/libskypeweb.c @@ -26,6 +26,9 @@ void
skypeweb_do_all_the_things(SkypeWebAccount *sa)
{
+ if (!sa->username) {
+ skypeweb_get_self_details(sa);
+ } else
if (sa->registration_token) {
skypeweb_get_self_details(sa);
@@ -318,7 +321,7 @@ skypeweb_login(PurpleAccount *account) sa->waiting_conns = g_queue_new();
sa->messages_host = g_strdup(SKYPEWEB_DEFAULT_MESSAGES_HOST);
- if(strchr(sa->username, '@')) {
+ if(strchr(purple_account_get_username(account), '@')) {
//Has an email address for a username, probably a microsoft account?
skypeweb_begin_oauth_login(sa);
} else {
diff --git a/skypeweb/skypeweb_contacts.c b/skypeweb/skypeweb_contacts.c index e38729f..41d9220 100644 --- a/skypeweb/skypeweb_contacts.c +++ b/skypeweb/skypeweb_contacts.c @@ -285,8 +285,8 @@ skypeweb_got_self_details(SkypeWebAccount *sa, JsonNode *node, gpointer user_dat purple_account_set_private_alias(sa->account, displayname);
}
- if (sa->username) {
- skypeweb_get_friend_list(sa);
+ if (!PURPLE_CONNECTION_IS_CONNECTED(sa->pc)) {
+ skypeweb_do_all_the_things(sa);
}
}
|