[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.421,1.422

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19555/src

Modified Files:
	gtkimhtml.c 
Log Message:
Bits'n'pieces:
Don't allow gaim-remote "clones" to knock gaim out by specifying a big packet
length.
Correctly bound the point sizes in gtkimhtml & yahoo
Fix up some code in MSN that isn't actually being used, just in case someone
comes along and submits a patch that would use it.
Don't try writing to the server in MSN if you're not actually connected
Fix message flags in SILC


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -d -p -r1.421 -r1.422
--- gtkimhtml.c	25 Apr 2005 04:22:11 -0000	1.421
+++ gtkimhtml.c	5 May 2005 13:09:28 -0000	1.422
@@ -96,10 +96,9 @@ static void hijack_menu_cb(GtkIMHtml *im
 static void paste_received_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data);
 static void paste_plaintext_received_cb (GtkClipboard *clipboard, const gchar *text, gpointer data);
 
-/* POINT_SIZE converts from AIM font sizes to point sizes.  It probably should be redone in such a
- * way that it base the sizes off the default font size rather than using arbitrary font sizes. */
+/* POINT_SIZE converts from AIM font sizes to a point size scale factor. */
 #define MAX_FONT_SIZE 7
-#define POINT_SIZE(x) (options & GTK_IMHTML_USE_POINTSIZE ? x : _point_sizes [MIN ((x), MAX_FONT_SIZE) - 1])
+#define POINT_SIZE(x) (_point_sizes [MIN ((x > 0 ? x : 1), MAX_FONT_SCALE) - 1])
 static gdouble _point_sizes [] = { .69444444, .8333333, 1, 1.2, 1.44, 1.728, 2.0736};
 
 enum {
@@ -3453,7 +3452,7 @@ static GtkTextTag *find_font_size_tag(Gt
 		GtkTextAttributes *attr = gtk_text_view_get_default_attributes(GTK_TEXT_VIEW(imhtml));
 		tag = gtk_text_buffer_create_tag(imhtml->text_buffer, str, "size",
 		                                 (gint) (pango_font_description_get_size(attr->font) *
-		                                 (double) _point_sizes[size-1]), NULL);
+		                                 (double) POINT_SIZE(size)), NULL);
 		gtk_text_attributes_unref(attr);
 	}