# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1029460681 0
# Node ID c731327dbc47b8d9e42c1b526751691ab7214c49
# Parent  bc71eb7428ef172cfb02ee3953365d8ffdef6792
[gaim-migrate @ 3414]
Thanks to Timothy Lee and Dan Colascione for gettiing perl 5.8 to work.

committer: Tailor Script <tailor@pidgin.im>

diff -r bc71eb7428ef -r c731327dbc47 src/gtkimhtml.c
--- a/src/gtkimhtml.c	Thu Aug 15 04:04:23 2002 +0000
+++ b/src/gtkimhtml.c	Fri Aug 16 01:18:01 2002 +0000
@@ -287,7 +287,11 @@
 	GdkPixmap *pm;
 	GdkBitmap *bm;
 
+#if GTK_CHECK_VERSION(1,3,0)
+	PangoFontDescription *font;
+#else
 	GdkFont *font;
+#endif
 	GdkColor *fore;
 	GdkColor *back;
 	GdkColor *bg;
@@ -1442,7 +1446,11 @@
 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 bc71eb7428ef -r c731327dbc47 src/gtkimhtml.h
--- a/src/gtkimhtml.h	Thu Aug 15 04:04:23 2002 +0000
+++ b/src/gtkimhtml.h	Fri Aug 16 01:18:01 2002 +0000
@@ -45,7 +45,11 @@
 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;
@@ -110,7 +114,11 @@
 					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);
 
diff -r bc71eb7428ef -r c731327dbc47 src/perl.c
--- a/src/perl.c	Thu Aug 15 04:04:23 2002 +0000
+++ b/src/perl.c	Fri Aug 16 01:18:01 2002 +0000
@@ -34,6 +34,8 @@
 
 #ifdef USE_PERL
 
+#define group perl_group
+
 #include <EXTERN.h>
 #ifndef _SEM_SEMUN_UNDEFINED
 #define HAS_UNION_SEMUN
@@ -49,6 +51,7 @@
 #include <dirent.h>
 #include <string.h>
 
+#undef group
 
 /* perl module support */
 extern void xs_init _((void));
@@ -175,13 +178,14 @@
 {
 	DIR *dir;
 	struct dirent *ent;
+	struct dirent dirent_buf;
 	char *buf;
 	char *path;
 
 	path = gaim_user_dir();
 	dir = opendir(path);
 	if (dir) {
-		while ((ent = readdir(dir))) {
+		while ((readdir_r(dir,&dirent_buf,&ent),ent)) {
 			if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")) {
 				if (is_pl_file(ent->d_name)) {
 					buf = g_malloc(strlen(path) + strlen(ent->d_name) + 2);