Changeset 5f40da7 for protocols/msn/ns.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/ns.c (modified) (4 diffs)

protocols/msn/ns.c

@@ -609 +609 @@
                 if( g_strcasecmp( cmd[1], "Hotmail" ) == 0 )
                 {
-                        char *ct = msn_findheader( msg, "Content-Type:", msglen );
+                        char *ct = get_rfc822_header( msg, "Content-Type:", msglen );
                         
                         if( !ct )
@@ -622 +622 @@
                                         return( 1 );
                                 
-                                mtype = msn_findheader( body, "Type:", blen );
-                                arg1 = msn_findheader( body, "Arg1:", blen );
+                                mtype = get_rfc822_header( body, "Type:", blen );
+                                arg1 = get_rfc822_header( body, "Arg1:", blen );
                                 
                                 if( mtype && strcmp( mtype, "1" ) == 0 )
@@ -642 +642 @@
                                 if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        char *inbox = msn_findheader( body, "Inbox-Unread:", blen );
-                                        char *folders = msn_findheader( body, "Folders-Unread:", blen );
+                                        char *inbox = get_rfc822_header( body, "Inbox-Unread:", blen );
+                                        char *folders = get_rfc822_header( body, "Folders-Unread:", blen );
 
                                         if( inbox && folders )
@@ -656 +656 @@
                                 if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        char *from = msn_findheader( body, "From-Addr:", blen );
-                                        char *fromname = msn_findheader( body, "From:", blen );
+                                        char *from = get_rfc822_header( body, "From-Addr:", blen );
+                                        char *fromname = get_rfc822_header( body, "From:", blen );
                                         
                                         if( from && fromname )