gimp r26094 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Wed Jul  9 10:45:21 2008
New Revision: 26094
URL: http://svn.gnome.org/viewvc/gimp?rev=26094&view=rev

Log:
2008-07-09  Sven Neumann  <sven gimp org>

	* app/display/gimpstatusbar.c (gimp_statusbar_progress_message):
	don't accept a progress message if the status bar is already
	showing a temporary message.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpstatusbar.c

Modified: trunk/app/display/gimpstatusbar.c
==============================================================================
--- trunk/app/display/gimpstatusbar.c	(original)
+++ trunk/app/display/gimpstatusbar.c	Wed Jul  9 10:45:21 2008
@@ -493,13 +493,18 @@
   GimpStatusbar *statusbar  = GIMP_STATUSBAR (progress);
   GtkWidget     *label      = GTK_STATUSBAR (statusbar)->label;
   PangoLayout   *layout;
-  const gchar   *stock_id   = gimp_get_message_stock_id (severity);
+  const gchar   *stock_id;
   gboolean       handle_msg = FALSE;
 
-  /*  we can only handle short one-liners  */
+  /*  don't accept a message if we are already displaying one  */
+  if (statusbar->temp_timeout_id)
+    return FALSE;
 
+  /*  we can only handle short one-liners  */
   layout = gtk_widget_create_pango_layout (label, message);
 
+  stock_id = gimp_get_message_stock_id (severity);
+
   if (pango_layout_get_line_count (layout) == 1)
     {
       gint width;