also cut the message at a '\r' character. Fixes the remaining aspect of

2007-11-08  Sven Neumann  <sven@gimp.org>

	* app/display/gimpstatusbar.c (gimp_statusbar_vprintf): also cut
	the message at a '\r' character. Fixes the remaining aspect of
	bug #492718.


svn path=/trunk/; revision=24091
This commit is contained in:
Sven Neumann 2007-11-08 18:20:30 +00:00 committed by Sven Neumann
parent 869daa3fbc
commit e985096088
2 changed files with 10 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2007-11-08 Sven Neumann <sven@gimp.org>
* app/display/gimpstatusbar.c (gimp_statusbar_vprintf): also cut
the message at a '\r' character. Fixes the remaining aspect of
bug #492718.
2007-11-08 Michael Natterer <mitch@gimp.org> 2007-11-08 Michael Natterer <mitch@gimp.org>
* libgimp/gimpenums.c.tail: replaced by generated version. * libgimp/gimpenums.c.tail: replaced by generated version.

View File

@ -1171,6 +1171,10 @@ gimp_statusbar_vprintf (const gchar *format,
message = g_strdup_vprintf (format, args); message = g_strdup_vprintf (format, args);
/* guard us from multi-line strings */ /* guard us from multi-line strings */
newline = strchr (message, '\r');
if (newline)
*newline = '\0';
newline = strchr (message, '\n'); newline = strchr (message, '\n');
if (newline) if (newline)
*newline = '\0'; *newline = '\0';