diff --git a/ChangeLog b/ChangeLog index 3aa91ff942..a55b43e65c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-01-18 Matthias Clasen + + * gtk/gtkitemfactory.c (gtk_item_factory_get_widget_by_action): + Clarify documentation. (#69026) + + * gtk/gtkprogressbar.c (gtk_progress_bar_size_request): Fix + missing initialization of adjustment. (#69025) + 2002-01-17 Raja R Harinath Simplify Makefiles. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3aa91ff942..a55b43e65c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2002-01-18 Matthias Clasen + + * gtk/gtkitemfactory.c (gtk_item_factory_get_widget_by_action): + Clarify documentation. (#69026) + + * gtk/gtkprogressbar.c (gtk_progress_bar_size_request): Fix + missing initialization of adjustment. (#69025) + 2002-01-17 Raja R Harinath Simplify Makefiles. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3aa91ff942..a55b43e65c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-01-18 Matthias Clasen + + * gtk/gtkitemfactory.c (gtk_item_factory_get_widget_by_action): + Clarify documentation. (#69026) + + * gtk/gtkprogressbar.c (gtk_progress_bar_size_request): Fix + missing initialization of adjustment. (#69025) + 2002-01-17 Raja R Harinath Simplify Makefiles. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3aa91ff942..a55b43e65c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-01-18 Matthias Clasen + + * gtk/gtkitemfactory.c (gtk_item_factory_get_widget_by_action): + Clarify documentation. (#69026) + + * gtk/gtkprogressbar.c (gtk_progress_bar_size_request): Fix + missing initialization of adjustment. (#69025) + 2002-01-17 Raja R Harinath Simplify Makefiles. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3aa91ff942..a55b43e65c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-01-18 Matthias Clasen + + * gtk/gtkitemfactory.c (gtk_item_factory_get_widget_by_action): + Clarify documentation. (#69026) + + * gtk/gtkprogressbar.c (gtk_progress_bar_size_request): Fix + missing initialization of adjustment. (#69025) + 2002-01-17 Raja R Harinath Simplify Makefiles. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3aa91ff942..a55b43e65c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-01-18 Matthias Clasen + + * gtk/gtkitemfactory.c (gtk_item_factory_get_widget_by_action): + Clarify documentation. (#69026) + + * gtk/gtkprogressbar.c (gtk_progress_bar_size_request): Fix + missing initialization of adjustment. (#69025) + 2002-01-17 Raja R Harinath Simplify Makefiles. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3aa91ff942..a55b43e65c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-01-18 Matthias Clasen + + * gtk/gtkitemfactory.c (gtk_item_factory_get_widget_by_action): + Clarify documentation. (#69026) + + * gtk/gtkprogressbar.c (gtk_progress_bar_size_request): Fix + missing initialization of adjustment. (#69025) + 2002-01-17 Raja R Harinath Simplify Makefiles. diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 944780f47c..780d2d7b1c 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -710,8 +710,11 @@ gtk_item_factory_get_widget (GtkItemFactory *ifactory, * @returns: the widget which corresponds to the given action, or %NULL * if no widget was found * - * Obtains the widget which was constructed from the first #GtkItemFactoryEntry + * Obtains the widget which was constructed from the #GtkItemFactoryEntry * with the given @action. + * + * If there are multiple items with the same action, the result is + * undefined. */ GtkWidget* gtk_item_factory_get_widget_by_action (GtkItemFactory *ifactory, diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 879f44332f..d6c16147fd 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -459,6 +459,9 @@ gtk_progress_bar_size_request (GtkWidget *widget, if (progress->show_text && pbar->bar_style != GTK_PROGRESS_DISCRETE) { + if (!progress->adjustment) + gtk_progress_set_adjustment (progress, NULL); + buf = gtk_progress_get_text_from_value (progress, progress->adjustment->upper); layout = gtk_widget_create_pango_layout (widget, buf);