aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/ft.h14
-rw-r--r--protocols/jabber/s5bytestream.c4
-rw-r--r--protocols/jabber/si.c6
-rw-r--r--protocols/oscar/aim.h2
-rw-r--r--protocols/oscar/auth.c2
-rw-r--r--protocols/oscar/conn.c4
-rw-r--r--protocols/oscar/im.c16
-rw-r--r--protocols/oscar/misc.c2
-rw-r--r--protocols/oscar/msgcookie.c2
-rw-r--r--protocols/oscar/oscar.c2
-rw-r--r--protocols/oscar/rxhandlers.c2
-rw-r--r--protocols/oscar/rxqueue.c4
-rw-r--r--protocols/oscar/service.c12
-rw-r--r--protocols/oscar/tlv.c4
-rw-r--r--protocols/oscar/txqueue.c2
-rw-r--r--protocols/skype/README2
-rw-r--r--protocols/twitter/twitter_http.c2
-rw-r--r--protocols/yahoo/libyahoo2.c4
-rw-r--r--protocols/yahoo/yahoo2_callbacks.h2
19 files changed, 44 insertions, 44 deletions
diff --git a/protocols/ft.h b/protocols/ft.h
index fd6ef92a..d95c9aef 100644
--- a/protocols/ft.h
+++ b/protocols/ft.h
@@ -57,15 +57,15 @@ typedef enum {
* |
* | accept
* V
- * /------ /-------------\ /------------------------\
- * out_of_data | | TRANSFERING | -----------------> | TRANSFERING | CANCELED |
- * \-----> \-------------/ [canceled,]free \------------------------/
+ * /------ /-------------\ /--------------------------\
+ * out_of_data | | TRANSFERRING | -----------------> | TRANSFERRING | CANCELED |
+ * \-----> \-------------/ [canceled,]free \--------------------------/
* |
* | finished,free
* V
- * /------------------------\
- * | TRANSFERING | FINISHED |
- * \------------------------/
+ * /-------------------------\
+ * | TRANSFERRING | FINISHED |
+ * \-------------------------/
*/
typedef struct file_transfer {
@@ -114,7 +114,7 @@ typedef struct file_transfer {
gpointer priv;
/*
- * If set, called after succesful connection setup.
+ * If set, called after successful connection setup.
*/
void (*accept)(struct file_transfer *file);
diff --git a/protocols/jabber/s5bytestream.c b/protocols/jabber/s5bytestream.c
index f9f9d2e1..7081ea85 100644
--- a/protocols/jabber/s5bytestream.c
+++ b/protocols/jabber/s5bytestream.c
@@ -535,7 +535,7 @@ gboolean jabber_bs_recv_handshake(gpointer data, gint fd, b_input_condition cond
/* usually a proxy sends back the 40 bytes address but I encountered at least one (of jabber.cz)
* that sends atyp=0 addrlen=0 and only 6 bytes (one less than one would expect).
* Therefore I removed the wait for more bytes. Since we don't care about what else the proxy
- * is sending, it shouldnt matter */
+ * is sending, it should not matter */
if (bt->tf->ft->sending) {
jabber_bs_send_activate(bt);
@@ -558,7 +558,7 @@ gboolean jabber_bs_recv_handshake(gpointer data, gint fd, b_input_condition cond
* If the handshake failed we can try the next streamhost, if there is one.
* An intelligent sender would probably specify himself as the first streamhost and
* a proxy as the second (Kopete and PSI are examples here). That way, a (potentially)
- * slow proxy is only used if neccessary. This of course also means, that the timeout
+ * slow proxy is only used if necessary. This of course also means, that the timeout
* per streamhost should be kept short. If one or two firewalled adresses are specified,
* they have to timeout first before a proxy is tried.
*/
diff --git a/protocols/jabber/si.c b/protocols/jabber/si.c
index cb2487bc..77f7a752 100644
--- a/protocols/jabber/si.c
+++ b/protocols/jabber/si.c
@@ -185,7 +185,7 @@ void jabber_si_transfer_request(struct im_connection *ic, file_transfer_t *ft, c
jd->filetransfers = g_slist_prepend(jd->filetransfers, tf);
- /* query buddy's features and server's streaming proxies if neccessary */
+ /* query buddy's features and server's streaming proxies if necessary */
if (!tf->bud->features) {
jabber_iq_query_features(ic, bud->full_jid);
@@ -282,7 +282,7 @@ int jabber_si_handle_request(struct im_connection *ic, struct xt_node *node, str
}
if (requestok) {
- /* Figure out who the transfer should come frome... */
+ /* Figure out who the transfer should come from... */
ext_jid = ini_jid;
if ((s = strchr(ini_jid, '/'))) {
@@ -402,7 +402,7 @@ static xt_status jabber_si_handle_response(struct im_connection *ic, struct xt_n
/* All this means we expect something like this: ( I think )
* <iq from=... to=... id=...>
* <si xmlns=si>
- * [ <file xmlns=ft/> ] <-- not neccessary
+ * [ <file xmlns=ft/> ] <-- not necessary
* <feature xmlns=feature>
* <x xmlns=xdata type=submit>
* <field var=stream-method>
diff --git a/protocols/oscar/aim.h b/protocols/oscar/aim.h
index 265cd19b..3b6b3925 100644
--- a/protocols/oscar/aim.h
+++ b/protocols/oscar/aim.h
@@ -870,7 +870,7 @@ int aim_sncmp(const char *a, const char *b);
/*
* 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.
*
diff --git a/protocols/oscar/auth.c b/protocols/oscar/auth.c
index 5e1dc4ec..e4f624c0 100644
--- a/protocols/oscar/auth.c
+++ b/protocols/oscar/auth.c
@@ -40,7 +40,7 @@ int aim_sendcookie(aim_session_t *sess, aim_conn_t *conn, const guint8 *chipsaho
* Normally the FLAP version is sent as the first few bytes of the cookie,
* meaning you generally never call this.
*
- * But there are times when something might want it seperate. Specifically,
+ * But there are times when something might want it separate. Specifically,
* libfaim sends this internally when doing SNAC login.
*
*/
diff --git a/protocols/oscar/conn.c b/protocols/oscar/conn.c
index 3cfc38e9..568f4548 100644
--- a/protocols/oscar/conn.c
+++ b/protocols/oscar/conn.c
@@ -14,7 +14,7 @@ static int aim_logoff(aim_session_t *sess);
/*
* 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
@@ -35,7 +35,7 @@ static int aim_logoff(aim_session_t *sess);
* 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
diff --git a/protocols/oscar/im.c b/protocols/oscar/im.c
index 2ddf35ed..ccf03b7d 100644
--- a/protocols/oscar/im.c
+++ b/protocols/oscar/im.c
@@ -49,7 +49,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
@@ -63,7 +63,7 @@
* Implementation note: Since this is one of the most-used functions
* in all of libfaim, it is written with performance in mind. As such,
* it is not as clear as it could be in respect to how this message is
- * supposed to be layed out. Most obviously, tlvlists should be used
+ * supposed to be laid out. Most obviously, tlvlists should be used
* instead of writing out the bytes manually.
*
* XXX more precise verification that we never send SNACs larger than 8192
@@ -475,7 +475,7 @@ static int outgoingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a
* 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.
*
*/
@@ -637,7 +637,7 @@ static int incomingim_ch1_parsemsgs(aim_session_t *sess, guint8 *data, int len,
; /* no subencoding */
}
#if 0
- /* XXX this isn't really necesary... */
+ /* XXX this isn't really necessary... */
if (((args.flag1 != 0x0000) &&
(args.flag1 != 0x0002) &&
(args.flag1 != 0x0003) &&
@@ -1160,11 +1160,11 @@ static int incomingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a
* Channel ID.
*
* Channel 0x0001 is the message channel. There are
- * other channels for things called "rendevous"
+ * other channels for things called "rendezvous"
* which represent chat and some of the other new
* features of AIM2/3/3.5.
*
- * 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.
*
@@ -1180,7 +1180,7 @@ static int incomingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a
* 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.
* aim_extractuserinfo() returns the number of bytes used by the
* userinfo tlvs, so you can start reading the rest of them right
* afterward.
@@ -1252,7 +1252,7 @@ int aim_reqicbmparams(aim_session_t *sess)
/*
*
- * 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. You don't want those. Send this.
*
*/
diff --git a/protocols/oscar/misc.c b/protocols/oscar/misc.c
index 6d55e7fc..5640b7cd 100644
--- a/protocols/oscar/misc.c
+++ b/protocols/oscar/misc.c
@@ -2,7 +2,7 @@
/*
* aim_misc.c
*
- * TODO: Seperate a lot of this into an aim_bos.c.
+ * TODO: Separate a lot of this into an aim_bos.c.
*
* Other things...
*
diff --git a/protocols/oscar/msgcookie.c b/protocols/oscar/msgcookie.c
index 1fcdd7c2..ceee65dc 100644
--- a/protocols/oscar/msgcookie.c
+++ b/protocols/oscar/msgcookie.c
@@ -141,7 +141,7 @@ aim_msgcookie_t *aim_checkcookie(aim_session_t *sess, const guint8 *cookie, int
* @sess: session to remove the cookie from
* @cookiep: the address of a pointer to the cookie struct to remove
*
- * this function removes the cookie *cookie from teh list of cookies
+ * this function removes the cookie *cookie from the list of cookies
* in sess, and then frees all memory associated with it. including
* its data! if you want to use the private data after calling this,
* make sure you copy it first.
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index f006a8c1..f86f8bcb 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -1265,7 +1265,7 @@ static int gaim_parse_incoming_im(aim_session_t *sess, aim_frame_t *fr, ...)
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);
diff --git a/protocols/oscar/rxhandlers.c b/protocols/oscar/rxhandlers.c
index 9ca2764a..6ff106b2 100644
--- a/protocols/oscar/rxhandlers.c
+++ b/protocols/oscar/rxhandlers.c
@@ -380,7 +380,7 @@ void aim_rxdispatch(aim_session_t *sess)
/*
* 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 :)
*/
diff --git a/protocols/oscar/rxqueue.c b/protocols/oscar/rxqueue.c
index e5c52376..2c78bdd3 100644
--- a/protocols/oscar/rxqueue.c
+++ b/protocols/oscar/rxqueue.c
@@ -360,7 +360,7 @@ void aim_frame_destroy(aim_frame_t *frame)
/*
* Grab a single command sequence off the socket, and enqueue
- * it in the incoming event queue in a seperate struct.
+ * it in the incoming event queue in a separate struct.
*/
int aim_get_command(aim_session_t *sess, aim_conn_t *conn)
{
@@ -478,7 +478,7 @@ int aim_get_command(aim_session_t *sess, aim_conn_t *conn)
}
/*
- * Purge recieve queue of all handled commands (->handled==1). Also
+ * Purge receive queue of all handled commands (->handled==1). Also
* allows for selective freeing using ->nofree so that the client can
* keep the data for various purposes.
*
diff --git a/protocols/oscar/service.c b/protocols/oscar/service.c
index 673cc5ad..088c5bc9 100644
--- a/protocols/oscar/service.c
+++ b/protocols/oscar/service.c
@@ -156,7 +156,7 @@ int aim_reqrates(aim_session_t *sess, aim_conn_t *conn)
}
/*
- * 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
@@ -708,9 +708,9 @@ int aim_setextstatus(aim_session_t *sess, aim_conn_t *conn, guint32 status)
* 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.
@@ -722,14 +722,14 @@ int aim_setextstatus(aim_session_t *sess, aim_conn_t *conn, guint32 status)
* 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,
- * not just sending back a bad hash. Do not immediatly suspect this code
+ * not just sending back a bad hash. Do not immediately suspect this code
* if you get disconnected. AOL and the open/free software community have
* played this game for a couple years now, generating the above message
- * on numerous ocassions.
+ * on numerous occasions.
*
* Anyway, neener. We win again.
*
diff --git a/protocols/oscar/tlv.c b/protocols/oscar/tlv.c
index e01f728a..af08b6d2 100644
--- a/protocols/oscar/tlv.c
+++ b/protocols/oscar/tlv.c
@@ -24,7 +24,7 @@ static void freetlv(aim_tlv_t **oldtlv)
* 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.
*
*/
@@ -134,7 +134,7 @@ int aim_sizetlvchain(aim_tlvlist_t **list)
/**
* aim_addtlvtochain_str - Add a string to a TLV chain
- * @list: Desination chain (%NULL pointer if empty)
+ * @list: Designation chain (%NULL pointer if empty)
* @type: TLV type
* @str: String to add
* @len: Length of string to add (not including %NULL)
diff --git a/protocols/oscar/txqueue.c b/protocols/oscar/txqueue.c
index 7ad2a3dd..07faa44a 100644
--- a/protocols/oscar/txqueue.c
+++ b/protocols/oscar/txqueue.c
@@ -66,7 +66,7 @@ aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, guint8 framing, g
*
* 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
diff --git a/protocols/skype/README b/protocols/skype/README
index f780ca32..021f6d20 100644
--- a/protocols/skype/README
+++ b/protocols/skype/README
@@ -202,7 +202,7 @@ $ skyped -n -d
channel.
* `account skype set skypeconsole_receive true` will make the
- `skypeconsole` account dump all the recieved raw traffic for you
+ `skypeconsole` account dump all the received raw traffic for you
- If you want to automatically join bookmarked groupchats right after
you logged in, do:
diff --git a/protocols/twitter/twitter_http.c b/protocols/twitter/twitter_http.c
index 7a180b5e..2632f333 100644
--- a/protocols/twitter/twitter_http.c
+++ b/protocols/twitter/twitter_http.c
@@ -23,7 +23,7 @@
/***************************************************************************\
* *
-* Some funtions within this file have been copied from other files within *
+* Some functions within this file have been copied from other files within *
* BitlBee. *
* *
****************************************************************************/
diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c
index 9188c809..b6f20e16 100644
--- a/protocols/yahoo/libyahoo2.c
+++ b/protocols/yahoo/libyahoo2.c
@@ -11,7 +11,7 @@
* gaim released under the GNU GPL. This code is also released under the
* GNU GPL.
*
- * This code is derivitive of Gaim <http://gaim.sourceforge.net>
+ * This code is derivative of Gaim <http://gaim.sourceforge.net>
* copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
* 1998-1999, Adam Fritzler <afritz@marko.net>
* 1998-2002, Rob Flynn <rob@marko.net>
@@ -1401,7 +1401,7 @@ static void yahoo_process_status(struct yahoo_input_data *yid,
}
/*
- * Status updates may be spread accross multiple packets and not
+ * Status updates may be spread across multiple packets and not
* even on buddy boundaries, so keeping some state is important.
* So, continue where we left off, and only add a user entry to
* the list once it's complete (301-315 End buddy).
diff --git a/protocols/yahoo/yahoo2_callbacks.h b/protocols/yahoo/yahoo2_callbacks.h
index 740417ee..728040e4 100644
--- a/protocols/yahoo/yahoo2_callbacks.h
+++ b/protocols/yahoo/yahoo2_callbacks.h
@@ -684,7 +684,7 @@ struct yahoo_callbacks {
/*
* Name: ext_yahoo_connect_async
* Connect to a host:port asynchronously. This function should return
- * immediately returing a tag used to identify the connection handler,
+ * immediately returning a tag used to identify the connection handler,
* or a pre-connect error (eg: host name lookup failure).
* Once the connect completes (successfully or unsuccessfully), callback
* should be called (see the signature for yahoo_connect_callback).
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 16:48:56 +0000