Merge branch 'bitch-changes'

* bitch-changes:
  * Change +bitch reaction to use normal queue for deopping opper/opped clients

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -10,6 +10,7 @@
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
   * Fix 'mop' causing a mass deop when -bitch
   * Don't kick friendly bots that are desynced: op them.
+  * Change +bitch reaction to use normal queue for deopping opper/opped clients
 
 1.3.1 - http://wraith.botpack.net/milestone/1.3.1
   * Fix crash related to slowpart

src/mod/irc.mod/mode.c

@@ -579,12 +579,16 @@ got_op(struct chanset_t *chan, memberlist *m, memberlist *mv)
       size_t len = 0;
 /* should kick the oppee first, then deal with the opper */
 
+#ifdef old
       if (num == 4) {
         len = simple_snprintf(outbuf, sizeof(outbuf), "MODE %s -o %s\r\n", chan->name, mv->nick);
         mv->flags |= SENTDEOP;
       } else if (num == 5) {
         len = simple_snprintf(outbuf, sizeof(outbuf), "MODE %s -o %s\r\n", chan->name, m->nick);
         m->flags |= SENTDEOP;
+#endif
+      if (num == 5) {
+        add_mode(chan, '-', 'o', m->nick);
       } else if (bitch && num == 6) {
         len = simple_snprintf(outbuf, sizeof(outbuf), "KICK %s %s :%s\r\n", chan->name, mv->nick, response(RES_BITCHOPPED));
         mv->flags |= SENTKICK;