Mercurial > pidgin.yaz
diff console/libgnt/gntutils.c @ 14424:c374f45f4c94
[gaim-migrate @ 17132]
Do the same for the texts in buttons, and minor adjustments.
committer: Tailor Script <tailor@pidgin.im>
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Sat, 02 Sep 2006 23:23:30 +0000 |
parents | cfd5bcc06a7e |
children | ca36763497d9 |
line wrap: on
line diff
--- a/console/libgnt/gntutils.c Sat Sep 02 23:06:25 2006 +0000 +++ b/console/libgnt/gntutils.c Sat Sep 02 23:23:30 2006 +0000 @@ -82,17 +82,18 @@ while (*start) { if ((end = strchr(start, '\n')) != NULL || (end = strchr(start, '\r')) != NULL) { - if (gnt_util_onscreen_width(start, end) <= maxw) { - ++end; - } else + 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; - if (*end && *end != '\n' && *end != '\r') - str = g_string_append_c(str, '\n'); } return g_string_free(str, FALSE); }