Changeset 3fbce97 for protocols/jabber/si.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/jabber/si.c (modified) (3 diffs)

protocols/jabber/si.c

@@ -186 +186 @@
         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) {
@@ -283 +283 @@
 
         if (requestok) {
-                /* Figure out who the transfer should come frome... */
+                /* Figure out who the transfer should come from... */
 
                 ext_jid = ini_jid;
@@ -403 +403 @@
          * <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>