[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.78,1.79

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv27874

Modified Files:
	gtkimhtml.c 
Log Message:
i don't know why this is so difficult


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- gtkimhtml.c	2001/11/20 01:23:37	1.78
+++ gtkimhtml.c	2001/11/20 01:29:42	1.79
@@ -62,7 +62,7 @@
 #define MAX_FONT_SIZE 7
 #define DEFAULT_FONT_SIZE 3
 
-#define POINT_SIZE(x) (_point_sizes [(x) - 1])
+#define POINT_SIZE(x) (_point_sizes [MIN ((x), MAX_FONT_SIZE) - 1])
 static gint _point_sizes [] = { 80, 100, 120, 140, 200, 300, 400 };
 
 #define DEFAULT_PRE_FACE "courier"
@@ -1931,7 +1931,7 @@
 		if (italics)
 			newvals [SLANT] = "i";
 		if (fontsize) {
-			g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (MIN (fontsize, MAX_FONT_SIZE)));
+			g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (fontsize));
 			newvals [PXLSZ] = "*";
 			newvals [PTSZ] = fs;
 		}
@@ -1961,8 +1961,7 @@
 		for (i = 0; fontsize && names [i]; i++) {
 			newvals [FMLY] = names [i];
 
-			g_snprintf (fs, sizeof (fs), "%d",
-				    POINT_SIZE (MIN (fontsize, MAX_FONT_SIZE)) / 10);
+			g_snprintf (fs, sizeof (fs), "%d", POINT_SIZE (fontsize) / 10);
 			newvals [PXLSZ] = fs;
 			newvals [PTSZ] = "*";