Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv30866/src
Modified Files:
gtkimhtml.c gtkimhtml.h
Log Message:
malcommit
Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- gtkimhtml.c 16 Aug 2002 01:18:01 -0000 1.111
+++ gtkimhtml.c 16 Aug 2002 01:25:02 -0000 1.112
@@ -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;
Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gtkimhtml.h 16 Aug 2002 01:18:01 -0000 1.15
+++ gtkimhtml.h 16 Aug 2002 01:25:03 -0000 1.16
@@ -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);
|
