From b078dfb78c89aea87cd422eae52694738e473cf3 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Sun, 21 Jul 2019 19:59:18 +0300 Subject: Restore "Free for chat" status support (fixes #1963) --- plugins/SimpleStatusMsg/src/main.cpp | 5 +++-- plugins/SimpleStatusMsg/src/utils.cpp | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'plugins/SimpleStatusMsg') diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index ca42180c0f..96ea1e0525 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -492,7 +492,8 @@ int CheckProtoSettings(const char *szProto, int iInitialStatus) case 2: return ID_STATUS_AWAY; case 3: return ID_STATUS_NA; case 4: return ID_STATUS_DND; - case 5: return ID_STATUS_INVISIBLE; + case 5: return ID_STATUS_FREECHAT; + case 6: return ID_STATUS_INVISIBLE; default: return iInitialStatus; } } @@ -1352,7 +1353,7 @@ static int OnIdleChanged(WPARAM, LPARAM lParam) // we're entering idle if (lParam & IDF_ISIDLE) { - if (!db_get_b(0, "AutoAway", pa->szModuleName, 0) && iCurrentStatus != ID_STATUS_ONLINE) + if (!db_get_b(0, "AutoAway", pa->szModuleName, 0) && iCurrentStatus != ID_STATUS_ONLINE && iCurrentStatus != ID_STATUS_FREECHAT) return 0; } else { diff --git a/plugins/SimpleStatusMsg/src/utils.cpp b/plugins/SimpleStatusMsg/src/utils.cpp index 3fd0d1b8d2..b516a2a71d 100644 --- a/plugins/SimpleStatusMsg/src/utils.cpp +++ b/plugins/SimpleStatusMsg/src/utils.cpp @@ -79,6 +79,7 @@ const wchar_t *GetDefaultMessage(int status) case ID_STATUS_NA: return TranslateT("Give it up, I'm not in!"); case ID_STATUS_OCCUPIED: return TranslateT("Not right now."); case ID_STATUS_DND: return TranslateT("Give a guy some peace, would ya?"); + case ID_STATUS_FREECHAT: return TranslateT("I'm a chatbot!"); case ID_STATUS_ONLINE: return TranslateT("Yep, I'm here."); case ID_STATUS_OFFLINE: return TranslateT("Nope, not here."); case ID_STATUS_INVISIBLE: return TranslateT("I'm hiding from the mafia."); @@ -97,6 +98,7 @@ const char *StatusModeToDbSetting(int status, const char *suffix) case ID_STATUS_NA: prefix = "Na"; break; case ID_STATUS_DND: prefix = "Dnd"; break; case ID_STATUS_OCCUPIED: prefix = "Occupied"; break; + case ID_STATUS_FREECHAT: prefix = "FreeChat"; break; case ID_STATUS_ONLINE: prefix = "On"; break; case ID_STATUS_OFFLINE: prefix = "Off"; break; case ID_STATUS_INVISIBLE: prefix = "Inv"; break; -- cgit v1.2.3