pidgin.2.5.8: c959ac21: *** Plucked rev e2bd07369c221038b091b908...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: c959ac21920e301c034d22f23d05015d56542412
Ancestor: ed447a77deaa36e01c268453db70b00718e3856a
Author: rekkanoryo at pidgin.im
Date: 2009-06-26T00:05:42
Branch: im.pidgin.pidgin.2.5.8
URL: http://d.pidgin.im/viewmtn/revision/info/c959ac21920e301c034d22f23d05015d56542412

Modified files:
        libpurple/protocols/yahoo/yahoo.c

ChangeLog: 

*** Plucked rev e2bd07369c221038b091b908c8e07f0ae6179cd9 (nosnilmot at pidgin.im):
g_strv_length() is only available in glib2 2.6 and newer


-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo.c	c3e5a917837b881f85d89c84eafb7949afde74d6
+++ libpurple/protocols/yahoo/yahoo.c	2df1b3d38014a3e70c54e2a6e1e6fb39816bdbc4
@@ -1471,11 +1471,16 @@ static void yahoo_auth16_stage2(PurpleUt
 	}
 	else if (len > 0 && ret_data && *ret_data) {
 		gchar **split_data = g_strsplit(ret_data, "\r\n", -1);
-		int totalelements = g_strv_length(split_data);
+		int totalelements = 0;
 		int response_no = -1;
 		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 >= 5) {
 			response_no = strtol(split_data[1], NULL, 10);
 			crumb = g_strdup(split_data[2] + strlen("crumb="));
@@ -1553,10 +1558,15 @@ static void yahoo_auth16_stage1_cb(Purpl
 	}
 	else if (len > 0 && ret_data && *ret_data) {
 		gchar **split_data = g_strsplit(ret_data, "\r\n", -1);
-		int totalelements = g_strv_length(split_data);
+		int totalelements = 0;
 		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 >= 5) {
 			response_no = strtol(split_data[1], NULL, 10);
 			token = g_strdup(split_data[2] + strlen("ymsgr="));