Changeset 5f40da7 for protocols/msn/sb.c

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (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:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• protocols/msn/sb.c (modified) (3 diffs)

protocols/msn/sb.c

@@ -682 +682 @@
         if( strcmp( cmd[0], "MSG" ) == 0 )
         {
-                char *ct = msn_findheader( msg, "Content-Type:", msglen );
+                char *ct = get_rfc822_header( msg, "Content-Type:", msglen );
                 
                 if( !ct )
@@ -711 +711 @@
                 else if( g_strncasecmp( ct, "text/x-msmsgsinvite", 19 ) == 0 )
                 {
-                        char *command = msn_findheader( body, "Invitation-Command:", blen );
-                        char *cookie = msn_findheader( body, "Invitation-Cookie:", blen );
+                        char *command = get_rfc822_header( body, "Invitation-Command:", blen );
+                        char *cookie = get_rfc822_header( body, "Invitation-Cookie:", blen );
                         unsigned int icookie;
                         
@@ -750 +750 @@
                 else if( g_strncasecmp( ct, "text/x-msmsgscontrol", 20 ) == 0 )
                 {
-                        char *who = msn_findheader( msg, "TypingUser:", msglen );
+                        char *who = get_rfc822_header( msg, "TypingUser:", msglen );
                         
                         if( who )