Gadu-Gadu protocol:

- show error popup when file io function returns an error code
hope to explain avatar problems


git-svn-id: http://svn.miranda-ng.org/main/trunk@2895 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 11 insertions, 11 deletions

diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp
index 6e6d8aa155..c0ee96e5e9 100644
--- a/protocols/Gadu-Gadu/src/import.cpp
+++ b/protocols/Gadu-Gadu/src/import.cpp
@@ -362,9 +362,9 @@ INT_PTR GGPROTO::import_server(WPARAM wParam, LPARAM lParam)
 	{

 		TCHAR error[128];

 		gg_LeaveCriticalSection(&sess_mutex, "import_server", 65, 1, "sess_mutex", 1);

-		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be imported because of error:\n\t%s"), _tcserror(errno));

+		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be imported because of error:\n\t%s (Error: %d)"), _tcserror(errno), errno);

 		MessageBox(NULL, error, m_tszUserName, MB_OK | MB_ICONSTOP);

-		netlog("import_server(): Cannot import list because of \"%s\".", strerror(errno));

+		netlog("import_server(): Cannot import list. errno:%d: %s", errno, strerror(errno));

 	}

 	gg_LeaveCriticalSection(&sess_mutex, "import_server", 65, 2, "sess_mutex", 1);

 	free(password);

@@ -409,9 +409,9 @@ INT_PTR GGPROTO::remove_server(WPARAM wParam, LPARAM lParam)
 	{

 		TCHAR error[128];

 		gg_LeaveCriticalSection(&sess_mutex, "remove_server", 66, 1, "sess_mutex", 1);

-		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be removeed because of error:\n\t%s"), _tcserror(errno));

+		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be removeed because of error: %s (Error: %d)"), _tcserror(errno), errno);

 		MessageBox(NULL, error, m_tszUserName, MB_OK | MB_ICONSTOP);

-		netlog("remove_server(): Cannot remove list because of \"%s\".", strerror(errno));

+		netlog("remove_server(): Cannot remove list. errno=%d: %s", errno, strerror(errno));

 	}

 	gg_LeaveCriticalSection(&sess_mutex, "remove_server", 66, 2, "sess_mutex", 1);

 

@@ -483,10 +483,10 @@ INT_PTR GGPROTO::import_text(WPARAM wParam, LPARAM lParam)
 	}

 	else

 	{

-		TCHAR error[128];

-		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be imported from file \"%s\" because of error:\n\t%s"), str, _tcserror(errno));

+		TCHAR error[256];

+		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be imported from file \"%s\" because of error:\n\t%s (Error: %d)"), str, _tcserror(errno), errno);

 		MessageBox(NULL, error, m_tszUserName, MB_OK | MB_ICONSTOP);

-		netlog("import_text(): Cannot import list from file \"%S\" because of \"%s\".", str, strerror(errno));

+		netlog("import_text(): Cannot import list from file \"%S\". errno=%d: %s", str, errno, strerror(errno));

 	}

 

 	return 0;

@@ -545,9 +545,9 @@ INT_PTR GGPROTO::export_text(WPARAM wParam, LPARAM lParam)
 	else

 	{

 		TCHAR error[128];

-		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be exported to file \"%s\" because of error:\n\t%s"), str, _tcserror(errno));

+		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be exported to file \"%s\" because of error:\n\t%s (Error: %d)"), str, _tcserror(errno), errno);

 		MessageBox(NULL, error, m_tszUserName, MB_OK | MB_ICONSTOP);

-		netlog("export_text(): Cannot export list to file \"%s\" because of \"%s\".", str, strerror(errno));

+		netlog("export_text(): Cannot export list to file \"%s\". errno=%d: %s", str, errno, strerror(errno));

 	}

 

 	return 0;

@@ -596,9 +596,9 @@ INT_PTR GGPROTO::export_server(WPARAM wParam, LPARAM lParam)
 	{

 		TCHAR error[128];

 		gg_LeaveCriticalSection(&sess_mutex, "export_server", 67, 1, "sess_mutex", 1);

-		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be exported because of error:\n\t%s"), _tcserror(errno));

+		mir_sntprintf(error, SIZEOF(error), TranslateT("List cannot be exported because of error:\n\t%s (Error: %d)"), _tcserror(errno), errno);

 		MessageBox(NULL, error, m_tszUserName, MB_OK | MB_ICONSTOP);

-		netlog("export_server(): Cannot export list because of \"%s\".", strerror(errno));

+		netlog("export_server(): Cannot export list. errno=%d: %s", errno, strerror(errno));

 	}

 	gg_LeaveCriticalSection(&sess_mutex, "export_server", 67, 2, "sess_mutex", 1);