[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.110,1.111 gtkimhtml.h,1.14,1.15 perl.c,1.72,1.73

[Sean E. <sea...@us...>]

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

Modified Files:
	gtkimhtml.c gtkimhtml.h perl.c 
Log Message:
Thanks to Timothy Lee and Dan Colascione for gettiing perl 5.8 to work.



Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- gtkimhtml.c	7 Aug 2002 23:25:33 -0000	1.110
+++ gtkimhtml.c	16 Aug 2002 01:18:01 -0000	1.111
@@ -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;

Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gtkimhtml.h	20 Apr 2002 08:10:13 -0000	1.14
+++ gtkimhtml.h	16 Aug 2002 01:18:01 -0000	1.15
@@ -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);
 

Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- perl.c	29 May 2002 01:44:40 -0000	1.72
+++ perl.c	16 Aug 2002 01:18:01 -0000	1.73
@@ -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);