diff --git a/ChangeLog b/ChangeLog index 8fc758f41c..e34b7a1c21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 28 21:00:44 2001 Matthias Clasen + + * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting + of use_text_format to the end of the function. (#56447) + Tue Aug 28 20:06:07 2001 Matthias Clasen * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8fc758f41c..e34b7a1c21 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Aug 28 21:00:44 2001 Matthias Clasen + + * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting + of use_text_format to the end of the function. (#56447) + Tue Aug 28 20:06:07 2001 Matthias Clasen * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8fc758f41c..e34b7a1c21 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Aug 28 21:00:44 2001 Matthias Clasen + + * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting + of use_text_format to the end of the function. (#56447) + Tue Aug 28 20:06:07 2001 Matthias Clasen * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8fc758f41c..e34b7a1c21 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Aug 28 21:00:44 2001 Matthias Clasen + + * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting + of use_text_format to the end of the function. (#56447) + Tue Aug 28 20:06:07 2001 Matthias Clasen * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8fc758f41c..e34b7a1c21 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Aug 28 21:00:44 2001 Matthias Clasen + + * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting + of use_text_format to the end of the function. (#56447) + Tue Aug 28 20:06:07 2001 Matthias Clasen * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8fc758f41c..e34b7a1c21 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Aug 28 21:00:44 2001 Matthias Clasen + + * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting + of use_text_format to the end of the function. (#56447) + Tue Aug 28 20:06:07 2001 Matthias Clasen * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8fc758f41c..e34b7a1c21 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Aug 28 21:00:44 2001 Matthias Clasen + + * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting + of use_text_format to the end of the function. (#56447) + Tue Aug 28 20:06:07 2001 Matthias Clasen * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 6e0f8441f2..5e9ebc387e 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -907,9 +907,6 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar, { g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar)); - /* We don't support formats in this interface */ - GTK_PROGRESS (pbar)->use_text_format = FALSE; - if (text && *text) { gtk_progress_set_show_text (GTK_PROGRESS (pbar), TRUE); @@ -921,6 +918,9 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar, gtk_progress_set_format_string (GTK_PROGRESS (pbar), ""); } + /* We don't support formats in this interface */ + GTK_PROGRESS (pbar)->use_text_format = FALSE; + g_object_notify (G_OBJECT (pbar), "text"); }