diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-06 23:33:37 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-06 23:33:37 +0300 |
| commit | b5475af6d5ec30b6c53293bb1c9268bef38efd12 (patch) | |
| tree | 8635806077d1af0e3f76c1400322aef1d57c67e1 /src/mir_app | |
| parent | 80c32c431207f86b0be44f5f94488de35458fc55 (diff) | |
more unused stuff cleaned
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/clistcore.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/menu_clist.cpp | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index 0e454969f0..7c300e574a 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -58,8 +58,6 @@ static int fnIsVisibleContact(ClcCacheEntry*, ClcGroup*) void InitClistCore()
{
- cli.version = 6;
- cli.bDisplayLocked = true;
cli.menuProtos = &g_menuProtos;
cli.pfnContactListControlWndProc = fnContactListControlWndProc;
diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp index 466a8e3ff1..c3dd5a83e8 100644 --- a/src/mir_app/src/menu_clist.cpp +++ b/src/mir_app/src/menu_clist.cpp @@ -551,11 +551,8 @@ static INT_PTR StatusMenuExecService(WPARAM wParam, LPARAM) wchar_t buf[256], *ptszName;
if (bIsLocked) {
pimi->mi.flags |= CMIF_CHECKED;
- if (cli.bDisplayLocked) {
- mir_snwprintf(buf, TranslateT("%s (locked)"), acc->tszAccountName);
- ptszName = buf;
- }
- else ptszName = acc->tszAccountName;
+ mir_snwprintf(buf, TranslateT("%s (locked)"), acc->tszAccountName);
+ ptszName = buf;
}
else {
ptszName = acc->tszAccountName;
@@ -759,7 +756,7 @@ void RebuildMenuOrder(void) mi.position = pos++;
mi.hIcon = ic = (HICON)CallProtoServiceInt(0, pa->szModuleName, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0);
- if (pa->IsLocked() && cli.bDisplayLocked) {
+ if (pa->IsLocked()) {
mir_snwprintf(tbuf, TranslateT("%s (locked)"), pa->tszAccountName);
mi.name.w = tbuf;
}
@@ -783,7 +780,7 @@ void RebuildMenuOrder(void) if (pa->IsLocked())
mi.flags |= CMIF_CHECKED;
- if ((mi.flags & CMIF_CHECKED) && cli.bDisplayLocked) {
+ if ((mi.flags & CMIF_CHECKED)) {
mir_snwprintf(tbuf, TranslateT("%s (locked)"), pa->tszAccountName);
mi.name.w = tbuf;
}
|