From 870fdd7d9bf520b673c5177b30c9d6d6cce090b1 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Sun, 10 Dec 2017 16:05:53 +0300 Subject: - remove emails (if author retired - it's useless to write to him; if author is active - users should use GitHub for ticket creation); - also remove AUTHOREMAIL field from structure --- src/mir_app/res/resource.rc | 2 -- src/mir_app/src/newplugins.cpp | 2 +- src/mir_app/src/pluginopts.cpp | 12 +++--------- src/mir_app/src/resource.h | 1 - 4 files changed, 4 insertions(+), 13 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 34acde8b42..5f606d2740 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -404,8 +404,6 @@ BEGIN EDITTEXT IDC_PLUGINLONGINFO,70,136,236,25,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER RTEXT "Author(s):",IDC_STATIC,6,165,61,10 EDITTEXT IDC_PLUGINAUTHOR,70,165,236,18,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER - RTEXT "E-mail:",IDC_STATIC,6,188,61,10 - CONTROL "",IDC_PLUGINEMAIL,"Hyperlink",WS_TABSTOP,70,188,236,10 RTEXT "Homepage:",IDC_STATIC,6,200,61,9 CONTROL "",IDC_PLUGINURL,"Hyperlink",WS_TABSTOP,70,201,236,10 RTEXT "Unique ID:",IDC_STATIC,6,214,61,10 diff --git a/src/mir_app/src/newplugins.cpp b/src/mir_app/src/newplugins.cpp index a080c0eab0..9d19dedc54 100644 --- a/src/mir_app/src/newplugins.cpp +++ b/src/mir_app/src/newplugins.cpp @@ -272,7 +272,7 @@ static int checkPI(BASIC_PLUGIN_INFO* bpi, PLUGININFOEX* pi) return FALSE; if (pi->shortName == nullptr || pi->description == nullptr || pi->author == nullptr || - pi->authorEmail == nullptr || pi->copyright == nullptr || pi->homepage == nullptr) + pi->copyright == nullptr || pi->homepage == nullptr) return FALSE; return TRUE; diff --git a/src/mir_app/src/pluginopts.cpp b/src/mir_app/src/pluginopts.cpp index 02e6d7b10c..2228ed80b1 100644 --- a/src/mir_app/src/pluginopts.cpp +++ b/src/mir_app/src/pluginopts.cpp @@ -44,7 +44,7 @@ struct PluginListItemData wchar_t fileName[MAX_PATH]; HINSTANCE hInst; int flags, stdPlugin; - wchar_t *author, *authorEmail, *description, *copyright, *homepage; + wchar_t *author, *description, *copyright, *homepage; MUUID uuid; }; @@ -119,7 +119,6 @@ static BOOL dialogListPlugins(WIN32_FIND_DATA *fd, wchar_t *path, WPARAM, LPARAM ListView_SetItem(hwndList, &it); dat->author = sttUtf8auto(pi.pluginInfo->author); - dat->authorEmail = sttUtf8auto(pi.pluginInfo->authorEmail); dat->copyright = sttUtf8auto(pi.pluginInfo->copyright); dat->description = sttUtf8auto(pi.pluginInfo->description); dat->homepage = sttUtf8auto(pi.pluginInfo->homepage); @@ -179,7 +178,6 @@ static void RemoveAllItems(HWND hwnd) while (ListView_GetItem(hwnd, &lvi)) { PluginListItemData *dat = (PluginListItemData*)lvi.lParam; mir_free(dat->author); - mir_free(dat->authorEmail); mir_free(dat->copyright); mir_free(dat->description); mir_free(dat->homepage); @@ -426,7 +424,6 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar ListView_GetItemText(hwndList, hdr->iItem, 2, buf, _countof(buf)); SetDlgItemText(hwndDlg, IDC_PLUGININFOFRAME, sel ? buf : L""); SetDlgItemText(hwndDlg, IDC_PLUGINAUTHOR, sel ? dat->author : L""); - SetDlgItemText(hwndDlg, IDC_PLUGINEMAIL, sel ? dat->authorEmail : L""); SetDlgItemText(hwndDlg, IDC_PLUGINLONGINFO, sel ? dat->description : L""); SetDlgItemText(hwndDlg, IDC_PLUGINCPYR, sel ? dat->copyright : L""); SetDlgItemText(hwndDlg, IDC_PLUGINURL, sel ? dat->homepage : L""); @@ -513,13 +510,10 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar Utils_OpenUrl("https://miranda-ng.org/downloads/"); break; - case IDC_PLUGINEMAIL: case IDC_PLUGINURL: char buf[512]; - char *p = &buf[7]; - mir_strcpy(buf, "mailto:"); - if (GetDlgItemTextA(hwndDlg, LOWORD(wParam), p, _countof(buf) - 7)) - Utils_OpenUrl(LOWORD(wParam) == IDC_PLUGINEMAIL ? buf : p); + if (GetDlgItemTextA(hwndDlg, LOWORD(wParam), buf, _countof(buf))) + Utils_OpenUrl(buf); break; } } diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h index 1230a2e293..d4302e4ca7 100644 --- a/src/mir_app/src/resource.h +++ b/src/mir_app/src/resource.h @@ -498,7 +498,6 @@ #define IDC_PLUGINCPYR 1681 #define IDC_PLUGINURL 1682 #define IDC_PLUGINPID 1683 -#define IDC_PLUGINEMAIL 1684 #define IDC_IDLESPIN 1687 #define IDC_NODBDRIVERS 1690 #define IDC_IDLESTATUSLOCK 1691 -- cgit v1.2.3