Fix several typos in libpurple
Ran `codespell -w`, ignoring some stuff, or making things better.
Testing Done:
Compile only.
Reviewed at https://reviews.imfreedom.org/r/1016/
--- a/libpurple/account.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/account.h Sun Oct 10 02:52:05 2021 -0500
@@ -230,9 +230,8 @@
* @alias: The optional alias of the user.
* @message: The optional message sent from the user adding you.
- * Notifies the user that the account was addded to a remote user's buddy
- * list and asks ther user if they want to add the remote user to their buddy
+ * Notifies the user that the account was added to a remote user's buddy list + * and asks the user if they want to add the remote user to their buddy list. * This will present a dialog informing the local user that the remote user
* added them to the remote user's buddy list and will ask if they want to add
--- a/libpurple/cmds.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/cmds.h Sun Oct 10 02:52:05 2021 -0500
@@ -138,7 +138,7 @@
* Flags used to set various properties of commands. Every command should
* have at least one of #PURPLE_CMD_FLAG_IM and #PURPLE_CMD_FLAG_CHAT set in
- * order to be even slighly useful.
+ * order to be even slightly useful. * See purple_cmd_register().
--- a/libpurple/connection.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/connection.c Sun Oct 10 02:52:05 2021 -0500
@@ -83,10 +83,10 @@
gboolean is_finalizing; /* The object is being destroyed. */
- /* The connection error and its description if an error occured */
+ /* The connection error and its description if an error occurred. */ PurpleConnectionErrorInfo *error_info;
- guint disconnect_timeout; /* Timer used for nasty stack tricks */
+ guint disconnect_timeout; /* Timer used for nasty stack tricks. */ } PurpleConnectionPrivate;
/* GObject property enums */
@@ -977,7 +977,7 @@
-_purple_connection_new(PurpleAccount *account, gboolean regist, const char *password)
+_purple_connection_new(PurpleAccount *account, gboolean is_registration, const gchar *password) PurpleProtocol *protocol;
@@ -994,20 +994,18 @@
message = g_strdup_printf(_("Missing protocol for %s"),
purple_account_get_username(account));
- purple_notify_error(NULL, regist ? _("Registration Error") :
+ purple_notify_error(NULL, is_registration ? _("Registration Error") : _("Connection Error"), message, NULL,
purple_request_cpar_from_account(account));
- if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, SERVER, register_user))
+ if (!PURPLE_PROTOCOL_IMPLEMENTS(protocol, SERVER, register_user)) {
if (((password == NULL) || (*password == '\0')) &&
!(purple_protocol_get_options(protocol) & OPT_PROTO_NO_PASSWORD) &&
!(purple_protocol_get_options(protocol) & OPT_PROTO_PASSWORD_OPTIONAL))
@@ -1031,8 +1029,7 @@
g_return_if_fail(gc != NULL);
PurpleConnectionPrivate *priv;
purple_debug_info("connection", "Registering. gc = %p\n", gc);
@@ -1042,9 +1039,7 @@
purple_protocol_server_register_user(PURPLE_PROTOCOL_SERVER(protocol),
purple_debug_info("connection", "Connecting. gc = %p\n", gc);
purple_signal_emit(purple_accounts_get_handle(), "account-connecting", account);
@@ -1056,7 +1051,7 @@
_purple_connection_new_unregister(PurpleAccount *account, const char *password,
PurpleAccountUnregistrationCb cb, gpointer user_data)
- /* Lots of copy/pasted code to avoid API changes. You might want to integrate that into the previous function when posssible. */
+ /* Lots of copy/pasted code to avoid API changes. You might want to integrate that into the previous function when possible. */ PurpleProtocol *protocol;
--- a/libpurple/media.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/media.h Sun Oct 10 02:52:05 2021 -0500
@@ -250,7 +250,7 @@
* Gets the session type from a session
- * Returns: The retreived session type.
+ * Returns: The retrieved session type. PurpleMediaSessionType purple_media_get_session_type(PurpleMedia *media, const gchar *sess_id);
--- a/libpurple/media/backend-fs2.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/media/backend-fs2.c Sun Oct 10 02:52:05 2021 -0500
@@ -1972,7 +1972,7 @@
- /* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode
+ /* TURN over SSL is only supported by libnice for Google's "pseudo" SSL mode purple_debug_info("backend-fs2",
--- a/libpurple/media/backend-iface.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/media/backend-iface.h Sun Oct 10 02:52:05 2021 -0500
@@ -132,7 +132,7 @@
* Creates and adds a stream to the media backend.
- * Returns: True if the stream was successfully created, othewise False.
+ * Returns: True if the stream was successfully created, otherwise False. G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gboolean purple_media_backend_add_stream(PurpleMediaBackend *self,
--- a/libpurple/media/candidate.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/media/candidate.h Sun Oct 10 02:52:05 2021 -0500
@@ -118,7 +118,7 @@
* purple_media_candidate_get_component_id:
- * @candidate: The candidate to get the compnent id from.
+ * @candidate: The candidate to get the component id from. * Gets the component id (rtp or rtcp)
--- a/libpurple/mediamanager.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/mediamanager.h Sun Oct 10 02:52:05 2021 -0500
@@ -245,7 +245,7 @@
* @manager: The manager the output window was registered with.
* @output_window_id: The ID of the output window.
- * Remove a previously registerd output window.
+ * Remove a previously registered output window. * Returns: TRUE if it found the output window and was successful, else FALSE.
@@ -334,11 +334,11 @@
* @blocking: Whether to block until the data was send or not.
* Sends a buffer of data to a #PURPLE_MEDIA_APPLICATION session.
- * If @blocking is set, unless an error occured, the function will not return
+ * If @blocking is set, unless an error occurred, the function will not return * until the data has been flushed into the network.
* If the stream is not writable, the data will be queued. It is the
- * responsability of the user to stop sending data when the stream isn't
- * writable anymore. It is also the responsability of the user to only start
+ * responsibility of the user to stop sending data when the stream isn't + * writable anymore. It is also the responsibility of the user to only start * sending data after the stream has been configured correctly (encryption
* parameters for example).
@@ -360,7 +360,7 @@
* with currently available data.
* Receive a buffer of data from a #PURPLE_MEDIA_APPLICATION session.
- * If @blocking is set, unless an error occured, the function will not return
+ * If @blocking is set, unless an error occurred, the function will not return * until @max_size bytes are read.
* Returns: Number of bytes received or -1 in case of error.
--- a/libpurple/memorypool.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/memorypool.c Sun Oct 10 02:52:05 2021 -0500
@@ -74,7 +74,7 @@
PurpleMemoryPoolBlock *block;
- /* ceil block struct size to the multipy of align */
+ /* ceil block struct size to the multiply of align */ total_size = ((sizeof(PurpleMemoryPoolBlock) - 1) /
PURPLE_MEMORY_POOL_BLOCK_PADDING + 1) *
sizeof(PurpleMemoryPoolBlock);
--- a/libpurple/nat-pmp.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/nat-pmp.c Sun Oct 10 02:52:05 2021 -0500
@@ -180,7 +180,7 @@
mib[1] = PF_ROUTE; /* entire routing table or a subset of it */
mib[2] = 0; /* protocol number - always 0 */
- mib[3] = 0; /* address family - 0 for all addres families */
+ mib[3] = 0; /* address family - 0 for all address families */ @@ -513,7 +513,7 @@
-purple_pmp_network_config_changed_cb(GNetworkMonitor *monitor, gboolean avialable, gpointer data)
+purple_pmp_network_config_changed_cb(GNetworkMonitor *monitor, gboolean available, gpointer data) pmp_info.status = PURPLE_PMP_STATUS_UNDISCOVERED;
g_free(pmp_info.publicip);
--- a/libpurple/network.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/network.c Sun Oct 10 02:52:05 2021 -0500
@@ -292,7 +292,7 @@
-purple_network_upnp_mapping_remove_cb(gboolean sucess, gpointer data)
+purple_network_upnp_mapping_remove_cb(gboolean success, gpointer data) purple_debug_info("network", "done removing UPnP port mapping\n");
--- a/libpurple/plugins/log_reader.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/plugins/log_reader.c Sun Oct 10 02:52:05 2021 -0500
@@ -1327,7 +1327,7 @@
* The format is (Link: URL)URL
- * So, I want to find each occurance of "(Link: " and replace that chunk with:
+ * So, I want to find each occurrence of "(Link: " and replace that chunk with: * Then, replace the next ")" with:
--- a/libpurple/purplechatconversation.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purplechatconversation.h Sun Oct 10 02:52:05 2021 -0500
@@ -319,7 +319,7 @@
- * Sets your nickname (used for hilighting) for a chat.
+ * Sets your nickname (used for highlighting) for a chat. void purple_chat_conversation_set_nick(PurpleChatConversation *chat, const gchar *nick);
@@ -327,7 +327,7 @@
* purple_chat_conversation_get_nick:
- * Gets your nickname (used for hilighting) for a chat.
+ * Gets your nickname (used for highlighting) for a chat. --- a/libpurple/purpleconversation.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purpleconversation.c Sun Oct 10 02:52:05 2021 -0500
@@ -99,8 +99,8 @@
me = purple_account_get_name_for_display(account);
- /* Always linkfy the text for display, unless we're
- * explicitly asked to do otheriwse*/
+ /* Always linkify the text for display, unless we're explicitly asked to do if(!(msgflags & PURPLE_MESSAGE_INVISIBLE)) {
if(msgflags & PURPLE_MESSAGE_NO_LINKIFY) {
displayed = g_strdup(message);
--- a/libpurple/purpleconversation.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purpleconversation.h Sun Oct 10 02:52:05 2021 -0500
@@ -34,7 +34,7 @@
* This is the base class for the conversation abstraction on Libpurple.
- * The present API manages the common functionallity for both kinds of conversations
+ * The present API manages the common functionality for both kinds of conversations * @PurpleIMConversation and @PurpleChatConversation.
--- a/libpurple/purplemarkup.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purplemarkup.h Sun Oct 10 02:52:05 2021 -0500
@@ -148,10 +148,9 @@
* @str: The input NUL terminated, HTML, UTF-8 (or ASCII) string.
- * @x: The character offset into an unformatted version of str to
- * @y: The character offset (into an unformatted vesion of str) of
- * one past the last character to include in the slice.
+ * @x: The character offset into an unformatted version of str to begin at. + * @y: The character offset (into an unformatted version of str) of one past + * the last character to include in the slice. * Returns a newly allocated substring of the HTML UTF-8 string "str".
* The markup is preserved such that the substring will have the same
--- a/libpurple/purplemessage.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purplemessage.h Sun Oct 10 02:52:05 2021 -0500
@@ -101,7 +101,7 @@
* PurpleMessageContentType:
* @PURPLE_MESSAGE_CONTENT_TYPE_PLAIN: The message has no formatting.
* @PURPLE_MESSAGE_CONTENT_TYPE_HTML: The message is formatted in HTML.
- * @PURPLE_MESSAGE_CONTENT_TYPE_XHTML: The mesage is formatted in XHTML.
+ * @PURPLE_MESSAGE_CONTENT_TYPE_XHTML: The message is formatted in XHTML. * @PURPLE_MESSAGE_CONTENT_TYPE_MARKDOWN: The message is formatted in Markdown.
* The message formatting for the message.
--- a/libpurple/purplepresence.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purplepresence.h Sun Oct 10 02:52:05 2021 -0500
@@ -110,7 +110,7 @@
* purple_presence_switch_status:
- * @presence: The #PurplePresence instace.
+ * @presence: The #PurplePresence instance. * @status_id: The status ID to switch to.
* Switches the active status in a presence.
--- a/libpurple/purpleprivate.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purpleprivate.h Sun Oct 10 02:52:05 2021 -0500
@@ -84,8 +84,8 @@
* _purple_connection_new:
* @account: The account the connection should be connecting to.
- * @regist: Whether we are registering a new account or just
- * trying to do a normal signon.
+ * @is_registration: Whether we are registering a new account or just trying to * @password: The password to use.
* Creates a connection to the specified account and either connects
@@ -99,8 +99,8 @@
* in account.c. If you're trying to sign on an account, use that
-void _purple_connection_new(PurpleAccount *account, gboolean regist,
+void _purple_connection_new(PurpleAccount *account, gboolean is_registration, + const gchar *password); * _purple_connection_new_unregister:
* @account: The account to unregister
--- a/libpurple/purpleprotocolclient.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purpleprotocolclient.h Sun Oct 10 02:52:05 2021 -0500
@@ -345,7 +345,7 @@
* @client: The #PurpleProtocolClient instance.
* @conv: A #PurpleConversation instance.
- * Gets the maximum number of charcters per message for @conv.
+ * Gets the maximum number of characters per message for @conv. * Returns: The maximum number of characters per message for @conv or -1 for no
--- a/libpurple/purpleprotocolmedia.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purpleprotocolmedia.h Sun Oct 10 02:52:05 2021 -0500
@@ -115,7 +115,7 @@
* purple_protocol_media_get_caps:
* @media: The #PurpleProtocolMedia instance.
* @account: The #PurpleAccount instance.
- * @who: The user to get the media capabilites for.
+ * @who: The user to get the media capabilities for. * Gets the #PurpleMediaCaps for @who which determine what types of media are
--- a/libpurple/purpleprotocolserver.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/purpleprotocolserver.h Sun Oct 10 02:52:05 2021 -0500
@@ -190,8 +190,8 @@
* @connection: The #PurpleConnection instance.
* @who: The name of the user whose information you're asking for.
- * Gets the user info or profile for @who and displays it in a protocol specifc
+ * Gets the user info or profile for @who and displays it in a protocol @@ -291,7 +291,7 @@
* @groups: (element-type PurpleGroup): A #GList of #PurpleGroup's
* corresponding to @buddies.
- * Similiar to purple_protocol_server_remove_buddy() but allows you to remove
+ * Similar to purple_protocol_server_remove_buddy() but allows you to remove * If @protocol_server doesn't implement this function directly,
--- a/libpurple/request-datasheet.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/request-datasheet.c Sun Oct 10 02:52:05 2021 -0500
@@ -343,8 +343,8 @@
- /* we don't allow modifying collumn count when datasheet contains
+ /* We don't allow modifying column count when datasheet contains any rec->data = g_new0(gchar*,
purple_request_datasheet_get_column_count(sheet) + 1);
--- a/libpurple/savedstatuses.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/savedstatuses.c Sun Oct 10 02:52:05 2021 -0500
@@ -266,7 +266,7 @@
* Purple 1.5.0 and earlier require a name to be set, so we
- * do this little hack to maintain backward compatability
+ * do this little hack to maintain backward compatibility * in the status.xml file. Eventually this should be removed
* and we should determine if a status is transient by
* whether the "name" attribute is set to something or if
--- a/libpurple/savedstatuses.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/savedstatuses.h Sun Oct 10 02:52:05 2021 -0500
@@ -159,7 +159,7 @@
* Unset a substatus for an account in a saved status. This clears
- * the previosly set substatus for the PurpleSavedStatus. If this
+ * the previously set substatus for the PurpleSavedStatus. If this * saved status is activated then this account will use the default
* status type and message.
--- a/libpurple/server.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/server.c Sun Oct 10 02:52:05 2021 -0500
@@ -553,7 +553,7 @@
* Make copies of the message and the sender in case plugins want
- * to free these strings and replace them with a modifed version.
+ * to free these strings and replace them with a modified version. @@ -919,7 +919,7 @@
* Make copies of the message and the sender in case plugins want
- * to free these strings and replace them with a modifed version.
+ * to free these strings and replace them with a modified version. buffy = g_strdup(message);
--- a/libpurple/server.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/server.h Sun Oct 10 02:52:05 2021 -0500
@@ -103,7 +103,7 @@
* @gc: The connection over which to send the typing notification.
* @name: The name of the buddy we were asking information from.
- * Request user infromation from the server.
+ * Request user information from the server. void purple_serv_get_info(PurpleConnection *gc, const char *name);
@@ -270,7 +270,7 @@
* @gc: The #PurpleConnection
* @name: The name of the person that stopped typing.
- * Called from a protocol when it has recieved a type stopped.
+ * Called from a protocol when it has received a type stopped. * @todo Could probably move this into the conversation API.
--- a/libpurple/theme-loader.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/theme-loader.h Sun Oct 10 02:52:05 2021 -0500
@@ -31,7 +31,7 @@
* @section_id: libpurple-theme-loader
* @short_description: <filename>theme-loader.h</filename>
- * @title: Theme Loader Abstact Class
+ * @title: Theme Loader Abstract Class * The base class for all theme loaders.
--- a/libpurple/theme-manager.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/theme-manager.h Sun Oct 10 02:52:05 2021 -0500
@@ -69,14 +69,14 @@
* purple_theme_manager_init:
- * Initalizes the theme manager.
+ * Initializes the theme manager. void purple_theme_manager_init(void);
* purple_theme_manager_uninit:
- * Uninitalizes the manager then frees all the themes and loaders it is
+ * Uninitializes the manager then frees all the themes and loaders it is void purple_theme_manager_uninit(void);
--- a/libpurple/theme.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/theme.h Sun Oct 10 02:52:05 2021 -0500
@@ -30,7 +30,7 @@
* @section_id: libpurple-theme
* @short_description: <filename>theme.h</filename>
- * @title: Theme Abstact Class
+ * @title: Theme Abstract Class * The theme API represents the common abilities for all of our supported
--- a/libpurple/trie.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/trie.h Sun Oct 10 02:52:05 2021 -0500
@@ -70,7 +70,7 @@
* @user_data: the user supplied data passed when calling #purple_trie_replace.
- * A funtion called on every matching substring to be replaced.
+ * A function called on every matching substring to be replaced. * If you decide to replace the word, append your text to @out and return %TRUE.
* Otherwise, you must not touch @out. In both cases, you must not do any
--- a/libpurple/upnp.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/upnp.h Sun Oct 10 02:52:05 2021 -0500
@@ -71,7 +71,7 @@
* @cb_data: (closure): Extra data to be passed to the callback.
* Sends a discovery request to search for a UPnP enabled IGD that
- * contains the WANIPConnection service that will allow us to recieve the
+ * contains the WANIPConnection service that will allow us to receive the * public IP address of the IGD, and control it for forwarding ports.
* The result will be cached for further use.
--- a/libpurple/util.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/util.h Sun Oct 10 02:52:05 2021 -0500
@@ -890,7 +890,7 @@
* Case insensitive search for a word in a string. The needle string
* must be contained in the haystack string and not be immediately
- * preceded or immediately followed by another alpha-numeric character.
+ * preceded or immediately followed by another alphanumeric character. * Returns: TRUE if haystack has the word, otherwise FALSE
--- a/libpurple/win32/win32dep.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/win32/win32dep.c Sun Oct 10 02:52:05 2021 -0500
@@ -3,7 +3,7 @@
- * Description: Windows dependant code for Purple
+ * Description: Windows dependent code for Purple * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
--- a/libpurple/xfer.c Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/xfer.c Sun Oct 10 02:52:05 2021 -0500
@@ -266,7 +266,7 @@
purple_xfer_conversation_write_internal(xfer, message, is_error, FALSE);
-/* maybe this one should be exported publically? */
+/* maybe this one should be exported publicly? */ purple_xfer_conversation_write_with_thumbnail(PurpleXfer *xfer,
--- a/libpurple/xmlnode.h Thu Oct 07 22:28:08 2021 -0500
+++ b/libpurple/xmlnode.h Sun Oct 10 02:52:05 2021 -0500
@@ -272,7 +272,7 @@
* purple_xmlnode_get_namespace:
- * @node: The node to get the namepsace from
+ * @node: The node to get the namespace from * Returns the namespace of a node