Mercurial > pidgin.yaz
diff libpurple/protocols/yahoo/libymsg.c @ 29504:057372f5c319
propagate from branch 'im.pidgin.pidgin' (head bd59b6d44034a232a0414586f78d8f559d9705f8)
to branch 'im.pidgin.pidgin.next.minor' (head e3b29e5b831c5e0c79521e61160af19f21dae099)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sun, 27 Sep 2009 22:22:36 +0000 |
| parents | 60e4ef6801ff 6e9917e067e6 |
| children | 2cc15ca3c26d |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Sat Sep 26 17:38:05 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Sun Sep 27 22:22:36 2009 +0000 @@ -1689,11 +1689,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=")); @@ -1775,11 +1772,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) {