diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-09-27 19:54:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-09-27 19:54:51 +0000 |
| commit | 4816a141d8c71e837d1db39288b3909ab8b27767 (patch) | |
| tree | 692bf01e8dfbc54033b471d4e7a6852a7ffc4e50 /gtk/gtkprogressbar.c | |
| parent | 335c622faf13fa209457a92e60977b018891b05a (diff) | |
| download | gtk+-4816a141d8c71e837d1db39288b3909ab8b27767.tar.gz | |
Reset the animation iter on unrealize as well as unmap. (#94336)
Fri Sep 27 15:27:45 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkimage.c (gtk_image_unrealize): Reset the
animation iter on unrealize as well as unmap.
(#94336)
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't
turn a value of "" into NULL. (#94157, Vitaly Tishkov)
Diffstat (limited to 'gtk/gtkprogressbar.c')
| -rw-r--r-- | gtk/gtkprogressbar.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index e5ac4eeb31..4d5f80d79e 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -910,17 +910,9 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar, { g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar)); - if (text && *text) - { - gtk_progress_set_show_text (GTK_PROGRESS (pbar), TRUE); - gtk_progress_set_format_string (GTK_PROGRESS (pbar), text); - } - else - { - gtk_progress_set_show_text (GTK_PROGRESS (pbar), FALSE); - gtk_progress_set_format_string (GTK_PROGRESS (pbar), NULL); - } - + gtk_progress_set_show_text (GTK_PROGRESS (pbar), text && *text); + gtk_progress_set_format_string (GTK_PROGRESS (pbar), text); + /* We don't support formats in this interface */ GTK_PROGRESS (pbar)->use_text_format = FALSE; |