[cvslog] (2004-10-17 08:38:21 UTC) Module eggdrop1.9: Change committed!

cvslog cvs at tsss.org
Sun Oct 17 02:38:21 CST 2004


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.9
Commit time: 2004-10-17 08:38:21 UTC
Commited by: stdarg <stdarg at techmonkeys.org>

Modified files:
     Makefile.am configure.ac lib/eggdrop/partychan.c
     lib/eggdrop/partyline.c lib/eggdrop/xmlread.c

Log message:

* Add intl include directory to CPPFLAGS when using builtin gettext

---------------------- diff included ----------------------
Index: eggdrop1.9/Makefile.am
diff -u eggdrop1.9/Makefile.am:1.24 eggdrop1.9/Makefile.am:1.25
--- eggdrop1.9/Makefile.am:1.24	Sun Oct 17 00:14:06 2004
+++ eggdrop1.9/Makefile.am	Sun Oct 17 03:38:11 2004
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.24 2004/10/17 05:14:06 stdarg Exp $
+# $Id: Makefile.am,v 1.25 2004/10/17 08:38:11 stdarg Exp $
 
 AUX_DIST		= $(ac_aux_dir)/install-sh \
 			$(ac_aux_dir)/ltmain.sh \
@@ -17,7 +17,7 @@
 
 EXTRA_DIST		= bootstrap config.xml
 
-SUBDIRS			= libltdl lib m4 modules src po intl
+SUBDIRS			= libltdl intl lib m4 modules src po
 DISTCLEANFILES		=
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure config-h.in \
 			config.cache config.log config.status \
Index: eggdrop1.9/configure.ac
diff -u eggdrop1.9/configure.ac:1.55 eggdrop1.9/configure.ac:1.56
--- eggdrop1.9/configure.ac:1.55	Sun Oct 17 00:14:06 2004
+++ eggdrop1.9/configure.ac	Sun Oct 17 03:38:11 2004
@@ -1,11 +1,11 @@
 dnl configure.ac: this file is processed by autoconf to produce ./configure.
 dnl
-dnl $Id: configure.ac,v 1.55 2004/10/17 05:14:06 stdarg Exp $
+dnl $Id: configure.ac,v 1.56 2004/10/17 08:38:11 stdarg Exp $
 
 AC_PREREQ(2.57)
 AC_INIT([Eggdrop], [1.9.0], [bugs at eggheads.org])
 AC_COPYRIGHT([Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Eggheads Development Team])
-AC_REVISION($Revision: 1.55 $)
+AC_REVISION($Revision: 1.56 $)
 AC_CONFIG_AUX_DIR(acconfig)
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_FILES([Makefile lib/Makefile lib/compat/Makefile lib/eggdrop/Makefile m4/Makefile po/Makefile.in src/Makefile modules/Makefile acconfig/module.mk intl/Makefile])
@@ -47,6 +47,9 @@
 
 # Gettext support
 EGG_GNU_GETTEXT
+if test "$USE_INCLUDED_LIBINTL" = "yes"; then
+	CPPFLAGS="${CPPFLAGS} -I\${top_builddir}/intl"
+fi
 
 
 # Libtool support
Index: eggdrop1.9/lib/eggdrop/partychan.c
diff -u eggdrop1.9/lib/eggdrop/partychan.c:1.18 eggdrop1.9/lib/eggdrop/partychan.c:1.19
--- eggdrop1.9/lib/eggdrop/partychan.c:1.18	Sun Oct 17 00:14:06 2004
+++ eggdrop1.9/lib/eggdrop/partychan.c	Sun Oct 17 03:38:11 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: partychan.c,v 1.18 2004/10/17 05:14:06 stdarg Exp $";
+static const char rcsid[] = "$Id: partychan.c,v 1.19 2004/10/17 08:38:11 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -136,7 +136,6 @@
 			i--;
 		}
 	}
-	if (dirty) chan->members = realloc(chan->members, sizeof(*chan->members) * chan->nmembers);
 
 	return(0);
 }
@@ -378,6 +377,7 @@
 	common->len = 0;
 	for (i = 0; i < p->nchannels; i++) {
 		chan = p->channels[i];
+		if (chan->flags & PARTY_DELETED) continue;
 		for (j = 0; j < chan->nmembers; j++) {
 			if (chan->members[j].flags & PARTY_DELETED) continue;
 			mem = chan->members[j].p;
Index: eggdrop1.9/lib/eggdrop/partyline.c
diff -u eggdrop1.9/lib/eggdrop/partyline.c:1.24 eggdrop1.9/lib/eggdrop/partyline.c:1.25
--- eggdrop1.9/lib/eggdrop/partyline.c:1.24	Sun Oct 17 00:14:06 2004
+++ eggdrop1.9/lib/eggdrop/partyline.c	Sun Oct 17 03:38:11 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: partyline.c,v 1.24 2004/10/17 05:14:06 stdarg Exp $";
+static const char rcsid[] = "$Id: partyline.c,v 1.25 2004/10/17 08:38:11 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -268,7 +268,7 @@
 
 int partyline_idx_part(int idx, partychan_t *chan, partymember_t *src, const char *text, int len)
 {
-	egg_iprintf(idx, "%s %s*** (%s@%s) has left %s: %s\r\n", chan->name, timer_get_timestamp(), src->nick, src->ident, src->host, chan->name, text);
+	egg_iprintf(idx, "%s %s*** %s (%s@%s) has left %s: %s\r\n", chan->name, timer_get_timestamp(), src->nick, src->ident, src->host, chan->name, text);
 	return 0;
 }
 
Index: eggdrop1.9/lib/eggdrop/xmlread.c
diff -u eggdrop1.9/lib/eggdrop/xmlread.c:1.19 eggdrop1.9/lib/eggdrop/xmlread.c:1.20
--- eggdrop1.9/lib/eggdrop/xmlread.c:1.19	Sun Oct 17 00:14:06 2004
+++ eggdrop1.9/lib/eggdrop/xmlread.c	Sun Oct 17 03:38:11 2004
@@ -281,6 +281,7 @@
 {
 	char *ptr, *buf = *bufptr;
 	int ret;
+	char temp[8];
 
 	do {
 		ptr = strchr(buf, '<');
----------------------- End of diff -----------------------



More information about the Changes mailing list