Mercurial > pidgin
comparison libpurple/protocols/msnp9/msn.c @ 27590:a08e84032814
merge of '2348ff22f0ff3453774b8b25b36238465580c609'
and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 12 Jul 2009 05:43:38 +0000 |
parents | f541583e31bd |
children | 42360009f2e5 |
comparison
equal
deleted
inserted
replaced
27104:048bcf41deef | 27590:a08e84032814 |
---|---|
787 purple_account_set_username(account, username); | 787 purple_account_set_username(account, username); |
788 | 788 |
789 if (!msn_session_connect(session, host, port, http_method)) | 789 if (!msn_session_connect(session, host, port, http_method)) |
790 purple_connection_error_reason(gc, | 790 purple_connection_error_reason(gc, |
791 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, | 791 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
792 _("Failed to connect to server.")); | 792 _("Unable to connect")); |
793 } | 793 } |
794 | 794 |
795 static void | 795 static void |
796 msn_close(PurpleConnection *gc) | 796 msn_close(PurpleConnection *gc) |
797 { | 797 { |