Mercurial > pidgin
diff libpurple/protocols/yahoo/libymsg.c @ 29217:fd2afe1b2d3c
propagate from branch 'im.pidgin.pidgin' (head af00ae634db8d99b296a90e1e0777bd23bd4df6a)
to branch 'im.pidgin.pidgin.next.minor' (head fa239a2e49b49a05b3c8612ea2e2580e7286ac63)
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Thu, 15 Oct 2009 10:45:22 +0000 |
parents | 29e96fb6cff3 a4e4d27fb810 |
children | e3206d6da6c7 |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Thu Oct 15 09:21:18 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Thu Oct 15 10:45:22 2009 +0000 @@ -1763,11 +1763,8 @@ char *crumb = NULL; char *crypt = NULL; -#if GLIB_CHECK_VERSION(2,6,0) totalelements = g_strv_length(split_data); -#else - while (split_data[++totalelements] != NULL); -#endif + if (totalelements >= 4) { response_no = strtol(split_data[0], NULL, 10); crumb = g_strdup(split_data[1] + strlen("crumb=")); @@ -1849,11 +1846,8 @@ int response_no = -1; char *token = NULL; -#if GLIB_CHECK_VERSION(2,6,0) totalelements = g_strv_length(split_data); -#else - while (split_data[++totalelements] != NULL); -#endif + if(totalelements == 1) response_no = strtol(split_data[0], NULL, 10); else if(totalelements >= 2) {