Mercurial > pidgin
comparison libpurple/protocols/msn/msn.c @ 20776:f3cfcbbac3d8
propagate from branch 'im.pidgin.pidgin' (head 294731552d0baf5f1f37a45e0c119b2188f34ba8)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 548e06334e7772c9583776ecbd80e8d2a68fcd79)
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Fri, 05 Oct 2007 15:50:17 +0000 |
parents | d3443cb6a60f 557c4c67bd29 |
children | 682543aced31 |
comparison
equal
deleted
inserted
replaced
20775:d3443cb6a60f | 20776:f3cfcbbac3d8 |
---|---|
798 gc = purple_account_get_connection(account); | 798 gc = purple_account_get_connection(account); |
799 | 799 |
800 if (!purple_ssl_is_supported()) | 800 if (!purple_ssl_is_supported()) |
801 { | 801 { |
802 gc->wants_to_die = TRUE; | 802 gc->wants_to_die = TRUE; |
803 purple_connection_error(gc, | 803 purple_connection_error_reason (gc, PURPLE_REASON_ENCRYPTION_ERROR, |
804 _("SSL support is needed for MSN. Please install a supported " | 804 _("SSL support is needed for MSN. Please install a supported " |
805 "SSL library.")); | 805 "SSL library.")); |
806 return; | 806 return; |
807 } | 807 } |
808 | 808 |
827 | 827 |
828 if (strcmp(username, purple_account_get_username(account))) | 828 if (strcmp(username, purple_account_get_username(account))) |
829 purple_account_set_username(account, username); | 829 purple_account_set_username(account, username); |
830 | 830 |
831 if (!msn_session_connect(session, host, port, http_method)) | 831 if (!msn_session_connect(session, host, port, http_method)) |
832 purple_connection_error(gc, _("Failed to connect to server.")); | 832 purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, |
833 _("Failed to connect to server.")); | |
833 } | 834 } |
834 | 835 |
835 static void | 836 static void |
836 msn_close(PurpleConnection *gc) | 837 msn_close(PurpleConnection *gc) |
837 { | 838 { |