diff options
| author | George Hazan <ghazan@miranda.im> | 2019-05-27 18:45:43 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-05-27 18:45:43 +0300 |
| commit | ef1a349d88912a89a8dd20ca1dcb342b6dc9c2ff (patch) | |
| tree | 78e6344d923966b7a8f1866763d6bacaf054a9e2 /protocols/Non-IM Contact/src | |
| parent | 189f6be24f11066a3c711b783cf98f79f703e3a5 (diff) | |
fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)
Diffstat (limited to 'protocols/Non-IM Contact/src')
| -rw-r--r-- | protocols/Non-IM Contact/src/contactinfo.cpp | 10 | ||||
| -rw-r--r-- | protocols/Non-IM Contact/src/services.cpp | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/protocols/Non-IM Contact/src/contactinfo.cpp b/protocols/Non-IM Contact/src/contactinfo.cpp index 3bf022857e..cd5faa64a8 100644 --- a/protocols/Non-IM Contact/src/contactinfo.cpp +++ b/protocols/Non-IM Contact/src/contactinfo.cpp @@ -144,7 +144,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP CheckRadioButton(hwnd, 40072, 40080, g_plugin.getWord(hContact, "Icon", ID_STATUS_ONLINE)); SetWindowLongPtr(GetDlgItem(hwnd, CHK_ONLINE), GWLP_USERDATA, (LONG_PTR)Skin_LoadProtoIcon(MODNAME, ID_STATUS_ONLINE)); g_PrevBtnWndProc = (WNDPROC)SetWindowLongPtr(GetDlgItem(hwnd, CHK_ONLINE), GWLP_WNDPROC, (LONG_PTR)ButtWndProc); - for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) { + for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_MAX; i++) { SetWindowLongPtr(GetDlgItem(hwnd, i), GWLP_USERDATA, (LONG_PTR)Skin_LoadProtoIcon(MODNAME, i)); SetWindowLongPtr(GetDlgItem(hwnd, i), GWLP_WNDPROC, (LONG_PTR)ButtWndProc); } @@ -241,7 +241,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP } else db_unset(hContact, "CList", "Group"); - for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) + for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_MAX; i++) if (IsDlgButtonChecked(hwnd, i)) g_plugin.setWord(hContact, "Icon", (WORD)i); @@ -600,14 +600,8 @@ INT_PTR ImportContacts(WPARAM, LPARAM) mir_snprintf(tmp, "Icon: DND\r\n"); else if (icon == ID_STATUS_OCCUPIED) mir_snprintf(tmp, "Icon: Occupied\r\n"); - else if (icon == ID_STATUS_FREECHAT) - mir_snprintf(tmp, "Icon: Free for chat\r\n"); else if (icon == ID_STATUS_INVISIBLE) mir_snprintf(tmp, "Icon: Invisible\r\n"); - else if (icon == ID_STATUS_ONTHEPHONE) - mir_snprintf(tmp, "Icon: On the phone\r\n"); - else if (icon == ID_STATUS_OUTTOLUNCH) - mir_snprintf(tmp, "Icon: Out to lunch\r\n"); else { free(msg); continue; diff --git a/protocols/Non-IM Contact/src/services.cpp b/protocols/Non-IM Contact/src/services.cpp index e1b3278b84..72ef8ec790 100644 --- a/protocols/Non-IM Contact/src/services.cpp +++ b/protocols/Non-IM Contact/src/services.cpp @@ -9,7 +9,7 @@ INT_PTR GetLCCaps(WPARAM wParam, LPARAM) if (wParam == PFLAGNUM_1) return 0; if (wParam == PFLAGNUM_2) - return PF2_ONLINE | PF2_LONGAWAY | PF2_SHORTAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT | PF2_INVISIBLE | PF2_OUTTOLUNCH | PF2_ONTHEPHONE; // add the possible statuses here. + return PF2_ONLINE | PF2_LONGAWAY | PF2_SHORTAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_INVISIBLE; // add the possible statuses here. if (wParam == PFLAGNUM_3) return 0; return 0; @@ -104,7 +104,7 @@ int SetLCStatus(WPARAM wParam, LPARAM) // INT_PTR GetLCStatus(WPARAM, LPARAM) { - if ((LCStatus >= ID_STATUS_ONLINE) && (LCStatus <= ID_STATUS_OUTTOLUNCH)) + if (LCStatus >= ID_STATUS_ONLINE && LCStatus <= ID_STATUS_MAX) return LCStatus; else return ID_STATUS_OFFLINE; |