diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-11-07 20:46:03 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-11-07 20:46:03 +0000 |
| commit | 2406bea2b43431c129fe334b527c6892422c6f63 (patch) | |
| tree | 5d71d2ff9918e7d6062a27faae3a6d9248aefbe3 | |
| parent | 6e43dea3e19c3e0b86e28245b7caaca3fbba37e6 (diff) | |
| download | gdk-pixbuf-2406bea2b43431c129fe334b527c6892422c6f63.tar.gz | |
If called when fontsel->face is NULL, just return "Sans 10". (#82745,
Thu Nov 7 15:42:12 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfontsel.c (gtk_font_selection_get_font_description):
If called when fontsel->face is NULL, just return
"Sans 10". (#82745, Vitaly Tishkov)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkfontsel.c | 11 |
7 files changed, 45 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Nov 7 15:42:12 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfontsel.c (gtk_font_selection_get_font_description): + If called when fontsel->face is NULL, just return + "Sans 10". (#82745, Vitaly Tishkov) + Thu Nov 7 15:29:43 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkimcontextsimple.c (check_hex): Use '_' diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 936c92346..ed02acb5c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Nov 7 15:42:12 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfontsel.c (gtk_font_selection_get_font_description): + If called when fontsel->face is NULL, just return + "Sans 10". (#82745, Vitaly Tishkov) + Thu Nov 7 15:29:43 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkimcontextsimple.c (check_hex): Use '_' diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 936c92346..ed02acb5c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Nov 7 15:42:12 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfontsel.c (gtk_font_selection_get_font_description): + If called when fontsel->face is NULL, just return + "Sans 10". (#82745, Vitaly Tishkov) + Thu Nov 7 15:29:43 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkimcontextsimple.c (check_hex): Use '_' diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 936c92346..ed02acb5c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Nov 7 15:42:12 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfontsel.c (gtk_font_selection_get_font_description): + If called when fontsel->face is NULL, just return + "Sans 10". (#82745, Vitaly Tishkov) + Thu Nov 7 15:29:43 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkimcontextsimple.c (check_hex): Use '_' diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 936c92346..ed02acb5c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Nov 7 15:42:12 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfontsel.c (gtk_font_selection_get_font_description): + If called when fontsel->face is NULL, just return + "Sans 10". (#82745, Vitaly Tishkov) + Thu Nov 7 15:29:43 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkimcontextsimple.c (check_hex): Use '_' diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 936c92346..ed02acb5c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Nov 7 15:42:12 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkfontsel.c (gtk_font_selection_get_font_description): + If called when fontsel->face is NULL, just return + "Sans 10". (#82745, Vitaly Tishkov) + Thu Nov 7 15:29:43 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkimcontextsimple.c (check_hex): Use '_' diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index d1bb6a224..878a908a9 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1000,8 +1000,15 @@ gtk_font_selection_load_font (GtkFontSelection *fontsel) static PangoFontDescription * gtk_font_selection_get_font_description (GtkFontSelection *fontsel) { - PangoFontDescription *font_desc = pango_font_face_describe (fontsel->face); - pango_font_description_set_size (font_desc, fontsel->size); + PangoFontDescription *font_desc; + + if (fontsel->face) + { + font_desc = pango_font_face_describe (fontsel->face); + pango_font_description_set_size (font_desc, fontsel->size); + } + else + font_desc = pango_font_description_from_string ("Sans 10"); return font_desc; } |