[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Sat Oct 20 05:23:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-10-20 10:22:24 UTC
Commited by: stdarg <stdarg at techmonkeys.org>

Modified files:
     src/modules.c src/tclhash.c src/tclhash.h src/mod/module.h
     src/mod/notes.mod/notes.c

Log message:

Applied patch by Oskar Liljeblad <oskar at osk.mine.nu>: Replaces H_away bind with new BT_away bind.

---------------------- diff included ----------------------
Index: eggdrop1.7/src/mod/module.h
diff -u eggdrop1.7/src/mod/module.h:1.70 eggdrop1.7/src/mod/module.h:1.71
--- eggdrop1.7/src/mod/module.h:1.70	Fri Oct 19 01:01:21 2001
+++ eggdrop1.7/src/mod/module.h	Sat Oct 20 05:22:14 2001
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.70 2001/10/19 06:01:21 guppy Exp $
+ * $Id: module.h,v 1.71 2001/10/20 10:22:14 stdarg Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -299,7 +299,7 @@
 /* 184 - 187 */
 #define H_link (*(p_tcl_bind_list *)(global[184]))
 #define H_disc (*(p_tcl_bind_list *)(global[185]))
-#define H_away (*(p_tcl_bind_list *)(global[186]))
+/* 186: H_away -- UNUSED (oskar) */
 #define H_nkch (*(p_tcl_bind_list *)(global[187]))
 /* 188 - 191 */
 #define USERENTRY_BOTADDR (*(struct user_entry_type *)(global[188]))
Index: eggdrop1.7/src/mod/notes.mod/notes.c
diff -u eggdrop1.7/src/mod/notes.mod/notes.c:1.40 eggdrop1.7/src/mod/notes.mod/notes.c:1.41
--- eggdrop1.7/src/mod/notes.mod/notes.c:1.40	Thu Oct 18 20:55:08 2001
+++ eggdrop1.7/src/mod/notes.mod/notes.c	Sat Oct 20 05:22:14 2001
@@ -5,7 +5,7 @@
  *   note cmds
  *   note ignores
  *
- * $Id: notes.c,v 1.40 2001/10/19 01:55:08 tothwolf Exp $
+ * $Id: notes.c,v 1.41 2001/10/20 10:22:14 stdarg Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -47,7 +47,7 @@
 				   drummer */
 static Function *global = NULL;	/* DAMN fcntl.h */
 
-static bind_table_t *BT_dcc, *BT_load;
+static bind_table_t *BT_dcc, *BT_load, *BT_away;
 
 static struct user_entry_type USERENTRY_FWD =
 {
@@ -1176,7 +1176,7 @@
     rem_builtins(H_temp, notes_join);
   if (BT_dcc) rem_builtins2(BT_dcc, notes_cmds);
   rem_builtins(H_chon, notes_chon);
-  rem_builtins(H_away, notes_away);
+  if (BT_away) rem_builtins2(BT_away, notes_away);
   rem_builtins(H_nkch, notes_nkch);
   if (BT_load) rem_builtins2(BT_load, notes_load);
   rem_help_reference("notes.help");
@@ -1227,11 +1227,12 @@
 
   BT_dcc = find_bind_table2("dcc");
   BT_load = find_bind_table2("load");
+  BT_away = find_bind_table2("away");
   if (BT_dcc) add_builtins2(BT_dcc, notes_cmds);
   if (BT_load) add_builtins2(BT_load, notes_load);
 
   add_builtins(H_chon, notes_chon);
-  add_builtins(H_away, notes_away);
+  if (BT_away) add_builtins2(BT_away, notes_away);
   add_builtins(H_nkch, notes_nkch);
   add_help_reference("notes.help");
   notes_server_setup(0);
Index: eggdrop1.7/src/modules.c
diff -u eggdrop1.7/src/modules.c:1.78 eggdrop1.7/src/modules.c:1.79
--- eggdrop1.7/src/modules.c:1.78	Fri Oct 19 02:33:58 2001
+++ eggdrop1.7/src/modules.c	Sat Oct 20 05:22:13 2001
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.78 2001/10/19 07:33:58 stdarg Exp $
+ * $Id: modules.c,v 1.79 2001/10/20 10:22:13 stdarg Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -376,7 +376,7 @@
   /* 184 - 187 */
   (Function) & H_link,		/* p_tcl_bind_list *			*/
   (Function) & H_disc,		/* p_tcl_bind_list *			*/
-  (Function) & H_away,		/* p_tcl_bind_list *			*/
+  (Function) 0,		/* p_tcl_bind_list *			*/
   (Function) & H_nkch,		/* p_tcl_bind_list *			*/
   /* 188 - 191 */
   (Function) & USERENTRY_BOTADDR,	/* struct user_entry_type *	*/
Index: eggdrop1.7/src/tclhash.c
diff -u eggdrop1.7/src/tclhash.c:1.49 eggdrop1.7/src/tclhash.c:1.50
--- eggdrop1.7/src/tclhash.c:1.49	Thu Oct 18 20:55:05 2001
+++ eggdrop1.7/src/tclhash.c	Sat Oct 20 05:22:13 2001
@@ -7,7 +7,7 @@
  *   (non-Tcl) procedure lookups for msg/dcc/file commands
  *   (Tcl) binding internal procedures to msg/dcc/file commands
  *
- * $Id: tclhash.c,v 1.49 2001/10/19 01:55:05 tothwolf Exp $
+ * $Id: tclhash.c,v 1.50 2001/10/20 10:22:13 stdarg Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -50,7 +50,7 @@
 p_tcl_bind_list		bind_table_list;
 p_tcl_bind_list		H_chat, H_act, H_bcst, H_chon, H_chof,
 			H_link, H_disc, H_chjn, H_chpt,
-			H_bot, H_time, H_nkch, H_away, H_note, H_filt;
+			H_bot, H_time, H_nkch, H_note, H_filt;
 
 static int builtin_2char();
 static int builtin_3char();
@@ -187,7 +187,6 @@
   H_chat = add_bind_table("chat", HT_STACKABLE, builtin_chat);
   H_bot = add_bind_table("bot", 0, builtin_3char);
   H_bcst = add_bind_table("bcst", HT_STACKABLE, builtin_chat);
-  H_away = add_bind_table("away", HT_STACKABLE, builtin_chat);
   H_act = add_bind_table("act", HT_STACKABLE, builtin_chat);
   Context;
 }
@@ -1123,16 +1122,7 @@
 
 void check_tcl_away(const char *bot, int idx, const char *msg)
 {
-  char	u[11];
-
   check_bind(BT_away, bot, NULL, bot, idx, msg);
-
-  snprintf(u, sizeof u, "%d", idx);
-  Tcl_SetVar(interp, "_away1", (char *) bot, 0);
-  Tcl_SetVar(interp, "_away2", (char *) u, 0);
-  Tcl_SetVar(interp, "_away3", msg ? (char *) msg : "", 0);
-  check_tcl_bind(H_away, bot, 0, " $_away1 $_away2 $_away3",
-		 MATCH_MASK | BIND_STACKABLE);
 }
 
 void tell_binds(int idx, char *par)
Index: eggdrop1.7/src/tclhash.h
diff -u eggdrop1.7/src/tclhash.h:1.21 eggdrop1.7/src/tclhash.h:1.22
--- eggdrop1.7/src/tclhash.h:1.21	Tue Oct 16 19:19:16 2001
+++ eggdrop1.7/src/tclhash.h	Sat Oct 20 05:22:13 2001
@@ -1,7 +1,7 @@
 /*
  * tclhash.h
  *
- * $Id: tclhash.h,v 1.21 2001/10/17 00:19:16 stdarg Exp $
+ * $Id: tclhash.h,v 1.22 2001/10/20 10:22:13 stdarg Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -172,7 +172,7 @@
 int check_validity(char *, Function);
 extern p_tcl_bind_list H_chat, H_act, H_bcst, H_chon, H_chof;
 extern p_tcl_bind_list H_bot, H_link;
-extern p_tcl_bind_list H_away, H_nkch, H_filt, H_disc;
+extern p_tcl_bind_list H_nkch, H_filt, H_disc;
 
 int check_bind(bind_table_t *table, const char *match, struct flag_record *_flags, ...);
 
----------------------- End of diff -----------------------



More information about the Changes mailing list