Commit ac98d231 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Reset use_text_format to %TRUE for a %NULL text string. (#94157, once

Fri Oct 18 15:38:50 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkprogressbar.c (gtk_progress_bar_set_text):
        Reset use_text_format to %TRUE for a %NULL text string.
        (#94157, once again).
parent 30faa38a
Fri Oct 18 15:38:50 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text):
Reset use_text_format to %TRUE for a %NULL text string.
(#94157, once again).
Thu Oct 17 17:17:05 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_size_request):
......@@ -7,7 +13,7 @@ Thu Oct 17 14:38:37 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event):
Align the baseline of the accelerator label with the
first baseline of the main label of the menu item. (#76593)
first baseline of the main label of the menu item. (#76953)
Wed Oct 16 18:25:24 2002 Owen Taylor <otaylor@redhat.com>
......@@ -54,7 +60,6 @@ Thu Oct 17 22:37:57 2002 Soeren Sandmann <sandmann@daimi.au.dk>
Unbreaks various things using SubstructureNotifyMask.
>>>>>>> 1.3770
Thu Oct 17 16:13:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c gtk/gtkradiobutton.c: Make
......
Fri Oct 18 15:38:50 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text):
Reset use_text_format to %TRUE for a %NULL text string.
(#94157, once again).
Thu Oct 17 17:17:05 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_size_request):
......@@ -7,7 +13,7 @@ Thu Oct 17 14:38:37 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event):
Align the baseline of the accelerator label with the
first baseline of the main label of the menu item. (#76593)
first baseline of the main label of the menu item. (#76953)
Wed Oct 16 18:25:24 2002 Owen Taylor <otaylor@redhat.com>
......@@ -54,7 +60,6 @@ Thu Oct 17 22:37:57 2002 Soeren Sandmann <sandmann@daimi.au.dk>
Unbreaks various things using SubstructureNotifyMask.
>>>>>>> 1.3770
Thu Oct 17 16:13:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c gtk/gtkradiobutton.c: Make
......
Fri Oct 18 15:38:50 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text):
Reset use_text_format to %TRUE for a %NULL text string.
(#94157, once again).
Thu Oct 17 17:17:05 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_size_request):
......@@ -7,7 +13,7 @@ Thu Oct 17 14:38:37 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event):
Align the baseline of the accelerator label with the
first baseline of the main label of the menu item. (#76593)
first baseline of the main label of the menu item. (#76953)
Wed Oct 16 18:25:24 2002 Owen Taylor <otaylor@redhat.com>
......@@ -54,7 +60,6 @@ Thu Oct 17 22:37:57 2002 Soeren Sandmann <sandmann@daimi.au.dk>
Unbreaks various things using SubstructureNotifyMask.
>>>>>>> 1.3770
Thu Oct 17 16:13:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c gtk/gtkradiobutton.c: Make
......
Fri Oct 18 15:38:50 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text):
Reset use_text_format to %TRUE for a %NULL text string.
(#94157, once again).
Thu Oct 17 17:17:05 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_size_request):
......@@ -7,7 +13,7 @@ Thu Oct 17 14:38:37 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event):
Align the baseline of the accelerator label with the
first baseline of the main label of the menu item. (#76593)
first baseline of the main label of the menu item. (#76953)
Wed Oct 16 18:25:24 2002 Owen Taylor <otaylor@redhat.com>
......@@ -54,7 +60,6 @@ Thu Oct 17 22:37:57 2002 Soeren Sandmann <sandmann@daimi.au.dk>
Unbreaks various things using SubstructureNotifyMask.
>>>>>>> 1.3770
Thu Oct 17 16:13:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c gtk/gtkradiobutton.c: Make
......
Fri Oct 18 15:38:50 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text):
Reset use_text_format to %TRUE for a %NULL text string.
(#94157, once again).
Thu Oct 17 17:17:05 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_size_request):
......@@ -7,7 +13,7 @@ Thu Oct 17 14:38:37 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event):
Align the baseline of the accelerator label with the
first baseline of the main label of the menu item. (#76593)
first baseline of the main label of the menu item. (#76953)
Wed Oct 16 18:25:24 2002 Owen Taylor <otaylor@redhat.com>
......@@ -54,7 +60,6 @@ Thu Oct 17 22:37:57 2002 Soeren Sandmann <sandmann@daimi.au.dk>
Unbreaks various things using SubstructureNotifyMask.
>>>>>>> 1.3770
Thu Oct 17 16:13:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c gtk/gtkradiobutton.c: Make
......
Fri Oct 18 15:38:50 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text):
Reset use_text_format to %TRUE for a %NULL text string.
(#94157, once again).
Thu Oct 17 17:17:05 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_size_request):
......@@ -7,7 +13,7 @@ Thu Oct 17 14:38:37 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkaccellabel.c (gtk_accel_label_expose_event):
Align the baseline of the accelerator label with the
first baseline of the main label of the menu item. (#76593)
first baseline of the main label of the menu item. (#76953)
Wed Oct 16 18:25:24 2002 Owen Taylor <otaylor@redhat.com>
......@@ -54,7 +60,6 @@ Thu Oct 17 22:37:57 2002 Soeren Sandmann <sandmann@daimi.au.dk>
Unbreaks various things using SubstructureNotifyMask.
>>>>>>> 1.3770
Thu Oct 17 16:13:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c gtk/gtkradiobutton.c: Make
......
......@@ -915,8 +915,11 @@ gtk_progress_bar_set_text (GtkProgressBar *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;
/* We don't support formats in this interface, but turn
* them back on for NULL, which should put us back to
* the initial state.
*/
GTK_PROGRESS (pbar)->use_text_format = (text == NULL);
g_object_notify (G_OBJECT (pbar), "text");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment