dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't accept a progress message if the status bar is already showing a 

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.

svn path=/trunk/; revision=26094
This commit is contained in:
Sven Neumann 2008-07-09 10:45:21 +00:00 committed by Sven Neumann
parent c3e86092bb
commit 1fe4281317
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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.
2008-07-09 Sven Neumann <sven@gimp.org>
* plug-ins/common/tiff-load.c (tiff_warning): send warnings about

9
app/display/gimpstatusbar.c
View File

@ -493,13 +493,18 @@ gimp_statusbar_progress_message (GimpProgress *progress,
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;