From e9850960881f13cae31e238e9359d5d4c5446ee8 Mon Sep 17 00:00:00 2001
From: Sven Neumann <sven@gimp.org>
Date: Thu, 8 Nov 2007 18:20:30 +0000
Subject: [PATCH] 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
---
 ChangeLog                   | 6 ++++++
 app/display/gimpstatusbar.c | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7d19534c5d..78851581ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* libgimp/gimpenums.c.tail: replaced by generated version.
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index 2508e4710a..120d89d6ec 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -1171,6 +1171,10 @@ gimp_statusbar_vprintf (const gchar *format,
   message = g_strdup_vprintf (format, args);
 
   /*  guard us from multi-line strings  */
+  newline = strchr (message, '\r');
+  if (newline)
+    *newline = '\0';
+
   newline = strchr (message, '\n');
   if (newline)
     *newline = '\0';