Don't turn a value of "" into NULL. (#94157, Vitaly Tishkov)

Wed Sep 25 08:16:59 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't
        turn a value of "" into NULL. (#94157, Vitaly Tishkov)
This commit is contained in:
Owen Taylor
2002-09-25 12:22:12 +00:00
committed by Owen Taylor
parent 433a163a1f
commit 6fea756129
7 changed files with 33 additions and 11 deletions

View File

@@ -1,3 +1,8 @@
Wed Sep 25 08:16:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't
turn a value of "" into NULL. (#94157, Vitaly Tishkov)
Tue Sep 24 23:43:10 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

View File

@@ -1,3 +1,8 @@
Wed Sep 25 08:16:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't
turn a value of "" into NULL. (#94157, Vitaly Tishkov)
Tue Sep 24 23:43:10 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

View File

@@ -1,3 +1,8 @@
Wed Sep 25 08:16:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't
turn a value of "" into NULL. (#94157, Vitaly Tishkov)
Tue Sep 24 23:43:10 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

View File

@@ -1,3 +1,8 @@
Wed Sep 25 08:16:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't
turn a value of "" into NULL. (#94157, Vitaly Tishkov)
Tue Sep 24 23:43:10 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

View File

@@ -1,3 +1,8 @@
Wed Sep 25 08:16:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't
turn a value of "" into NULL. (#94157, Vitaly Tishkov)
Tue Sep 24 23:43:10 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

View File

@@ -1,3 +1,8 @@
Wed Sep 25 08:16:59 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't
turn a value of "" into NULL. (#94157, Vitaly Tishkov)
Tue Sep 24 23:43:10 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

View File

@@ -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), "");
}
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;