From: <may...@us...> - 2006-08-21 16:16:20
|
Revision: 16952 Author: mayuan2006 Date: 2006-08-21 09:16:10 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16952&view=rev Log Message: ----------- update for fail-safe check of Passport 3.0's Authentication Modified Paths: -------------- branches/soc-2006-msnp13/src/protocols/msn/nexus.c branches/soc-2006-msnp13/src/protocols/msn/userlist.c Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.c =================================================================== --- branches/soc-2006-msnp13/src/protocols/msn/nexus.c 2006-08-21 15:17:22 UTC (rev 16951) +++ branches/soc-2006-msnp13/src/protocols/msn/nexus.c 2006-08-21 16:16:10 UTC (rev 16952) @@ -163,7 +163,7 @@ MsnSoapConn *soapconn; MsnNexus * nexus; MsnSession *session; - char *ru,*lc,*id,*tw,*ct,*kpp,*kv,*ver,*rn,*tpf; + char *ru,*lc,*id,*tw,*ct,*kpp,*kv,*ver,*rn,*tpf,*fs; char *username, *password; char *request_str, *head, *tail,*challenge_str; @@ -187,6 +187,7 @@ lc = (char *)g_hash_table_lookup(nexus->challenge_data, "lc"); id = (char *)g_hash_table_lookup(nexus->challenge_data, "id"); tw = (char *)g_hash_table_lookup(nexus->challenge_data, "tw"); + fs = (char *)g_hash_table_lookup(nexus->challenge_data, "fs"); ru = (char *)g_hash_table_lookup(nexus->challenge_data, "ru"); ct = (char *)g_hash_table_lookup(nexus->challenge_data, "ct"); kpp= (char *)g_hash_table_lookup(nexus->challenge_data, "kpp"); @@ -206,10 +207,14 @@ return; } + if(!fs){ + fs =g_strdup_printf("1"); + } challenge_str = g_strdup_printf( - "lc=%s&id=%s&tw=%s&fs=1&ru=%s&ct=%s&kpp=%s&kv=%s&ver=%s&rn=%s&tpf=%s\r\n", - lc,id,tw,ru,ct,kpp,kv,ver,rn,tpf + "lc=%s&id=%s&tw=%s&fs=%s&ru=%s&ct=%s&kpp=%s&kv=%s&ver=%s&rn=%s&tpf=%s\r\n", + lc,id,tw,fs,ru,ct,kpp,kv,ver,rn,tpf ); + g_free(fs); /*build the SOAP windows Live ID XML body */ tail = g_strdup_printf(TWN_ENVELOP_TEMPLATE,username,password,challenge_str ); Modified: branches/soc-2006-msnp13/src/protocols/msn/userlist.c =================================================================== --- branches/soc-2006-msnp13/src/protocols/msn/userlist.c 2006-08-21 15:17:22 UTC (rev 16951) +++ branches/soc-2006-msnp13/src/protocols/msn/userlist.c 2006-08-21 16:16:10 UTC (rev 16952) @@ -90,16 +90,13 @@ pa->friendly = g_strdup(friendly); pa->gc = gc; - if (friendly != NULL) - { + if (friendly != NULL){ msg = g_strdup_printf( _("The user %s (%s) wants to add %s to his or her " "buddy list."), passport, friendly, gaim_account_get_username(gc->account)); - } - else - { + }else{ msg = g_strdup_printf( _("The user %s wants to add %s to his or " "her buddy list."), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |