diff options
| author | Frederic Crozat <fcrozat@mandriva.com> | 2007-06-08 03:51:14 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-06-08 03:51:14 +0000 |
| commit | dbb4ded5321ee35910dd85b16db9cffdc4b35a78 (patch) | |
| tree | 8ff24825b14c96e6b4ea7a2aff4a45503cf89b97 | |
| parent | f57141ee2fc0b7cc2202712becbe56f1f32cab34 (diff) | |
| download | gdm-dbb4ded5321ee35910dd85b16db9cffdc4b35a78.tar.gz | |
+ gui/greeter/greeter_parser.c: (parse_label): Ensure a non null size is
2007-06-08 Frederic Crozat <fcrozat@mandriva.com>
+ gui/greeter/greeter_parser.c: (parse_label): Ensure a non
null size is set by default for pango font description.
svn path=/trunk/; revision=4975
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gui/greeter/greeter_parser.c | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2007-06-08 Frederic Crozat <fcrozat@mandriva.com> + + + gui/greeter/greeter_parser.c: (parse_label): Ensure a non + null size is set by default for pango font description. + 2007-06-05 Brian Cameron <brian.cameron@sun.com> * daemon/display.[ch], daemon/gdm-xdmcp-manager.c, daemon/slave.c: diff --git a/gui/greeter/greeter_parser.c b/gui/greeter/greeter_parser.c index 82c86825..707999ef 100644 --- a/gui/greeter/greeter_parser.c +++ b/gui/greeter/greeter_parser.c @@ -1444,8 +1444,11 @@ parse_label (xmlNodePtr node, info->data.text.colors[i] = (info->data.text.colors[i] << 8) | (guint) info->data.text.alphas[i]; } - if (info->data.text.fonts[GREETER_ITEM_STATE_NORMAL] == NULL) - info->data.text.fonts[GREETER_ITEM_STATE_NORMAL] = pango_font_description_from_string ("Sans"); + if (info->data.text.fonts[GREETER_ITEM_STATE_NORMAL] == NULL) { + info->data.text.fonts[GREETER_ITEM_STATE_NORMAL] = pango_font_description_from_string ("Sans"); + if (gtk_widget_get_default_style()->font_desc) + pango_font_description_merge (info->data.text.fonts[GREETER_ITEM_STATE_NORMAL], gtk_widget_get_default_style()->font_desc, FALSE); + } do_font_size_reduction (info); |