diff options
| -rw-r--r-- | plugins/CmdLine/src/mimcmd_data.h | 2 | ||||
| -rw-r--r-- | plugins/NewXstatusNotify/src/resource.h | 3 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/resource.h | 3 | ||||
| -rw-r--r-- | protocols/FacebookRM/src/json.cpp | 2 | ||||
| -rw-r--r-- | protocols/ICQCorp/src/protocol.h | 1 |
5 files changed, 2 insertions, 9 deletions
diff --git a/plugins/CmdLine/src/mimcmd_data.h b/plugins/CmdLine/src/mimcmd_data.h index 6660375062..9351596ef9 100644 --- a/plugins/CmdLine/src/mimcmd_data.h +++ b/plugins/CmdLine/src/mimcmd_data.h @@ -89,7 +89,7 @@ typedef TSharedData *PSharedData; #define MIMCMD_IGNORE 19
#define MIMCMD_LUA 20
-#define MIMCMD_HELP_STATUS LPGENW("Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is an optional parameter specifying the account to set the status for. If it's not specified then the command will issue a global status change.")
+#define MIMCMD_HELP_STATUS LPGENW("Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, invisible.\n<Account> is an optional parameter specifying the account to set the status for. If it's not specified then the command will issue a global status change.")
#define MIMCMD_HELP_AWAYMSG LPGENW("Changes away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.")
#define MIMCMD_HELP_XSTATUS LPGENW("Changes extended status either globally or per account.\nUsage: xstatus <xStatus> [<account>].\n<xStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.")
#define MIMCMD_HELP_POPUPS LPGENW("Disables or enables popups display.\nUsage: popups (disable | enable | toggle).\nThe command will either enable or disable popups display.")
diff --git a/plugins/NewXstatusNotify/src/resource.h b/plugins/NewXstatusNotify/src/resource.h index 3b1f78becf..8a89753da3 100644 --- a/plugins/NewXstatusNotify/src/resource.h +++ b/plugins/NewXstatusNotify/src/resource.h @@ -156,10 +156,7 @@ #define IDC_DND_TX 41074
#define IDC_NA_TX 41075
#define IDC_OCCUPIED_TX 41076
-#define IDC_FREEFORCHAT_TX 41077
#define IDC_INVISIBLE_TX 41078
-#define IDC_ONTHEPHONE_TX 41079
-#define IDC_OUTTOLUNCH_TX 41080
#define IDC_XSTATUS_TX 41081
#define IDC_STATUSMSG_TX 41082
#define IDC_OFFLINE_BG 42071
diff --git a/plugins/TrafficCounter/src/resource.h b/plugins/TrafficCounter/src/resource.h index fa4907236c..b2bc799716 100644 --- a/plugins/TrafficCounter/src/resource.h +++ b/plugins/TrafficCounter/src/resource.h @@ -22,7 +22,6 @@ #define IDD_DETAILS 125
#define IDD_HISTORY 127
#define IDI_AWAY 128
-#define IDI_FREE4CHAT 129
#define IDI_INVISIBLE 130
#define IDI_NA 131
#define IDI_LOAD 132
@@ -107,9 +106,7 @@ #define IDI_GROUP_ICON 286
#define IDI_UNINSTALL_ICON 287
#define IDD_OPT_STATS 295
-#define IDI_ONTHEPHONE 1002
#define IDC_MESSAGE 1002
-#define IDI_OUTTOLUNCH 1003
#define IDC_AUTOCLOSE 1004
#define IDC_FROM 1005
#define IDC_AUTOMIN 1005
diff --git a/protocols/FacebookRM/src/json.cpp b/protocols/FacebookRM/src/json.cpp index b774fde6ee..2ff53ff346 100644 --- a/protocols/FacebookRM/src/json.cpp +++ b/protocols/FacebookRM/src/json.cpp @@ -1064,7 +1064,7 @@ int FacebookProto::ParseMessages(std::string &pData, std::vector<facebook_messag // const JSONNode &ol_ = itNodes["ol"]; // possible values: -1 (when goes to offline), 0 (when goes back online) (something more?) // const JSONNode &p_ = itNodes["p"]; // class with fbAppStatus, messengerStatus, otherStatus, status, webStatus - int status = ID_STATUS_INVISIBLE; // FREECHAT to easily spot some problem, as we expect it will always be p==0 or p==2 below + int status = ID_STATUS_INVISIBLE; // INVISIBLE to easily spot some problem, as we expect it will always be p==0 or p==2 below if (a_) { int a = a_.as_int(); diff --git a/protocols/ICQCorp/src/protocol.h b/protocols/ICQCorp/src/protocol.h index 70d6544acd..b3b3e875dd 100644 --- a/protocols/ICQCorp/src/protocol.h +++ b/protocols/ICQCorp/src/protocol.h @@ -109,7 +109,6 @@ const unsigned short int ICQ_STATUS_AWAY = 0x0001; const unsigned short int ICQ_STATUS_NA = 0x0005;
const unsigned short int ICQ_STATUS_OCCUPIED = 0x0011;
const unsigned short int ICQ_STATUS_DND = 0x0013;
-const unsigned short int ICQ_STATUS_FREECHAT = 0x0020;
const unsigned short int ICQ_STATUS_PRIVATE = 0x0100;
// miscellaneous constants
|