comparison console/libgnt/gntutils.c @ 14424:c374f45f4c94

[gaim-migrate @ 17132] Do the same for the texts in buttons, and minor adjustments. committer: Tailor Script <[e-mail]>

14423:cfd5bcc06a7e

	str = g_string_new(NULL);

	while (*start) {
		if ((end = strchr(start, '\n')) != NULL ||
			(end = strchr(start, '\r')) != NULL) {
			if (gnt_util_onscreen_width(start, end) <= maxw) {
				++end;
			} else
				end = NULL;
		}
		if (end == NULL)
			end = gnt_util_onscreen_width_to_pointer(start, maxw, NULL);
		str = g_string_append_len(str, start, end - start);
		start = end;
		if (*end && *end != '\n' && *end != '\r')
			str = g_string_append_c(str, '\n');
	}
	return g_string_free(str, FALSE);
}

14424:c374f45f4c94

	str = g_string_new(NULL);

	while (*start) {
		if ((end = strchr(start, '\n')) != NULL ||
			(end = strchr(start, '\r')) != NULL) {
			if (gnt_util_onscreen_width(start, end) > maxw)
				end = NULL;
		}
		if (end == NULL)
			end = gnt_util_onscreen_width_to_pointer(start, maxw, NULL);
		str = g_string_append_len(str, start, end - start);
		if (*end) {
			str = g_string_append_c(str, '\n');
			if (*end == '\n' || *end == '\r')
				end++;
		}
		start = end;
	}
	return g_string_free(str, FALSE);
}