Author: dylan
Date: 2004-09-05 02:02:06 -0400 (Sun, 05 Sep 2004)
New Revision: 358
Removed:
trunk/clients/irssi/src/core/Makefile
trunk/clients/irssi/src/core/Makefile.in
trunk/clients/irssi/src/core/channel-events.c
trunk/clients/irssi/src/core/haver-channels-setup.c
trunk/clients/irssi/src/core/haver-channels.c
trunk/clients/irssi/src/core/haver-channels.h
trunk/clients/irssi/src/core/haver-commands.c
trunk/clients/irssi/src/core/haver-commands.h
trunk/clients/irssi/src/core/haver-message.c
trunk/clients/irssi/src/core/haver-message.h
trunk/clients/irssi/src/core/haver-queries.c
trunk/clients/irssi/src/core/haver-queries.h
trunk/misc/mbot/
Modified:
trunk/clients/irssi/src/core/Makefile.am
trunk/clients/irssi/src/core/haver-core.c
trunk/clients/irssi/src/core/haver-login.c
trunk/clients/irssi/src/core/haver-protocol.c
trunk/clients/irssi/src/core/haver-servers.c
trunk/clients/irssi/src/core/haver-servers.h
trunk/clients/irssi/src/core/haver-session.c
trunk/docs/manual/chap/events.texi
trunk/jarverd/lib/Jarver/Connection.pm
trunk/main/server/lib/Haver/Server/POE/Commands.pm
trunk/main/server/lib/Haver/Server/POE/Connection.pm
Log:
hmm, these changes were made long ago
and not commited. I am very sorry.
Deleted: trunk/clients/irssi/src/core/Makefile
===================================================================
--- trunk/clients/irssi/src/core/Makefile 2004-09-05 05:25:38 UTC (rev
357)
+++ trunk/clients/irssi/src/core/Makefile 2004-09-05 06:02:06 UTC (rev
358)
@@ -1,390 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = /bin/sh
-
-srcdir = .
-top_srcdir = ../..
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-mandir = ${prefix}/man
-includedir = ${prefix}/include
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/irssi-haver
-pkglibdir = $(libdir)/irssi-haver
-pkgincludedir = $(includedir)/irssi-haver
-
-top_builddir = ../..
-
-ACLOCAL = aclocal-1.4
-AUTOCONF = autoconf
-AUTOMAKE = automake-1.4
-AUTOHEADER = autoheader
-
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL}
-transform = s,x,x,
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias =
-host_triplet = i686-pc-linux-gnu
-AR = ar
-AS = @AS@
-CC = gcc
-CPP = gcc -E
-CXX = g++
-CXXCPP = g++ -E
-DLLTOOL = @DLLTOOL@
-ECHO = echo
-EGREP = grep -E
-EXEEXT =
-F77 = g77
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLIB_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-GLIB_CONFIG =
-GLIB_GENMARSHAL = glib-genmarshal
-GLIB_LIBS = -Wl,--export-dynamic -lgmodule-2.0 -ldl -lglib-2.0
-GLIB_MKENUMS = glib-mkenums
-GOBJECT_QUERY = gobject-query
-HAVE_LIB = @HAVE_LIB@
-IRSSI_INCLUDE = /home/dylan/var/download/src/irssi-0.8.9
-LIB = @LIB@
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIB = @LTLIB@
-MAINT = #
-MAKEINFO = makeinfo
-OBJDUMP = @OBJDUMP@
-OBJEXT = o
-PACKAGE = irssi-haver
-PKG_CONFIG = /usr/bin/pkg-config
-RANLIB = ranlib
-RC = @RC@
-STRIP = strip
-VERSION = 0.0.2
-
-moduledir = $(libdir)/irssi/modules
-
-module_LTLIBRARIES = libhaver_core.la
-libhaver_core_la_LDFLAGS = -avoid-version
-
-INCLUDES = $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src
-I$(IRSSI_INCLUDE)/src/core
-
-
-libhaver_core_la_SOURCES = haver-commands.c haver-core.c
haver-protocol.c haver-parser.c haver-servers.c haver-login.c
haver-message.c haver-queries.c haver-session.c
haver-channels.c channel-events.c haver.c
-
-
-noinst_HEADERS = haver.h haver-commands.h
haver-protocol.h haver-servers.h haver-login.h haver-message.h
haver-queries.h haver-parser.h haver-channels.h module.h
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config-plugin.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(module_LTLIBRARIES)
-
-
-DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I../..
-CPPFLAGS =
-LDFLAGS =
-LIBS =
-libhaver_core_la_LIBADD =
-libhaver_core_la_OBJECTS = haver-commands.lo haver-core.lo \
-haver-protocol.lo haver-parser.lo haver-servers.lo haver-login.lo \
-haver-message.lo haver-queries.lo haver-session.lo haver-channels.lo \
-channel-events.lo haver.lo
-CFLAGS = -g -O2 -Wall
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-DEP_FILES = .deps/channel-events.P .deps/haver-channels.P \
-.deps/haver-commands.P .deps/haver-core.P .deps/haver-login.P \
-.deps/haver-message.P .deps/haver-parser.P .deps/haver-protocol.P \
-.deps/haver-queries.P .deps/haver-servers.P .deps/haver-session.P \
-.deps/haver.P
-SOURCES = $(libhaver_core_la_SOURCES)
-OBJECTS = $(libhaver_core_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu src/core/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-moduleLTLIBRARIES:
-
-clean-moduleLTLIBRARIES:
- -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
-
-distclean-moduleLTLIBRARIES:
-
-maintainer-clean-moduleLTLIBRARIES:
-
-install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(moduledir)
- @list='$(module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p
$(DESTDIR)$(moduledir)/$$p"; \
- $(LIBTOOL) --mode=install $(INSTALL) $$p
$(DESTDIR)$(moduledir)/$$p; \
- else :; fi; \
- done
-
-uninstall-moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- list='$(module_LTLIBRARIES)'; for p in $$list; do \
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p; \
- done
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
- $(COMPILE) -c `cygpath -w $<`
-
-.s.o:
- $(COMPILE) -c $<
-
-.S.o:
- $(COMPILE) -c $<
-
-mostlyclean-compile:
- -rm -f *.o core *.core
- -rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
- -rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libhaver_core.la: $(libhaver_core_la_OBJECTS) $(libhaver_core_la_DEPENDENCIES)
- $(LINK) -rpath $(moduledir) $(libhaver_core_la_LDFLAGS)
$(libhaver_core_la_OBJECTS) $(libhaver_core_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags
$$unique $(LISP))
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
- -rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/core
-
-distdir: $(DISTFILES)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(top_distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here
--srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/core/Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
- -rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
-%.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-moduleLTLIBRARIES
-install-data: install-data-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-moduleLTLIBRARIES
-uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(moduledir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am: mostlyclean-moduleLTLIBRARIES mostlyclean-compile \
- mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
- mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am: clean-moduleLTLIBRARIES clean-compile clean-libtool \
- clean-tags clean-depend clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am: distclean-moduleLTLIBRARIES distclean-compile \
- distclean-libtool distclean-tags distclean-depend \
- distclean-generic clean-am
- -rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am: maintainer-clean-moduleLTLIBRARIES \
- maintainer-clean-compile maintainer-clean-libtool \
- maintainer-clean-tags maintainer-clean-depend \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-moduleLTLIBRARIES distclean-moduleLTLIBRARIES \
-clean-moduleLTLIBRARIES maintainer-clean-moduleLTLIBRARIES \
-uninstall-moduleLTLIBRARIES install-moduleLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-user_install:
- cp -f .libs/libhaver_core.so $(HOME)/.irssi/modules/
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Modified: trunk/clients/irssi/src/core/Makefile.am
===================================================================
--- trunk/clients/irssi/src/core/Makefile.am 2004-09-05 05:25:38 UTC (rev
357)
+++ trunk/clients/irssi/src/core/Makefile.am 2004-09-05 06:02:06 UTC (rev
358)
@@ -9,30 +9,20 @@
-I$(IRSSI_INCLUDE)/src/core
libhaver_core_la_SOURCES = \
- haver-commands.c \
haver-core.c \
- haver-protocol.c \
+ haver-login.c \
haver-parser.c \
+ haver-protocol.c \
haver-servers.c \
- haver-login.c \
- haver-message.c \
- haver-queries.c \
haver-session.c \
- haver-channels.c \
- channel-events.c \
- haver.c
-
+ haver.c
noinst_HEADERS = \
- haver.h \
- haver-commands.h \
- haver-protocol.h \
- haver-servers.h \
haver-login.h \
- haver-message.h \
- haver-queries.h \
haver-parser.h \
- haver-channels.h \
- module.h
+ haver-protocol.h \
+ haver-servers.h \
+ haver.h \
+ module.h
user_install:
cp -f .libs/libhaver_core.so $(HOME)/.irssi/modules/
Deleted: trunk/clients/irssi/src/core/Makefile.in
===================================================================
--- trunk/clients/irssi/src/core/Makefile.in 2004-09-05 05:25:38 UTC (rev
357)
+++ trunk/clients/irssi/src/core/Makefile.in 2004-09-05 06:02:06 UTC (rev
358)
@@ -1,390 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-ECHO = @ECHO@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GOBJECT_QUERY = @GOBJECT_QUERY@
-HAVE_LIB = @HAVE_LIB@
-IRSSI_INCLUDE = @IRSSI_INCLUDE@
-LIB = @LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-RC = @RC@
-STRIP = @STRIP@
-VERSION = @VERSION@
-
-moduledir = $(libdir)/irssi/modules
-
-module_LTLIBRARIES = libhaver_core.la
-libhaver_core_la_LDFLAGS = -avoid-version
-
-INCLUDES = $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src
-I$(IRSSI_INCLUDE)/src/core
-
-
-libhaver_core_la_SOURCES = haver-commands.c haver-core.c
haver-protocol.c haver-parser.c haver-servers.c haver-login.c
haver-message.c haver-queries.c haver-session.c
haver-channels.c channel-events.c haver.c
-
-
-noinst_HEADERS = haver.h haver-commands.h
haver-protocol.h haver-servers.h haver-login.h haver-message.h
haver-queries.h haver-parser.h haver-channels.h module.h
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config-plugin.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(module_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libhaver_core_la_LIBADD =
-libhaver_core_la_OBJECTS = haver-commands.lo haver-core.lo \
-haver-protocol.lo haver-parser.lo haver-servers.lo haver-login.lo \
-haver-message.lo haver-queries.lo haver-session.lo haver-channels.lo \
-channel-events.lo haver.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
$(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-DEP_FILES = .deps/channel-events.P .deps/haver-channels.P \
-.deps/haver-commands.P .deps/haver-core.P .deps/haver-login.P \
-.deps/haver-message.P .deps/haver-parser.P .deps/haver-protocol.P \
-.deps/haver-queries.P .deps/haver-servers.P .deps/haver-session.P \
-.deps/haver.P
-SOURCES = $(libhaver_core_la_SOURCES)
-OBJECTS = $(libhaver_core_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu src/core/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-moduleLTLIBRARIES:
-
-clean-moduleLTLIBRARIES:
- -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
-
-distclean-moduleLTLIBRARIES:
-
-maintainer-clean-moduleLTLIBRARIES:
-
-install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(moduledir)
- @list='$(module_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p
$(DESTDIR)$(moduledir)/$$p"; \
- $(LIBTOOL) --mode=install $(INSTALL) $$p
$(DESTDIR)$(moduledir)/$$p; \
- else :; fi; \
- done
-
-uninstall-moduleLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- list='$(module_LTLIBRARIES)'; for p in $$list; do \
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p; \
- done
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
- $(COMPILE) -c `cygpath -w $<`
-
-.s.o:
- $(COMPILE) -c $<
-
-.S.o:
- $(COMPILE) -c $<
-
-mostlyclean-compile:
- -rm -f *.o core *.core
- -rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
- -rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libhaver_core.la: $(libhaver_core_la_OBJECTS) $(libhaver_core_la_DEPENDENCIES)
- $(LINK) -rpath $(moduledir) $(libhaver_core_la_LDFLAGS)
$(libhaver_core_la_OBJECTS) $(libhaver_core_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags
$$unique $(LISP))
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
- -rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/core
-
-distdir: $(DISTFILES)
- here=`cd $(top_builddir) && pwd`; \
- top_distdir=`cd $(top_distdir) && pwd`; \
- distdir=`cd $(distdir) && pwd`; \
- cd $(top_srcdir) \
- && $(AUTOMAKE) --include-deps --build-dir=$$here
--srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/core/Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
- -rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
-%.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-moduleLTLIBRARIES
-install-data: install-data-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-moduleLTLIBRARIES
-uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(moduledir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am: mostlyclean-moduleLTLIBRARIES mostlyclean-compile \
- mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
- mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am: clean-moduleLTLIBRARIES clean-compile clean-libtool \
- clean-tags clean-depend clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am: distclean-moduleLTLIBRARIES distclean-compile \
- distclean-libtool distclean-tags distclean-depend \
- distclean-generic clean-am
- -rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am: maintainer-clean-moduleLTLIBRARIES \
- maintainer-clean-compile maintainer-clean-libtool \
- maintainer-clean-tags maintainer-clean-depend \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-moduleLTLIBRARIES distclean-moduleLTLIBRARIES \
-clean-moduleLTLIBRARIES maintainer-clean-moduleLTLIBRARIES \
-uninstall-moduleLTLIBRARIES install-moduleLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-user_install:
- cp -f .libs/libhaver_core.so $(HOME)/.irssi/modules/
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Deleted: trunk/clients/irssi/src/core/channel-events.c
===================================================================
--- trunk/clients/irssi/src/core/channel-events.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/channel-events.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,162 +0,0 @@
-/*
- channel-events.c : irssi
-
- Copyright (C) 1999-2000 Timo Sirainen
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "channels-setup.h"
-#include "settings.h"
-
-#include "haver-servers.h"
-#include "haver-channels.h"
-#include "haver-protocol.h"
-
-/* Find any unjoined channel that matches `channel'. Long channel names are
- also a bit problematic, so find a channel where start of the name matches.
*/
-static HAVER_CHANNEL_REC *channel_find_unjoined(HAVER_SERVER_REC *server,
- const char *channel)
-{
- GSList *tmp;
- int len;
-
- len = strlen(channel);
- for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
- HAVER_CHANNEL_REC *rec = tmp->data;
-
- if (!IS_HAVER_CHANNEL(rec) || rec->joined)
- continue;
-
- if (g_strncasecmp(channel, rec->name, len) == 0 &&
- (len > 20 || rec->name[len] == '\0'))
- return rec;
- }
-
- return NULL;
-}
-
-static void event_join(HAVER_SERVER_REC *server, GSList *args)
-{
- HAVER_CHANNEL_REC *chanrec;
- char *uid, *cid;
- g_assert(args != NULL);
-
- cid = (char *) g_slist_nth_data(args, 0);
- uid = (char *) g_slist_nth_data(args, 1);
-
- g_assert(cid != NULL);
- g_assert(uid != NULL);
-
-
-
- if (g_strcasecmp(uid, server->nick) != 0) {
- /* someone else joined channel, no need to do anything */
- return;
- }
-
- //if (server->userhost == NULL)
- // server->userhost = g_strdup("haver");
-
- chanrec = haver_channel_find(server, cid);
-
- if (chanrec != NULL && chanrec->joined) {
- /* already joined this channel - probably a broken proxy that
- forgot to send PART between */
- chanrec->left = TRUE;
- channel_destroy(CHANNEL(chanrec));
- chanrec = NULL; }
-
- if (chanrec == NULL) {
- /* didn't get here with /join command.. */
- chanrec = haver_channel_create(server, cid, TRUE);
- }
-
- chanrec->joined = TRUE;
- if (strcmp(chanrec->name, cid) != 0) {
- g_free(chanrec->name);
- chanrec->name = g_strdup(cid);
- }
-
-}
-
-static void event_part(HAVER_SERVER_REC *server, GSList *args)
-{
- char *cid, *uid;
- HAVER_CHANNEL_REC *chanrec;
-
- g_assert(args != NULL);
- g_assert(args->next != NULL);
-
- cid = (char *) args->data;
- uid = (char *) args->next->data;
-
- g_assert(cid != NULL);
- g_assert(uid != NULL);
-
- if (g_strcasecmp(uid, server->nick) != 0) {
- /* someone else part, no need to do anything here */
- DEBUG("Someone else.");
- return;
- }
- DEBUG("MEEE!!!");
-
-
- chanrec = channel_find(SERVER(server), cid);
- if (chanrec != NULL && chanrec->joined) {
- chanrec->left = TRUE;
- channel_destroy( (CHANNEL_REC *) chanrec);
- }
-}
-
-static void event_fail(HAVER_SERVER_REC *server, GSList *args)
-{
- gboolean handle = FALSE;
- char *cmd, *error;
- g_assert(args);
-
- cmd = (char *) args->data;
-
- if (strcmp(cmd, "JOIN") == 0)
- handle = TRUE;
- else if (strcmp(cmd, "PART"))
- handle = TRUE;
-
- if (handle) {
- // do later.
- signal_stop();
- }
-}
-
-void haver_channel_events_init(void)
-{
- //settings_add_bool("misc", "join_auto_chans_on_invite", TRUE);
-
-
- signal_add_first("haver event join", (SIGNAL_FUNC) event_join);
- signal_add_first("haver event part", (SIGNAL_FUNC) event_part);
- signal_add("haver event fail", (SIGNAL_FUNC) event_fail);
-}
-
-void haver_channel_events_deinit(void)
-{
- signal_remove("haver event join", (SIGNAL_FUNC) event_join);
- signal_remove("haver event part", (SIGNAL_FUNC) event_part);
- signal_remove("haver event fail", (SIGNAL_FUNC) event_fail);
-
-}
Deleted: trunk/clients/irssi/src/core/haver-channels-setup.c
===================================================================
--- trunk/clients/irssi/src/core/haver-channels-setup.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-channels-setup.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,33 +0,0 @@
-/*
- haver-channels-setup.c : irssi
-
- Copyright (C) 1999-2000 Timo Sirainen
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "module.h"
-#include "signals.h"
-#include "channels.h"
-
-void haver_channels_setup_init(void)
-{
- signal_add("channel wholist", (SIGNAL_FUNC) channel_send_autocommands);
-}
-
-void haver_channels_setup_deinit(void)
-{
- signal_remove("channel wholist", (SIGNAL_FUNC)
channel_send_autocommands);
-}
Deleted: trunk/clients/irssi/src/core/haver-channels.c
===================================================================
--- trunk/clients/irssi/src/core/haver-channels.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-channels.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,187 +0,0 @@
-/*
- haver-channels.c : irssi
-
- Copyright (C) 1999-2000 Timo Sirainen
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "module.h"
-#include "signals.h"
-#include "misc.h"
-#include "levels.h"
-#include "channels-setup.h"
-#include "commands.h"
-
-//#include "bans.h"
-//#include "modes.h"
-//#include "mode-lists.h"
-#include "haver-servers.h"
-#include "haver-channels.h"
-//#include "haver-nicklist.h"
-#include "haver-protocol.h"
-
-
-void haver_channel_events_init(void);
-void haver_channel_events_deinit(void);
-
-HAVER_CHANNEL_REC *haver_channel_create(HAVER_SERVER_REC *server,
- const char *name, int automatic)
-{
- HAVER_CHANNEL_REC *rec;
-
- g_return_val_if_fail(server == NULL || IS_HAVER_SERVER(server), NULL);
- g_return_val_if_fail(name != NULL, NULL);
-
- rec = g_new0(HAVER_CHANNEL_REC, 1);
- rec->no_modes = TRUE;
-
- channel_init((CHANNEL_REC *)rec, (SERVER_REC *)server,
- name, NULL, automatic);
- return rec;
-}
-
-#define get_join_key(key) \
- (((key) == NULL || *(key) == '\0') ? "x" : (key))
-
-
-void haver_channels_join(HAVER_SERVER_REC *server,
- const char *data, int automatic)
-{
- CHANNEL_SETUP_REC *schannel;
- HAVER_CHANNEL_REC *chanrec;
- char *channel;
-
- g_return_if_fail(data != NULL);
- g_return_if_fail(IS_HAVER_SERVER(server) && server->connected);
- if (*data == '\0') return;
-
-
-
- channel = g_strdup(data);
- chanrec = haver_channel_find(server, channel);
-
- if (chanrec == NULL) {
- schannel = channel_setup_find(channel,
server->connrec->chatnet);
- chanrec = haver_channel_create(server, channel, automatic);
- }
-
- if (strlen(channel) > 0) {
- GSList *out = NULL;
-
- out = g_slist_append(out, "JOIN");
- out = g_slist_append(out, channel);
- haver_send(HAVER_SERVER(server), out);
-
- g_slist_free(out);
- }
-
- g_free(channel);
-}
-
-/* function for finding HAVER channels - adds support for !channels */
-static CHANNEL_REC *haver_channel_find_server(SERVER_REC *server,
- const char *channel)
-{
- GSList *item;
-
- for (item = server->channels; item != NULL; item = item->next) {
- CHANNEL_REC *rec = item->data;
-
- if (rec->chat_type != server->chat_type)
- continue;
-
- /* check both !ABCDEchannel and !channel */
- if (g_strcasecmp(channel, rec->name) == 0)
- return rec;
-
- //if (g_strcasecmp(channel, rec->visible_name) == 0)
- // return rec;
- }
-
- return NULL;
-}
-
-static void sig_server_connected(SERVER_REC *server)
-{
- if (!IS_HAVER_SERVER(server))
- return;
-
- server->channel_find_func = haver_channel_find_server;
- server->channels_join = (void (*) (SERVER_REC *, const char *, int))
- haver_channels_join;
-}
-
-static char *haver_get_join_data(CHANNEL_REC *channel)
-{
- HAVER_CHANNEL_REC *haver_channel = (HAVER_CHANNEL_REC *) channel;
-
- return haver_channel->key == NULL ? g_strdup(haver_channel->name) :
- g_strconcat(haver_channel->name, " ", haver_channel->key,
NULL);
-}
-
-static void sig_channel_created(HAVER_CHANNEL_REC *channel)
-{
- if (IS_HAVER_CHANNEL(channel))
- channel->get_join_data = haver_get_join_data;
-}
-
-static void sig_channel_destroyed(HAVER_CHANNEL_REC *channel)
-{
- if (!IS_HAVER_CHANNEL(channel))
- return;
-
- if (!channel->server->disconnected && !channel->left &&
!channel->kicked) {
- /* destroying channel record without actually
- having left the channel yet */
- signal_emit("command part", 3, "", channel->server, channel);
- }
-}
-
-void haver_channels_init(void)
-{
- signal_add_first("server connected", (SIGNAL_FUNC)
sig_server_connected);
- signal_add("channel created", (SIGNAL_FUNC) sig_channel_created);
- signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
-
- haver_channel_events_init();
- //channel_rejoin_init(); /* after channel_events_init() */
- //channels_query_init();
- //haver_channels_setup_init();
-
- //bans_init();
- //modes_init();
- //mode_lists_init();
- //massjoin_init();
- //haver_nicklist_init();
-}
-
-void haver_channels_deinit(void)
-{
- signal_remove("server connected", (SIGNAL_FUNC) sig_server_connected);
- signal_remove("channel created", (SIGNAL_FUNC) sig_channel_created);
- signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
-
- haver_channel_events_deinit();
- //channel_rejoin_deinit();
- //channels_query_deinit();
- //haver_channels_setup_deinit();
-
- //bans_deinit();
- //modes_deinit();
- //mode_lists_deinit();
- //massjoin_deinit();
- //haver_nicklist_deinit();
-}
Deleted: trunk/clients/irssi/src/core/haver-channels.h
===================================================================
--- trunk/clients/irssi/src/core/haver-channels.h 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-channels.h 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,31 +0,0 @@
-#ifndef __HAVER_CHANNELS_H
-#define __HAVER_CHANNELS_H
-
-#include "chat-protocols.h"
-#include "channels.h"
-
-/* Returns HAVER_CHANNEL_REC if it's HAVER channel, NULL if it isn't. */
-#define HAVER_CHANNEL(channel) \
- PROTO_CHECK_CAST(CHANNEL(channel), HAVER_CHANNEL_REC, chat_type,
"HAVER")
-
-#define IS_HAVER_CHANNEL(channel) \
- (HAVER_CHANNEL(channel) ? TRUE : FALSE)
-
-#define STRUCT_SERVER_REC HAVER_SERVER_REC
-struct _HAVER_CHANNEL_REC {
-#include "channel-rec.h"
-
- GHashTable *info;
-};
-
-void haver_channels_init(void);
-void haver_channels_deinit(void);
-
-/* Create new HAVER channel record */
-HAVER_CHANNEL_REC *haver_channel_create(HAVER_SERVER_REC *server, const char
*name,
- int automatic);
-
-#define haver_channel_find(server, name) \
- HAVER_CHANNEL(channel_find(SERVER(server), name))
-
-#endif
Deleted: trunk/clients/irssi/src/core/haver-commands.c
===================================================================
--- trunk/clients/irssi/src/core/haver-commands.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-commands.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,78 +0,0 @@
-/*
- haver-servers.c : irssi
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "module.h"
-
-#include "haver-commands.h"
-#include "haver-servers.h"
-#include "haver-protocol.h"
-#include "fe-common/core/printtext.h"
-#include "levels.h"
-#include "settings.h"
-
-static void cmd_foobar(const char *str, HAVER_SERVER_REC * sock)
-{
- CMD_HAVER_SERVER(sock);
-
- printtext(sock, NULL, MSGLEVEL_CLIENTNOTICE,
- "foobar: %s", str);
- printtext(sock, NULL, MSGLEVEL_CLIENTNOTICE,
- "Is haver server? %s", IS_HAVER_SERVER(sock) ? "yes" :
"no");
-}
-
-static void cmd_part(const char *data, HAVER_SERVER_REC *server, WI_ITEM_REC
*item)
-{
- GSList *out = NULL;
- char *channame, *msg;
- void *free_arg;
-
- CMD_HAVER_SERVER(server);
-
- if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
- PARAM_FLAG_OPTCHAN, item, &channame, &msg))
- return;
- if (*channame == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-
- if (*msg == '\0') msg = (char *) settings_get_str("part_message");
-
- out = g_slist_append(out, "PART");
- out = g_slist_append(out, channame);
-
- haver_send(server, out);
-
- g_slist_free(out);
-
- cmd_params_free(free_arg);
-}
-
-void haver_commands_init(void)
-{
-// command_bind_haver("addbuddy", NULL, (SIGNAL_FUNC) cmd_addbuddy);
- command_bind_haver("foobar", NULL, (SIGNAL_FUNC) cmd_foobar);
- command_bind_haver("part", NULL, (SIGNAL_FUNC) cmd_part);
-// command_bind_haver("save", NULL, (SIGNAL_FUNC) save_buddy_file);
- /* command_bind_haver("connect", NULL, (SIGNAL_FUNC)
haver_check_buddies);*/
- command_set_options("connect", "+haver");
-}
-
-void haver_commands_deinit(void)
-{
- /* command_unbind("connect", (SIGNAL_FUNC) haver_check_buddies);*/
- command_unbind("foobar", (SIGNAL_FUNC) cmd_foobar);
- command_unbind("part", (SIGNAL_FUNC) cmd_part);
-}
Deleted: trunk/clients/irssi/src/core/haver-commands.h
===================================================================
--- trunk/clients/irssi/src/core/haver-commands.h 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-commands.h 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,26 +0,0 @@
-#ifndef __HAVER_COMMANDS_H
-#define __HAVER_COMMANDS_H
-
-#include "commands.h"
-
-#define command_bind_haver(cmd, section, signal) \
- command_bind_proto(cmd, HAVER_PROTOCOL, section, signal)
-#define command_bind_haver_first(cmd, section, signal) \
- command_bind_proto_first(cmd, HAVER_PROTOCOL, section, signal)
-#define command_bind_haver_last(cmd, section, signal) \
- command_bind_proto_last(cmd, HAVER_PROTOCOL, section, signal)
-
-/* Simply returns if server isn't for HAVER protocol. Prints ERR_NOT_CONNECTED
- error if there's no server or server isn't connected yet */
-#define CMD_HAVER_SERVER(server) \
- G_STMT_START { \
- if (server != NULL && !IS_HAVER_SERVER(server)) \
- return; \
- if (server == NULL || !(server)->connected) \
- cmd_return_error(CMDERR_NOT_CONNECTED); \
- } G_STMT_END
-
-void haver_commands_init(void);
-void haver_commands_deinit(void);
-
-#endif
Modified: trunk/clients/irssi/src/core/haver-core.c
===================================================================
--- trunk/clients/irssi/src/core/haver-core.c 2004-09-05 05:25:38 UTC (rev
357)
+++ trunk/clients/irssi/src/core/haver-core.c 2004-09-05 06:02:06 UTC (rev
358)
@@ -18,20 +18,17 @@
#include "module.h"
#include "signals.h"
+#include "commands.h"
#include "chat-protocols.h"
#include "chatnets.h"
#include "servers-setup.h"
#include "channels-setup.h"
+#include "settings.h"
-#include "haver-commands.h"
#include "haver-servers.h"
-#include "haver-queries.h"
#include "haver-protocol.h"
#include "haver-login.h"
-#include "haver-message.h"
-#include "haver-channels.h"
-#include "settings.h"
void haver_session_init(void);
void haver_session_deinit(void);
@@ -81,8 +78,7 @@
rec->server_connect = (void (*)(SERVER_REC*)) haver_server_connect;
rec->channel_create = NULL;
- rec->query_create = (QUERY_REC * (*)(const char *, const char *, int))
- haver_query_create;
+ rec->query_create = *(QUERY_REC * (*)(const char *, const char *, int))
haver_query_create;
chat_protocol_register(rec);
g_free(rec);
@@ -91,13 +87,10 @@
haver_servers_init();
// haver_servers_reconnect_init();
haver_protocol_init();
- haver_commands_init();
- haver_queries_init();
-
- haver_login_init();
- haver_message_init();
haver_session_init();
- haver_channels_init();
+ haver_login_init();
+
+ command_set_options("connect", "+haver");
module_register("haver", "core");
}
@@ -107,11 +100,7 @@
haver_servers_deinit();
// haver_servers_reconnect_deinit();
haver_protocol_deinit();
- haver_commands_deinit();
- haver_queries_deinit();
- haver_message_deinit();
haver_session_deinit();
- haver_channels_deinit();
haver_login_deinit();
signal_emit("chat protocol deinit", 1, chat_protocol_find("haver"));
Modified: trunk/clients/irssi/src/core/haver-login.c
===================================================================
--- trunk/clients/irssi/src/core/haver-login.c 2004-09-05 05:25:38 UTC (rev
357)
+++ trunk/clients/irssi/src/core/haver-login.c 2004-09-05 06:02:06 UTC (rev
358)
@@ -51,7 +51,9 @@
static void event_accept(HAVER_SERVER_REC *server, GSList *args)
{
- signal_emit("haver login", 2, server, args->data);
+ server->connected = 1;
+ server->real_connect_time = time(NULL);
+ signal_emit("event connected", 1, server);
}
static void want_ident(HAVER_SERVER_REC *server, GSList *args)
Deleted: trunk/clients/irssi/src/core/haver-message.c
===================================================================
--- trunk/clients/irssi/src/core/haver-message.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-message.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,95 +0,0 @@
-/*
- haver-protocol.c : irssi
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "module.h"
-#include "signals.h"
-#include "network.h"
-#include "net-sendbuffer.h"
-#include "rawlog.h"
-#include "haver-message.h"
-#include "haver-protocol.h"
-
-#include "haver-servers.h"
-#include "line-split.h"
-#include "haver-channels.h"
-#include "haver-parser.h"
-
-#include "fe-common/core/printtext.h"
-#include "levels.h"
-#include "irssi-version.h"
-
-static void event_msg(HAVER_SERVER_REC *server, GSList *args)
-{
- char *cid = (char *) args->data;
- char *uid = (char *) args->next->data;
- char *type = (char *) args->next->next->data;
- char *msg = (char *) args->next->next->next->data;
-
- if (g_strcasecmp(server->nick, uid) != 0)
- signal_emit("message public", 5, server, msg, uid, "haver",
cid);
-}
-
-static void event_pmsg(HAVER_SERVER_REC *server, GSList *args)
-{
- char *uid = (char *) args->data;
- char *type = (char *) args->next->data;
- char *msg = (char *) args->next->next->data;
-
- signal_emit("message private", 4, server, msg, uid, "haver");
-}
-
-static void event_join(HAVER_SERVER_REC *server, GSList *args)
-{
- /* "message join", SERVER_REC, char *channel, char *nick, char *address
*/
- char *cid = (char *) args->data;
- char *uid = (char *) args->next->data;
- HAVER_CHANNEL_REC *chanrec;
- g_assert(uid != NULL);
- g_assert(cid != NULL);
-
-
- signal_emit("message join", 4, server, cid, uid, "haver");
-}
-
-static void event_part(HAVER_SERVER_REC *server, GSList *args)
-{
- /* "message part", SERVER_REC, char *channel, char *nick, char *address
*/
- char *cid = (char *) args->data;
- char *uid = (char *) args->next->data;
- g_assert(uid != NULL);
- g_assert(cid != NULL);
-
- signal_emit("message part", 4, server, cid, uid, "haver");
-}
-
-
-void haver_message_init(void)
-{
- signal_add("haver event msg", (SIGNAL_FUNC) event_msg);
- signal_add("haver event pmsg", (SIGNAL_FUNC) event_pmsg);
- signal_add("haver event join", (SIGNAL_FUNC) event_join);
- signal_add("haver event part", (SIGNAL_FUNC) event_part);
-}
-
-void haver_message_deinit(void)
-{
- signal_remove("haver event msg", (SIGNAL_FUNC) event_msg);
- signal_remove("haver event pmsg", (SIGNAL_FUNC) event_pmsg);
- signal_remove("haver event join", (SIGNAL_FUNC) event_join);
- signal_remove("haver event part", (SIGNAL_FUNC) event_part);
-}
Deleted: trunk/clients/irssi/src/core/haver-message.h
===================================================================
--- trunk/clients/irssi/src/core/haver-message.h 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-message.h 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,8 +0,0 @@
-#ifndef __HAVER_MESSAGE_H
-#define __HAVER_MESSAGE_H
-
-
-void haver_message_init(void);
-void haver_message_deinit(void);
-
-#endif
Modified: trunk/clients/irssi/src/core/haver-protocol.c
===================================================================
--- trunk/clients/irssi/src/core/haver-protocol.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-protocol.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -89,6 +89,7 @@
tmpbuf, sizeof(tmpbuf));
ret = line_split(tmpbuf, recvlen, str, &server->buffer);
+
if (ret == -1) {
/* connection lost */
server->connection_lost = TRUE;
@@ -199,7 +200,7 @@
if (!IS_HAVER_SERVER(server))
return;
- NOTICE("Reconnected");
+ NOTICE("Connected");
server->readtag = g_input_add(net_sendbuffer_handle(server->handle),
G_INPUT_READ, (GInputFunction)
haver_parse_incoming, server);
@@ -214,20 +215,19 @@
signal_stop();
}
-/* SIGNAL */
+#if 0
static void haver_login(HAVER_SERVER_REC * server, const char *data)
{
/* Login OK */
DEBUG("logged in");
- server->connected = TRUE;
- signal_emit("event connected", 1, server);
}
+#endif
/* INIT */
void haver_protocol_init(void)
{
signal_add("server connected", (SIGNAL_FUNC) server_connected);
- signal_add("haver login", (SIGNAL_FUNC) haver_login);
+// signal_add("haver login", (SIGNAL_FUNC) haver_login);
signal_add("server incoming", (SIGNAL_FUNC)
haver_parse_incoming_line);
signal_add("haver event", (SIGNAL_FUNC) haver_event);
signal_add("haver event haver", (SIGNAL_FUNC) haver_event_haver);
@@ -241,7 +241,7 @@
void haver_protocol_deinit(void)
{
signal_remove("server connected", (SIGNAL_FUNC) server_connected);
- signal_remove("haver login", (SIGNAL_FUNC) haver_login);
+// signal_remove("haver login", (SIGNAL_FUNC) haver_login);
signal_remove("server incoming", (SIGNAL_FUNC)
haver_parse_incoming_line);
signal_remove("haver event", (SIGNAL_FUNC) haver_event);
signal_remove("haver event haver", (SIGNAL_FUNC) haver_event_haver);
Deleted: trunk/clients/irssi/src/core/haver-queries.c
===================================================================
--- trunk/clients/irssi/src/core/haver-queries.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-queries.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,80 +0,0 @@
-/*
- haver-queries.c : irssi
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "module.h"
-#include "signals.h"
-#include "misc.h"
-
-#include "haver-servers.h"
-#include "haver-queries.h"
-//#include "haver-buddy.h"
-
-/*static void query_update_topic(QUERY_REC *query, const char *uin, guint32 ip)
-{
- if (ip && ip != -1) {
- char *address = g_strdup_printf("[EMAIL PROTECTED]", uin,
ip>>24, (ip>>16)&255, (ip>>8)&255, ip&255);
- if (!query->address || strcmp(query->address, address))
- query_change_address(query, address);
- g_free(address);
- } else if (!query->address) {
- query_change_address(query, uin);
- }
-}*/
-
-QUERY_REC *haver_query_create(const char *server_tag, const char *nick, int
automatic)
-{
- QUERY_REC *rec;
-
- g_return_val_if_fail(nick != NULL, NULL);
-
- rec = g_new0(QUERY_REC, 1);
- rec->chat_type = HAVER_PROTOCOL;
- rec->name = g_strdup(nick);
- rec->server_tag = g_strdup(server_tag);
- query_init(rec, automatic);
-
- //nick = buddy_getuin(nick);
- //query_update_topic(rec, nick, buddy_getip(nick));
- return rec;
-}
-
-#if 0
-void query_updateip(HAVER_SERVER_REC *server, const char *nick, guint32 ip)
-{
- const char *uin = buddy_getuin(nick);
- nick = buddy_getalias(nick);
-
- buddy_setip(uin, ip);
- if (server) {
- /* save nick's address to query */
- QUERY_REC *query = haver_query_find(server, nick);
-
- if (query) query_update_topic(query, uin, ip);
- }
-}
-#endif
-
-void haver_queries_init(void)
-{
- //signal_add_last("message private", (SIGNAL_FUNC) event_privmsg);
-}
-
-void haver_queries_deinit(void)
-{
- //signal_remove("message private", (SIGNAL_FUNC) event_privmsg);
-}
Deleted: trunk/clients/irssi/src/core/haver-queries.h
===================================================================
--- trunk/clients/irssi/src/core/haver-queries.h 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-queries.h 2004-09-05 06:02:06 UTC
(rev 358)
@@ -1,23 +0,0 @@
-#ifndef __HAVER_QUERIES_H
-#define __HAVER_QUERIES_H
-
-#include "queries.h"
-#include "haver-servers.h"
-
-/* Returns HAVER_QUERY_REC if it's HAVER query, NULL if it isn't. */
-#define HAVER_QUERY(query) \
- PROTO_CHECK_CAST(QUERY(query), QUERY_REC, chat_type, "haver")
-
-#define IS_HAVER_QUERY(query) \
- (HAVER_QUERY(query) ? TRUE : FALSE)
-
-QUERY_REC *haver_query_create(const char *server_tag, const char *nick, int
automatic);
-
-#define haver_query_find(server, name) \
- query_find(SERVER(server), name)
-
-void haver_queries_init(void);
-void haver_queries_deinit(void);
-//void query_updateip(HAVER_SERVER_REC *server, const char *nick, guint32 ip);
-
-#endif
Modified: trunk/clients/irssi/src/core/haver-servers.c
===================================================================
--- trunk/clients/irssi/src/core/haver-servers.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-servers.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -25,6 +25,7 @@
#include "haver-servers.h"
#include "haver-protocol.h"
#include "commands.h"
+#include "queries.h"
HAVER_SERVER_REC * haver_server_init_connect(HAVER_SERVER_CONNECT_REC * conn)
{
@@ -39,6 +40,7 @@
server = g_new0(HAVER_SERVER_REC, 1);
server->chat_type = chat_protocol_lookup("haver");
+
server->connrec = conn;
server_connect_ref(SERVER_CONNECT(conn));
@@ -50,6 +52,25 @@
return server;
}
+QUERY_REC *haver_query_create(const char *server_tag, const char *nick, int
automatic)
+{
+ QUERY_REC *rec;
+
+ g_return_val_if_fail(nick != NULL, NULL);
+
+ rec = g_new0(QUERY_REC, 1);
+ rec->chat_type = HAVER_PROTOCOL;
+ rec->name = g_strdup(nick);
+ rec->server_tag = g_strdup(server_tag);
+ query_init(rec, automatic);
+
+ //nick = buddy_getuin(nick);
+ //query_update_topic(rec, nick, buddy_getip(nick));
+ return rec;
+}
+
+
+
void haver_server_connect(HAVER_SERVER_REC * server)
{
if (!server_start_connect((SERVER_REC *) server)) {
@@ -115,11 +136,11 @@
if (!IS_HAVER_SERVER(server))
return;
- server->isnickflag = isnickflag_func;
- server->ischannel = ischannel_func;
+ server->isnickflag = isnickflag_func;
+ server->ischannel = ischannel_func;
server->get_nick_flags = get_nick_flags;
- server->send_message = send_message;
-
+ server->send_message = send_message;
+ server->no_reconnect = TRUE;
}
void haver_servers_init(void)
Modified: trunk/clients/irssi/src/core/haver-servers.h
===================================================================
--- trunk/clients/irssi/src/core/haver-servers.h 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-servers.h 2004-09-05 06:02:06 UTC
(rev 358)
@@ -35,7 +35,21 @@
//HAVER_SERVER_CONNECT_REC *redirected;
};
+
+#define HAVER_QUERY(query) \
+ PROTO_CHECK_CAST(QUERY(query), QUERY_REC, chat_type, "haver")
+
+#define IS_HAVER_QUERY(query) \
+ (HAVER_QUERY(query) ? TRUE : FALSE)
+
+QUERY_REC *haver_query_create(const char *server_tag, const char *nick, int
automatic);
+
+#define haver_query_find(server, name) \
+ query_find(SERVER(server), name)
+
+
HAVER_SERVER_REC * haver_server_init_connect(HAVER_SERVER_CONNECT_REC * conn);
+QUERY_REC *haver_query_create(const char *server_tag, const char *nick, int
automatic);
void haver_server_connect(HAVER_SERVER_REC * conn);
char *haver_server_get_channels(HAVER_SERVER_REC * server);
Modified: trunk/clients/irssi/src/core/haver-session.c
===================================================================
--- trunk/clients/irssi/src/core/haver-session.c 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/clients/irssi/src/core/haver-session.c 2004-09-05 06:02:06 UTC
(rev 358)
@@ -20,12 +20,14 @@
#include "signals.h"
#include "haver-servers.h"
+#include "haver-protocol.h"
static void server_connected(HAVER_SERVER_REC * server)
{
if (!IS_HAVER_SERVER(server) || !server->session_reconnect)
return;
+ NOTICE("Connected.");
server->connected = TRUE;
signal_emit("event connected", 1, server);
}
Modified: trunk/docs/manual/chap/events.texi
===================================================================
--- trunk/docs/manual/chap/events.texi 2004-09-05 05:25:38 UTC (rev 357)
+++ trunk/docs/manual/chap/events.texi 2004-09-05 06:02:06 UTC (rev 358)
@@ -6,6 +6,7 @@
@end menu
@include chap/events/basic.texi
[EMAIL PROTECTED] chap/events/keepalive.texi
@ignore
\begin{cmddef}{MSG}{\param{where} \param{type} \params{msg}}
Modified: trunk/jarverd/lib/Jarver/Connection.pm
===================================================================
--- trunk/jarverd/lib/Jarver/Connection.pm 2004-09-05 05:25:38 UTC (rev
357)
+++ trunk/jarverd/lib/Jarver/Connection.pm 2004-09-05 06:02:06 UTC (rev
358)
@@ -64,7 +64,7 @@
cmd_ACCEPT
cmd_JOIN
cmd_MSG
- cmd_USERS
+ cmd_LIST
cmd_CHANS
cmd_QUIT
cmd_PART
@@ -133,11 +133,11 @@
$heap->{channel} = $1;
$heap->{haver}->put(['JOIN', $1]);
} elsif (/^Hc$/ or /^Hc\t(.+)$/) {
- $heap->{haver}->put(['USERS', $1 || $heap->{channel}]);
+ $heap->{haver}->put(['LIST', $1 || $heap->{channel}, 'user']);
} elsif (/^Hb$/) {
$heap->{haver}->put(['CHANS']);
} elsif (/^Ha$/) {
- $heap->{haver}->put(['USERS', '*']);
+ $heap->{haver}->put(['LIST', '*']);
} elsif (/^E(.+)$/) {
my $msg = $1;
my $kind;
@@ -165,7 +165,7 @@
$heap->{haver}->put(
[
'MARK', $mark,
- 'LINFO', $heap->{channel}, '*'
+ 'LINFO', $heap->{channel}, 'user', '*'
]
);
} elsif ($data =~ /^Ia\t?(.+)$/) {
@@ -365,9 +365,9 @@
$heap->{jrc}->put('F'.$uid."\t".$msg.'F');
}
-sub cmd_USERS {
+sub cmd_LIST {
my ($kernel, $heap, $args) = @_[KERNEL,HEAP,ARG0];
- my $cid = shift @$args;
+ my ($cid, $ns) = splice(@$args, 0, 2);
if ($cid ne '*') {
$heap->{jrc}->put('H'.$heap->{name}."\tc$cid\t" . join("\t",
@$args) . 'H');
@@ -410,7 +410,7 @@
sub cmd_LINFO {
my ($kernel, $heap, $args) = @_[KERNEL, HEAP, ARG0];
- my ($cid, $uid) = splice(@$args, 0, 2);
+ my ($cid, $type, $uid) = splice(@$args, 0, 3);
my $msg = "^$heap->{name}\t$heap->{mark}\tIa$uid\t";
my %hash = @$args;
$hash{Access} = delete($hash{Role}) . "\t" . delete($hash{Rank});
Modified: trunk/main/server/lib/Haver/Server/POE/Commands.pm
===================================================================
--- trunk/main/server/lib/Haver/Server/POE/Commands.pm 2004-09-05 05:25:38 UTC
(rev 357)
+++ trunk/main/server/lib/Haver/Server/POE/Commands.pm 2004-09-05 06:02:06 UTC
(rev 358)
@@ -99,14 +99,14 @@
}
unless (Haver::Server::Object::User->is_valid_id($id)) {
- $kernel->yield('fail', 'IDENT', 'syntax', [$id]);
+ $kernel->yield('fail', 'IDENT', 'syntax.id', [$id]);
$kernel->yield('want', 'IDENT');
} elsif ($ns eq 'user' and ($id =~ /&/ or $id =~ /@/)) {
- $poe_kernel->yield('fail', 'IDENT', 'reserved', [$id]);
+ $poe_kernel->yield('fail', 'IDENT', 'reserved.id', [$id]);
$kernel->yield('want', 'IDENT');
} else {
if ($Registry->contains('user', $id)) {
- $poe_kernel->yield('fail', 'IDENT', 'used', [$id]);
+ $poe_kernel->yield('fail', 'IDENT', 'used.id', [$id]);
$kernel->yield('want', 'IDENT');
} else {
my $user = new Haver::Server::Object::User(
@@ -163,7 +163,7 @@
if ($method eq 'pass') {
$kernel->yield('want', 'AUTH:PASS');
} else {
- $kernel->yield('fail', 'AUTH', 'unknown', [$method]);
+ $kernel->yield('fail', 'AUTH', 'unknown.method', [$method]);
$kernel->yield('want', 'IDENT');
}
@@ -180,7 +180,7 @@
if ($pass eq $user->get('.password')) {
$kernel->yield('accept', $id, $user);
} else {
- $kernel->yield('fail', 'AUTH:PASS', 'nomatch', []);
+ $kernel->yield('fail', 'AUTH:PASS', 'nomatch.passhash', []);
$kernel->yield('bye', 'monkeys');
}
}
@@ -225,7 +225,7 @@
my $user = $heap->{user};
if ($chan->contains('user', $heap->{uid})) {
- $kernel->yield('fail', 'JOIN', joined => [$cid]);
+ $kernel->yield('fail', 'JOIN', 'joined'=> [$cid]);
return;
}
Modified: trunk/main/server/lib/Haver/Server/POE/Connection.pm
===================================================================
--- trunk/main/server/lib/Haver/Server/POE/Connection.pm 2004-09-05
05:25:38 UTC (rev 357)
+++ trunk/main/server/lib/Haver/Server/POE/Connection.pm 2004-09-05
06:02:06 UTC (rev 358)
@@ -100,7 +100,7 @@
my $timer = $kernel->alarm_set(
'shutdown',
- time + 20,
+ time + 60 * 60,
'TIMEOUT',
);
