Fix typos in protocol plugins
Ran `codespell -w`, ignoring a few things, and cleaning up some others.
Testing Done:
Compile only
Reviewed at https://reviews.imfreedom.org/r/1018/
--- a/libpurple/protocols/bonjour/bonjour_ft.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/bonjour/bonjour_ft.c Sun Oct 10 05:00:30 2021 -0500
@@ -494,7 +494,7 @@
* distinct buddies with the same ipv6 link local address on two distinct
* interfaces. Unfortunately XEP-0065 does not seem to specify how to deal with
* link local ip addresses properly...
- * However, in practice the possiblity for such a conflict is relatively low+ * However, in practice the possibility for such a conflict is relatively low * (2011 - might be different in the future though?).
* @param host ipv4 or ipv6 address string
--- a/libpurple/protocols/bonjour/mdns_common.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/bonjour/mdns_common.c Sun Oct 10 05:00:30 2021 -0500
@@ -124,7 +124,7 @@
ret = _add_txt_record(ret, "status", data->status);
ret = _add_txt_record(ret, "node", "libpurple");
ret = _add_txt_record(ret, "ver", VERSION);
- /* Currently always set to "!" since we don't support AV and wont ever be in a conference */+ /* Currently always set to "!" since we don't support AV and won't ever be in a conference */ ret = _add_txt_record(ret, "vc", data->vc);
if (email != NULL && *email != '\0') {
ret = _add_txt_record(ret, "email", email);
--- a/libpurple/protocols/bonjour/xmpp.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/bonjour/xmpp.c Sun Oct 10 05:00:30 2021 -0500
@@ -654,7 +654,7 @@
- /* We don't want to recieve anything else */+ /* We don't want to receive anything else */ purple_gio_graceful_close(G_IO_STREAM(bconv->socket),
G_INPUT_STREAM(bconv->input),
G_OUTPUT_STREAM(bconv->output));
@@ -826,7 +826,7 @@
/* There may be multiple entries for the same IP - one per
- * presence recieved (e.g. multiple interfaces).+ * presence received (e.g. multiple interfaces). * We need to make sure that we find the previously used entry.
tmp = g_slist_find(bb->ips, bb->conversation->ip_link);
@@ -1149,7 +1149,7 @@
/* Cancel any file transfers that are waiting to begin */
- /* There wont be any transfers if it hasn't been attached to a buddy */+ /* There won't be any transfers if it hasn't been attached to a buddy */ if (bconv->pb != NULL && bd != NULL) {
GSList *xfers, *tmp_next;
--- a/libpurple/protocols/facebook/api.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/facebook/api.c Sun Oct 10 05:00:30 2021 -0500
@@ -1743,9 +1743,9 @@
-fb_api_cb_publish_pt(FbThrift *thft, GSList **press, GError **error)+fb_api_cb_publish_pt(FbThrift *thft, GSList **presences, GError **error)
+ FbApiPresence *api_presence; @@ -1784,10 +1784,10 @@
FB_API_TCHK(fb_thrift_read_i32(thft, &i32));
- pres = fb_api_presence_dup(NULL);- pres->active = i32 != 0;- *press = g_slist_prepend(*press, pres);+ api_presence = fb_api_presence_dup(NULL); + api_presence->uid = i64; + api_presence->active = i32 != 0; + *presences = g_slist_prepend(*presences, api_presence); fb_util_debug_info("Presence: %" FB_ID_FORMAT " (%d) id: %d",
@@ -1849,19 +1849,19 @@
+ GSList *presences = NULL; thft = fb_thrift_new(pload, 0);
- fb_api_cb_publish_pt(thft, &press, &err);+ fb_api_cb_publish_pt(thft, &presences, &err); if (G_LIKELY(err == NULL)) {
- g_signal_emit_by_name(api, "presences", press);+ g_signal_emit_by_name(api, "presences", presences); fb_api_error_emit(api, err);
- g_slist_free_full(press, (GDestroyNotify) fb_api_presence_free);+ g_slist_free_full(presences, (GDestroyNotify)fb_api_presence_free); @@ -3338,27 +3338,27 @@
-fb_api_presence_dup(const FbApiPresence *pres)+fb_api_presence_dup(const FbApiPresence *presence)
+ if (presence == NULL) { return g_new0(FbApiPresence, 1);
- return g_memdup2(pres, sizeof *pres);+ return g_memdup2(presence, sizeof *presence); -fb_api_presence_reset(FbApiPresence *pres)+fb_api_presence_reset(FbApiPresence *presence) - g_return_if_fail(pres != NULL);- memset(pres, 0, sizeof *pres);+ g_return_if_fail(presence != NULL); + memset(presence, 0, sizeof *presence); -fb_api_presence_free(FbApiPresence *pres)+fb_api_presence_free(FbApiPresence *presence) - if (G_LIKELY(pres != NULL)) {+ if (G_LIKELY(presence != NULL)) { --- a/libpurple/protocols/facebook/api.h Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/facebook/api.h Sun Oct 10 05:00:30 2021 -0500
@@ -843,34 +843,34 @@
- * @pres: The #FbApiPresence or #NULL.+ * @presence: The #FbApiPresence or %NULL. - * Duplicates an #FbApiPresence. If @pres is #NULL, a new zero filled- * #FbApiPresence is returned. The returned #FbApiPresence should be- * freed with #fb_api_presence_free() when no longer needed.+ * Duplicates an #FbApiPresence. If @presence is %NULL, a new zero filled + * #FbApiPresence is returned. The returned #FbApiPresence should be freed with + * #fb_api_presence_free() when no longer needed. * Returns: The new #FbApiPresence.
-fb_api_presence_dup(const FbApiPresence *pres);+fb_api_presence_dup(const FbApiPresence *presence); - * @pres: The #FbApiPresence.+ * @presence: The #FbApiPresence. * Resets an #FbApiPresence.
-fb_api_presence_reset(FbApiPresence *pres);+fb_api_presence_reset(FbApiPresence *presence); - * @pres: The #FbApiPresence.+ * @presence: The #FbApiPresence. * Frees all memory used by the #FbApiPresence.
-fb_api_presence_free(FbApiPresence *pres);+fb_api_presence_free(FbApiPresence *presence); --- a/libpurple/protocols/facebook/facebook.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/facebook/facebook.c Sun Oct 10 05:00:30 2021 -0500
@@ -600,10 +600,9 @@
-fb_cb_api_presences(FbApi *api, GSList *press, gpointer data)+fb_cb_api_presences(FbApi *api, GSList *presences, gpointer data)
@@ -614,16 +613,16 @@
gc = fb_data_get_connection(fata);
acct = purple_connection_get_account(gc);
- for (l = press; l != NULL; l = l->next) {+ for (l = presences; l != NULL; l = l->next) { + FbApiPresence *api_presence = l->data;
+ if (api_presence->active) { pstat = PURPLE_STATUS_AVAILABLE;
pstat = PURPLE_STATUS_OFFLINE;
- FB_ID_TO_STR(pres->uid, uid);+ FB_ID_TO_STR(api_presence->uid, uid); statid = purple_primitive_get_id_from_type(pstat);
purple_protocol_got_user_status(acct, uid, statid, NULL);
@@ -1174,11 +1173,11 @@
PurpleNotifyUserInfo *info, gboolean full)
+ PurplePresence *presence; - pres = purple_buddy_get_presence(buddy);- status = purple_presence_get_active_status(pres);+ presence = purple_buddy_get_presence(buddy); + status = purple_presence_get_active_status(presence); if (!PURPLE_BUDDY_IS_ONLINE(buddy)) {
/* Prevent doubles statues for Offline buddies */
--- a/libpurple/protocols/facebook/json.h Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/facebook/json.h Sun Oct 10 05:00:30 2021 -0500
@@ -176,7 +176,7 @@
* @name: The member name or #NULL.
- * Adds a boolean memeber to the #JsonBuilder.+ * Adds a boolean member to the #JsonBuilder. fb_json_bldr_add_bool(JsonBuilder *bldr, const gchar *name, gboolean value);
@@ -187,7 +187,7 @@
* @name: The member name or #NULL.
- * Adds a floating point memeber to the #JsonBuilder.+ * Adds a floating point member to the #JsonBuilder. fb_json_bldr_add_dbl(JsonBuilder *bldr, const gchar *name, gdouble value);
@@ -198,7 +198,7 @@
* @name: The member name or #NULL.
- * Adds a integer memeber to the #JsonBuilder.+ * Adds an integer member to the #JsonBuilder. fb_json_bldr_add_int(JsonBuilder *bldr, const gchar *name, gint64 value);
@@ -209,7 +209,7 @@
* @name: The member name or #NULL.
- * Adds a string memeber to the #JsonBuilder.+ * Adds a string member to the #JsonBuilder. fb_json_bldr_add_str(JsonBuilder *bldr, const gchar *name, const gchar *value);
@@ -221,7 +221,7 @@
* @format: The format string literal.
* @...: The arguments for @format.
- * Adds a formatted string memeber to the #JsonBuilder.+ * Adds a formatted string member to the #JsonBuilder. fb_json_bldr_add_strf(JsonBuilder *bldr, const gchar *name,
--- a/libpurple/protocols/facebook/util.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/facebook/util.c Sun Oct 10 05:00:30 2021 -0500
@@ -295,18 +295,18 @@
-fb_util_request_buddy_ok(gpointer *mata, PurpleRequestFields *fields)+fb_util_request_buddy_ok(gpointer *request_data, PurpleRequestFields *fields) - FbUtilRequestBuddyFunc func = mata[0];+ FbUtilRequestBuddyFunc func = request_data[0]; - gpointer data = mata[2];+ gpointer data = request_data[2]; PurpleRequestField *field;
@@ -322,20 +322,20 @@
-fb_util_request_buddy_cancel(gpointer *mata, PurpleRequestFields *fields)+fb_util_request_buddy_cancel(gpointer *request_data, PurpleRequestFields *fields) - FbUtilRequestBuddyFunc func = mata[1];- gpointer data = mata[2];+ FbUtilRequestBuddyFunc func = request_data[1]; + gpointer data = request_data[2];
@@ -374,7 +374,7 @@
+ gpointer *request_data; @@ -383,10 +383,10 @@
PurpleRequestFieldGroup *group;
PurpleRequestFields *fields;
- mata = g_new0(gpointer, 3);+ request_data = g_new0(gpointer, 3); + request_data[0] = ok_cb; + request_data[1] = cancel_cb; + request_data[2] = data; acct = purple_connection_get_account(gc);
buddies = purple_blist_find_buddies(acct, NULL);
@@ -426,7 +426,7 @@
G_CALLBACK(fb_util_request_buddy_ok),
G_CALLBACK(fb_util_request_buddy_cancel),
--- a/libpurple/protocols/gg/keymapper.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/gg/keymapper.c Sun Oct 10 05:00:30 2021 -0500
@@ -35,7 +35,7 @@
* can be also an unique key. We also need a map, to quickly figure out the
* address for any previously stored value.
- * The naming problem: values becames the keys and vice-versa.+ * The naming problem: values becomes the keys and vice-versa. --- a/libpurple/protocols/gg/message-prpl.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/gg/message-prpl.c Sun Oct 10 05:00:30 2021 -0500
@@ -384,8 +384,10 @@
g_match_info_next(match, NULL);
if (tag == GGP_HTML_TAG_UNKNOWN) {
- purple_debug_warning("gg", "ggp_message_format_to_gg: "- "uknown tag %s\n", tag_str);+ "ggp_message_format_to_gg: unknown tag %s", /* closing *all* formatting-related tags (GG11 weirdness)
@@ -610,8 +612,10 @@
} else if (tag == GGP_HTML_TAG_A || tag == GGP_HTML_TAG_EOM) {
} else if (tag == GGP_HTML_TAG_UNKNOWN) {
- purple_debug_warning("gg", "ggp_message_format_to_gg: "- "uknown tag %s\n", tag_str);+ "ggp_message_format_to_gg: unknown tag %s", purple_debug_error("gg", "ggp_message_format_to_gg: "
"not handled tag %s\n", tag_str);
@@ -628,7 +632,7 @@
"end of message not reached\n");
- /* releasing fonts recources */+ /* releasing fonts resources */ ggp_font_free(font_current);
ggp_font_free(font_base);
--- a/libpurple/protocols/jabber/auth.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/jabber/auth.c Sun Oct 10 05:00:30 2021 -0500
@@ -219,7 +219,7 @@
(err_code = purple_xmlnode_get_attrib(error, "code")) &&
purple_strequal(err_code, "401")) {
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
- /* Clear the pasword if it isn't being saved */+ /* Clear the password if it isn't being saved */ if(!purple_account_get_remember_password(account)) {
PurpleCredentialManager *manager = NULL;
--- a/libpurple/protocols/jabber/caps.h Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/jabber/caps.h Sun Oct 10 05:00:30 2021 -0500
@@ -76,7 +76,7 @@
gboolean jabber_caps_exts_known(const JabberCapsClientInfo *info, char **exts);
- * Main entity capabilites function to get the capabilities of a contact.+ * Main entity capabilities function to get the capabilities of a contact. * The callback will be called synchronously if we already have the
* capabilities for the specified (node,ver,hash) (and, if exts are specified,
--- a/libpurple/protocols/jabber/ibb.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/jabber/ibb.c Sun Oct 10 05:00:30 2021 -0500
@@ -75,7 +75,7 @@
sess->block_size = atoi(block_size);
/* if we create a session from an incoming <open/> request, it means the
- session is immediatly open... */+ session is immediately open... */ sess->state = JABBER_IBB_SESSION_OPENED;
--- a/libpurple/protocols/jabber/jabber.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/jabber/jabber.c Sun Oct 10 05:00:30 2021 -0500
@@ -1592,7 +1592,7 @@
/* TODO: As Will pointed out in IRC, after being notified by the core to
* shutdown, we should async. wait for the server to send us the stream
- * termination before destorying everything. That seems like it would require+ * termination before destroying everything. That seems like it would require * changing the semantics of protocol's close(), so it's a good idea for 3.0.0.
void jabber_close(PurpleConnection *gc)
@@ -2736,7 +2736,7 @@
text = _("Authorization mechanism too weak");
} else if(purple_xmlnode_get_child(packet, "not-authorized")) {
SET_REASON(PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED);
- /* Clear the pasword if it isn't being saved */+ /* Clear the password if it isn't being saved */ if (!purple_account_get_remember_password(purple_connection_get_account(js->gc))) {
PurpleAccount *account = purple_connection_get_account(js->gc);
PurpleCredentialManager *manager = NULL;
--- a/libpurple/protocols/jabber/jabber.h Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/jabber/jabber.h Sun Oct 10 05:00:30 2021 -0500
@@ -139,8 +139,8 @@
* 3. We receive this roster push and modify our local blist. This
* triggers us to send a roster add for group B.
- * 4. The server recieves our earlier roster add for group A and sends+ * 4. The server receives our earlier roster add for group A and sends us a * 5. We receive this roster push and modify our local blist. This
* triggers us to send a roster add for group A.
* 6. The server receives our earlier roster add for group B and sends
--- a/libpurple/protocols/jabber/jingle/rtp.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/jabber/jingle/rtp.c Sun Oct 10 05:00:30 2021 -0500
@@ -220,7 +220,7 @@
- /* The same signal is emited *four* times in case of acceptance+ /* The same signal is emitted *four* times in case of acceptance * by purple_media_stream_info() (stream acceptance, session
* acceptance, participant acceptance, and conference acceptance).
* We only react to the first one, where sid and name are given
--- a/libpurple/protocols/jabber/si.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/jabber/si.c Sun Oct 10 05:00:30 2021 -0500
@@ -804,7 +804,7 @@
"jabber_si_xfer_connect_proxy_cb: got error, method: %d\n",
if (jsx->stream_method & STREAM_METHOD_IBB) {
- /* if we previously tried bytestreams, we need to disble it. */+ /* if we previously tried bytestreams, we need to disable it. */ if(jsx->stream_method & STREAM_METHOD_BYTESTREAMS) {
jsx->stream_method &= ~STREAM_METHOD_BYTESTREAMS;
@@ -1637,7 +1637,7 @@
/* we should maybe "remember" if bytestreams has failed before (in the
same session) with this JID, and only present IBB as an option to
- avoid unnessesary timeout */+ avoid unnecessary timeout */ /* maybe we should have an account option to always just try IBB
for people who know their firewalls are very restrictive */
if (jsx->stream_method & STREAM_METHOD_BYTESTREAMS) {
--- a/libpurple/protocols/jabber/tests/test_jabber_caps.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/jabber/tests/test_jabber_caps.c Sun Oct 10 05:00:30 2021 -0500
@@ -51,7 +51,7 @@
g_test_add_func("/jabber/caps/parse invalid nodes",
test_jabber_caps_parse_invalid_nodes);
- g_test_add_func("/jabber/caps/calulate from xmlnode",+ g_test_add_func("/jabber/caps/calculate from xmlnode", test_jabber_caps_calculate_from_xmlnode);
--- a/libpurple/protocols/novell/nmconference.h Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/novell/nmconference.h Sun Oct 10 05:00:30 2021 -0500
@@ -25,7 +25,7 @@
#include "nmuserrecord.h"
-/* A blank GUID -- represents an uninstatiated conference */+/* A blank GUID -- represents an uninstantiated conference */ #define BLANK_GUID "[00000000-00000000-00000000-0000-0000]"
/* This is how much of the conference GUIDs to compare when testing
--- a/libpurple/protocols/novell/novell.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/novell/novell.c Sun Oct 10 05:00:30 2021 -0500
@@ -1363,9 +1363,9 @@
/* Add sub-folders and contacts to sub-folders...
- * iterate throught the sub-folders in reverse order- * because Purple adds the folders to the front -- so we- * want to add the first folder last+ * iterate through the sub-folders in reverse order because + * Purple adds the folders to the front -- so we want to add + * the first folder last cnt = nm_folder_get_subfolder_count(root_folder);
for (i = cnt-1; i >= 0; i--) {
@@ -1558,23 +1558,24 @@
-/* Send a join conference, the first item in the parms list is the+/* Send a join conference, the first item in the params list is the * NMUser object and the second item is the conference to join.
* This callback is passed to purple_request_action when we ask the
* user if they want to join the conference.
-_join_conference_cb(GSList * parms)+_join_conference_cb(GSList *params) NMConference *conference;
- if (parms == NULL || g_slist_length(parms) != 2)+ if (params == NULL || g_slist_length(params) != 2) {
- user = g_slist_nth_data(parms, 0);- conference = g_slist_nth_data(parms, 1);+ user = g_slist_nth_data(params, 0); + conference = g_slist_nth_data(params, 1); if (user && conference) {
rc = nm_send_join_conference(user, conference,
@@ -1582,33 +1583,34 @@
_check_for_disconnect(user, rc);
-/* Send a reject conference, the first item in the parms list is the+/* Send a reject conference, the first item in the params list is the * NMUser object and the second item is the conference to reject.
* This callback is passed to purple_request_action when we ask the
* user if they want to joing the conference.
-_reject_conference_cb(GSList * parms)+_reject_conference_cb(GSList *params) NMConference *conference;
- if (parms == NULL || g_slist_length(parms) != 2)+ if (params == NULL || g_slist_length(params) != 2) {
- user = g_slist_nth_data(parms, 0);- conference = g_slist_nth_data(parms, 1);+ user = g_slist_nth_data(params, 0); + conference = g_slist_nth_data(params, 1); if (user && conference) {
rc = nm_send_reject_conference(user, conference, NULL, NULL);
_check_for_disconnect(user, rc);
@@ -1913,7 +1915,7 @@
const char *title = NULL;
const char *secondary = NULL;
@@ -1933,13 +1935,13 @@
name, purple_date_format_full(localtime(&gmt)));
secondary = _("Would you like to join the conversation?");
- /* Set up parms list for the callbacks+ /* Set up params list for the callbacks * We need to send the NMUser object and
* the NMConference object to the callbacks
- parms = g_slist_append(parms, user);- parms = g_slist_append(parms, nm_event_get_conference(event));+ params = g_slist_append(params, user); + params = g_slist_append(params, nm_event_get_conference(event)); /* TODO: Would it be better to use purple_serv_got_chat_invite() here? */
@@ -1947,7 +1949,7 @@
purple_request_action(gc, title, primary, secondary,
PURPLE_DEFAULT_ACTION_NONE,
purple_request_cpar_from_connection(gc),
_("Yes"), G_CALLBACK(_join_conference_cb),
_("No"), G_CALLBACK(_reject_conference_cb));
--- a/libpurple/protocols/sametime/sametime.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/sametime/sametime.c Sun Oct 10 05:00:30 2021 -0500
@@ -97,7 +97,7 @@
#define MW_CONNECT_STEPS 11
-/* stages of conciousness */+/* stages of consciousness */ #define MW_STATE_OFFLINE "offline"
#define MW_STATE_ACTIVE "active"
#define MW_STATE_AWAY "away"
@@ -1125,7 +1125,7 @@
if(owner && purple_strequal(owner, acct_n))
- /* we actually are synching by this key as opposed to the group+ /* we actually are syncing by this key as opposed to the group title, which can be different things in the st list */
gname = purple_blist_node_get_string(gn, GROUP_KEY_NAME);
if(! gname) gname = purple_group_get_name(grp);
@@ -2274,7 +2274,7 @@
static void mw_ft_closed(struct mwFileTransfer *ft, guint32 code) {
- get purple ft from client data in ft
- - indicate rejection/cancelation/completion+ - indicate rejection/cancellation/completion - free the file transfer itself
@@ -2310,7 +2310,7 @@
- get purple ft from client data in ft
- - update transfered percentage+ - update transferred percentage - if done, destroy the ft, disassociate from purple ft
--- a/libpurple/protocols/zephyr/zephyr_html.c Sun Oct 10 02:52:05 2021 -0500
+++ b/libpurple/protocols/zephyr/zephyr_html.c Sun Oct 10 05:00:30 2021 -0500
@@ -242,7 +242,7 @@
- /* Catch all for all unrecognized/misparsed <foo> tage */+ /* Catch all for all unrecognized/misparsed <foo> tags */ g_string_append_c(frame->text, *message++);
} else if (*message == '@') {
