Changeset 3fbce97 for protocols/oscar/im.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• protocols/oscar/im.c (modified) (7 diffs)

protocols/oscar/im.c

@@ -50 +50 @@
  * 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.)
  *
@@ -64 +64 @@
  * 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.
  *
@@ -476 +476 @@
  * 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.
  *
@@ -638 +638 @@
                         }
 #if 0
-                        /* XXX this isn't really necesary... */
+                        /* XXX this isn't really necessary... */
                         if (((args.flag1 != 0x0000) &&
                              (args.flag1 != 0x0002) &&
@@ -1161 +1161 @@
          *
          * 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.
@@ -1181 +1181 @@
          * 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
@@ -1253 +1253 @@
 /*
  *
- * 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.
  *