pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16693] trunk/src/protocols/msn/nexus.c

[<dat...@us...>]

Revision: 16693
Author:   datallah
Date:     2006-08-10 17:55:18 -0700 (Thu, 10 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16693&view=rev

Log Message:
-----------
Fix CID 111 (which never would actually happen, but this is cleaner and clearer)

Modified Paths:
--------------
    trunk/src/protocols/msn/nexus.c
Modified: trunk/src/protocols/msn/nexus.c
===================================================================
--- trunk/src/protocols/msn/nexus.c	2006-08-11 00:21:26 UTC (rev 16692)
+++ trunk/src/protocols/msn/nexus.c	2006-08-11 00:55:18 UTC (rev 16693)
@@ -422,8 +422,8 @@
 
 	if ((da_login = strstr(base, "DALogin=")) != NULL)
 	{
-		if ((da_login = strchr(da_login, '=')) != NULL)
-			da_login++;
+		/* skip over "DALogin=" */
+		da_login += 8;
 
 		if ((c = strchr(da_login, ',')) != NULL)
 			*c = '\0';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16778] trunk/src/protocols/msn/nexus.c

[<ebl...@us...>]

Revision: 16778
Author:   eblanton
Date:     2006-08-15 19:44:21 -0700 (Tue, 15 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16778&view=rev

Log Message:
-----------
Thanks to Josh Blanton for this fix to MSN signon with non-glibc
printf.  This is a complete hack, but it's no worse than what is there
now.

Modified Paths:
--------------
    trunk/src/protocols/msn/nexus.c
Modified: trunk/src/protocols/msn/nexus.c
===================================================================
--- trunk/src/protocols/msn/nexus.c	2006-08-16 02:37:49 UTC (rev 16777)
+++ trunk/src/protocols/msn/nexus.c	2006-08-16 02:44:21 UTC (rev 16778)
@@ -293,7 +293,16 @@
 
 }
 
+/* this guards against missing hash entries */
+char *
+nexus_challenge_data_lookup(GHashTable *challenge_data, const char *key)
+{
+  char *entry;
 
+  return (entry = (char *)g_hash_table_lookup(challenge_data, key)) ?
+    entry : "(null)";
+}
+
 void
 login_connect_cb(gpointer data, GaimSslConnection *gsc,
 				 GaimInputCondition cond)
@@ -336,16 +345,16 @@
 		"Host: %s\r\n"
 		"Connection: Keep-Alive\r\n"
 		"Cache-Control: no-cache\r\n",
-		(char *)g_hash_table_lookup(nexus->challenge_data, "lc"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "id"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "tw"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "fs"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ru"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "lc"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "id"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "tw"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "fs"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "ru"),
 		ctint,
-		(char *)g_hash_table_lookup(nexus->challenge_data, "kpp"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "kv"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ver"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "tpf"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "kpp"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "kv"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "ver"),
+		nexus_challenge_data_lookup(nexus->challenge_data, "tpf"),
 		nexus->login_host);
 
 	buffer = g_strdup_printf("%s,pwd=XXXXXXXX,%s\r\n", head, tail);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16782] trunk/src/protocols/msn/nexus.c

[<the...@us...>]

Revision: 16782
Author:   thekingant
Date:     2006-08-15 23:11:10 -0700 (Tue, 15 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16782&view=rev

Log Message:
-----------
Fix a warning:
nexus.c:299: warning: no previous prototype for 'nexus_challenge_data_lookup'

And change this code to use tab indentation

Modified Paths:
--------------
    trunk/src/protocols/msn/nexus.c
Modified: trunk/src/protocols/msn/nexus.c
===================================================================
--- trunk/src/protocols/msn/nexus.c	2006-08-16 05:12:48 UTC (rev 16781)
+++ trunk/src/protocols/msn/nexus.c	2006-08-16 06:11:10 UTC (rev 16782)
@@ -294,13 +294,13 @@
 }
 
 /* this guards against missing hash entries */
-char *
+static char *
 nexus_challenge_data_lookup(GHashTable *challenge_data, const char *key)
 {
-  char *entry;
+	char *entry;
 
-  return (entry = (char *)g_hash_table_lookup(challenge_data, key)) ?
-    entry : "(null)";
+	return (entry = (char *)g_hash_table_lookup(challenge_data, key)) ?
+		entry : "(null)";
 }
 
 void


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.