From b5975ff4291cddcf3b81a9f17639192da4b44f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20P=C3=B6sel?= <robyer@seznam.cz>
Date: Tue, 5 May 2015 15:03:10 +0000
Subject: Steam: Remove traces of Skype, cleanup; Version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@13443 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Steam/src/steam_dialogs.cpp |  2 --
 protocols/Steam/src/steam_menus.cpp   |  2 +-
 protocols/Steam/src/steam_options.h   | 18 +++++++++---------
 protocols/Steam/src/steam_utils.cpp   |  2 +-
 protocols/Steam/src/version.h         |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'protocols/Steam')

diff --git a/protocols/Steam/src/steam_dialogs.cpp b/protocols/Steam/src/steam_dialogs.cpp
index 8819c17ad8..118583f218 100644
--- a/protocols/Steam/src/steam_dialogs.cpp
+++ b/protocols/Steam/src/steam_dialogs.cpp
@@ -205,12 +205,10 @@ void CSteamOptionsMain::OnApply()
 	if (m_username.IsChanged())
 	{
 		m_proto->delSetting("SteamID");
-		m_proto->delSetting("Cookies");
 		m_proto->delSetting("TokenSecret");
 	}
 	if (m_password.IsChanged())
 	{
-		m_proto->delSetting("Cookie");
 		m_proto->delSetting("TokenSecret");
 	}
 	mir_free(group);
diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp
index b4507db158..8e2865bf22 100644
--- a/protocols/Steam/src/steam_menus.cpp
+++ b/protocols/Steam/src/steam_menus.cpp
@@ -135,7 +135,7 @@ void CSteamProto::OnInitStatusMenu()
 
 void CSteamProto::InitMenus()
 {
-	hChooserMenu = MO_CreateMenuObject("SkypeAccountChooser", LPGEN("Steam menu chooser"), 0, "Steam/MenuChoose");
+	hChooserMenu = MO_CreateMenuObject("SteamAccountChooser", LPGEN("Steam menu chooser"), 0, "Steam/MenuChoose");
 
 	//////////////////////////////////////////////////////////////////////////////////////
 	// Contact menu initialization
diff --git a/protocols/Steam/src/steam_options.h b/protocols/Steam/src/steam_options.h
index 86bd7a183e..a998cf0e6b 100644
--- a/protocols/Steam/src/steam_options.h
+++ b/protocols/Steam/src/steam_options.h
@@ -1,17 +1,17 @@
-#ifndef _SKYPE_OPTIONS_H_
-#define _SKYPE_OPTIONS_H_
+#ifndef _STEAM_OPTIONS_H_
+#define _STEAM_OPTIONS_H_
 
-class CSkypeOptionsMain : public CSkypeDlgBase
+class CSteamOptionsMain : public CSteamDlgBase
 {
 private:
-	typedef CSkypeDlgBase CSuper;
+	typedef CSteamDlgBase CSuper;
 
-	CCtrlEdit m_skypename;
+	CCtrlEdit m_steamname;
 	CCtrlEdit m_password;
 	CCtrlEdit m_group;
 
 protected:
-	CSkypeOptionsMain(CSkypeProto *proto, int idDialog, HWND hwndParent = NULL);
+	CSteamOptionsMain(CSteamProto *proto, int idDialog, HWND hwndParent = NULL);
 
 	void OnInitDialog();
 	void OnApply();
@@ -19,11 +19,11 @@ protected:
 public:
 	static CDlgBase *CreateAccountManagerPage(void *param, HWND owner)
 	{
-		CSkypeOptionsMain *page = new CSkypeOptionsMain((CSkypeProto*)param, IDD_ACCOUNT_MANAGER, owner);
+		CSteamOptionsMain *page = new CSteamOptionsMain((CSteamProto*)param, IDD_ACCOUNT_MANAGER, owner);
 		page->Show();
 	}
 
-	static CDlgBase *CreateMainOptionsPage(void *param) { return new CSkypeOptionsMain((CSkypeProto*)param, IDD_OPTIONS_MAIN); }
+	static CDlgBase *CreateMainOptionsPage(void *param) { return new CSteamOptionsMain((CSteamProto*)param, IDD_OPTIONS_MAIN); }
 };
 
-#endif //_SKYPE_OPTIONS_H_
\ No newline at end of file
+#endif //_STEAM_OPTIONS_H_
\ No newline at end of file
diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp
index ea924eac86..46b7d8b6de 100644
--- a/protocols/Steam/src/steam_utils.cpp
+++ b/protocols/Steam/src/steam_utils.cpp
@@ -183,7 +183,7 @@ void CSteamProto::ShowNotification(const wchar_t *caption, const wchar_t *messag
 		ppd.lchContact = hContact;
 		wcsncpy(ppd.lpwzContactName, caption, MAX_CONTACTNAME);
 		wcsncpy(ppd.lpwzText, message, MAX_SECONDLINE);
-		ppd.lchIcon = ::Skin_GetIcon("Skype_main");
+		ppd.lchIcon = ::Skin_GetIcon(MODULE"_main");
 
 		if (!PUAddPopupW(&ppd))
 			return;
diff --git a/protocols/Steam/src/version.h b/protocols/Steam/src/version.h
index fb21edaeb0..8dff6cd310 100644
--- a/protocols/Steam/src/version.h
+++ b/protocols/Steam/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION            0
 #define __MINOR_VERSION            11
 #define __RELEASE_NUM              3
-#define __BUILD_NUM                2
+#define __BUILD_NUM                3
 
 #include <stdver.h>
 
-- 
cgit v1.2.3