From dd1460d664f7266920b07527f25f87ec8233daaf Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 25 Sep 2013 10:58:24 +0000
Subject: valid options initialization

git-svn-id: http://svn.miranda-ng.org/main/trunk@6225 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MSN/msn_10.vcxproj         |  1 -
 protocols/MSN/msn_10.vcxproj.filters |  3 --
 protocols/MSN/msn_11.vcxproj         |  1 -
 protocols/MSN/msn_11.vcxproj.filters |  3 --
 protocols/MSN/src/msn_opts.cpp       |  3 +-
 protocols/MSN/src/msn_useropts.cpp   | 79 ------------------------------------
 6 files changed, 1 insertion(+), 89 deletions(-)
 delete mode 100644 protocols/MSN/src/msn_useropts.cpp

(limited to 'protocols/MSN')

diff --git a/protocols/MSN/msn_10.vcxproj b/protocols/MSN/msn_10.vcxproj
index 2f1775f088..81e3580c47 100644
--- a/protocols/MSN/msn_10.vcxproj
+++ b/protocols/MSN/msn_10.vcxproj
@@ -239,7 +239,6 @@
     <ClCompile Include="src\msn_svcs.cpp" />
     <ClCompile Include="src\msn_switchboard.cpp" />
     <ClCompile Include="src\msn_threads.cpp" />
-    <ClCompile Include="src\msn_useropts.cpp" />
     <ClCompile Include="src\msn_ws.cpp" />
     <ClCompile Include="src\msn.cpp" />
   </ItemGroup>
diff --git a/protocols/MSN/msn_10.vcxproj.filters b/protocols/MSN/msn_10.vcxproj.filters
index ea6d433142..b9585f0393 100644
--- a/protocols/MSN/msn_10.vcxproj.filters
+++ b/protocols/MSN/msn_10.vcxproj.filters
@@ -110,9 +110,6 @@
     <ClCompile Include="src\msn_threads.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\msn_useropts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\msn_ws.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/protocols/MSN/msn_11.vcxproj b/protocols/MSN/msn_11.vcxproj
index 7d38255630..e2574dfdc2 100644
--- a/protocols/MSN/msn_11.vcxproj
+++ b/protocols/MSN/msn_11.vcxproj
@@ -242,7 +242,6 @@
     <ClCompile Include="src\msn_svcs.cpp" />
     <ClCompile Include="src\msn_switchboard.cpp" />
     <ClCompile Include="src\msn_threads.cpp" />
-    <ClCompile Include="src\msn_useropts.cpp" />
     <ClCompile Include="src\msn_ws.cpp" />
     <ClCompile Include="src\msn.cpp" />
   </ItemGroup>
diff --git a/protocols/MSN/msn_11.vcxproj.filters b/protocols/MSN/msn_11.vcxproj.filters
index ea6d433142..b9585f0393 100644
--- a/protocols/MSN/msn_11.vcxproj.filters
+++ b/protocols/MSN/msn_11.vcxproj.filters
@@ -110,9 +110,6 @@
     <ClCompile Include="src\msn_threads.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\msn_useropts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\msn_ws.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index 2351be7f5f..240768ee53 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
@@ -669,8 +669,7 @@ INT_PTR CALLBACK DlgDeleteContactUI(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 
 int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam)
 {
-	OPTIONSDIALOGPAGE odp = {0};
-	odp.cbSize      = sizeof(odp);
+	OPTIONSDIALOGPAGE odp = { sizeof(odp) };
 	odp.position    = -790000000;
 	odp.hInstance   = hInst;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN);
diff --git a/protocols/MSN/src/msn_useropts.cpp b/protocols/MSN/src/msn_useropts.cpp
deleted file mode 100644
index ee7856fe9b..0000000000
--- a/protocols/MSN/src/msn_useropts.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Plugin of Miranda IM for communicating with users of the MSN Messenger protocol.
-
-Copyright (c) 2012-2013 Miranda NG Team
-Copyright (c) 2006-2012 Boris Krasnovskiy.
-Copyright (c) 2003-2005 George Hazan.
-Copyright (c) 2002-2003 Richard Hughes (original version).
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "msn_global.h"
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// MSN contact option page dialog procedure.
-
-/*
-INT_PTR CALLBACK MsnDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	switch (msg)
-	{
-		case WM_INITDIALOG:
-			{
-				TranslateDialogDefault(hwndDlg);
-
-				const HANDLE hContact = (HANDLE)lParam;
-
-				SetDlgItemInt(hwndDlg, IDC_MOBILE, db_get_b(hContact, m_szModuleName, "MobileAllowed", 0), 0);
-				SetDlgItemInt(hwndDlg, IDC_MSN_MOBILE, db_get_b(hContact, m_szModuleName, "MobileEnabled", 0), 0);
-
-				DWORD dwFlagBits = setDword(hContact, "FlagBits", 0);
-				SetDlgItemTextA(hwndDlg, IDC_WEBMESSENGER, (dwFlagBits & 0x200) ? "Y" : "N");
-			}
-
-			return TRUE;
-
-		case WM_DESTROY:
-			break;
-	}
-
-	return FALSE;
-}
-*/
-/////////////////////////////////////////////////////////////////////////////////////////
-// MsnOnDetailsInit - initializes user info dialog pages.
-
-int MsnOnDetailsInit(WPARAM wParam, LPARAM lParam)
-{
-/*
-	if (!MSN_IsMyContact(hContact))
-		return 0;
-
-	if (getDword(hContact, "FlagBits", 0))
-	{
-		OPTIONSDIALOGPAGE odp = {0};
-
-		odp.cbSize      = sizeof(odp);
-		odp.pfnDlgProc  = MsnDlgProc;
-		odp.position    = -1900000000;
-		odp.pszTemplate = MAKEINTRESOURCEA(IDD_USEROPTS);
-		odp.ptszTitle   = m_tszUserName;
-		odp.flags       = ODPF_TCHAR | ODPF_DONTTRANSLATE;
-
-		UserInfo_AddPage(wParam, &odp);
-	}
-*/
-	return 0;
-}
-- 
cgit v1.2.3