Remove unnecessary leftover check that was causing a UMR. (#100768,

Mon Dec  9 17:31:06 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkiconfactory.c (icon_size_lookup_intern): Remove
        unnecessary leftover check that was causing a UMR.
        (#100768, Kjartan Maraas)

diff --git a/ChangeLog b/ChangeLog
index 9cf40f64d92ae4a3c9173e0bbf85edffff9e419b..e5ff82748d161cca5a90d8f5e4d1ffb425fba251 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec  9 17:31:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c (icon_size_lookup_intern): Remove
+       unnecessary leftover check that was causing a UMR.
+       (#100768, Kjartan Maraas)
+
 Mon Dec  9 19:11:22 2002  Artis Trops  <hornet@navigator.lv>
 
        * configure.in: Added Latvian (lv) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9cf40f64d92ae4a3c9173e0bbf85edffff9e419b..e5ff82748d161cca5a90d8f5e4d1ffb425fba251 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Dec  9 17:31:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c (icon_size_lookup_intern): Remove
+       unnecessary leftover check that was causing a UMR.
+       (#100768, Kjartan Maraas)
+
 Mon Dec  9 19:11:22 2002  Artis Trops  <hornet@navigator.lv>
 
        * configure.in: Added Latvian (lv) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9cf40f64d92ae4a3c9173e0bbf85edffff9e419b..e5ff82748d161cca5a90d8f5e4d1ffb425fba251 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Dec  9 17:31:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c (icon_size_lookup_intern): Remove
+       unnecessary leftover check that was causing a UMR.
+       (#100768, Kjartan Maraas)
+
 Mon Dec  9 19:11:22 2002  Artis Trops  <hornet@navigator.lv>
 
        * configure.in: Added Latvian (lv) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9cf40f64d92ae4a3c9173e0bbf85edffff9e419b..e5ff82748d161cca5a90d8f5e4d1ffb425fba251 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Dec  9 17:31:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c (icon_size_lookup_intern): Remove
+       unnecessary leftover check that was causing a UMR.
+       (#100768, Kjartan Maraas)
+
 Mon Dec  9 19:11:22 2002  Artis Trops  <hornet@navigator.lv>
 
        * configure.in: Added Latvian (lv) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9cf40f64d92ae4a3c9173e0bbf85edffff9e419b..e5ff82748d161cca5a90d8f5e4d1ffb425fba251 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Dec  9 17:31:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c (icon_size_lookup_intern): Remove
+       unnecessary leftover check that was causing a UMR.
+       (#100768, Kjartan Maraas)
+
 Mon Dec  9 19:11:22 2002  Artis Trops  <hornet@navigator.lv>
 
        * configure.in: Added Latvian (lv) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9cf40f64d92ae4a3c9173e0bbf85edffff9e419b..e5ff82748d161cca5a90d8f5e4d1ffb425fba251 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Dec  9 17:31:06 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c (icon_size_lookup_intern): Remove
+       unnecessary leftover check that was causing a UMR.
+       (#100768, Kjartan Maraas)
+
 Mon Dec  9 19:11:22 2002  Artis Trops  <hornet@navigator.lv>
 
        * configure.in: Added Latvian (lv) to ALL_LINGUAS.

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index dedd12b4d66caf7bc17e1945996e1e8720498c73..5d991b91850335a6d0a02770b0ab7fa1cfcd12e5 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1158,7 +1158,7 @@ icon_size_lookup_intern (GtkSettings *settings,
   
   init_icon_sizes ();
 
-  if (size >= icon_sizes_used || icon_sizes[size].width < 0)
+  if (size >= icon_sizes_used)
     return FALSE;
 
   if (size == GTK_ICON_SIZE_INVALID)