diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-08 19:32:53 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-08 19:32:53 +0300 |
| commit | 54d4f23914b1b40d5a81345a1eacef6750ed0266 (patch) | |
| tree | 1f3da4238893f4c120639e83fc3c0d7c05cf7817 /src | |
| parent | 637160171257b00778e12ce46f9e4231e2c41621 (diff) | |
stupid option removed from group chats according to results of voting
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/chat_options.cpp | 1 | ||||
| -rw-r--r-- | src/mir_app/src/chat_clist.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index a45ca08495..c204f62095 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -43,7 +43,6 @@ static branch_t branch1[] = { { LPGENW("Show the topic of the room on your contact list (if supported)"), "TopicOnClist", 0, false }, { LPGENW("Do not play sounds when the chat room is focused"), "SoundsFocus", 0, false }, { LPGENW("Do not pop up the window when joining a chat room"), "PopupOnJoin", 0, false }, - { LPGENW("Toggle the visible state when double clicking in the contact list"), "ToggleVisibility", 0, false }, { LPGENW("Show contact statuses if protocol supports them"), "ShowContactStatus", 0, false }, { LPGENW("Display contact status icon before user role icon"), "ContactStatusFirst", 0, false }, }; diff --git a/src/mir_app/src/chat_clist.cpp b/src/mir_app/src/chat_clist.cpp index 82a7aa4843..b78094d782 100644 --- a/src/mir_app/src/chat_clist.cpp +++ b/src/mir_app/src/chat_clist.cpp @@ -114,8 +114,7 @@ int RoomDoubleclicked(WPARAM hContact, LPARAM) SESSION_INFO *si = SM_FindSession(roomid, szProto);
if (si) {
- // is the "toggle visibility option set, so we need to close the window?
- if (si->pDlg != nullptr && db_get_b(0, CHAT_MODULE, "ToggleVisibility", 0) == 1 && !cli.pfnGetEvent(hContact, 0) && IsWindowVisible(si->pDlg->GetHwnd()) && !IsIconic(si->pDlg->GetHwnd())) {
+ if (si->pDlg != nullptr && !cli.pfnGetEvent(hContact, 0) && IsWindowVisible(si->pDlg->GetHwnd()) && !IsIconic(si->pDlg->GetHwnd())) {
si->pDlg->CloseTab();
return 1;
}
|