summaryrefslogtreecommitdiff
path: root/src/core/stdclist
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2019-05-27 18:45:43 +0300
committerGeorge Hazan <ghazan@miranda.im>2019-05-27 18:45:43 +0300
commitef1a349d88912a89a8dd20ca1dcb342b6dc9c2ff (patch)
tree78e6344d923966b7a8f1866763d6bacaf054a9e2 /src/core/stdclist
parent189f6be24f11066a3c711b783cf98f79f703e3a5 (diff)
fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)
Diffstat (limited to 'src/core/stdclist')
-rw-r--r--src/core/stdclist/src/clcopts.cpp8
-rw-r--r--src/core/stdclist/src/contact.cpp5
2 files changed, 2 insertions, 11 deletions
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 6233f348a7..c9070e91f3 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -66,10 +66,7 @@ static const struct CheckBoxValues_t greyoutValues[] =
{ PF2_LONGAWAY, LPGENW("Not available") },
{ PF2_LIGHTDND, LPGENW("Occupied") },
{ PF2_HEAVYDND, LPGENW("Do not disturb")},
- { PF2_FREECHAT, LPGENW("Free for chat") },
- { PF2_INVISIBLE, LPGENW("Invisible") },
- { PF2_OUTTOLUNCH, LPGENW("Out to lunch") },
- { PF2_ONTHEPHONE, LPGENW("On the phone") }
+ { PF2_INVISIBLE, LPGENW("Invisible") }
};
static const struct CheckBoxValues_t offlineValues[] =
@@ -80,10 +77,7 @@ static const struct CheckBoxValues_t offlineValues[] =
{ PF2_LONGAWAY, LPGENW("Not available") },
{ PF2_LIGHTDND, LPGENW("Occupied") },
{ PF2_HEAVYDND, LPGENW("Do not disturb")},
- { PF2_FREECHAT, LPGENW("Free for chat") },
{ PF2_INVISIBLE, LPGENW("Invisible") },
- { PF2_OUTTOLUNCH, LPGENW("Out to lunch") },
- { PF2_ONTHEPHONE, LPGENW("On the phone") }
};
static void FillCheckBoxTree(HWND hwndTree, const struct CheckBoxValues_t *values, int nValues, DWORD style)
diff --git a/src/core/stdclist/src/contact.cpp b/src/core/stdclist/src/contact.cpp
index 7c77f5f465..3a561482d0 100644
--- a/src/core/stdclist/src/contact.cpp
+++ b/src/core/stdclist/src/contact.cpp
@@ -38,10 +38,7 @@ static statusModeOrder[] =
{ ID_STATUS_DND, 110 },
{ ID_STATUS_NA, 450 },
{ ID_STATUS_OCCUPIED, 100 },
- { ID_STATUS_FREECHAT, 0 },
- { ID_STATUS_INVISIBLE, 20 },
- { ID_STATUS_ONTHEPHONE, 150 },
- { ID_STATUS_OUTTOLUNCH, 425 }
+ { ID_STATUS_INVISIBLE, 20 }
};
int GetStatusModeOrdering(int statusMode)