*** Plucked rev e2bd07369c221038b091b908c8e07f0ae6179cd9 (nosnilmot@pidgin.im): release-2.5.8

Fri, 26 Jun 2009 00:05:42 +0000

author
John Bailey <rekkanoryo@rekkanoryo.org>
date
Fri, 26 Jun 2009 00:05:42 +0000
branch
release-2.5.8
changeset 25778
1c726d419ae6
parent 25777
d44beb250a69
child 25779
63c770cc86df

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

libpurple/protocols/yahoo/yahoo.c file | annotate | diff | comparison | revisions
--- a/libpurple/protocols/yahoo/yahoo.c	Fri Jun 26 00:05:17 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Fri Jun 26 00:05:42 2009 +0000
@@ -1471,11 +1471,16 @@
 	}
 	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 @@
 	}
 	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="));

mercurial