# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 966626471 0
# Node ID 8e7ad10b5f26d7f33b4f68977e3119001630b5b9
# Parent  8b3412f3ac2a94483a8b9bfa908f606b0d3a8509
[gaim-migrate @ 731]
faim fix, and font may load faster now (?)

committer: Tailor Script <tailor@pidgin.im>

diff -r 8b3412f3ac2a -r 8e7ad10b5f26 libfaim/faim/aim.h
--- 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;
diff -r 8b3412f3ac2a -r 8e7ad10b5f26 src/gtkhtml.c
--- 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;