Changeset 93b7bd4 for protocols/msn/passport.c

Timestamp:

2006-10-15T09:34:02Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ee5c355

Parents:

7e83adca (diff), e97827b (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 from devel and storage-xml.

File:

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

protocols/msn/passport.c

@@ -59 +59 @@
         rep->data = data;
         rep->func = func;
+        rep->header = header;
         
         server = g_strdup( prd_cached );
@@ -125 +126 @@
 static char *passport_create_header( char *cookie, char *email, char *pwd )
 {
-        char *buffer = g_new0( char, 2048 );
+        char *buffer;
         char *currenttoken;
         char *email_enc, *pwd_enc;
+        
+        currenttoken = strstr( cookie, "lc=" );
+        if( currenttoken == NULL )
+                return NULL;
         
         email_enc = g_new0( char, strlen( email ) * 3 + 1 );
@@ -137 +142 @@
         http_encode( pwd_enc );
         
-        currenttoken = strstr( cookie, "lc=" );
-        if( currenttoken == NULL )
-                return( NULL );
-        
-        g_snprintf( buffer, 2048,
-                    "Authorization: Passport1.4 OrgVerb=GET,"
-                    "OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
-                    "sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
-                    currenttoken );
+        buffer = g_strdup_printf( "Authorization: Passport1.4 OrgVerb=GET,"
+                                  "OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
+                                  "sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
+                                  currenttoken );
         
         g_free( email_enc );
         g_free( pwd_enc );
         
-        return( buffer );
+        return buffer;
 }