diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/chat_session.c | 2 | ||||
| -rw-r--r-- | src/command/command.c | 32 | ||||
| -rw-r--r-- | src/config/accounts.c | 2 | ||||
| -rw-r--r-- | src/muc.c | 2 | ||||
| -rw-r--r-- | src/roster_list.c | 10 | ||||
| -rw-r--r-- | src/tools/parser.c | 10 | ||||
| -rw-r--r-- | src/ui/console.c | 2 | ||||
| -rw-r--r-- | src/ui/core.c | 8 | ||||
| -rw-r--r-- | src/ui/statusbar.c | 4 | ||||
| -rw-r--r-- | src/ui/window.c | 2 | ||||
| -rw-r--r-- | src/xmpp/presence.c | 2 |
11 files changed, 38 insertions, 38 deletions
diff --git a/src/chat_session.c b/src/chat_session.c index 555452cb..8ce2e437 100644 --- a/src/chat_session.c +++ b/src/chat_session.c @@ -141,7 +141,7 @@ chat_session_recipient_active(const char * const barejid, const char * const res // session exists with resource, update chat_states if (g_strcmp0(session->resource, resource) == 0) { session->send_states = send_states; - // session exists with differet resource and no override, replace + // session exists with different resource and no override, replace } else if (!session->resource_override) { _chat_session_new(barejid, resource, FALSE, send_states); } diff --git a/src/command/command.c b/src/command/command.c index 4411487d..944a9b8d 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -290,7 +290,7 @@ static struct cmd_t command_defs[] = "nick value - Nickname to use in the room", "password value - Password if the room requires it.", "", - "If no nickname is specfied the account preference 'muc.nick' will be used which by default is the localpart of your JID.", + "If no nickname is specified the account preference 'muc.nick' will be used which by default is the localpart of your JID.", "If the room doesn't exist, and the server allows it, a new one will be created.", NULL } } }, @@ -318,7 +318,7 @@ static struct cmd_t command_defs[] = { "/invites", "Show outstanding chat room invites.", { "/invites", "--------", - "Show all rooms that you have been invited to, and not accepted or declind.", + "Show all rooms that you have been invited to, and not accepted or declined.", NULL } } }, { "/decline", @@ -326,7 +326,7 @@ static struct cmd_t command_defs[] = { "/decline room", "Decline a chat room invite.", { "/decline room", "-------------", - "Decline a chat room ivivation.", + "Decline a chat room invitation.", "", "room - The room for the invite you wish to decline.", NULL } } }, @@ -515,9 +515,9 @@ static struct cmd_t command_defs[] = "Manage subscriptions to contact presence.", "", "request [jid] - Send a subscription request to the user.", - "allow [jid] - Approve a contact's subscription reqeust.", + "allow [jid] - Approve a contact's subscription request.", "deny [jid] - Remove subscription for a contact, or deny a request", - "show [jid] - Show subscriprion status for a contact.", + "show [jid] - Show subscription status for a contact.", "sent - Show all sent subscription requests pending a response.", "received - Show all received subscription requests awaiting your response.", "", @@ -548,7 +548,7 @@ static struct cmd_t command_defs[] = " any - Contacts with any status (same as calling with no argument).", "role - moderator|participant|visitor", "affiliation - owner|admin|member", - "group - Filter the results by the specfied group.", + "group - Filter the results by the specified group.", NULL } } }, { "/close", @@ -633,24 +633,24 @@ static struct cmd_t command_defs[] = " : Valid values are 1-1000.", "dynamic : Start with a 0 timeout and increase the value dynamically up to the specified 'timeout'.", " : on|off", - "A higher timeout will result in less CPU usage, but a noticable delay for response to input.", + "A higher timeout will result in less CPU usage, but a noticeable delay for response to input.", "A lower timeout will result in higher CPU usage, but faster response to input.", "Using the dynamic setting, higher CPU usage will occur during activity, but over time the CPU usage will decrease whilst there is no activity.", NULL } } }, { "/notify", cmd_notify, parse_args, 2, 3, &cons_notify_setting, - { "/notify [type value]|[type setting value]", "Control various desktop noficiations.", + { "/notify [type value]|[type setting value]", "Control various desktop notifications.", { "/notify [type value]|[type setting value]", "-----------------------------------------", "Settings for various desktop notifications where type is one of:", - "message : Notificaitons for regular messages.", + "message : Notifications for regular messages.", " : on|off", "message current : Whether messages in the current window trigger notifications.", " : on|off", "message text : Show message text in message notifications.", " : on|off", - "room : Notificaitons for chat room messages.", + "room : Notifications for chat room messages.", " : on|off|mention", "room current : Whether chat room messages in the current window trigger notifications.", " : on|off", @@ -661,7 +661,7 @@ static struct cmd_t command_defs[] = " : use 0 to disable.", "typing : Notifications when contacts are typing.", " : on|off", - "typing current : Whether typing notifications are triggerd for the current window.", + "typing current : Whether typing notifications are triggered for the current window.", " : on|off", "invite : Notifications for chat room invites.", " : on|off", @@ -742,7 +742,7 @@ static struct cmd_t command_defs[] = { "/mouse on|off", "-------------", "If set to 'on', profanity will handle mouse actions, which enables scrolling the main window with the mouse wheel.", - "To select text, use the shift key while selcting an area.", + "To select text, use the shift key while selecting an area.", "If set to 'off', profanity leaves mouse handling to the terminal implementation.", "This feature is experimental, certain mouse click events may occasionally freeze", "Profanity until a key is pressed or another mouse event is received", @@ -804,13 +804,13 @@ static struct cmd_t command_defs[] = "start [contact] - Start an OTR session with the contact, or the current recipient if in a chat window and no argument supplied.", "end - End the current OTR session,", "trust - Indicate that you have verified the contact's fingerprint.", - "untrust - Indicate the the contact's fingerprint is not verified,", + "untrust - Indicate the contact's fingerprint is not verified,", "log - How to log OTR messages, options are 'on', 'off' and 'redact', with redaction being the default.", "warn - Show when unencrypted messaging is being used in the title bar, options are 'on' and 'off' with 'on' being the default.", "libver - Show which version of the libotr library is being used.", "policy - manual, opportunistic or always.", "secret [secret]- Verify a contacts identity using a shared secret.", - "question [question] [answer] - Verify a contacts identity using a question and expected anwser, if the question has spaces, surround with double quotes.", + "question [question] [answer] - Verify a contacts identity using a question and expected answer, if the question has spaces, surround with double quotes.", "answer [answer] - Respond to a question answer verification request with your answer.", NULL } } }, @@ -876,9 +876,9 @@ static struct cmd_t command_defs[] = { "/ping", cmd_ping, parse_args, 0, 1, NULL, { "/ping [target]", "Send ping IQ request.", - { "/ping [rarget]", + { "/ping [target]", "--------------", - "Sends an IQ ping stanza to the specificed target.", + "Sends an IQ ping stanza to the specified target.", "If no target is supplied, your chat server will be used.", NULL } } }, diff --git a/src/config/accounts.c b/src/config/accounts.c index dd0d6eb4..6c04549c 100644 --- a/src/config/accounts.c +++ b/src/config/accounts.c @@ -828,7 +828,7 @@ _fix_legacy_accounts(const char * const account_name) _save_accounts(); } - // acounts with no muc service or nick + // accounts with no muc service or nick if (!g_key_file_has_key(accounts, account_name, "muc.service", NULL)) { gchar *account_jid = g_key_file_get_string(accounts, account_name, "jid", NULL); Jid *jidp = jid_create(account_jid); diff --git a/src/muc.c b/src/muc.c index 0d606873..ea4ae915 100644 --- a/src/muc.c +++ b/src/muc.c @@ -315,7 +315,7 @@ muc_nick_change_pending(const char * const room) } /* - * Change the current nuck name for the room, call once + * Change the current nick name for the room, call once * the service has responded */ void diff --git a/src/roster_list.c b/src/roster_list.c index 4ec5ea4f..b9a142cb 100644 --- a/src/roster_list.c +++ b/src/roster_list.c @@ -286,7 +286,7 @@ roster_get_contacts_by_presence(const char * const presence) } } - // resturn all contact structs + // return all contact structs return result; } @@ -303,7 +303,7 @@ roster_get_contacts(void) result = g_slist_insert_sorted(result, value, (GCompareFunc)_compare_contacts); } - // resturn all contact structs + // return all contact structs return result; } @@ -321,7 +321,7 @@ roster_get_contacts_online(void) result = g_slist_insert_sorted(result, value, (GCompareFunc)_compare_contacts); } - // resturn all contact structs + // return all contact structs return result; } @@ -371,7 +371,7 @@ roster_get_nogroup(void) } } - // resturn all contact structs + // return all contact structs return result; } @@ -395,7 +395,7 @@ roster_get_group(const char * const group) } } - // resturn all contact structs + // return all contact structs return result; } diff --git a/src/tools/parser.c b/src/tools/parser.c index 98fc21d4..1f8a5220 100644 --- a/src/tools/parser.c +++ b/src/tools/parser.c @@ -47,9 +47,9 @@ * * inp - The line of input * min - The minimum allowed number of arguments - * max - The maxmimum allowed number of arguments + * max - The maximum allowed number of arguments * - * Returns - An NULL terminated array of strings representing the aguments + * Returns - An NULL terminated array of strings representing the arguments * of the command, or NULL if the validation fails. * * E.g. the following input line: @@ -69,7 +69,7 @@ parse_args(const char * const inp, int min, int max, gboolean *result) return NULL; } - // copy and strip input of leading/trailing whitepsace + // copy and strip input of leading/trailing whitespace char *copy = strdup(inp); g_strstrip(copy); @@ -181,9 +181,9 @@ parse_args(const char * const inp, int min, int max, gboolean *result) * * inp - The line of input * min - The minimum allowed number of arguments - * max - The maxmimum allowed number of arguments + * max - The maximum allowed number of arguments * - * Returns - An NULL terminated array of strings representing the aguments + * Returns - An NULL terminated array of strings representing the arguments * of the command, or NULL if the validation fails. * * E.g. the following input line: diff --git a/src/ui/console.c b/src/ui/console.c index 01d1c73a..ef7df667 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -723,7 +723,7 @@ cons_show_account(ProfAccount *account) if (curr != NULL) { win_save_println(console, "Resources:"); - // sort in order of availabiltiy + // sort in order of availability while (curr != NULL) { Resource *resource = curr->data; ordered_resources = g_list_insert_sorted(ordered_resources, diff --git a/src/ui/core.c b/src/ui/core.c index fc6c0ed4..b5d32c73 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1871,7 +1871,7 @@ ui_room_message(const char * const roomjid, const char * const nick, if (wins_is_current(window)) { status_bar_active(num); - // not currenlty on groupchat window + // not currently on groupchat window } else { status_bar_new(num); cons_show_incoming_message(nick, num); @@ -1955,7 +1955,7 @@ ui_room_requires_config(const char * const roomjid) if (wins_is_current(window)) { status_bar_active(num); - // not currenlty on groupchat window + // not currently on groupchat window } else { status_bar_new(num); } @@ -2096,7 +2096,7 @@ ui_room_subject(const char * const roomjid, const char * const nick, const char if (wins_is_current(window)) { status_bar_active(num); - // not currenlty on groupchat window + // not currently on groupchat window } else { status_bar_active(num); } @@ -2130,7 +2130,7 @@ ui_room_broadcast(const char * const roomjid, const char * const message) if (wins_is_current(window)) { status_bar_active(num); - // not currenlty on groupchat window + // not currently on groupchat window } else { status_bar_new(num); } diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c index 58f3fc58..b9244fcd 100644 --- a/src/ui/statusbar.c +++ b/src/ui/statusbar.c @@ -192,7 +192,7 @@ status_bar_inactive(const int win) is_new[11] = TRUE; _mark_new(11); - // still have active winsows + // still have active windows } else if (g_hash_table_size(remaining_active) != 0) { is_active[11] = TRUE; is_new[11] = FALSE; @@ -241,7 +241,7 @@ status_bar_active(const int win) _mark_active(11); } - // visible winsow indicators + // visible window indicators } else { is_active[true_win] = TRUE; is_new[true_win] = FALSE; diff --git a/src/ui/window.c b/src/ui/window.c index 85cc875c..d683312b 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -690,7 +690,7 @@ win_show_info(ProfWin *window, PContact contact) if (resources != NULL) { win_save_print(window, '-', NULL, 0, 0, "", "Resources:"); - // sort in order of availabiltiy + // sort in order of availability GList *curr = resources; while (curr != NULL) { Resource *resource = curr->data; diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index a0d9e0f1..f4c45318 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -517,7 +517,7 @@ _handle_caps(char *jid, XMPPCaps *caps) } } - // unsupported hash, xep-0115, assoiciate with JID, no cache + // unsupported hash, xep-0115, associate with JID, no cache } else if (caps->hash) { log_info("Hash %s not supported: %s, sending service discovery request", caps->hash, jid); char *id = create_unique_id("caps"); |