Mercurial > pidgin.yaz
diff libpurple/protocols/yahoo/libymsg.c @ 29623:3c9534e77ea1
propagate from branch 'im.pidgin.pidgin' (head 53ad409302bf312b4f1e4153f893f1350638c8c9)
to branch 'im.pidgin.pidgin.next.minor' (head e36acc862ca620a7afc746236306cb0eba4ca37a)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Mon, 02 Nov 2009 03:18:15 +0000 |
| parents | 99b9c9ee7363 e3206d6da6c7 |
| children | 7b1cfd48beab |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Mon Nov 02 03:12:45 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Mon Nov 02 03:18:15 2009 +0000 @@ -1764,11 +1764,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=")); @@ -1850,11 +1847,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) {