From 49e2ce57910d52c914af340bd14e6970b734a922 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Tue, 4 Jun 2019 15:50:53 +0300 Subject: fix fo statuses ids --- plugins/Actman/services.ini | 14 ++++---------- plugins/BossKeyPlus/src/BossKey.cpp | 2 +- plugins/MirandaG15/src/CContactList.cpp | 5 +---- plugins/Popup/src/resource.h | 2 -- 4 files changed, 6 insertions(+), 17 deletions(-) (limited to 'plugins') diff --git a/plugins/Actman/services.ini b/plugins/Actman/services.ini index 572e95f396..276b16487b 100644 --- a/plugins/Actman/services.ini +++ b/plugins/Actman/services.ini @@ -75,7 +75,7 @@ descr=Change 'hide offline contacts' option value [Service:CList/SetStatusMode] alias=MS_CLIST_SETSTATUSMODE -wparam=40071 Offline|40072 Online|40073 Away|40074 Do not disturb|40075 Not available|40076 Occupied|40077 Free for chat|40078 Invisible|40079 On the phone|40080 Out to lunch +wparam=40071 Offline|40072 Online|40073 Away|40074 Do not disturb|40075 Not available|40076 Occupied|40077 Invisible lparam=0 return=int 0, if successful descr=Set global status @@ -442,14 +442,14 @@ descr=Manage Jabber Bookmarks [Service:/SetAwayMsg] alias=PS_SETAWAYMSG -wparam=40071 Offline|40072 Online|40073 Away|40074 Do not disturb|40075 Not available|40076 Occupied|40077 Free for chat|40078 Invisible|40079 On the phone|40080 Out to lunch +wparam=40071 Offline|40072 Online|40073 Away|40074 Do not disturb|40075 Not available|40076 Occupied|40077 Invisible lparam=text return=int 0, if successful descr=Set status message [Service:/SetStatus] alias=PS_SETSTATUS -wparam=40071 Offline|40072 Online|40073 Away|40074 Do not disturb|40075 Not available|40076 Occupied|40077 Free for chat|40078 Invisible|40079 On the phone|40080 Out to lunch +wparam=40071 Offline|40072 Online|40073 Away|40074 Do not disturb|40075 Not available|40076 Occupied|40077 Invisible lparam=0 return=int 0, if successful descr=Set protocol status @@ -531,14 +531,8 @@ value=40074 value=40075 [Const:ID_STATUS_OCCUPIED] value=40076 -[Const:ID_STATUS_FREECHAT] -value=40077 [Const:ID_STATUS_INVISIBLE] -value=40078 -[Const:ID_STATUS_ONTHEPHONE] -value=40079 -[Const:ID_STATUS_OUTTOLUNCH] -value=40080 +value=40077 [Const:ID_STATUS_IDLE] value=40081 diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 6907c3dbdf..a4c0d993d3 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -207,7 +207,7 @@ static int ChangeAllProtoStatuses(unsigned statusMode, wchar_t *msg) unsigned status = Proto_GetStatus(proto[i]->szModuleName); if ( (g_wMask & OPT_ONLINEONLY) ? // check "Change only if current status is Online" option - ((status == ID_STATUS_ONLINE)) // process only "online" and "free for chat" + ((status == ID_STATUS_ONLINE)) // process only "online" : ((status > ID_STATUS_OFFLINE) && (status < ID_STATUS_IDLE) && (status != ID_STATUS_INVISIBLE))) // process all existing statuses except for "invisible" & "offline" { if (g_wMask & OPT_SETONLINEBACK) { // need to save old statuses & status messages diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp index f62ed747c2..5e2a1b15db 100644 --- a/plugins/MirandaG15/src/CContactList.cpp +++ b/plugins/MirandaG15/src/CContactList.cpp @@ -11,10 +11,7 @@ const int aiStatusPriority[] = 1, // ID_STATUS_DND 40074 7, // ID_STATUS_NA 40075 6, // ID_STATUS_OCCUPIED 40076 - 10, // ID_STATUS_FREECHAT 40077 - 9, // ID_STATUS_INVISIBLE 40078 - 8, // ID_STATUS_ONTHEPHONE 40079 - 8 // ID_STATUS_OUTTOLUNCH 40080 + 9, // ID_STATUS_INVISIBLE 40077 }; //************************************************************************ diff --git a/plugins/Popup/src/resource.h b/plugins/Popup/src/resource.h index 8dd0e96ff2..8146f57751 100644 --- a/plugins/Popup/src/resource.h +++ b/plugins/Popup/src/resource.h @@ -170,8 +170,6 @@ #define IDC_CHK_ONLINE 40072 #define IDC_CHK_NA 40075 #define IDC_CHK_OCCUPIED 40076 -#define IDC_CHK_ONTHEPHONE 40079 -#define IDC_CHK_OUTTOLUNCH 40080 // Next default values for new objects // -- cgit v1.2.3