diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-25 23:02:35 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-25 23:02:35 +0300 |
| commit | 83c27fd8c56bdaded7063c298e5e76e941d2bc6e (patch) | |
| tree | 64053adb85e74db8a020d407a775aa08b62a2aa5 | |
| parent | f241ded42f1163c30bb6c4b533a7546b03d46a48 (diff) | |
merge with master to
fixes #1377 ("Options -> Plugins -> Download more plugins" opens Miranda folder instead of website)
| -rw-r--r-- | plugins/StatusManager/src/main.cpp | 13 | ||||
| -rw-r--r-- | 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),
|