aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into readline

Browse Source
This commit is contained in:
James Booth 2015-02-23 00:50:58 +00:00
commit 7454bede8b
11 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_session.c
View File

@ -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);
}

26
src/command/command.c
View File

@ -332,7 +332,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.",
"",
"Example: /join jdev@conference.jabber.org",
@ -365,7 +365,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",
@ -373,7 +373,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 } } },
@ -573,9 +573,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.",
"",
@ -613,7 +613,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",
@ -701,20 +701,20 @@ static struct cmd_t command_defs[] =
{ "/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 kinds of desktop notifications.",
"",
"message on|off : Notificaitons for regular messages.",
"message on|off : Notifications for regular messages.",
"message current on|off : Whether messages in the current window trigger notifications.",
"message text on|off : Show message text in message notifications.",
"room on|off|mention : Notificaitons for chat room messages.",
"room on|off|mention : Notifications for chat room messages.",
"room current on|off : Whether chat room messages in the current window trigger notifications.",
"room text on|off : Show message text in chat room message notifications.",
"remind seconds : Notification reminder period for unread messages, use 0 to disable.",
"typing on|off : Notifications when contacts are typing.",
"typing current of|off : Whether typing notifications are triggerd for the current window.",
"typing current of|off : Whether typing notifications are triggered for the current window.",
"invite on|off : Notifications for chat room invites.",
"sub on|off : Notifications for subscription requests.",
"",
@ -860,7 +860,7 @@ static struct cmd_t command_defs[] =
"libver : Show which version of the libotr library is being used.",
"policy manual|opportunistic|always : Set the global OTR policy.",
"secret [secret] : Verify a contacts identity using a shared secret.",
"question [question] [answer] : Verify a contacts identity using a question and expected anwser.",
"question [question] [answer] : Verify a contacts identity using a question and expected answer.",
"answer [answer] : Respond to a question answer verification request with your answer.",
NULL } } },
@ -925,9 +925,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 pinged.",
NULL } } },

2
src/config/accounts.c
View File

@ -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);

2
src/muc.c
View File

@ -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

10
src/roster_list.c
View File

@ -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;
}

10
src/tools/parser.c
View File

@ -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:

2
src/ui/console.c
View File

@ -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,

8
src/ui/core.c
View File

@ -1873,7 +1873,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);
@ -1957,7 +1957,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);
}
@ -2098,7 +2098,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);
}
@ -2132,7 +2132,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);
}

4
src/ui/statusbar.c
View File

@ -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;

2
src/ui/window.c
View File

@ -722,7 +722,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;

2
src/xmpp/presence.c
View File

@ -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");