Mercurial > pidgin.yaz
changeset 8735:92cbf9713795
[gaim-migrate @ 9490]
Patch by Jonathan Champ to corect the vairous speling mistakes we hav e in
the coments and documentaion. Thansk Jonathan!
committer: Tailor Script <tailor@pidgin.im>
line wrap: on
line diff
--- a/COPYRIGHT Wed Apr 21 01:20:41 2004 +0000 +++ b/COPYRIGHT Wed Apr 21 01:34:26 2004 +0000 @@ -21,6 +21,7 @@ Philip Brown Sean Burke Cerulean Studios, LLC +Jonathan Champ Ka-Hing Cheung Arturo Cisneros, Jr. Vincas Ciziunas
--- a/plugins/docklet/eggtrayicon.c Wed Apr 21 01:20:41 2004 +0000 +++ b/plugins/docklet/eggtrayicon.c Wed Apr 21 01:34:26 2004 +0000 @@ -254,7 +254,7 @@ #if HAVE_GTK_MULTIHEAD /* FIXME: this code does not compile, screen is undefined. Now try * getting the GdkScreen from xscreen (:. Dunno how to solve this - * (there is prolly some easy way I cant think of right now) + * (there is probably some easy way I cant think of right now) */ gtk_plug_construct_for_display (GTK_PLUG (icon), gdk_screen_get_display (screen), 0);
--- a/plugins/gaim-remote/remote.h Wed Apr 21 01:20:41 2004 +0000 +++ b/plugins/gaim-remote/remote.h Wed Apr 21 01:34:26 2004 +0000 @@ -38,7 +38,7 @@ * like "Open new conversation" or "send IM". * Even though there's much redundancy with the * other CUI_TYPES, we're better keeping this stuff - * seperate because it's intended use is so different */ + * separate because it's intended use is so different */ #define CUI_META_LIST 1 /* 1 is always list; this is ignored by the core.
--- a/plugins/perl/perl-common.c Wed Apr 21 01:20:41 2004 +0000 +++ b/plugins/perl/perl-common.c Wed Apr 21 01:34:26 2004 +0000 @@ -210,7 +210,7 @@ /* * Shizzel. So the perl script changed one of the parameters, * and we want this change to affect the original parameters. - * args[i] is just a tempory little list of pointers. We don't + * args[i] is just a temporary little list of pointers. We don't * want to free args[i] here because the new parameter doesn't * overwrite the data that args[i] points to. That is done by * the function that called execute_perl. I'm not explaining this
--- a/plugins/perl/perl.c Wed Apr 21 01:20:41 2004 +0000 +++ b/plugins/perl/perl.c Wed Apr 21 01:34:26 2004 +0000 @@ -134,7 +134,7 @@ { /* We use to function one to load a file the other to execute the string obtained from the first and holding - the file conents. This allows to have a realy local $/ + the file contents. This allows to have a really local $/ without introducing temp variables to hold the old value. Just a question of style:) */ "package Gaim::PerlLoader;"
--- a/plugins/win32/winprefs/gtkappbar.c Wed Apr 21 01:20:41 2004 +0000 +++ b/plugins/win32/winprefs/gtkappbar.c Wed Apr 21 01:34:26 2004 +0000 @@ -25,7 +25,7 @@ /* * TODO: * - Move 'App on top' feature from Trans plugin to here - * - Bug: Multiple Show/Hide Desktop calls causes client area to disapear + * - Bug: Multiple Show/Hide Desktop calls causes client area to disappear */ #include <windows.h> #include <winver.h>
--- a/src/away.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/away.c Wed Apr 21 01:34:26 2004 +0000 @@ -59,7 +59,7 @@ gtk_tree_model_get(GTK_TREE_MODEL(awayqueuestore), iter, 0, &name, -1); - gaim_debug(GAIM_DEBUG_INFO, "away", "Unqueueing messages from %s.\n", + gaim_debug(GAIM_DEBUG_INFO, "away", "Dequeueing messages from %s.\n", name); templist = message_queue; @@ -138,7 +138,7 @@ GtkTreeSelection *select; if(!(event->type == GDK_2BUTTON_PRESS && event->button == 1)) - return FALSE; /* Double clicking on the list will unqueue that user's messages. */ + return FALSE; /* Double clicking on the list will dequeue that user's messages. */ select = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); if(gtk_tree_selection_get_selected(select, NULL, &iter))
--- a/src/blist.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/blist.c Wed Apr 21 01:34:26 2004 +0000 @@ -2653,7 +2653,7 @@ } -/* XXX: this is compatability stuff. Remove after.... oh, I dunno... 0.77 or so */ +/* XXX: this is compatibility stuff. Remove after.... oh, I dunno... 0.77 or so */ void gaim_group_set_setting(GaimGroup *g, const char *key, const char *value) {
--- a/src/blist.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/blist.h Wed Apr 21 01:34:26 2004 +0000 @@ -723,9 +723,9 @@ void gaim_blist_node_set_bool(GaimBlistNode *node, const char *key, gboolean value); /** - * Retreives a named boolean setting from a node in the buddy list + * Retrieves a named boolean setting from a node in the buddy list * - * @param node The node to retreive the data from + * @param node The node to retrieve the data from * @param key The identifier of the data * * @return The value, or FALSE if there is no setting @@ -742,9 +742,9 @@ void gaim_blist_node_set_int(GaimBlistNode *node, const char *key, int value); /** - * Retreives a named integer setting from a node in the buddy list + * Retrieves a named integer setting from a node in the buddy list * - * @param node The node to retreive the data from + * @param node The node to retrieve the data from * @param key The identifier of the data * * @return The value, or 0 if there is no setting @@ -762,9 +762,9 @@ const char *value); /** - * Retreives a named string setting from a node in the buddy list + * Retrieves a named string setting from a node in the buddy list * - * @param node The node to retreive the data from + * @param node The node to retrieve the data from * @param key The identifier of the data * * @return The value, or NULL if there is no setting
--- a/src/connection.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/connection.h Wed Apr 21 01:34:26 2004 +0000 @@ -38,7 +38,7 @@ typedef enum { GAIM_CONNECTION_HTML = 0x0001, /**< Connection sends/receives in 'HTML'. */ - GAIM_CONNECTION_NO_BGCOLOR = 0x0002, /**< Connection does not send/recieve + GAIM_CONNECTION_NO_BGCOLOR = 0x0002, /**< Connection does not send/receive background colors. */ GAIM_CONNECTION_AUTO_RESP = 0x0004, /**< Send auto responses when away. */ GAIM_CONNECTION_FORMATTING_WBFO = 0x0008, /**< The text buffer must be formatted as a whole */
--- a/src/ft.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/ft.h Wed Apr 21 01:34:26 2004 +0000 @@ -165,7 +165,7 @@ * Decreases the reference count on a GaimXfer. * If the reference reaches 0, gaim_xfer_destroy (an internal function) * will destroy the xfer. It calls the ui destroy cb first. - * Since the core keeps a ref on the xfer, only an erronous call to + * Since the core keeps a ref on the xfer, only an erroneous call to * this function will destroy the xfer while still in use. * * @param xfer A file transfer handle.
--- a/src/gtkconn.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/gtkconn.c Wed Apr 21 01:34:26 2004 +0000 @@ -311,7 +311,7 @@ * shown or hidden. Also make sure the label on the Reconnect * button is correctly set to either Reconnect or Remove. If there * is more than one account then make sure the GtkTreeView is shown. - * If there are no accounts disconnectd then hide the dialog. + * If there are no accounts disconnected then hide the dialog. */ static void disconnect_window_update_buttons(GtkTreeModel *model) {
--- a/src/gtkconv.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/gtkconv.c Wed Apr 21 01:34:26 2004 +0000 @@ -1417,7 +1417,7 @@ /* If ALT (or whatever) was held down... */ else if (event->state & GDK_MOD1_MASK) { - /* XXX - Make sure the conv exists befeore switching to it */ + /* XXX - Make sure the conv exists before switching to it */ if (event->keyval > '0' && event->keyval <= '9') { int switchto = event->keyval - '1'; if (switchto < numconvs) @@ -2229,7 +2229,7 @@ /* * Makes sure all the menu items and all the buttons are hidden/shown and - * sensitive/insensitve. This is called after changing tabs and when an + * sensitive/insensitive. This is called after changing tabs and when an * account signs on or off. */ static void @@ -2257,7 +2257,7 @@ /* * Handle hiding and showing stuff based on what type of conv this is. * Stuff that Gaim IMs support in general should be shown for IM - * conversations. Stuff that Gaim chats support in gerneal should be + * conversations. Stuff that Gaim chats support in general should be * shown for chat conversations. It doesn't matter whether the PRPL * supports it or not--that only affects if the button or menu item * is sensitive or not.
--- a/src/gtkdebug.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/gtkdebug.c Wed Apr 21 01:34:26 2004 +0000 @@ -281,7 +281,7 @@ * NOTE: This must be set before prefs are loaded, and the callbacks * set after they are loaded, since prefs sets the enabled * preference here and that loads the window, which calls the - * configure event, which overrrides the width and height! :P + * configure event, which overrides the width and height! :P */ gaim_prefs_add_none("/gaim/gtk/debug");
--- a/src/gtkimhtml.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/gtkimhtml.c Wed Apr 21 01:34:26 2004 +0000 @@ -3072,7 +3072,7 @@ * (12:45:27) ?? ???: secondary_cursor_color = (rgb(background) + rgb(primary_cursor_color) ) / 2 * (12:45:55) ?? ???: understand? * (12:46:14) Tim: yeah. i didn't know there was an exact formula - * (12:46:56) ?? ???: u might need to exactract separate each color from RGB + * (12:46:56) ?? ???: u might need to extract separate each color from RGB */ static void mark_set_cb(GtkTextBuffer *buffer, GtkTextIter *arg1, GtkTextMark *mark, @@ -3524,7 +3524,7 @@ * as smileys and IM images are represented by the Unicode "unknown" character. Handle them. Else * check for tags that are toggled on, insert their html form, and push them on the queue. Then insert * the actual text. Then check for tags that are toggled off and insert them, after checking the queue. - * Finally, replace <, >, &, and " with their HTML equivilent. + * Finally, replace <, >, &, and " with their HTML equivalent. */ char *gtk_imhtml_get_markup_range(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end) {
--- a/src/gtkimhtml.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/gtkimhtml.h Wed Apr 21 01:34:26 2004 +0000 @@ -250,7 +250,7 @@ void gtk_imhtml_font_grow(GtkIMHtml *imhtml); char *gtk_imhtml_get_markup_range(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end); char *gtk_imhtml_get_markup(GtkIMHtml *imhtml); -/* returns a null terminated array of pointers to null ternimated strings, each string for each line */ +/* returns a null terminated array of pointers to null terminated strings, each string for each line */ /* g_strfreev() should be called on it */ char **gtk_imhtml_get_markup_lines(GtkIMHtml *imhtml); char *gtk_imhtml_get_text(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *stop);
--- a/src/gtkpounce.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/gtkpounce.h Wed Apr 21 01:34:26 2004 +0000 @@ -32,7 +32,7 @@ * * @param account The optional account to use. * @param name The optional name to pounce on. - * @param cur_pounce The current buddy pounce, if editting an existing one. + * @param cur_pounce The current buddy pounce, if editing an existing one. */ void gaim_gtkpounce_dialog_show(GaimAccount *account, const char *name, GaimPounce *cur_pounce);
--- a/src/gtkprefs.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/gtkprefs.h Wed Apr 21 01:34:26 2004 +0000 @@ -74,7 +74,7 @@ * @param max The maximum value of the spin button * @param sg If not NULL, the size group to which the spin button will be added * @return An hbox containing both the label and the spinner. Can be - * used to set the widgets to sensitive or insensitve based on the + * used to set the widgets to sensitive or insensitive based on the * value of a checkbox. */ GtkWidget *gaim_gtk_prefs_labeled_spin_button(GtkWidget *page,
--- a/src/gtkutils.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/gtkutils.h Wed Apr 21 01:34:26 2004 +0000 @@ -157,9 +157,9 @@ void gtk_toggle_sensitive_array(GtkWidget *w, GPtrArray *data); /** - * Adds a seperator to a menu. + * Adds a separator to a menu. * - * @param menu The menu to add a seperator to. + * @param menu The menu to add a separator to. */ void gaim_separator(GtkWidget *menu);
--- a/src/internal.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/internal.h Wed Apr 21 01:34:26 2004 +0000 @@ -1,4 +1,4 @@ -/** + /** * @file internal.h Internal definitions and includes * @ingroup core * @@ -55,7 +55,7 @@ #define MSG_LEN 2048 /* The above should normally be the same as BUF_LEN, - * but just so we're explictly asking for the max message + * but just so we're explicitly asking for the max message * length. */ #define BUF_LEN MSG_LEN #define BUF_LONG BUF_LEN * 2
--- a/src/log.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/log.h Wed Apr 21 01:34:26 2004 +0000 @@ -122,7 +122,7 @@ * @param type The type of log this is. * @param name The name of this conversation (Screenname, chat name, * etc.) - * @param account The account the conversation is occuring on + * @param account The account the conversation is occurring on * @param time The time this conversation started * @return The new log */
--- a/src/plugin.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/plugin.h Wed Apr 21 01:34:26 2004 +0000 @@ -380,7 +380,7 @@ /** * Registers a function that will be called when a plugin is loaded. * - * @param func The callback functino. + * @param func The callback function. * @param data Data to pass to the callback. */ void gaim_plugins_register_load_notify_cb(void (*func)(GaimPlugin *, void *), @@ -389,14 +389,14 @@ /** * Unregisters a function that would be called when a plugin is loaded. * - * @param func The callback functino. + * @param func The callback function. */ void gaim_plugins_unregister_load_notify_cb(void (*func)(GaimPlugin *, void *)); /** * Registers a function that will be called when a plugin is unloaded. * - * @param func The callback functino. + * @param func The callback function. * @param data Data to pass to the callback. */ void gaim_plugins_register_unload_notify_cb(void (*func)(GaimPlugin *, void *), @@ -405,7 +405,7 @@ /** * Unregisters a function that would be called when a plugin is unloaded. * - * @param func The callback functino. + * @param func The callback function. */ void gaim_plugins_unregister_unload_notify_cb(void (*func)(GaimPlugin *, void *));
--- a/src/protocols/icq/udp.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/icq/udp.c Wed Apr 21 01:34:26 2004 +0000 @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* - * $Id: udp.c 2487 2001-10-10 19:58:11Z warmenhoven $ + * $Id: udp.c 9490 2004-04-21 01:34:26Z chipx86 $ * * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and * Bill Soudan <soudan@kde.org> @@ -403,7 +403,7 @@ } /******************************* -This routine sends the aknowlegement cmd to the +This routine sends the acknowlegement cmd to the server it appears that this must be done after everything the server sends us *******************************/
--- a/src/protocols/jabber/buddy.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/jabber/buddy.c Wed Apr 21 01:34:26 2004 +0000 @@ -270,7 +270,7 @@ }; /* - * The "vCard" tag's attibute list... + * The "vCard" tag's attribute list... */ struct tag_attr { char *attr;
--- a/src/protocols/msn/msn.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/msn/msn.c Wed Apr 21 01:34:26 2004 +0000 @@ -1371,7 +1371,7 @@ url_buffer[strlen(url_buffer) - 1] = '\0'; } - /* MSN always puts in ' for apostrophies...replace them */ + /* MSN always puts in ' for apostrophes...replace them */ while ((p = strstr(url_buffer, "'")) != NULL) { *p = '\'';
--- a/src/protocols/msn/state.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/msn/state.h Wed Apr 21 01:34:26 2004 +0000 @@ -1,5 +1,5 @@ /** - * @file state.h State functinos and definitions + * @file state.h State functions and definitions * * gaim *
--- a/src/protocols/napster/napster.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/napster/napster.c Wed Apr 21 01:34:26 2004 +0000 @@ -170,7 +170,7 @@ name = g_hash_table_lookup(data, "group"); - /* Make sure the name has a # preceeding it */ + /* Make sure the name has a # preceding it */ if (name[0] != '#') nap_write_packet(gc, 400, "#%s", name); else
--- a/src/protocols/novell/nmrequest.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/novell/nmrequest.h Wed Apr 21 01:34:26 2004 +0000 @@ -86,7 +86,7 @@ void nm_request_set_user_define(NMRequest * req, gpointer user_define); /** - * Set the return code. This is the return code that we recieved in + * Set the return code. This is the return code that we received in * the server response fields. * * @param req The request object
--- a/src/protocols/novell/nmuser.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/novell/nmuser.h Wed Apr 21 01:34:26 2004 +0000 @@ -150,7 +150,7 @@ * @param server IP Address of server * @param port Port to connect to on the server * @param data Client data to associate with the user - * @param event_callback Function to call when we recieve an event + * @param event_callback Function to call when we receive an event * * @return The initialized user object. Must be freed by calling * nm_deinitialize_user
--- a/src/protocols/oscar/aim.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/aim.h Wed Apr 21 01:34:26 2004 +0000 @@ -87,7 +87,7 @@ * Current Maximum Length for Screen Names (not including NULL) * * Currently only names up to 16 characters can be registered - * however it is aparently legal for them to be larger. + * however it is apparently legal for them to be larger. */ #define MAXSNLEN 97
--- a/src/protocols/oscar/aim_cbtypes.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/aim_cbtypes.h Wed Apr 21 01:34:26 2004 +0000 @@ -94,7 +94,7 @@ #define AIM_CB_BUD_DEFAULT 0xffff /* - * SNAC Family: Messeging Services. + * SNAC Family: Messaging Services. */ #define AIM_CB_MSG_ERROR 0x0001 #define AIM_CB_MSG_PARAMINFO 0x0005 @@ -288,7 +288,7 @@ /* * SNAC Family: Internal Messages * - * This isn't truely a SNAC family either, but using + * This isn't truly a SNAC family either, but using * these, we can integrated non-SNAC services into * the SNAC-centered libfaim callback structure. *
--- a/src/protocols/oscar/bos.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/bos.c Wed Apr 21 01:34:26 2004 +0000 @@ -49,7 +49,7 @@ } /* - * Subtype 0x0004 - Set group permisson mask. + * Subtype 0x0004 - Set group permission mask. * * Normally 0x1f (all classes). *
--- a/src/protocols/oscar/chat.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/chat.c Wed Apr 21 01:34:26 2004 +0000 @@ -115,7 +115,7 @@ /* * Subtype 0x0002 - General room information. Lots of stuff. * - * Values I know are in here but I havent attached + * Values I know are in here but I haven't attached * them to any of the 'Unknown's: * - Language (English) *
--- a/src/protocols/oscar/chatnav.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/chatnav.c Wed Apr 21 01:34:26 2004 +0000 @@ -48,7 +48,7 @@ * here, is set to "create". * * Either this goes on the "list of questions concerning - * why-the-hell-did-you-do-that", or this value is completly + * why-the-hell-did-you-do-that", or this value is completely * ignored. Without experimental evidence, but a good knowledge of * AOL style, I'm going to guess that it is the latter, and that * the value of the room name in create requests is ignored.
--- a/src/protocols/oscar/conn.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/conn.c Wed Apr 21 01:34:26 2004 +0000 @@ -22,7 +22,7 @@ /* * In OSCAR, every connection has a set of SNAC groups associated * with it. These are the groups that you can send over this connection - * without being guarenteed a "Not supported" SNAC error. + * without being guaranteed a "Not supported" SNAC error. * * The grand theory of things says that these associations transcend * what libfaim calls "connection types" (conn->type). You can probably @@ -43,7 +43,7 @@ * easy and deliver this SNAC for you, but there isn't one there. * * Here comes the good bit. Without even letting anyone know, particularly - * the module that decided to send this SNAC, and definitly not that twit + * the module that decided to send this SNAC, and definitely not that twit * in Greenland, you send out a service request. In this request, you have * marked the need for a connection supporting group 0x000e. A few seconds * later, you receive a service redirect with an IP address and a cookie in
--- a/src/protocols/oscar/email.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/email.c Wed Apr 21 01:34:26 2004 +0000 @@ -90,7 +90,7 @@ /* See if we already have some info associated with this cookie */ for (new=sess->emailinfo; (new && strncmp(cookie16, new->cookie16, 16)); new=new->next); if (new) { - /* Free some of the old info, if existant */ + /* Free some of the old info, if it exists */ free(new->cookie8); free(new->cookie16); free(new->url); @@ -115,7 +115,7 @@ havenewmail = 1; new->nummsgs = tmp; } else { - /* If they don't send a 0x0080 TLV, it means we definately have new mail */ + /* If they don't send a 0x0080 TLV, it means we definitely have new mail */ /* (ie. this is not just another status update) */ havenewmail = 1; new->nummsgs++; /* We know we have at least 1 new email */
--- a/src/protocols/oscar/ft.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/ft.c Wed Apr 21 01:34:26 2004 +0000 @@ -108,7 +108,7 @@ * which is simpler and should be more accurate than Josh Myer's original * code. -- wtm * - * This algorithim works every time I have tried it. The other fails + * This algorithm works every time I have tried it. The other fails * sometimes. So, AOL who thought this up? It has got to be the weirdest * checksum I have ever seen. *
--- a/src/protocols/oscar/im.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/im.c Wed Apr 21 01:34:26 2004 +0000 @@ -2,7 +2,7 @@ * Family 0x0004 - Routines for sending/receiving Instant Messages. * * Note the term ICBM (Inter-Client Basic Message) which blankets - * all types of genericly routed through-server messages. Within + * all types of generically routed through-server messages. Within * the ICBM types (family 4), a channel is defined. Each channel * represents a different type of message. Channel 1 is used for * what would commonly be called an "instant message". Channel 2 @@ -118,7 +118,7 @@ /** * Subtype 0x0002 - Set ICBM parameters. * - * I definitly recommend sending this. If you don't, you'll be stuck + * I definitely recommend sending this. If you don't, you'll be stuck * with the rather unreasonable defaults. * */ @@ -217,7 +217,7 @@ * notably when the (r) symbol is used), you must use the full UNICODE * encoding for your message. In UNICODE mode, _all_ characters must * occupy 16bits, including ones that are not special. (Remember that - * the first 128 UNICODE symbols are equivelent to ASCII7, however they + * the first 128 UNICODE symbols are equivalent to ASCII7, however they * must be prefixed with a zero high order byte.) * * I strongly discourage the use of UNICODE mode, mainly because none @@ -380,7 +380,7 @@ /* * Set the Buddy Icon Requested flag. - * XXX - Everytime? Surely not... + * XXX - Every time? Surely not... */ if (args->flags & AIM_IMFLAGS_BUDDYREQ) { aimbs_put16(&fr->data, 0x0009); @@ -1189,7 +1189,7 @@ * open source clients (like encryption or something) -- see faimtest for * examples of how to do this. * - * I would definitly recommend avoiding this feature unless you really + * I would definitely recommend avoiding this feature unless you really * know what you are doing, and/or you have something neat to do with it. * */ @@ -1516,7 +1516,7 @@ /* * This is here to protect ourselves from ourselves. That - * is, if something above doesn't completly parse its value + * is, if something above doesn't completely parse its value * section, or, worse, overparses it, this will set the * stream where it needs to be in order to land on the next * TLV when the loop continues. @@ -1985,7 +1985,7 @@ * Channel 0x0001 is the message channel. It is * used to send basic ICBMs. * - * Channel 0x0002 is the Rendevous channel, which + * Channel 0x0002 is the Rendezvous channel, which * is where Chat Invitiations and various client-client * connection negotiations come from. * @@ -2003,7 +2003,7 @@ * Note that although this contains TLVs that appear contiguous * with the TLVs read below, they are two different pieces. The * userinfo block contains the number of TLVs that contain user - * information, the rest are not even though there is no seperation. + * information, the rest are not even though there is no separation. * You can start reading the message TLVs after aim_info_extract() * parses out the standard userinfo block. *
--- a/src/protocols/oscar/locate.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/locate.c Wed Apr 21 01:34:26 2004 +0000 @@ -282,7 +282,7 @@ } /** - * Remove this screen name from our queue. If this info was resquested + * Remove this screen name from our queue. If this info was requested * by our info request queue, then pop the next element off of the queue. * * @param sess The aim session.
--- a/src/protocols/oscar/oscar.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/oscar.c Wed Apr 21 01:34:26 2004 +0000 @@ -345,7 +345,7 @@ gchar *ret = NULL; char *begin, *end; - /* Make sure encoding begings with charset= */ + /* Make sure encoding begins with charset= */ if (strncmp(encoding, "text/aolrtf; charset=", 21)) return NULL; @@ -1049,7 +1049,7 @@ * * The series of events for a file send is: * -Create xfer and call gaim_xfer_request (this happens in oscar_ask_sendfile) - * -User chooses a file and oscar_xfer_init is called. It establishs a + * -User chooses a file and oscar_xfer_init is called. It establishes a * listening socket, then asks the remote user to connect to us (and * gives them the file name, port, IP, etc.) * -They connect to us and we send them an AIM_CB_OFT_PROMPT (this happens @@ -1068,7 +1068,7 @@ * them an AIM_CB_OFT_ACK. * -They begin to send us lots of raw data. * -When they finish sending data we send an AIM_CB_OFT_DONE and then close - * the connectionn. + * the connection. */ static void oscar_sendfile_connected(gpointer data, gint source, GaimInputCondition condition); @@ -2625,7 +2625,7 @@ if (args->info.sendfile.subtype == AIM_OFT_SUBTYPE_SEND_DIR) { /* last char of the ft req is a star, they are sending us a - * directory -- remove the star and trailing slash so we dont save + * directory -- remove the star and trailing slash so we don't save * directories that look like 'dirname\*' -- arl */ char *tmp = strrchr(args->info.sendfile.filename, '\\'); if (tmp && (tmp[1] == '*')) { @@ -3043,7 +3043,7 @@ ret = incomingim_chan1(sess, fr->conn, userinfo, args); } break; - case 2: { /* rendevous */ + case 2: { /* rendezvous */ struct aim_incomingim_ch2_args *args; args = va_arg(ap, struct aim_incomingim_ch2_args *); ret = incomingim_chan2(sess, fr->conn, userinfo, args); @@ -5973,7 +5973,7 @@ * This function rips out all the data chunks and creates an imgstore for * each one. In order to do this, it first goes through the IM and takes * out all the IMG tags. When doing so, it rewrites the original IMG tag - * with one compatable with the imgstore Gaim core code. For each one, we + * with one compatible with the imgstore Gaim core code. For each one, we * then read in chunks of data from the end of the message and actually * create the img store using the given data. *
--- a/src/protocols/oscar/rxhandlers.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/rxhandlers.c Wed Apr 21 01:34:26 2004 +0000 @@ -555,7 +555,7 @@ /* * This doesn't have to be called here. It could easily be done - * by a seperate thread or something. It's an administrative operation, + * by a separate thread or something. It's an administrative operation, * and can take a while. Though the less you call it the less memory * you'll have :) */
--- a/src/protocols/oscar/rxqueue.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/rxqueue.c Wed Apr 21 01:34:26 2004 +0000 @@ -240,7 +240,7 @@ } /* - * Purge recieve queue of all handled commands (->handled==1). + * Purge receive queue of all handled commands (->handled==1). * */ faim_export void aim_purge_rxqueue(aim_session_t *sess)
--- a/src/protocols/oscar/service.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/service.c Wed Apr 21 01:34:26 2004 +0000 @@ -196,7 +196,7 @@ } /* - * OSCAR defines several 'rate classes'. Each class has seperate + * OSCAR defines several 'rate classes'. Each class has separate * rate limiting properties (limit level, alert level, disconnect * level, etc), and a set of SNAC family/type pairs associated with * it. The rate classes, their limiting properties, and the definitions @@ -881,9 +881,9 @@ * on Win32. So far, AOL has only been requesting bytes in static regions * of memory. (I won't put it past them to start requesting data in * less static regions -- regions that are initialized at run time, but still - * before the client recieves this request.) + * before the client receives this request.) * - * When the client recieves the request, it adds it to the current ds + * When the client receives the request, it adds it to the current ds * (0x00400000) and dereferences it, copying the data into a buffer which * it then runs directly through the MD5 hasher. The 16 byte output of * the hash is then sent back to the server. @@ -895,7 +895,7 @@ * for accessing the AOL network using unauthorized software. You can * download a FREE, fully featured, and authorized client, here * http://www.aol.com/aim/download2.html" - * The connection is then closed, recieving disconnect code 1, URL + * The connection is then closed, receiving disconnect code 1, URL * http://www.aim.aol.com/errors/USER_LOGGED_OFF_NEW_LOGIN.html. * * Note, however, that numerous inconsistencies can cause the above error,
--- a/src/protocols/oscar/snac.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/snac.c Wed Apr 21 01:34:26 2004 +0000 @@ -4,7 +4,7 @@ * * outstanding_snacs is a list of aim_snac_t structs. A SNAC should be added * whenever a new SNAC is sent and it should remain in the list until the - * response for it has been receieved. + * response for it has been received. * * cleansnacs() should be called periodically by the client in order * to facilitate the aging out of unreplied-to SNACs. This can and does @@ -103,7 +103,7 @@ /* * This is for cleaning up old SNACs that either don't get replies or - * a reply was never received for. Garabage collection. Plain and simple. + * a reply was never received for. Garbage collection. Plain and simple. * * maxage is the _minimum_ age in seconds to keep SNACs. *
--- a/src/protocols/oscar/tlv.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/tlv.c Wed Apr 21 01:34:26 2004 +0000 @@ -39,7 +39,7 @@ * XXX There should be a flag setable here to have the tlvlist contain * bstream references, so that at least the ->value portion of each * element doesn't need to be malloc/memcpy'd. This could prove to be - * just as effecient as the in-place TLV parsing used in a couple places + * just as efficient as the in-place TLV parsing used in a couple places * in libfaim. * * @param bs Input bstream @@ -60,7 +60,7 @@ * type 0x0013 can only be two bytes, despite * what the actual given length is. So here * we dump any invalid TLVs of that sort. Hopefully - * theres no special cases to this special case. + * there's no special cases to this special case. * - mid (30jun2000) */ if ((type == 0x0013) && (length != 0x0002)) @@ -119,14 +119,14 @@ * XXX There should be a flag setable here to have the tlvlist contain * bstream references, so that at least the ->value portion of each * element doesn't need to be malloc/memcpy'd. This could prove to be - * just as effecient as the in-place TLV parsing used in a couple places + * just as efficient as the in-place TLV parsing used in a couple places * in libfaim. * * @param bs Input bstream * @param num The max number of TLVs that will be read, or -1 if unlimited. * There are a number of places where you want to read in a tlvchain, * but the chain is not at the end of the SNAC, and the chain is - * preceeded by the number of TLVs. So you can limit that with this. + * preceded by the number of TLVs. So you can limit that with this. */ faim_internal aim_tlvlist_t *aim_tlvlist_readnum(aim_bstream_t *bs, fu16_t num) { @@ -187,14 +187,14 @@ * XXX There should be a flag setable here to have the tlvlist contain * bstream references, so that at least the ->value portion of each * element doesn't need to be malloc/memcpy'd. This could prove to be - * just as effecient as the in-place TLV parsing used in a couple places + * just as efficient as the in-place TLV parsing used in a couple places * in libfaim. * * @param bs Input bstream * @param len The max length in bytes that will be read. * There are a number of places where you want to read in a tlvchain, * but the chain is not at the end of the SNAC, and the chain is - * preceeded by the length of the TLVs. So you can limit that with this. + * preceded by the length of the TLVs. So you can limit that with this. */ faim_internal aim_tlvlist_t *aim_tlvlist_readlen(aim_bstream_t *bs, fu16_t len) { @@ -245,7 +245,7 @@ /** * Duplicate a TLV chain. - * This is pretty pelf exslanatory. + * This is pretty self explanatory. * * @param orig The TLV chain you want to make a copy of. * @return A newly allocated TLV chain. @@ -268,7 +268,7 @@ * * @param one One of the TLV chains to compare. * @param two The other TLV chain to compare. - * @preturn Retrun 0 if the lists are the same, return 1 if they are different. + * @preturn Return 0 if the lists are the same, return 1 if they are different. */ faim_internal int aim_tlvlist_cmp(aim_tlvlist_t *one, aim_tlvlist_t *two) { @@ -375,7 +375,7 @@ * @param type TLV type. * @length Length of string to add (not including %NULL). * @value String to add. - * @retun The size of the value added. + * @return The size of the value added. */ faim_internal int aim_tlvlist_add_raw(aim_tlvlist_t **list, const fu16_t type, const fu16_t length, const fu8_t *value) { @@ -414,7 +414,7 @@ * @param list Destination chain. * @param type TLV type to add. * @param value Value to add. - * @retun The size of the value added. + * @return The size of the value added. */ faim_internal int aim_tlvlist_add_8(aim_tlvlist_t **list, const fu16_t type, const fu8_t value) { @@ -431,7 +431,7 @@ * @param list Destination chain. * @param type TLV type to add. * @param value Value to add. - * @retun The size of the value added. + * @return The size of the value added. */ faim_internal int aim_tlvlist_add_16(aim_tlvlist_t **list, const fu16_t type, const fu16_t value) { @@ -448,7 +448,7 @@ * @param list Destination chain. * @param type TLV type to add. * @param value Value to add. - * @retun The size of the value added. + * @return The size of the value added. */ faim_internal int aim_tlvlist_add_32(aim_tlvlist_t **list, const fu16_t type, const fu32_t value) { @@ -473,7 +473,7 @@ * @param list Destination chain * @param type TLV type to add * @param caps Bitfield of capability flags to send - * @retun The size of the value added. + * @return The size of the value added. */ faim_internal int aim_tlvlist_add_caps(aim_tlvlist_t **list, const fu16_t type, const fu32_t caps) { @@ -495,7 +495,7 @@ * * @param list Destination chain. * @param type TLV type to add. - * @retun The size of the value added. + * @return The size of the value added. */ faim_internal int aim_tlvlist_add_userinfo(aim_tlvlist_t **list, fu16_t type, aim_userinfo_t *userinfo) { @@ -516,7 +516,7 @@ * @param type TLV type to add. * @param roomname The name of the chat. * @param instance The instance. - * @retun The size of the value added. + * @return The size of the value added. */ faim_internal int aim_tlvlist_add_chatroom(aim_tlvlist_t **list, fu16_t type, fu16_t exchange, const char *roomname, fu16_t instance) { @@ -548,7 +548,7 @@ * * @param list Destination chain. * @param type TLV type to add. - * @retun The size of the value added. + * @return The size of the value added. */ faim_internal int aim_tlvlist_add_noval(aim_tlvlist_t **list, const fu16_t type) {
--- a/src/protocols/oscar/txqueue.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/oscar/txqueue.c Wed Apr 21 01:34:26 2004 +0000 @@ -1,7 +1,7 @@ /* * txqueue.c * - * Herein lies all the mangement routines for the transmit (Tx) queue. + * Herein lies all the management routines for the transmit (Tx) queue. * */ @@ -92,7 +92,7 @@ /* * The overall purpose here is to enqueue the passed in command struct * into the outgoing (tx) queue. Basically... - * 1) Make a scope-irrelevent copy of the struct + * 1) Make a scope-irrelevant copy of the struct * 3) Mark as not-sent-yet * 4) Enqueue the struct into the list * 6) Return @@ -179,7 +179,7 @@ { /* - * If we want to send on a connection that is inprogress, we have to force + * If we want to send on a connection that is in progress, we have to force * them to use the queue based version. Otherwise, use whatever they * want. */ @@ -353,7 +353,7 @@ */ if ((cur->conn->lastactivity + cur->conn->forcedlatency) >= time(NULL)) { /* - * XXX should be a break! we dont want to block the + * XXX should be a break! we don't want to block the * upper layers * * XXX or better, just do this right.
--- a/src/protocols/rendezvous/mdns.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/rendezvous/mdns.c Wed Apr 21 01:34:26 2004 +0000 @@ -921,7 +921,7 @@ /* * If invalid data is encountered at any point when parsing data - * then the entire packet is disgarded and NULL is returned. + * then the entire packet is discarded and NULL is returned. * */ DNSPacket *
--- a/src/protocols/rendezvous/mdns.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/rendezvous/mdns.h Wed Apr 21 01:34:26 2004 +0000 @@ -152,7 +152,7 @@ * be used for sending the outgoing mDNS datagram. * @param domain This is the domain name you wish to query. It should * be of the format "_presence._tcp.local" for example. - * @return 0 if sucessful. + * @return 0 if successful. */ int mdns_query(int fd, const char *domain, unsigned short type);
--- a/src/protocols/rendezvous/rendezvous.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/rendezvous/rendezvous.c Wed Apr 21 01:34:26 2004 +0000 @@ -325,7 +325,7 @@ } /****************************/ -/* Icon and Emblem Funtions */ +/* Icon and Emblem Functions */ /****************************/ static const char* rendezvous_prpl_list_icon(GaimAccount *a, GaimBuddy *b) { @@ -385,7 +385,7 @@ } /****************************/ -/* Connection Funtions */ +/* Connection Functions */ /****************************/ static void rendezvous_callback(gpointer data, gint source, GaimInputCondition condition) {
--- a/src/protocols/yahoo/util.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/yahoo/util.c Wed Apr 21 01:34:26 2004 +0000 @@ -91,7 +91,7 @@ /* * I found these on some website but i don't know that they actually - * work (or are supposed to work). I didn't impliment them yet. + * work (or are supposed to work). I didn't implement them yet. * * [0;30m ---black * [1;37m ---white
--- a/src/protocols/yahoo/yahoo.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/yahoo/yahoo.c Wed Apr 21 01:34:26 2004 +0000 @@ -1013,7 +1013,7 @@ * will soon do so in the rest of the world. * * The new clients use this authentication method. I warn you in advance, it's - * bizzare, convoluted, inordinately complicated. It's also no more secure than + * bizarre, convoluted, inordinately complicated. It's also no more secure than * crypt() was. The only purpose this scheme could serve is to prevent third * part clients from connecting to their servers. *
--- a/src/protocols/yahoo/yahoochat.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/protocols/yahoo/yahoochat.c Wed Apr 21 01:34:26 2004 +0000 @@ -305,7 +305,7 @@ } -/* this is a comfirmation of yahoo_chat_online(); */ +/* this is a confirmation of yahoo_chat_online(); */ void yahoo_process_chat_online(GaimConnection *gc, struct yahoo_packet *pkt) { struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data; @@ -378,7 +378,7 @@ break; case 13: /* this is 1. maybe its the type of room? (normal, user created, private, etc?) */ break; - case 61: /*this looks similiar to 130 */ + case 61: /*this looks similar to 130 */ break; /* the previous section was just room info. this next section is
--- a/src/proxy.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/proxy.c Wed Apr 21 01:34:26 2004 +0000 @@ -870,7 +870,7 @@ c++; } - /* NOTE: HTTP_PROXY takes precendence. */ + /* NOTE: HTTP_PROXY takes precedence. */ info = gaim_global_proxy_get_info(); if (*host) gaim_proxy_info_set_host(info, host);
--- a/src/request.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/request.h Wed Apr 21 01:34:26 2004 +0000 @@ -512,7 +512,7 @@ * * @param field The field. * - * @return TRUE if the fiels is required, or FALSE. + * @return TRUE if the field is required, or FALSE. */ gboolean gaim_request_field_is_required(const GaimRequestField *field);
--- a/src/roomlist.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/roomlist.h Wed Apr 21 01:34:26 2004 +0000 @@ -126,7 +126,7 @@ /** * Returns a newly created room list object. * - * It has an inital reference count of 1. + * It has an initial reference count of 1. * * @param account The account that's listing rooms. * @return The new room list handle. @@ -156,7 +156,7 @@ * This must be called before gaim_roomlist_room_add(). * * @param list The room list. - * @param fields A GList of GaimRoomlistField's. UI's are encourged + * @param fields A GList of GaimRoomlistField's. UI's are encouraged * to default to displaying them in the order given. */ void gaim_roomlist_set_fields(GaimRoomlist *list, GList *fields); @@ -164,7 +164,7 @@ /** * Set the "in progress" state of the room list. * - * The UI is encourged to somehow hint to the user + * The UI is encouraged to somehow hint to the user * whether or not we're busy downloading a room list or not. * * @param list The room list. @@ -175,7 +175,7 @@ /** * Gets the "in progress" state of the room list. * - * The UI is encourged to somehow hint to the user + * The UI is encouraged to somehow hint to the user * whether or not we're busy downloading a room list or not. * * @param list The room list.
--- a/src/util.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/util.c Wed Apr 21 01:34:26 2004 +0000 @@ -323,7 +323,7 @@ } } #if 0 - /* I think this is rarely going to happend, if at all */ + /* I think this is rarely going to happen, if at all */ else if ((num < 2) && (strchr("()<>@,;:/[]", *cur))) /* There can't be these characters in the first two tokens. */ break; @@ -1970,7 +1970,7 @@ /* Count how many times the delimiter appears */ i = 0; /* position in the source string */ - j = 0; /* number of occurences of "delimiter" */ + j = 0; /* number of occurrences of "delimiter" */ while (string[i] != '\0') { if (!strncasecmp(&string[i], delimiter, length_del)) { i += length_del;
--- a/src/util.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/util.h Wed Apr 21 01:34:26 2004 +0000 @@ -127,12 +127,12 @@ * =? designates the beginning of the encoded-word * ?= designates the end of the encoded-word * ? segments the encoded word into three pieces. The first piece is - * the character set, the second peice is the encoding, and the + * the character set, the second piece is the encoding, and the * third piece is the encoded text. * * @param str The string to convert back. * - * @return The readble string. + * @return The readable string. */ char *gaim_mime_decode_field (const char *str);
--- a/src/win32/MinimizeToTray.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/win32/MinimizeToTray.c Wed Apr 21 01:34:26 2004 +0000 @@ -9,7 +9,7 @@ * * 1.0 29.06.2000 Initial version * 1.1 01.07.2000 The window retains it's place in the Z-order of windows - * when minimized/hidden. This means that when restored/shown, it doen't + * when minimized/hidden. This means that when restored/shown, it doesn't * always appear as the foreground window unless we call SetForegroundWindow * * Copyright 2000 Matthew Ellis <m.t.ellis@bigfoot.com>
--- a/src/win32/mingw_plus/winuser_extra.h Wed Apr 21 01:20:41 2004 +0000 +++ b/src/win32/mingw_plus/winuser_extra.h Wed Apr 21 01:34:26 2004 +0000 @@ -7,7 +7,7 @@ #ifndef _WINUSER_EXTRA_H_ #define _WINUSER_EXTRA_H_ -/* From MSDN Lib - Mingw dosn't have */ +/* From MSDN Lib - Mingw doesn't have */ #define FLASHW_STOP 0 #define FLASHW_CAPTION 0x00000001 #define FLASHW_TRAY 0x00000002 @@ -16,7 +16,7 @@ #define FLASHW_TIMERNOFG 0x0000000C -/* From MSDN Lib - Mingw dosn't have */ +/* From MSDN Lib - Mingw doesn't have */ typedef struct { UINT cbSize; HWND hwnd;
--- a/src/win_gaim.c Wed Apr 21 01:20:41 2004 +0000 +++ b/src/win_gaim.c Wed Apr 21 01:34:26 2004 +0000 @@ -175,10 +175,10 @@ case 1027: return "ca"; /* catalan */ case 1050: return "hr"; /* croation */ case 1029: return "cs"; /* czech */ - case 1030: return "da"; /* danaish */ + case 1030: return "da"; /* danish */ case 1043: return "nl"; /* dutch - netherlands */ case 1033: return "en"; /* english - us */ - case 1035: return "fi"; /* finish */ + case 1035: return "fi"; /* finnish */ case 1036: return "fr"; /* french - france */ case 1031: return "de"; /* german - germany */ case 1032: return "el"; /* greek */