From c27052be9621ab6390319cdc3bcce559d468c8a9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 13 Dec 2008 08:18:50 +0000 Subject: [PATCH] Don't try to keep state in a cell renderer between two paint calls. It * gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_pulse): Don't try to keep state in a cell renderer between two paint calls. It doesn't work. Patch by Kristian Mueller svn path=/trunk/; revision=21890 --- ChangeLog | 9 +++++++++ gtk/gtkcellrendererprogress.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75b6f85b03..ef9e5106cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-12-13 Matthias Clasen + + Bug 563158 – CellRendererProgress pulsing and progressing rows can + not be used together + + * gtk/gtkcellrendererprogress.c (gtk_cell_renderer_progress_set_pulse): + Don't try to keep state in a cell renderer between two paint + calls. It doesn't work. Patch by Kristian Mueller + 2008-12-13 Matthias Clasen Bug 555560 – gtk_combo_box_set_active fails with no model diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c index 3dec5b758d..08a7e9ae82 100644 --- a/gtk/gtkcellrendererprogress.c +++ b/gtk/gtkcellrendererprogress.c @@ -396,10 +396,10 @@ gtk_cell_renderer_progress_set_pulse (GtkCellRendererProgress *cellprogress, if (pulse != priv->pulse) { - if (priv->pulse <= 0) + if (pulse <= 0) priv->offset = 0; else - priv->offset++; + priv->offset = pulse; } priv->pulse = pulse;