summaryrefslogtreecommitdiff
path: root/protocols/VKontakte/src
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2013-10-20 12:28:56 +0000
committerKirill Volinsky <mataes2007@gmail.com>2013-10-20 12:28:56 +0000
commit2c1284aabea8b562e9e1e32ce6ef8d91a817d403 (patch)
treec8418eb57db01b162397cb176d24c435289605c2 /protocols/VKontakte/src
parent6613750b9a43c707036b56dd94b0597aafc9612e (diff)
options page added
git-svn-id: http://svn.miranda-ng.org/main/trunk@6550 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/VKontakte/src')
-rw-r--r--protocols/VKontakte/src/resource.h3
-rw-r--r--protocols/VKontakte/src/version.h8
-rw-r--r--protocols/VKontakte/src/vk_options.cpp4
-rw-r--r--protocols/VKontakte/src/vk_proto.cpp2
4 files changed, 7 insertions, 10 deletions
diff --git a/protocols/VKontakte/src/resource.h b/protocols/VKontakte/src/resource.h
index 0c1fe3cc33..4c42557a15 100644
--- a/protocols/VKontakte/src/resource.h
+++ b/protocols/VKontakte/src/resource.h
@@ -4,7 +4,8 @@
//
#define IDD_ACCMGRUI 101
#define IDD_CAPTCHAFORM 102
-#define IDI_KEYS 103
+#define IDD_OPT_MAIN 103
+#define IDI_KEYS 203
#define IDC_LOGIN 1001
#define IDC_PASSWORD 1002
#define IDC_URL 1003
diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h
index 6cdcc75c3a..247b6da7f6 100644
--- a/protocols/VKontakte/src/version.h
+++ b/protocols/VKontakte/src/version.h
@@ -4,14 +4,8 @@
#define __BUILD_NUM 2
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-#define __STRINGIFY_IMPL(x) #x
-#define __STRINGIFY(x) __STRINGIFY_IMPL(x)
-#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS)
-
-#define __PLUGIN_NAME "VKontakte"
-#define __INTERNAL_NAME "VKontakte"
+#define __PLUGIN_NAME "VKontakte protocol"
#define __FILENAME "VKontakte.dll"
#define __DESCRIPTION "VKontakte protocol support for Miranda NG."
#define __AUTHOR "Miranda NG Team"
diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index 27d4a902f4..1027af3508 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -109,8 +109,8 @@ int CVkProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)
odp.position = 1;
odp.ptszGroup = LPGENT("Network");
odp.ptszTab = LPGENT("Account");
- odp.pszTemplate = 0; // MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pfnDlgProc = 0; // OptionsProc;
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MAIN);
+ odp.pfnDlgProc = VKAccountProc;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 3ae5ff7258..a9d493ccc5 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -30,6 +30,8 @@ CVkProto::CVkProto(const char *szModuleName, const TCHAR *ptszUserName) :
CreateProtoService(PS_GETAVATARINFOT, &CVkProto::SvcGetAvatarInfo);
CreateProtoService(PS_GETAVATARCAPS, &CVkProto::SvcGetAvatarCaps);
+ HookProtoEvent(ME_OPT_INITIALISE, &CVkProto::OnOptionsInit);
+
TCHAR descr[512];
mir_sntprintf(descr, SIZEOF(descr), TranslateT("%s server connection"), m_tszUserName);