diff --git a/ChangeLog b/ChangeLog index 949f374a86..a6022c14ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-27 Matthias Clasen + + * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible + division by zero. (#77820) + Sat Apr 27 15:48:49 2002 Kristian Rietveld Merge TreeView fixes from HEAD: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 949f374a86..a6022c14ef 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-04-27 Matthias Clasen + + * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible + division by zero. (#77820) + Sat Apr 27 15:48:49 2002 Kristian Rietveld Merge TreeView fixes from HEAD: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 949f374a86..a6022c14ef 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-04-27 Matthias Clasen + + * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible + division by zero. (#77820) + Sat Apr 27 15:48:49 2002 Kristian Rietveld Merge TreeView fixes from HEAD: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 949f374a86..a6022c14ef 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-04-27 Matthias Clasen + + * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible + division by zero. (#77820) + Sat Apr 27 15:48:49 2002 Kristian Rietveld Merge TreeView fixes from HEAD: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 949f374a86..a6022c14ef 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-04-27 Matthias Clasen + + * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible + division by zero. (#77820) + Sat Apr 27 15:48:49 2002 Kristian Rietveld Merge TreeView fixes from HEAD: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 949f374a86..a6022c14ef 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-04-27 Matthias Clasen + + * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible + division by zero. (#77820) + Sat Apr 27 15:48:49 2002 Kristian Rietveld Merge TreeView fixes from HEAD: diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index bdc50b99df..6ce27d35a8 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -2041,8 +2041,12 @@ gtk_range_calc_layout (GtkRange *range, /* slider height is the fraction (page_size / * total_adjustment_range) times the trough height in pixels */ - height = ((bottom - top) * (range->adjustment->page_size / - (range->adjustment->upper - range->adjustment->lower))); + + if (range->adjustment->upper - range->adjustment->lower != 0) + height = ((bottom - top) * (range->adjustment->page_size / + (range->adjustment->upper - range->adjustment->lower))); + else + height = range->min_slider_size; if (height < range->min_slider_size || range->slider_size_fixed)