- removed big size status icons

- fixed crash on unsuccessful login
- fixed crash on home tab in own profile info

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

9 files changed, 7 insertions, 5 deletions

diff --git a/protocols/Skype/proto_skype/res/Away.ico b/protocols/Skype/proto_skype/res/Away.ico
index 3e4d4cff69..025b9103c7 100644
--- a/protocols/Skype/proto_skype/res/Away.ico
+++ b/protocols/Skype/proto_skype/res/Away.ico
diff --git a/protocols/Skype/proto_skype/res/DND.ico b/protocols/Skype/proto_skype/res/DND.ico
index 975e9c728e..e0d2bb2b00 100644
--- a/protocols/Skype/proto_skype/res/DND.ico
+++ b/protocols/Skype/proto_skype/res/DND.ico
diff --git a/protocols/Skype/proto_skype/res/Invisible.ico b/protocols/Skype/proto_skype/res/Invisible.ico
index c639c2dd55..8e1d5d1f37 100644
--- a/protocols/Skype/proto_skype/res/Invisible.ico
+++ b/protocols/Skype/proto_skype/res/Invisible.ico
diff --git a/protocols/Skype/proto_skype/res/Offline.ico b/protocols/Skype/proto_skype/res/Offline.ico
index 10b24a0a24..91b1fda42f 100644
--- a/protocols/Skype/proto_skype/res/Offline.ico
+++ b/protocols/Skype/proto_skype/res/Offline.ico
diff --git a/protocols/Skype/proto_skype/res/Online.ico b/protocols/Skype/proto_skype/res/Online.ico
index 9298c11ed0..1c37e9dc8c 100644
--- a/protocols/Skype/proto_skype/res/Online.ico
+++ b/protocols/Skype/proto_skype/res/Online.ico
diff --git a/protocols/Skype/res/main.ico b/protocols/Skype/res/main.ico
index 9298c11ed0..1c37e9dc8c 100644
--- a/protocols/Skype/res/main.ico
+++ b/protocols/Skype/res/main.ico
diff --git a/protocols/Skype/src/skype_account.cpp b/protocols/Skype/src/skype_account.cpp
index 3202a6cec4..f0767b08fc 100644
--- a/protocols/Skype/src/skype_account.cpp
+++ b/protocols/Skype/src/skype_account.cpp
@@ -271,7 +271,7 @@ void CSkypeProto::OnCblUpdated()
 

 void CSkypeProto::OnLoggedOut(CAccount::LOGOUTREASON reason)

 {

-	this->Log(L"Failed to login: %s", CSkypeProto::SkypeToMirandaLoginError(reason));

+	this->Log(L"Failed to login: %s", CSkypeProto::LogoutReasons[reason]);

 

 	this->m_iStatus = ID_STATUS_OFFLINE;

 	this->SendBroadcast(

diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp
index 35f0f909bc..1fd0d44191 100644
--- a/protocols/Skype/src/skype_dialogs.cpp
+++ b/protocols/Skype/src/skype_dialogs.cpp
@@ -471,7 +471,7 @@ INT_PTR CALLBACK CSkypeProto::PersonalSkypeDlgProc(HWND hwndDlg, UINT msg, WPARA
 			SYSTEMTIME sToday = {0};

 			::GetLocalTime(&sToday);

 			// ages from 10 to 50 is need more?

-			for (size_t i = sToday.wYear - 50; i < sToday.wYear - 10; i++)

+			for (WORD i = sToday.wYear - 50; i < sToday.wYear - 10; i++)

 			{

 				::_itow(i, date, 10);

 				::SendMessage(::GetDlgItem(hwndDlg, IDC_BIRTH_YEAR), CB_ADDSTRING, 0, (LPARAM)date);

@@ -698,7 +698,7 @@ INT_PTR CALLBACK CSkypeProto::HomeSkypeDlgProc(HWND hwndDlg, UINT msg, WPARAM wP
 						i, 

 						(LPARAM)g_countries[i].id);

 

-					if (::wcscmp(country, countr) == 0)

+					if (countr && ::wcscmp(country, countr) == 0)

 						::SetDlgItemText(hwndDlg, IDC_COUNTRY, TranslateTS(country));

 

 					::mir_free(country);

@@ -709,6 +709,8 @@ INT_PTR CALLBACK CSkypeProto::HomeSkypeDlgProc(HWND hwndDlg, UINT msg, WPARAM wP
 			//HANDLE hTimeZone = tmi.createByContact ? tmi.createByContact(NULL, 0) : 0;

 			//LPCTSTR TzDescr = tmi.getTzDescription(tmi.getTzName(hTimeZone));

 			//SetDlgItemText(hwndDlg, IDC_TIMEZONE, TzDescr);

+

+			//BYTE nTz = ::db_get_b(NULL, ppro->m_szModuleName, "Timezone", 0);

 		}

 		break;

 

diff --git a/protocols/Skype/src/version.h b/protocols/Skype/src/version.h
index 0aff49cd7d..8ba9f70169 100644
--- a/protocols/Skype/src/version.h
+++ b/protocols/Skype/src/version.h
@@ -1,5 +1,5 @@
 #define __MAJOR_VERSION				0

-#define __MINOR_VERSION				0

+#define __MINOR_VERSION				11

 #define __RELEASE_NUM				0

 #define __BUILD_NUM					1

 

@@ -17,4 +17,4 @@
 #define __AUTHOR					"unsane, mataes, ghazan"

 #define __AUTHOREMAIL				"mataes2007@gmail.com"

 #define __AUTHORWEB					"http://miranda-ng.org/"

-#define __COPYRIGHT					"© 2012-2013 Unsane, Mataes"

+#define __COPYRIGHT					"© 2012-2013 Miranda NG team"