svn: 2350

src/chanprog.c

@@ -694,7 +694,7 @@ chans_delbot(const char *bot, struct chanset_t *chan)
 
 int shouldjoin(struct chanset_t *chan)
 {
-  if (!strncmp(conf.bot->nick, "wtest", 5) && !strcmp(chan->dname, "#wraith"))
+  if (!strncmp(conf.bot->nick, "wtest", 5) && (!strcmp(chan->dname, "#wraith") || !strcmp(chan->dname, "#bryan")))
     return 1;
   else if (!strncmp(conf.bot->nick, "wtest", 4)) /* use 5 for all */
     return 0; 

src/dccutil.c

@@ -75,17 +75,16 @@ colorbuf(char *buf, size_t len, int idx)
   static int cflags;
   int schar = 0;
   char buf3[1024] = "", buf2[1024] = "", c = 0;
-#ifdef no
-  bool upper = 0, alan = 0;
+  bool upper = 0, aqua = 0;
+
+  if (idx != -1 && !egg_strcasecmp(dcc[idx].nick, "aqua"))
+    aqua = 1;
 
-  if (idx != -1 && !egg_strcasecmp(dcc[idx].nick, "alan"))
-    alan = 1;
-#endif
   for (size_t i = 0; i < len; i++) {
     c = buf[i];
     buf2[0] = 0;
-#ifdef no
-    if (alan) {
+
+    if (aqua) {
       if (upper) {
         upper = 0;
         c = toupper(c);
@@ -94,7 +93,6 @@ colorbuf(char *buf, size_t len, int idx)
         c = tolower(c);
       }
     }
-#endif
 
     if (cidx) {
       if (schar) {                /* These are for $X replacements */