diff options
| -rw-r--r-- | src/command/command.c | 8 | ||||
| -rw-r--r-- | src/ui/console.c | 10 | ||||
| -rw-r--r-- | src/ui/core.c | 8 | ||||
| -rw-r--r-- | src/xmpp/presence.c | 4 | ||||
| -rw-r--r-- | src/xmpp/roster.c | 2 |
5 files changed, 14 insertions, 18 deletions
diff --git a/src/command/command.c b/src/command/command.c index e37331ce..6d7aa627 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -74,7 +74,7 @@ static struct cmd_t command_defs[] = { { "/help", cmd_help, parse_args, 0, 1, NULL, - { "/help [area|command]", "Get help on using Profanity", + { "/help [area|command]", "Get help on using Profanity.", { "/help [area|command]", "-------------------------", "Use with no arguments to get a help summary.", @@ -90,7 +90,7 @@ static struct cmd_t command_defs[] = { "/about", cmd_about, parse_args, 0, 0, NULL, - { "/about", "About Profanity", + { "/about", "About Profanity.", { "/about", "------", "Show versioning and license information.", @@ -540,7 +540,7 @@ static struct cmd_t command_defs[] = { "/chlog", cmd_chlog, parse_args, 1, 1, &cons_chlog_setting, - { "/chlog on|off", "Chat logging to file", + { "/chlog on|off", "Chat logging to file.", { "/chlog on|off", "-------------", "Switch chat logging on or off.", @@ -551,7 +551,7 @@ static struct cmd_t command_defs[] = { "/grlog", cmd_grlog, parse_args, 1, 1, &cons_grlog_setting, - { "/grlog on|off", "Chat logging of chat rooms to file", + { "/grlog on|off", "Chat logging of chat rooms to file.", { "/grlog on|off", "-------------", "Switch chat room logging on or off.", diff --git a/src/ui/console.c b/src/ui/console.c index bb6c4a38..c02201f9 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -548,7 +548,6 @@ _cons_show_received_subs(void) g_slist_free_full(received, g_free); } - wins_refresh_console(); cons_alert(); } @@ -570,7 +569,6 @@ _cons_show_sent_subs(void) cons_show("No pending requests sent."); } - wins_refresh_console(); cons_alert(); } @@ -1282,7 +1280,7 @@ _cons_help(void) cons_show("/help groupchat - List groupchat commands."); cons_show("/help presence - List commands to change presence."); cons_show("/help roster - List commands for manipulating your roster."); - cons_show("/help service - List service discovery commands"); + cons_show("/help service - List service discovery commands."); cons_show("/help settings - List commands for changing settings."); cons_show("/help other - Other commands."); cons_show("/help navigation - How to navigate around Profanity."); @@ -1299,12 +1297,10 @@ _cons_navigation_help(void) cons_show(""); cons_show("Navigation:"); cons_show(""); - cons_show("Alt-1 : This console window."); - cons_show("Alt-2..Alt-0 : Chat windows."); + cons_show("Alt-1 (F1) : This console window."); + cons_show("Alt-2..Alt-0 (F2..F10) : Chat windows."); cons_show("Alt-LEFT : Previous chat window"); cons_show("Alt-RIGHT : Next chat window"); - cons_show("F1 : This console window."); - cons_show("F2..F10 : Chat windows."); cons_show("UP, DOWN : Navigate input history."); cons_show("LEFT, RIGHT, HOME, END : Edit current input."); cons_show("CTRL-LEFT, CTRL-RIGHT : Jump word in input."); diff --git a/src/ui/core.c b/src/ui/core.c index c5636d3a..c06f025e 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -954,8 +954,8 @@ _ui_outgoing_msg(const char * const from, const char * const to, if (contact != NULL) { if (strcmp(p_contact_presence(contact), "offline") == 0) { - const char const *show = p_contact_presence(contact); - const char const *status = p_contact_status(contact); + const char *show = p_contact_presence(contact); + const char *status = p_contact_status(contact); win_show_status_string(window, to, show, status, NULL, "--", "offline"); } } @@ -1026,8 +1026,8 @@ _ui_room_roster(const char * const room, GList *roster, const char * const prese while (roster != NULL) { PContact member = roster->data; - const char const *nick = p_contact_barejid(member); - const char const *show = p_contact_presence(member); + const char *nick = p_contact_barejid(member); + const char *show = p_contact_presence(member); win_presence_colour_on(window, show); wprintw(window->win, "%s", nick); diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index 5698b520..3ca2f63e 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -261,7 +261,7 @@ _presence_join_room(Jid *jid) log_debug("Sending room join presence to: %s", jid->fulljid); xmpp_ctx_t *ctx = connection_get_ctx(); xmpp_conn_t *conn = connection_get_conn(); - contact_presence_t presence_type = + resource_presence_t presence_type = accounts_get_last_presence(jabber_get_account_name()); const char *show = stanza_get_presence_string_from_type(presence_type); char *status = jabber_get_presence_message(); @@ -289,7 +289,7 @@ _presence_change_room_nick(const char * const room, const char * const nick) log_debug("Sending room nickname change to: %s, nick: %s", room, nick); xmpp_ctx_t *ctx = connection_get_ctx(); xmpp_conn_t *conn = connection_get_conn(); - contact_presence_t presence_type = + resource_presence_t presence_type = accounts_get_last_presence(jabber_get_account_name()); const char *show = stanza_get_presence_string_from_type(presence_type); char *status = jabber_get_presence_message(); diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index 7d4b0efe..e84de155 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -297,7 +297,7 @@ _roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, item = xmpp_stanza_get_next(item); } - contact_presence_t conn_presence = + resource_presence_t conn_presence = accounts_get_login_presence(jabber_get_account_name()); presence_update(conn_presence, NULL, 0); } |