Mercurial > pidgin.yaz
diff pidgin/gtkimhtml.c @ 24838:0d7c21b5f1d7
propagate from branch 'im.pidgin.pidgin' (head c06356e8e8d2c586f0192a5564053c2584020da8)
to branch 'im.pidgin.pidgin.openq' (head a7077bc12b850d60ea7d768f4b9d4ee6ae6ad2c1)
| author | SHiNE CsyFeK <csyfek@gmail.com> |
|---|---|
| date | Thu, 25 Dec 2008 14:06:10 +0000 |
| parents | 01bd85f65fa1 |
| children | 3d456ca75ed9 43b721aa4b76 45434c3fd878 |
line wrap: on
line diff
--- a/pidgin/gtkimhtml.c Wed Dec 17 13:52:00 2008 +0000 +++ b/pidgin/gtkimhtml.c Thu Dec 25 14:06:10 2008 +0000 @@ -3117,18 +3117,24 @@ else if (g_ascii_strcasecmp(size, "smaller") == 0 || g_ascii_strcasecmp(size, "x-small") == 0) font->size = 2; - else if (g_ascii_strcasecmp(size, "larger") == 0 - || g_ascii_strcasecmp(size, "medium") == 0) + else if (g_ascii_strcasecmp(size, "medium") == 0) + font->size = 3; + else if (g_ascii_strcasecmp(size, "large") == 0 + || g_ascii_strcasecmp(size, "larger") == 0) font->size = 4; - else if (g_ascii_strcasecmp(size, "large") == 0) - font->size = 5; else if (g_ascii_strcasecmp(size, "x-large") == 0) - font->size = 6; + font->size = 5; else if (g_ascii_strcasecmp(size, "xx-large") == 0) - font->size = 7; - else - font->size = 3; - gtk_imhtml_font_set_size(imhtml, font->size); + font->size = 6; + + /* + * TODO: Handle other values, like percentages, or + * lengths specified as em, ex, px, in, cm, mm, pt + * or pc. Or even better, use an actual HTML + * renderer like webkit. + */ + if (font->size > 0) + gtk_imhtml_font_set_size(imhtml, font->size); } else if (oldfont) {