# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 965243713 0
# Node ID 91f877d86ca6807c7649f5e3e145c69371ee672c
# Parent  a0d68eab359a13efea46b78d0a7271ebdec60abf
[gaim-migrate @ 600]
Fixed _ wackiness, i hope

committer: Tailor Script <tailor@pidgin.im>

diff -r a0d68eab359a -r 91f877d86ca6 src/gaim.h
--- a/src/gaim.h	Wed Aug 02 17:35:00 2000 +0000
+++ b/src/gaim.h	Wed Aug 02 19:15:13 2000 +0000
@@ -98,9 +98,7 @@
 #ifndef USE_APPLET
 #ifdef ENABLE_NLS
 #  include <libintl.h>
-#  ifndef _ /* perl wackiness causes this */
-#    define _(x) gettext(x)
-#  endif
+#  define _(x) gettext(x)
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
 #  else
@@ -404,7 +402,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 587 $"
+#define REVISION "gaim:$Revision: 600 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
diff -r a0d68eab359a -r 91f877d86ca6 src/perl.c
--- a/src/perl.c	Wed Aug 02 17:35:00 2000 +0000
+++ b/src/perl.c	Wed Aug 02 19:15:13 2000 +0000
@@ -28,7 +28,6 @@
 #endif
 #undef PACKAGE
 
-#ifndef USE_APPLET /* FIXME: _ conflicts */
 #ifdef USE_PERL
 
 #include <EXTERN.h>
@@ -43,6 +42,12 @@
 #include <fcntl.h>
 #undef PACKAGE
 #include <stdio.h>
+
+/* perl module support */
+extern void xs_init _((void));
+extern void boot_DynaLoader _((CV * cv)); /* perl is so wacky */
+
+#undef _
 #include "gaim.h"
 
 struct perlscript {
@@ -80,10 +85,6 @@
 XS(XS_AIM_add_timeout_handler);
 
 
-/* perl module support */
-extern void xs_init _((void));
-extern void boot_DynaLoader _((CV * cv)); /* perl is so wacky */
-
 void xs_init()
 {
 	char *file = __FILE__;
@@ -300,7 +301,18 @@
 
 XS (XS_AIM_deny_list)
 {
-	/* FIXME */
+	char *name;
+	GList *list = deny;
+	int i = 0;
+	dXSARGS;
+	items = 0;
+
+	while (list) {
+		name = (char *)list->data;
+		XST_mPV(i++, name);
+		list = list->next;
+	}
+	XSRETURN(i);
 }
 
 XS (XS_AIM_command)
@@ -369,4 +381,3 @@
 }
 
 #endif /* USE_PERL */
-#endif /* ifndef USE_APPLET */