From 4bea1d8383c8d8461668e74204029e1ea9b1d75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Thu, 28 Feb 2013 09:54:02 +0000 Subject: Facebook: Fixed showing correct login error. Version bump. git-svn-id: http://svn.miranda-ng.org/main/trunk@3804 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/communication.cpp | 6 +++--- protocols/FacebookRM/src/version.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp index c960d9dead..c51f757fe3 100644 --- a/protocols/FacebookRM/src/communication.cpp +++ b/protocols/FacebookRM/src/communication.cpp @@ -685,14 +685,14 @@ bool facebook_client::login(const std::string &username,const std::string &passw parent->Log(" ! ! Login error: Captcha code is required."); return handle_error( "login", FORCE_DISCONNECT ); } - + // Get error message std::string error_str = utils::text::trim( utils::text::special_expressions_decode( utils::text::remove_html( utils::text::edit_html( - utils::text::source_get_value( &resp.data, 2, "id=\"standard_error\">", "" )) )) ); - + utils::text::source_get_value(&resp.data, 3, "login_error_box", "

", "

"))))); + if ( !error_str.length()) error_str = Translate("Unknown login error"); parent->Log(" ! ! Login error: %s", error_str.c_str()); diff --git a/protocols/FacebookRM/src/version.h b/protocols/FacebookRM/src/version.h index 86f1b195c5..684f1ed2e7 100644 --- a/protocols/FacebookRM/src/version.h +++ b/protocols/FacebookRM/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 0 #define __RELEASE_NUM 9 -#define __BUILD_NUM 3 +#define __BUILD_NUM 4 #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM #define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -- cgit v1.2.3