# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1029461103 0
# Node ID 7c26704c141af7055f5606d5e29d70edf8befe4f
# Parent  c731327dbc47b8d9e42c1b526751691ab7214c49
[gaim-migrate @ 3415]
malcommit

committer: Tailor Script <tailor@pidgin.im>

diff -r c731327dbc47 -r 7c26704c141a src/gtkimhtml.c
--- a/src/gtkimhtml.c	Fri Aug 16 01:18:01 2002 +0000
+++ b/src/gtkimhtml.c	Fri Aug 16 01:25:03 2002 +0000
@@ -287,11 +287,7 @@
 	GdkPixmap *pm;
 	GdkBitmap *bm;
 
-#if GTK_CHECK_VERSION(1,3,0)
-	PangoFontDescription *font;
-#else
 	GdkFont *font;
-#endif
 	GdkColor *fore;
 	GdkColor *back;
 	GdkColor *bg;
@@ -1446,11 +1442,7 @@
 gtk_imhtml_tip_paint (GtkIMHtml *imhtml)
 {
 	GtkStyle *style;
-#if GTK_CHECK_VERSION(1,3,0)
-	PangoFontDescription *font;
-#else
 	GdkFont *font;
-#endif
 	gint y, baseline_skip, gap;
 
 	style = imhtml->tip_window->style;
diff -r c731327dbc47 -r 7c26704c141a src/gtkimhtml.h
--- a/src/gtkimhtml.h	Fri Aug 16 01:18:01 2002 +0000
+++ b/src/gtkimhtml.h	Fri Aug 16 01:25:03 2002 +0000
@@ -45,11 +45,7 @@
 struct _GtkIMHtml {
 	GtkLayout layout;
 
-#if GTK_CHECK_VERSION(1,3,0)
-	PangoFontDescription *default_font;
-#else
 	GdkFont *default_font;
-#endif
 	GdkColor *default_fg_color;
 	GdkColor *default_bg_color;
 	GdkColor *default_hl_color;
@@ -114,11 +110,7 @@
 					GtkAdjustment    *vadj);
 
 void       gtk_imhtml_set_defaults     (GtkIMHtml        *imhtml,
-#if GTK_CHECK_VERSION(1,3,0)
-					PangoFontDescription *font,
-#else
 					GdkFont          *font,
-#endif
 					GdkColor         *fg_color,
 					GdkColor         *bg_color);