From 46fd718c6bd843b26b60087bd73e04391f8b4bcc Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 29 Jan 2001 21:38:10 +0000 Subject: [PATCH] Return if fontsel->font_index == -1 - that is, if no font is selected. Mon Jan 29 16:34:28 2001 Owen Taylor * gtk/gtkfontsel.c (gtk_font_selection_select_best_size): Return if fontsel->font_index == -1 - that is, if no font is selected. (Should fix #50290) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 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/gtkfontsel.c | 6 +++++- 8 files changed, 47 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 61df51f863..f824424ebc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 29 16:34:28 2001 Owen Taylor + + * gtk/gtkfontsel.c (gtk_font_selection_select_best_size): Return + if fontsel->font_index == -1 - that is, if no font is selected. + (Should fix #50290) + Mon Jan 29 15:22:51 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_remove): When removing an diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 61df51f863..f824424ebc 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Jan 29 16:34:28 2001 Owen Taylor + + * gtk/gtkfontsel.c (gtk_font_selection_select_best_size): Return + if fontsel->font_index == -1 - that is, if no font is selected. + (Should fix #50290) + Mon Jan 29 15:22:51 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_remove): When removing an diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 61df51f863..f824424ebc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jan 29 16:34:28 2001 Owen Taylor + + * gtk/gtkfontsel.c (gtk_font_selection_select_best_size): Return + if fontsel->font_index == -1 - that is, if no font is selected. + (Should fix #50290) + Mon Jan 29 15:22:51 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_remove): When removing an diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 61df51f863..f824424ebc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Jan 29 16:34:28 2001 Owen Taylor + + * gtk/gtkfontsel.c (gtk_font_selection_select_best_size): Return + if fontsel->font_index == -1 - that is, if no font is selected. + (Should fix #50290) + Mon Jan 29 15:22:51 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_remove): When removing an diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 61df51f863..f824424ebc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Jan 29 16:34:28 2001 Owen Taylor + + * gtk/gtkfontsel.c (gtk_font_selection_select_best_size): Return + if fontsel->font_index == -1 - that is, if no font is selected. + (Should fix #50290) + Mon Jan 29 15:22:51 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_remove): When removing an diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 61df51f863..f824424ebc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jan 29 16:34:28 2001 Owen Taylor + + * gtk/gtkfontsel.c (gtk_font_selection_select_best_size): Return + if fontsel->font_index == -1 - that is, if no font is selected. + (Should fix #50290) + Mon Jan 29 15:22:51 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_remove): When removing an diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 61df51f863..f824424ebc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jan 29 16:34:28 2001 Owen Taylor + + * gtk/gtkfontsel.c (gtk_font_selection_select_best_size): Return + if fontsel->font_index == -1 - that is, if no font is selected. + (Should fix #50290) + Mon Jan 29 15:22:51 2001 Owen Taylor * gtk/gtkmenu.c (gtk_menu_remove): When removing an diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 12828864e9..198d2149ff 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1560,10 +1560,14 @@ gtk_font_selection_select_best_size(GtkFontSelection *fontsel) gchar buffer[32]; GList *selection; gint type_filter; - + #ifdef FONTSEL_DEBUG g_message("In select_best_size\n"); #endif + + if (fontsel->font_index == -1) + return; + font = &fontsel_info->font_info[fontsel->font_index]; styles = &fontsel_info->font_styles[font->style_index]; style = &styles[fontsel->style];