From 83c27fd8c56bdaded7063c298e5e76e941d2bc6e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 25 May 2018 23:02:35 +0300 Subject: merge with master to fixes #1377 ("Options -> Plugins -> Download more plugins" opens Miranda folder instead of website) --- plugins/StatusManager/src/main.cpp | 13 ++++--------- src/mir_app/src/pluginopts.cpp | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/plugins/StatusManager/src/main.cpp b/plugins/StatusManager/src/main.cpp index 5996a200c6..9ddf3e2817 100644 --- a/plugins/StatusManager/src/main.cpp +++ b/plugins/StatusManager/src/main.cpp @@ -58,17 +58,12 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) ///////////////////////////////////////////////////////////////////////////////////////// // interfaces -MUUID Interfaces[2] = {0}; -MUUID miidAutoAway = MIID_AUTOAWAY; +static MUUID Interfaces[2] = { MIID_AUTOAWAY, MIID_LAST }; -MUUID* GetInterfaces(void) +extern "C" __declspec(dllexport) MUUID* MirandaPluginInterfaces(void) { - if (g_AAAEnabled) - Interfaces[0] = miidAutoAway; - return Interfaces; -}; - -extern "C" __declspec(dllexport) MUUID* MirandaInterfaces = GetInterfaces(); + return (g_AAAEnabled) ? Interfaces : nullptr; +} ///////////////////////////////////////////////////////////////////////////////////////// // plugin's entry point diff --git a/src/mir_app/src/pluginopts.cpp b/src/mir_app/src/pluginopts.cpp index f2730dcfaa..31172e66ce 100644 --- a/src/mir_app/src/pluginopts.cpp +++ b/src/mir_app/src/pluginopts.cpp @@ -238,8 +238,8 @@ class CPluginOptDlg : public CDlgBase public: CPluginOptDlg() : CDlgBase(g_hInst, IDD_OPT_PLUGINS), - m_link(this, IDC_GETMOREPLUGINS), - m_plugUrl(this, IDC_PLUGINURL, "https://miranda-ng.org/downloads/"), + m_link(this, IDC_GETMOREPLUGINS, "https://miranda-ng.org/downloads/"), + m_plugUrl(this, IDC_PLUGINURL), m_author(this, IDC_PLUGINAUTHOR), m_plugPid(this, IDC_PLUGINPID), m_plugInfo(this, IDC_PLUGINLONGINFO), -- cgit v1.2.3