Avoid a possible division by zero. (#77820)

	* gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible
	division by zero.  (#77820)

diff --git a/ChangeLog b/ChangeLog
index 9a3a22cfe0f9029ae193b31babe272803d8486ad..95d18bfbc04a46aef0a7b6a9870e3b28d395e283 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible
+       division by zero.  (#77820)
+
 Thu Apr 25 20:24:37 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9a3a22cfe0f9029ae193b31babe272803d8486ad..95d18bfbc04a46aef0a7b6a9870e3b28d395e283 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-04-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible
+       division by zero.  (#77820)
+
 Thu Apr 25 20:24:37 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9a3a22cfe0f9029ae193b31babe272803d8486ad..95d18bfbc04a46aef0a7b6a9870e3b28d395e283 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-04-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible
+       division by zero.  (#77820)
+
 Thu Apr 25 20:24:37 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9a3a22cfe0f9029ae193b31babe272803d8486ad..95d18bfbc04a46aef0a7b6a9870e3b28d395e283 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-04-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible
+       division by zero.  (#77820)
+
 Thu Apr 25 20:24:37 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9a3a22cfe0f9029ae193b31babe272803d8486ad..95d18bfbc04a46aef0a7b6a9870e3b28d395e283 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-04-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible
+       division by zero.  (#77820)
+
 Thu Apr 25 20:24:37 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9a3a22cfe0f9029ae193b31babe272803d8486ad..95d18bfbc04a46aef0a7b6a9870e3b28d395e283 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-04-25  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkrange.c (gtk_range_calc_layout): Avoid a possible
+       division by zero.  (#77820)
+
 Thu Apr 25 20:24:37 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index bdc50b99df66c19677f2a327dbc2c22a78a246b1..6ce27d35a846a075767bec1aaeb49835ce7a30e5 100644 (file)
--- 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)