Mercurial > pidgin
diff src/protocols/msn/session.c @ 10519:bec9130b24d2
[gaim-migrate @ 11833]
Leak fixes, round #2. And some minor MSN tweaks suggested by Felipe.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 17 Jan 2005 00:33:30 +0000 |
| parents | 8f1316d77315 |
| children | ace8cd0de6ea |
line wrap: on
line diff
--- a/src/protocols/msn/session.c Sat Jan 15 16:53:55 2005 +0000 +++ b/src/protocols/msn/session.c Mon Jan 17 00:33:30 2005 +0000 @@ -289,7 +289,7 @@ case MSN_ERROR_SERVCONN: msg = g_strdup(info); break; - case MSN_ERROR_UNSUPORTED_PROTOCOL: + case MSN_ERROR_UNSUPPORTED_PROTOCOL: msg = g_strdup(_("Our protocol is not supported by the " "server.")); break; @@ -348,6 +348,17 @@ { GaimConnection *gc; + /* Prevent the connection progress going backwards, eg. if we get + * transferred several times during login */ + if (session->login_step >= step) + return; + + /* If we're already logged in, we're probably here because of a + * mid-session XFR from the notification server, so we don't want to + * popup the connection progress dialog */ + if (session->logged_in) + return; + gc = session->account->gc; session->login_step = step;