Mercurial > pidgin.yaz
changeset 721:8e7ad10b5f26
[gaim-migrate @ 731]
faim fix, and font may load faster now (?)
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 18 Aug 2000 19:21:11 +0000 |
| parents | 8b3412f3ac2a |
| children | 26e96119d5a5 |
| files | libfaim/faim/aim.h src/gtkhtml.c |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libfaim/faim/aim.h Fri Aug 18 18:44:29 2000 +0000 +++ b/libfaim/faim/aim.h Fri Aug 18 19:21:11 2000 +0000 @@ -53,7 +53,7 @@ * But they get it to compile. */ #define faim_mutex_t char -#define faim_mutex_init(x, y) *x = 0 +#define faim_mutex_init(x) *x = 0 #define faim_mutex_lock(x) *x = 1; #define faim_mutex_unlock(x) *x = 0; #define faim_mutex_destroy(x) *x = 0;
--- a/src/gtkhtml.c Fri Aug 18 18:44:29 2000 +0000 +++ b/src/gtkhtml.c Fri Aug 18 19:21:11 2000 +0000 @@ -548,6 +548,18 @@ size += 10; } + /* whoops, couldn't do any of those. maybe they have a default outgoing + * font? maybe we can use that. */ + if (fontface[0]) { + /* woohoo! */ + size = 120; + while (size <= 720) { + if (load_font_with_cache(fontface, "medium", 'r', size, &my_font)) + return my_font; + size += 10; + } + } + /* ok, now we're in a pickle. if we can't do any of the above, let's * try doing the most boring font we can find. */ size = 120;