From 6fea756129a3a0f8a7817f2d917a0e370e26ccde Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 25 Sep 2002 12:22:12 +0000 Subject: [PATCH] Don't turn a value of "" into NULL. (#94157, Vitaly Tishkov) Wed Sep 25 08:16:59 2002 Owen Taylor * gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Don't turn a value of "" into NULL. (#94157, Vitaly Tishkov) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkprogressbar.c | 14 +++----------- 7 files changed, 33 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index a66c42cbf1..222a115ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 25 08:16:59 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c: check if last_selected is valid before doing diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a66c42cbf1..222a115ec3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Sep 25 08:16:59 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c: check if last_selected is valid before doing diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a66c42cbf1..222a115ec3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Sep 25 08:16:59 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c: check if last_selected is valid before doing diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a66c42cbf1..222a115ec3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Sep 25 08:16:59 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c: check if last_selected is valid before doing diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a66c42cbf1..222a115ec3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Sep 25 08:16:59 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c: check if last_selected is valid before doing diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a66c42cbf1..222a115ec3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Sep 25 08:16:59 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c: check if last_selected is valid before doing diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index d6c16147fd..a2ab666fd8 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), ""); - } - + 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;