From 7c2489e953f68bced5c25b4c0d1aa7bb6b26b415 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 9 Dec 2002 22:34:23 +0000 Subject: [PATCH] Remove unnecessary leftover check that was causing a UMR. (#100768, Mon Dec 9 17:31:06 2002 Owen Taylor * gtk/gtkiconfactory.c (icon_size_lookup_intern): Remove unnecessary leftover check that was causing a UMR. (#100768, Kjartan Maraas) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkiconfactory.c | 2 +- 7 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9cf40f64d9..e5ff82748d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 9 17:31:06 2002 Owen Taylor + + * 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 * configure.in: Added Latvian (lv) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9cf40f64d9..e5ff82748d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Dec 9 17:31:06 2002 Owen Taylor + + * 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 * configure.in: Added Latvian (lv) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9cf40f64d9..e5ff82748d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Dec 9 17:31:06 2002 Owen Taylor + + * 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 * configure.in: Added Latvian (lv) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9cf40f64d9..e5ff82748d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Dec 9 17:31:06 2002 Owen Taylor + + * 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 * configure.in: Added Latvian (lv) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9cf40f64d9..e5ff82748d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Dec 9 17:31:06 2002 Owen Taylor + + * 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 * configure.in: Added Latvian (lv) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9cf40f64d9..e5ff82748d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Dec 9 17:31:06 2002 Owen Taylor + + * 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 * configure.in: Added Latvian (lv) to ALL_LINGUAS. diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index dedd12b4d6..5d991b9185 100644 --- 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)