Mercurial > hg
changeset 277:4d7040cff8ee
Remove busy/occupied status, which does not really exist
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Tue, 05 Jul 2005 20:48:44 +0100 |
parents | 627925d885de |
children | a7af5517b453 |
files | mcabber/doc/mcabber.1 mcabber/doc/mcabber.1.html mcabber/doc/mcabber.1.txt mcabber/src/commands.c mcabber/src/histolog.c mcabber/src/jabglue.c mcabber/src/jabglue.h |
diffstat | 7 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/doc/mcabber.1 Mon Jul 04 12:55:54 2005 +0100 +++ b/mcabber/doc/mcabber.1 Tue Jul 05 20:48:44 2005 +0100 @@ -171,7 +171,7 @@ Send the text message to the currently selected buddy\&. Can be useful if you want to send a message beginning with a slash, for example\&. .TP -\fB/status\fR [online|avail|invisible|free|dnd|busy|notavail|away] +\fB/status\fR [online|avail|invisible|free|dnd|notavail|away] Set the current status\&. If no status is specified, display the current status\&. .SH "CONFIGURATION FILE"
--- a/mcabber/doc/mcabber.1.html Mon Jul 04 12:55:54 2005 +0100 +++ b/mcabber/doc/mcabber.1.html Tue Jul 05 20:48:44 2005 +0100 @@ -425,7 +425,7 @@ if you want to send a message beginning with a slash, for example. </dd> <dt><b> -/status [online|avail|invisible|free|dnd|busy|notavail|away] +/status [online|avail|invisible|free|dnd|notavail|away] </b></dt> <dd> Set the current status. If no status is specified, display the @@ -455,7 +455,7 @@ <div id="footer"> <p> Version 0.6.2<br /> -Last updated 02-Jul-2005 20:05:04 CEST +Last updated 05-Jul-2005 20:05:04 CEST </p> </div> </div>
--- a/mcabber/doc/mcabber.1.txt Mon Jul 04 12:55:54 2005 +0100 +++ b/mcabber/doc/mcabber.1.txt Tue Jul 05 20:48:44 2005 +0100 @@ -151,7 +151,7 @@ Send the text message to the currently selected buddy. Can be useful if you want to send a message beginning with a slash, for example. -/status [online|avail|invisible|free|dnd|busy|notavail|away]:: +/status [online|avail|invisible|free|dnd|notavail|away]:: Set the current status. If no status is specified, display the current status.
--- a/mcabber/src/commands.c Mon Jul 04 12:55:54 2005 +0100 +++ b/mcabber/src/commands.c Tue Jul 05 20:48:44 2005 +0100 @@ -98,7 +98,6 @@ compl_add_category_word(COMPL_STATUS, "invisible"); compl_add_category_word(COMPL_STATUS, "free"); compl_add_category_word(COMPL_STATUS, "dnd"); - compl_add_category_word(COMPL_STATUS, "busy"); compl_add_category_word(COMPL_STATUS, "notavail"); compl_add_category_word(COMPL_STATUS, "away"); @@ -310,7 +309,6 @@ else if (!strcasecmp(arg, "away")) st = away; else if (!strcasecmp(arg, "invisible")) st = invisible; else if (!strcasecmp(arg, "dnd")) st = dontdisturb; - else if (!strcasecmp(arg, "busy")) st = occupied; else if (!strcasecmp(arg, "notavail")) st = notavail; else if (!strcasecmp(arg, "free")) st = freeforchat; else {
--- a/mcabber/src/histolog.c Mon Jul 04 12:55:54 2005 +0100 +++ b/mcabber/src/histolog.c Tue Jul 05 20:48:44 2005 +0100 @@ -175,7 +175,7 @@ // Some checks if (((type == 'M') && (info != 'S' && info != 'R')) || - ((type == 'I') && (!strchr("OAIFDCN", info)))) { + ((type == 'I') && (!strchr("OAIFDN", info)))) { if (!err) { scr_LogPrint("Error in history file format (%s), l.%u", jid, ln); err = 1;
--- a/mcabber/src/jabglue.c Mon Jul 04 12:55:54 2005 +0100 +++ b/mcabber/src/jabglue.c Tue Jul 05 20:48:44 2005 +0100 @@ -45,7 +45,7 @@ unsigned char online; char imstatus2char[imstatus_size] = { - '_', 'o', 'i', 'f', 'd', 'c', 'n', 'a' + '_', 'o', 'i', 'f', 'd', 'n', 'a' }; static enum { @@ -240,7 +240,6 @@ (unsigned) -1); break; - case occupied: case dontdisturb: xmlnode_insert_cdata(xmlnode_insert_tag(x, "show"), "dnd", (unsigned) -1);
--- a/mcabber/src/jabglue.h Mon Jul 04 12:55:54 2005 +0100 +++ b/mcabber/src/jabglue.h Tue Jul 05 20:48:44 2005 +0100 @@ -16,7 +16,7 @@ extern jconn jc; extern char imstatus2char[]; -// Status chars: '_', 'o', 'i', 'f', 'd', 'c', 'n', 'a' +// Status chars: '_', 'o', 'i', 'f', 'd', 'n', 'a' enum imstatus { offline, @@ -24,7 +24,6 @@ invisible, freeforchat, dontdisturb, - occupied, notavail, away, imstatus_size