Changeset 6e9ae72

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline merge.

Files:

• Makefile (modified) (5 diffs)
• bitlbee.h (modified) (1 diff)
• configure (modified) (13 diffs)
• debian/bitlbee-plugin-skype.docs (added)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (3 diffs)
• debian/rules (modified) (4 diffs)
• debian/skyped.README.Debian (added)
• debian/skyped.docs (added)
• doc/CHANGES (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (1 diff)
• doc/user-guide/help.xsl (modified) (1 diff)
• doc/user-guide/misc.xml (modified) (2 diffs)
• doc/user-guide/quickstart.xml (modified) (3 diffs)
• ipc.c (modified) (4 diffs)
• irc.c (modified) (4 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• irc_im.c (modified) (3 diffs)
• irc_send.c (modified) (2 diffs)
• lib/http_client.c (modified) (9 diffs)
• lib/ssl_client.h (modified) (1 diff)
• lib/ssl_gnutls.c (modified) (6 diffs)
• lib/ssl_nss.c (modified) (1 diff)
• lib/ssl_openssl.c (modified) (1 diff)
• lib/xmltree.c (modified) (10 diffs)
• nick.c (modified) (2 diffs)
• otr.c (modified) (81 diffs)
• protocols/jabber/io.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (3 diffs)
• protocols/msn/ns.c (modified) (1 diff)
• protocols/msn/sb.c (modified) (4 diffs)
• protocols/msn/soap.c (modified) (5 diffs)
• protocols/nogaim.c (modified) (1 diff)
• protocols/oscar/chat.c (modified) (2 diffs)
• protocols/oscar/chatnav.c (modified) (2 diffs)
• protocols/oscar/icq.c (modified) (2 diffs)
• protocols/oscar/im.c (modified) (4 diffs)
• protocols/oscar/misc.c (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (14 diffs)
• protocols/oscar/rxqueue.c (modified) (1 diff)
• protocols/oscar/service.c (modified) (4 diffs)
• protocols/purple/purple.c (modified) (2 diffs)
• protocols/skype/.bzrignore (added)
• protocols/skype/.mailmap (added)
• protocols/skype/HACKING (added)
• protocols/skype/Makefile (added)
• protocols/skype/NEWS (added)
• protocols/skype/README (added)
• protocols/skype/asciidoc.conf (added)
• protocols/skype/client.sh (added)
• protocols/skype/skype.c (added)
• protocols/skype/skyped.cnf (added)
• protocols/skype/skyped.conf.dist (added)
• protocols/skype/skyped.py (added)
• protocols/skype/skyped.txt (added)
• protocols/skype/t/Makefile (added)
• protocols/skype/t/bitlbee.conf (added)
• protocols/skype/t/irssi/livetest-irssi.sh (added)
• protocols/skype/t/irssi/skype-call.test (added)
• protocols/skype/t/irssi/skype-info.test (added)
• protocols/skype/t/irssi/skype-login.test (added)
• protocols/skype/t/irssi/skype-msg.test (added)
• protocols/skype/t/irssi/trigger.pl (added)
• protocols/skype/t/livetest-bitlbee.sh (added)
• protocols/twitter/twitter.c (modified) (15 diffs)
• protocols/twitter/twitter.h (modified) (2 diffs)
• protocols/twitter/twitter_lib.c (modified) (22 diffs)
• protocols/twitter/twitter_lib.h (modified) (1 diff)
• protocols/yahoo/libyahoo2.c (modified) (26 diffs)
• query.c (modified) (3 diffs)
• root_commands.c (modified) (87 diffs)
• set.c (modified) (1 diff)
• set.h (modified) (2 diffs)
• storage_xml.c (modified) (5 diffs)

Makefile

@@ -27 +27 @@
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 
-all: $(OUTFILE) $(OTR_PI) systemd
+all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) systemd
         $(MAKE) -C doc
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype doc
+endif
 
 uninstall: uninstall-bin uninstall-doc 
@@ -71 +74 @@
 install-doc:
         $(MAKE) -C doc install
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype install-doc
+endif
 
 uninstall-doc:
         $(MAKE) -C doc uninstall
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype uninstall-doc
+endif
 
 install-bin:
-        mkdir -p $(DESTDIR)$(BINDIR)
-        install -m 0755 $(OUTFILE) $(DESTDIR)$(BINDIR)/$(OUTFILE)
+        mkdir -p $(DESTDIR)$(SBINDIR)
+        install -m 0755 $(OUTFILE) $(DESTDIR)$(SBINDIR)/$(OUTFILE)
 
 uninstall-bin:
-        rm -f $(DESTDIR)$(BINDIR)/$(OUTFILE)
+        rm -f $(DESTDIR)$(SBINDIR)/$(OUTFILE)
 
 install-dev:
@@ -104 +113 @@
         -rmdir $(DESTDIR)$(ETCDIR)
 
-install-plugins:
+install-plugins: install-plugin-otr install-plugin-skype
+
+install-plugin-otr:
 ifdef OTR_PI
         mkdir -p $(DESTDIR)$(PLUGINDIR)
         install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
+endif
+
+install-plugin-skype:
+ifdef SKYPE_PI
+        mkdir -p $(DESTDIR)$(PLUGINDIR)
+        install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
+        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped $(DESTDIR)$(BINDIR)
+        install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
+        install -m 0644 $(SRCDIR)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
+        install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
+        make -C protocols/skype install-doc
 endif
 
@@ -139 +161 @@
 $(OTR_PI): %.so: $(SRCDIR)%.c
         @echo '*' Building plugin $@
-        @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@
+        @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
+
+$(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c
+        @echo '*' Building plugin skype
+        @$(CC) $(CFLAGS) -fPIC -shared $< -o $@
 
 $(objects): %.o: $(SRCDIR)%.c
@@ -164 +190 @@
 
 -include .depend/*.d
+# DO NOT DELETE

bitlbee.h

@@ -35 +35 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "3.0.3"
+#define BITLBEE_VERSION "3.0.4"
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 0, 3)
+#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 0, 4)
 
 #define MAX_STRING 511

configure

@@ -9 +9 @@
 
 prefix='/usr/local/'
-bindir='$prefix/sbin/'
+bindir='$prefix/bin/'
+sbindir='$prefix/sbin/'
 etcdir='$prefix/etc/bitlbee/'
 mandir='$prefix/share/man/'
@@ -19 +20 @@
 libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
-ipcsocket='/var/run/bitlbee.sock'
+ipcsocket=''
 pcdir='$prefix/lib/pkgconfig'
 systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
@@ -28 +29 @@
 yahoo=1
 twitter=1
-twitter=1
 purple=0
 
@@ -36 +36 @@
 plugins=1
 otr=0
+skype=0
 
 events=glib
@@ -59 +60 @@
 --prefix=...    Directories to put files in             $prefix
 --bindir=...                                            $bindir
+--sbindir=...                                           $sbindir
 --etcdir=...                                            $etcdir
 --mandir=...                                            $mandir
@@ -66 +68 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
---ipcsocket=...                                         $ipcsocket
 
 --msn=0/1       Disable/enable MSN part                 $msn
@@ -83 +84 @@
 --otr=0/1/auto/plugin
                 Disable/enable OTR encryption support   $otr
+--skype=0/1/plugin
+                Disable/enable Skype support            $skype
 
 --events=...    Event handler (glib, libevent)          $events
@@ -98 +101 @@
 # Expand $prefix and get rid of double slashes
 bindir=`eval echo "$bindir/" | sed 's/\/\{1,\}/\//g'`
+sbindir=`eval echo "$sbindir/" | sed 's/\/\{1,\}/\//g'`
 etcdir=`eval echo "$etcdir/" | sed 's/\/\{1,\}/\//g'`
 mandir=`eval echo "$mandir/" | sed 's/\/\{1,\}/\//g'`
@@ -110 +114 @@
 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
+protocols_mods=""
+
 cat<<EOF>Makefile.settings
 ## BitlBee settings, generated by configure
 PREFIX=$prefix
 BINDIR=$bindir
+SBINDIR=$sbindir
 ETCDIR=$etcdir
 MANDIR=$mandir
@@ -323 +330 @@
 
 RESOLV_TESTCODE='
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h> 
@@ -335 +344 @@
 detect_resolv_dynamic()
 {
+        case "$arch" in
+        FreeBSD )
+                # In FreeBSD res_* routines are present in libc.so
+                LIBRESOLV=;;
+        * )
+                LIBRESOLV=-lresolv;;
+        esac
         TMPFILE=$(mktemp /tmp/bitlbee-configure.XXXXXX)
         ret=1
-        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - -lresolv >/dev/null 2>/dev/null
+        echo "$RESOLV_TESTCODE" | $CC -o $TMPFILE -x c - $LIBRESOLV >/dev/null 2>/dev/null
         if [ "$?" = "0" ]; then
-                echo 'EFLAGS+=-lresolv' >> Makefile.settings
+                echo "EFLAGS+=$LIBRESOLV" >> Makefile.settings
                 ret=0
         fi
@@ -538 +554 @@
 fi
 
+if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
+        echo 'SKYPE_PI=skype.so' >> Makefile.settings
+        protocols_mods="$protocol_mods skype(plugin)"
+fi
+
 if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
         echo
@@ -751 +772 @@
 
 if [ -n "$protocols" ]; then
-        echo '  Building with these protocols:' $protocols
+        echo '  Building with these protocols:' $protocols$protocols_mods
         case "$protocols" in
         *purple*)

debian/changelog

@@ +1 @@
+bitlbee (3.0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added bitlbee-plugin-skype and skyped packages, now part of BitlBee
+    instead of a separate package.
+  * Fixed dependencies of bitlbee-plugin-otr package to not break with
+    binary MTUs. (Closes: #651612)
+  * ^B and some other things are stripped in outgoing XMPP stanzas.
+    (Closes: #507856)
+  * OTR module linking fix. Not with the fix from the Debian bug but with
+    one from bugs.bitlbee.org. I hope that covers it. (Closes: #646369)
+  * Closing a few old bugs that were filed against the Debian package
+    instead of upstream:
+    - Joining password-protected MUCs is working for a while already, set
+      the password using "chan set". (Closes: #615624)
+    - "Headline:" msgs (Closes: #605459)
+    - Yahoo! was fixed long ago and Etch is deprecated. (Closes: #476529)
+    - identi.ca support is documented. (Closes: #613789)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 11 Dec 2011 16:53:31 +0000
+
 bitlbee (3.0.3-1) unstable; urgency=low
 

debian/control

@@ -5 +5 @@
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
 Standards-Version: 3.9.1
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~)
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~), asciidoc
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/
@@ -61 +61 @@
 Package: bitlbee-plugin-otr
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version}), bitlbee-common (= ${bee:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~), bitlbee-common (= ${bee:Version})
 Description: An IRC to other chat networks gateway (OTR plugin)
  This program can be used as an IRC server which forwards everything you
@@ -69 +69 @@
  This package contains a plugin that adds support for Off-The-Record
  encryption of instant messages.
+
+Package: bitlbee-plugin-skype
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, bitlbee (>= ${bee:Version}) | bitlbee-libpurple (>= ${bee:Version}), bitlbee (<< ${bee:Version}.1~) | bitlbee-libpurple (<< ${bee:Version}.1~)
+Recommends: skyped
+Description: An IRC to other chat networks gateway (Skype plugin)
+ This program can be used as an IRC server which forwards everything you
+ say to people on other chat networks: Jabber (which includes Google Talk
+ and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
+ .
+ This package contains a plugin that adds support for the Skype IM network.
+ You need to download and install the Skype client for this to work.
+
+Package: skyped
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.5), python-gnutls, python-skype (>=0.9.28.7)
+Recommends: skype
+Description: Daemon to control Skype remotely
+ Daemon to control the GUI Skype client. Currently required to control Skype
+ from the BitlBee IRC2IM gateway. Skyped and Skype can run on a different
+ host than the BitlBee server, the communication is encrypted.
+ .
+ You need to download and install the Skype client for this to work.

debian/rules

@@ -11 +11 @@
 BITLBEE_LIBPURPLE ?= 1
 BITLBEE_OTR ?= plugin
+BITLBEE_SKYPE ?= plugin
 BITLBEE_CONFIGURE_FLAGS ?=
 DEBUG ?= 0
@@ -27 +28 @@
 endif
 
+ifneq ($(BITLBEE_SKYPE),plugin)
+DH_OPTIONS += -Nbitlbee-plugin-skype -Nskyped
+endif
+
 build: build-stamp
 build-stamp:
@@ -32 +37 @@
 
         mkdir -p debian/build-native
-        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) $(BITLBEE_CONFIGURE_FLAGS)
+        ROOT=$$PWD; cd debian/build-native; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent --otr=$(BITLBEE_OTR) --skype=$(BITLBEE_SKYPE) $(BITLBEE_CONFIGURE_FLAGS)
         $(MAKE) -C debian/build-native
 
@@ -64 +69 @@
         $(MAKE) -C debian/build-native install-etc install-doc DESTDIR=`pwd`/debian/bitlbee-common
         $(MAKE) -C debian/build-native install-dev DESTDIR=`pwd`/debian/bitlbee-dev
-        $(MAKE) -C debian/build-native install-plugins DESTDIR=`pwd`/debian/bitlbee-plugin-otr
+        $(MAKE) -C debian/build-native install-plugin-otr DESTDIR=`pwd`/debian/bitlbee-plugin-otr
+        $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped
+
+        mkdir -p debian/bitlbee-plugin-skype/usr
+        mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr
+
+        mkdir -p debian/skyped/usr/share/man/man1
+        mv debian/bitlbee-common/usr/share/man/man1/skyped* debian/skyped/usr/share/man/man1
 
 ifeq ($(BITLBEE_LIBPURPLE),1)

doc/CHANGES

@@ -3 +3 @@
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
+
+Version 3.0.4:
+- Merged Skype support. This used to be a separate plugin, and it still is,
+  but by including it with BitlBee by default it will be easier to keep it
+  in sync with changes to BitlBee.
+- Fixed a file descriptor leak bug that may have caused strange behaviour
+  in BitlBee sessions running for a long time.
+- Now fetches Twitter mentions as well if the "fetch_mentions" account
+  setting is enabled.
+- With t.co now all over Twitter, show the original (but truncated) URL
+  between <brackets>.
+- Fixed MSN Messenger login issues ("timeout" while fetching buddy list).
+- Another (related) GnuTLS compatibility fix (now 2.13+?).
+
+Finished 4 Dec 2011 (Exactly 6 years since 1.0!)
 
 Version 3.0.3:

doc/user-guide/commands.xml

@@ -852 +852 @@
 
                         <variablelist>
-                                <varlistentry><term>undo [&lt;id&gt;]</term><listitem><para>Delete your last Tweet (or one with the given ID)</para></listitem></varlistentry>
-                                <varlistentry><term>rt &lt;screenname|id&gt;</term><listitem><para>Retweet someone's last Tweet (or one with the given ID)</para></listitem></varlistentry>
-                                <varlistentry><term>reply &lt;screenname|id&gt;</term><listitem><para>Reply to a Tweet (with a reply-to reference)</para></listitem></varlistentry>
+                                <varlistentry><term>undo #[&lt;id&gt;]</term><listitem><para>Delete your last Tweet (or one with the given ID)</para></listitem></varlistentry>
+                                <varlistentry><term>rt &lt;screenname|#id&gt;</term><listitem><para>Retweet someone's last Tweet (or one with the given ID)</para></listitem></varlistentry>
+                                <varlistentry><term>reply &lt;screenname|#id&gt;</term><listitem><para>Reply to a Tweet (with a reply-to reference)</para></listitem></varlistentry>
                                 <varlistentry><term>follow &lt;screenname&gt;</term><listitem><para>Start following a person</para></listitem></varlistentry>
                                 <varlistentry><term>unfollow &lt;screenname&gt;</term><listitem><para>Stop following a person</para></listitem></varlistentry>

doc/user-guide/help.xsl

@@ -73 +73 @@
 
         <xsl:template match="command-list">
+                <xsl:text>These are all root commands. See _b_help &lt;command name&gt;_b_ for more details on each command.&#10;&#10;</xsl:text>
                 <xsl:for-each select="../bitlbee-command">
                         <xsl:text> * _b_</xsl:text><xsl:value-of select="@name"/><xsl:text>_b_ - </xsl:text><xsl:value-of select="short-description"/><xsl:text>&#10;</xsl:text>
                 </xsl:for-each>
+                <xsl:text>&#10;Most commands can be shortened. For example instead of _b_account list_b_, try _b_ac l_b_.&#10;</xsl:text>
                 <xsl:text>&#10;</xsl:text>
         </xsl:template>

doc/user-guide/misc.xml

@@ -191 +191 @@
 
 <ircexample>
-        <ircline nick="wilmer">chan set &amp;wlm fill_by account</ircline>
+        <ircline nick="wilmer">chan &amp;wlm set fill_by account</ircline>
         <ircline nick="root">fill_by = `account'</ircline>
-        <ircline nick="wilmer">chan set &amp;wlm account msn</ircline>
+        <ircline nick="wilmer">chan &amp;wlm set account msn</ircline>
         <ircline nick="root">account = `msn'</ircline>
 </ircexample>
@@ -204 +204 @@
 
 <ircexample>
-        <ircline nick="wilmer">chan set &amp;offline show_users offline</ircline>
+        <ircline nick="wilmer">chan &amp;offline set show_users offline</ircline>
         <ircline nick="root">show_users = `offline'</ircline>
 </ircexample>

doc/user-guide/quickstart.xml

@@ -53 +53 @@
 
 <sect1 id="quickstart3">
-<title>Managing Contact Lists: Rename</title>
-
-<!--quickstart3-->
-<para>
-<emphasis>Step Three: Managing Contact Lists: Rename</emphasis>
-</para>
-
-<para>
-Now BitlBee logs in and downloads the contact list from the IM server. In a few seconds, all your on-line buddies should show up in the control channel.
-</para>
-
-<para>
-BitlBee will convert names into IRC-friendly form (for instance: tux@example.com will be given the nickname tux). If you have more than one person who would have the same name by this logic (for instance: tux@example.com and tux@bitlbee.org) the second one to log on will be tux_. The same is true if you have a tux log on to AOL and a tux log on from Yahoo.
-</para>
-
-<para>
-It would be easy to get these two mixed up, so BitlBee has a <emphasis>rename</emphasis> command to change the nickname into something more suitable: <emphasis>rename &lt;oldnick&gt; &lt;newnick&gt;</emphasis>
-</para>
-
-<ircexample>
-        <ircline nick="you">rename tux_ bitlbeetux</ircline>
-        <ircaction nick="tux_">is now known as <emphasis>bitlbeetux</emphasis></ircaction>
-        <ircline nick="root">Nick successfully changed</ircline>
-</ircexample>
-
-<para>
-When finished, type <emphasis>help quickstart4</emphasis> to continue.
-</para>
-
-</sect1>
-
-<sect1 id="quickstart4">
-<title>Step Four: Managing Contact Lists: Add and Remove.</title>
-
-<para>
-<emphasis>Step Four: Managing Contact Lists: Add and Remove.</emphasis>
-</para>
+<title>Step Four: Managing Contact Lists: Add, Remove and Rename</title>
 
 <para>
@@ -105 +69 @@
 
 <para>
-Lets say you accidentally added r2d3@example.com rather than r2d2@example.com, or maybe you just want to remove a user from your list because you never talk to them. To remove a name you will want to use the <emphasis>remove</emphasis> command: <emphasis>remove &lt;nick&gt;</emphasis>
+Lets say you accidentally added r2d3@example.com rather than r2d2@example.com, or maybe you just want to remove a user from your list because you never talk to them. To remove a name you will want to use the <emphasis>remove</emphasis> command: <emphasis>remove r2d3</emphasis>
 </para>
 
 <para>
-When finished, type <emphasis>help quickstart5</emphasis> to continue.
+Finally, if you have multiple users with similar names you may use the <emphasis>rename</emphasis> command to make it easier to remember: <emphasis>rename r2d2_ r2d2_aim</emphasis>
+</para>
+
+<para>
+When finished, type <emphasis>help quickstart4</emphasis> to continue.
 </para>
 
 </sect1>
 
-<sect1 id="quickstart5">
+<sect1 id="quickstart4">
 <title>Chatting</title>
 
@@ -139 +107 @@
 
 <para>
-You know the basics. If you want to get to know more about BitlBee, please type <emphasis>help quickstart6</emphasis>.
+You know the basics. If you want to know about some of the neat features BitlBee offers, please type <emphasis>help quickstart5</emphasis>.
 </para>
 
 </sect1>
 
-<sect1 id="quickstart6">
+<sect1 id="quickstart5">
 <title>Further Resources</title>
 
 <para>
-<emphasis>So you want more than just chatting? Or maybe you're just looking for a feature?</emphasis>
+<emphasis>So you want more than just chatting? Or maybe you're just looking for more features?</emphasis>
+</para>
+
+<para>
+With multiple channel support you can have contacts for specific protocols in their own channels, for instance, if you <emphasis>/join &amp;msn</emphasis> you will join a channel that only contains your MSN contacts.
+</para>
+
+<para>
+Account tagging allows you to use the given account name rather than a number when referencing your account. If you wish to turn off your gtalk account, you may <emphasis>account gtalk off</emphasis> rather than <emphasis>account 3 off</emphasis> where "3" is the account number.
 </para>
 

ipc.c

@@ -356 +356 @@
                         irc_switch_fd( irc, ipc_child_recv_fd );
                         irc_sync( irc );
-                        irc_usermsg( irc, "You've successfully taken over your old session" );
+                        irc_rootmsg( irc, "You've successfully taken over your old session" );
                         ipc_child_recv_fd = -1;
                         
@@ -374 +374 @@
         {
                 /* Master->New connection */
-                irc_usermsg( irc, "Could not take over old session" );
+                irc_rootmsg( irc, "Could not take over old session" );
         }
 }
@@ -412 +412 @@
         /* Drop credentials, we'll shut down soon and shouldn't overwrite
            any settings. */
-        irc_usermsg( irc, "Trying to take over existing session" );
+        irc_rootmsg( irc, "Trying to take over existing session" );
         
         irc_desync( irc );
@@ -909 +909 @@
         int serversock;
 
+        if (!IPCSOCKET || !*IPCSOCKET)
+                return 1;
+
         /* Clean up old socket files that were hanging around.. */
         if (unlink(IPCSOCKET) == -1 && errno != ENOENT) {

irc.c

@@ -363 +363 @@
                                         if( irc->status & USTATUS_LOGGED_IN )
                                         {
-                                                irc_usermsg( irc, "Error: Charset mismatch detected. The charset "
+                                                irc_rootmsg( irc, "Error: Charset mismatch detected. The charset "
                                                                   "setting is currently set to %s, so please make "
                                                                   "sure your IRC client will send and accept text in "
@@ -767 +767 @@
                         irc->root->last_channel = irc->default_channel;
                         
-                        irc_usermsg( irc,
+                        irc_rootmsg( irc,
                                      "Welcome to the BitlBee gateway!\n\n"
                                      "If you've never used BitlBee before, please do read the help "
@@ -910 +910 @@
                 g_free( test );
                 g_iconv_close( oc );
-                irc_usermsg( irc, "Unsupported character set: The IRC protocol "
+                irc_rootmsg( irc, "Unsupported character set: The IRC protocol "
                                   "only supports 8-bit character sets." );
                 return NULL;
@@ -941 +941 @@
         GSList *l;
         
-        irc_usermsg( irc, "Setting `%s' is obsolete, use the `show_users' "
+        irc_rootmsg( irc, "Setting `%s' is obsolete, use the `show_users' "
                      "channel setting instead.", set->key );
         

irc.h

@@ -317 +317 @@
 void irc_send_login( irc_t *irc );
 void irc_send_motd( irc_t *irc );
-void irc_usermsg( irc_t *irc, char *format, ... );
+const char *irc_user_msgdest( irc_user_t *iu );
+void irc_rootmsg( irc_t *irc, char *format, ... );
+void irc_usermsg( irc_user_t *iu, char *format, ... );
+void irc_usernotice( irc_user_t *iu, char *format, ... );
 void irc_send_join( irc_channel_t *ic, irc_user_t *iu );
 void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason );

irc_commands.c

@@ -92 +92 @@
                         irc->status &= ~USTATUS_IDENTIFIED;
                         irc_umode_set( irc, "-R", 1 );
-                        irc_usermsg( irc, "Changing nicks resets your identify status. "
+                        irc_rootmsg( irc, "Changing nicks resets your identify status. "
                                      "Re-identify or register a new account if you want "
                                      "your configuration to be saved. See \x02help "
@@ -433 +433 @@
                         {
                                 set_setstr( &a->set, "password", password );
-                                irc_usermsg( irc, "Password added to IM account "
-                                             "%s(%s)", a->prpl->name, a->user );
+                                irc_rootmsg( irc, "Password added to IM account "
+                                             "%s", a->tag );
                                 /* The IRC client may expect this. 491 suggests the OPER
                                    password was wrong, so the client won't expect a +o.
                                    It may however repeat the password prompt. We'll see. */
                                 irc_send_num( irc, 491, ":Password added to IM account "
-                                              "%s(%s)", a->prpl->name, a->user );
+                                              "%s", a->tag );
                         }
         }

irc_im.c

@@ -197 +197 @@
         irc_t *irc = bee->ui_data;
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        char *dst, *prefix = NULL;
+        const char *dst;
+        char *prefix = NULL;
         char *wrapped, *ts = NULL;
-        irc_channel_t *ic = NULL;
         char *msg = g_strdup( msg_ );
         GSList *l;
@@ -206 +206 @@
                 ts = irc_format_timestamp( irc, sent_at );
         
-        /* Too similar to irc_usermsg()... */
-        if( iu->last_channel )
-        {
-                if( iu->last_channel->flags & IRC_CHANNEL_JOINED )
-                        ic = iu->last_channel;
-                else
-                        ic = irc_channel_with_user( irc, iu );
-        }
-        
-        if( ic )
-        {
-                dst = ic->name;
+        dst = irc_user_msgdest( iu );
+        if( dst != irc->user->nick )
+        {
+                /* if not messaging directly, call user by name */
                 prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" );
         }
         else
         {
-                dst = irc->user->nick;
                 prefix = ts;
-                ts = NULL;
+                ts = NULL;      /* don't double-free */
         }
         
@@ -995 +986 @@
         else if( !acc->prpl->chat_join )
         {
-                irc_usermsg( ic->irc, "Named chatrooms not supported on that account." );
+                irc_rootmsg( ic->irc, "Named chatrooms not supported on that account." );
                 return SET_INVALID;
         }

irc_send.c

@@ -110 +110 @@
 }
 
-void irc_usermsg( irc_t *irc, char *format, ... )
-{
+/* Used by some funcs that generate PRIVMSGs to figure out if we're talking to
+   this person in /query or in a control channel. WARNING: callers rely on
+   this returning a pointer at irc->user_nick, not a copy of it. */
+const char *irc_user_msgdest( irc_user_t *iu )
+{
+        irc_t *irc = iu->irc;
         irc_channel_t *ic = NULL;
-        irc_user_t *iu = irc->root;
-        char text[2048];
-        va_list params;
-        char *dst;
-        
-        va_start( params, format );
-        g_vsnprintf( text, sizeof( text ), format, params );
-        va_end( params );
-        
-        /* Too similar to bee_irc_user_msg()... */
+
         if( iu->last_channel )
         {
@@ -128 +123 @@
                         ic = iu->last_channel;
                 else
-                        ic = irc_channel_with_user( irc, irc->root );
+                        ic = irc_channel_with_user( irc, iu );
         }
         
         if( ic )
-                dst = ic->name;
+                return ic->name;
         else
-                dst = irc->user->nick;
-        
-        irc_send_msg( irc->root, "PRIVMSG", dst, text, NULL );
+                return irc->user->nick;
+}
+
+/* cmd = "PRIVMSG" or "NOTICE" */
+static void irc_usermsg_( const char *cmd, irc_user_t *iu, const char *format, va_list params )
+{
+        char text[2048];
+        const char *dst;
+        
+        g_vsnprintf( text, sizeof( text ), format, params );
+        
+        dst = irc_user_msgdest( iu );
+        irc_send_msg( iu, cmd, dst, text, NULL );
+}
+
+void irc_usermsg(irc_user_t *iu, char *format, ... )
+{
+        va_list params;
+        va_start( params, format );
+        irc_usermsg_( "PRIVMSG", iu, format, params );
+        va_end( params );
+}
+
+void irc_usernotice(irc_user_t *iu, char *format, ... )
+{
+        va_list params;
+        va_start( params, format );
+        irc_usermsg_( "NOTICE", iu, format, params );
+        va_end( params );
+}
+
+void irc_rootmsg( irc_t *irc, char *format, ... )
+{
+        va_list params;
+        va_start( params, format );
+        irc_usermsg_( "PRIVMSG", irc->root, format, params );
+        va_end( params );
 }
 

lib/http_client.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2005 Wilmer van der Gaast and others                *
+  * Copyright 2002-2011 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -69 +69 @@
         req->request_length = strlen( request );
         req->redir_ttl = 3;
+        
+        if( getenv( "BITLBEE_DEBUG" ) )
+                printf( "About to send HTTP request:\n%s\n", req->request );
         
         return( req );
@@ -240 +243 @@
                                  http_incoming_data, req );
         
-        return FALSE;
+        if( ssl_pending( req->ssl ) )
+                return http_incoming_data( data, source, cond );
+        else
+                return FALSE;
 
 got_reply:
@@ -275 +281 @@
         
         *end1 = 0;
+        
+        if( getenv( "BITLBEE_DEBUG" ) )
+                printf( "HTTP response headers:\n%s\n", req->reply_headers );
         
         if( evil_server )
@@ -314 +323 @@
         }
         
-        if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 )
+        if( ( ( req->status_code >= 301 && req->status_code <= 303 ) ||
+              req->status_code == 307 ) && req->redir_ttl-- > 0 )
         {
                 char *loc, *new_request, *new_host;
@@ -354 +364 @@
                         url_t *url;
                         char *s;
+                        const char *new_method;
                         
                         s = strstr( loc, "\r\n" );
@@ -369 +380 @@
                         }
                         
-                        /* Okay, this isn't fun! We have to rebuild the request... :-( */
-                        new_request = g_malloc( req->request_length + strlen( url->file ) );
-                        
-                        /* So, now I just allocated enough memory, so I'm
-                           going to use strcat(), whether you like it or not. :-) */
-                        
-                        sprintf( new_request, "GET %s HTTP/1.0", url->file );
-                        
-                        s = strstr( req->request, "\r\n" );
-                        if( s == NULL )
+                        /* Find all headers and, if necessary, the POST request contents.
+                           Skip the old Host: header though. This crappy code here means
+                           anything using this http_client MUST put the Host: header at
+                           the top. */
+                        if( !( ( s = strstr( req->request, "\r\nHost: " ) ) &&
+                               ( s = strstr( s + strlen( "\r\nHost: " ), "\r\n" ) ) ) )
                         {
                                 req->status_string = g_strdup( "Error while rebuilding request string" );
-                                g_free( new_request );
                                 g_free( url );
                                 goto cleanup;
                         }
                         
-                        strcat( new_request, s );
+                        /* More or less HTTP/1.0 compliant, from my reading of RFC 2616.
+                           Always perform a GET request unless we received a 301. 303 was
+                           meant for this but it's HTTP/1.1-only and we're specifically
+                           speaking HTTP/1.0. ...
+                           
+                           Well except someone at identi.ca's didn't bother reading any
+                           RFCs and just return HTTP/1.1-specific status codes to HTTP/1.0
+                           requests. Fuckers. So here we are, handle 301..303,307. */
+                        if( strncmp( req->request, "GET", 3 ) == 0 )
+                                /* GETs never become POSTs. */
+                                new_method = "GET";
+                        else if( req->status_code == 302 || req->status_code == 303 )
+                                /* 302 de-facto becomes GET, 303 as specified by RFC 2616#10.3.3 */
+                                new_method = "GET";
+                        else
+                                /* 301 de-facto should stay POST, 307 specifally RFC 2616#10.3.8 */
+                                new_method = "POST";
+                        
+                        /* Okay, this isn't fun! We have to rebuild the request... :-( */
+                        new_request = g_strdup_printf( "%s %s HTTP/1.0\r\nHost: %s%s",
+                                                       new_method, url->file, url->host, s );
+                        
                         new_host = g_strdup( url->host );
                         new_port = url->port;
                         new_proto = url->proto;
+                        
+                        /* If we went from POST to GET, truncate the request content. */
+                        if( new_request[0] != req->request[0] && new_request[0] == 'G' &&
+                            ( s = strstr( new_request, "\r\n\r\n" ) ) )
+                                s[4] = '\0';
                         
                         g_free( url );
@@ -402 +434 @@
                 req->ssl = NULL;
                 
+                if( getenv( "BITLBEE_DEBUG" ) )
+                        printf( "New headers for redirected HTTP request:\n%s\n", new_request );
+        
                 if( new_proto == PROTO_HTTPS )
                 {
@@ -443 +478 @@
                 closesocket( req->fd );
         
+        if( getenv( "BITLBEE_DEBUG" ) && req )
+                printf( "Finishing HTTP request with status: %s\n",
+                        req->status_string ? req->status_string : "NULL" );
+        
         req->func( req );
         http_free( req );

lib/ssl_client.h

@@ -63 +63 @@
 G_MODULE_EXPORT int ssl_write( void *conn, const char *buf, int len );
 
-/* See ssl_openssl.c for an explanation. */
+/* Now needed by most SSL libs. See for more info:
+   http://www.gnu.org/software/gnutls/manual/gnutls.html#index-gnutls_005frecord_005fcheck_005fpending-209
+   http://www.openssl.org/docs/ssl/SSL_pending.html
+   
+   Required because OpenSSL empties the TCP buffer completely but doesn't
+   necessarily give us all the unencrypted data. Or maybe you didn't ask
+   for all of it because your buffer is too small.
+   
+   Returns 0 if there's nothing left, 1 if there's more data. */
 G_MODULE_EXPORT int ssl_pending( void *conn );
 

lib/ssl_gnutls.c

@@ -45 +45 @@
 #endif
 
+#define SSLDEBUG 0
+
 struct scd
 {
@@ -135 +137 @@
         gnutls_certificate_allocate_credentials( &conn->xcred );
         gnutls_init( &conn->session, GNUTLS_CLIENT );
-        gnutls_transport_set_lowat( conn->session, 1 ); 
+#if GNUTLS_VERSION_NUMBER < 0x020c00
+        gnutls_transport_set_lowat( conn->session, 0 );
+#endif
         gnutls_set_default_priority( conn->session );
         gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, conn->xcred );
@@ -187 +191 @@
         {
                 ssl_errno = SSL_NOHANDSHAKE;
-                return( -1 );
+                return -1;
         }
         
@@ -196 +200 @@
                 ssl_errno = SSL_AGAIN;
         
-        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 1, buf, st );
+        if( SSLDEBUG && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 2, buf, st );
         
         return st;
@@ -208 +212 @@
         {
                 ssl_errno = SSL_NOHANDSHAKE;
-                return( -1 );
+                return -1;
         }
         
@@ -217 +221 @@
                 ssl_errno = SSL_AGAIN;
         
-        if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 1, buf, st );
+        if( SSLDEBUG && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 2, buf, st );
         
         return st;
 }
 
-/* See ssl_openssl.c for an explanation. */
 int ssl_pending( void *conn )
 {
-        return 0;
+        if( conn == NULL )
+                return 0;
+        
+        if( !((struct scd*)conn)->established )
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return 0;
+        }
+        
+        return gnutls_record_check_pending( ((struct scd*)conn)->session ) != 0;
 }
 

lib/ssl_nss.c

@@ -207 +207 @@
 }
 
-/* See ssl_openssl.c for an explanation. */
 int ssl_pending( void *conn )
 {

lib/ssl_openssl.c

@@ -241 +241 @@
 }
 
-/* Only OpenSSL *really* needs this (and well, maybe NSS). See for more info:
-   http://www.gnu.org/software/gnutls/manual/gnutls.html#index-gnutls_005frecord_005fcheck_005fpending-209
-   http://www.openssl.org/docs/ssl/SSL_pending.html
-   
-   Required because OpenSSL empties the TCP buffer completely but doesn't
-   necessarily give us all the unencrypted data.
-   
-   Returns 0 if there's nothing left or if we don't have to care (GnuTLS),
-   1 if there's more data. */
 int ssl_pending( void *conn )
 {

lib/xmltree.c

@@ -323 +323 @@
 }
 
-#ifdef DEBUG
 void xt_print( struct xt_node *node )
 {
@@ -331 +330 @@
         /* Indentation */
         for( c = node; c->parent; c = c->parent )
-                printf( "    " );
+                fprintf( stderr, "    " );
         
         /* Start the tag */
-        printf( "<%s", node->name );
+        fprintf( stderr, "<%s", node->name );
         
         /* Print the attributes */
@@ -340 +339 @@
         {
                 char *v = g_markup_escape_text( node->attr[i].value, -1 );
-                printf( " %s=\"%s\"", node->attr[i].key, v );
+                fprintf( stderr, " %s=\"%s\"", node->attr[i].key, v );
                 g_free( v );
         }
@@ -349 +348 @@
         if( node->text == NULL && node->children == NULL )
         {
-                printf( "/>\n" );
+                fprintf( stderr, "/>\n" );
                 return;
                 /* Then we're finished! */
@@ -355 +354 @@
         
         /* Otherwise... */
-        printf( ">" );
+        fprintf( stderr, ">" );
         
         /* Only print the text if it contains more than whitespace (TEST). */
@@ -364 +363 @@
                 {
                         char *v = g_markup_escape_text( node->text, -1 );
-                        printf( "%s", v );
+                        fprintf( stderr, "%s", v );
                         g_free( v );
                 }
@@ -370 +369 @@
         
         if( node->children )
-                printf( "\n" );
+                fprintf( stderr, "\n" );
         
         for( c = node->children; c; c = c->next )
@@ -377 +376 @@
         if( node->children )
                 for( c = node; c->parent; c = c->parent )
-                        printf( "    " );
+                        fprintf( stderr, "    " );
         
         /* Non-empty tag is now finished. */
-        printf( "</%s>\n", node->name );
-}
-#endif
+        fprintf( stderr, "</%s>\n", node->name );
+}
 
 struct xt_node *xt_dup( struct xt_node *node )
@@ -557 +555 @@
 }
 
+/* Strip a few non-printable characters that aren't allowed in XML streams
+   (and upset some XMPP servers for example). */
+void xt_strip_text( char *in )
+{
+        char *out = in;
+        static const char nonprint[32] = {
+                0, 0, 0, 0, 0, 0, 0, 0, /* 0..7 */
+                0, 1, 1, 0, 0, 1, 0, 0, /* 9 (tab), 10 (\n), 13 (\r) */
+        };
+        
+        if( !in )
+                return;
+
+        while( *in )
+        {
+                if( (unsigned int) *in >= ' ' || nonprint[(unsigned int) *in] )
+                        *out ++ = *in;
+                in ++;
+        }
+        *out = *in;
+}
+
 struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children )
 {
@@ -568 +588 @@
         if( text )
         {
-                node->text_len = strlen( text );
-                node->text = g_memdup( text, node->text_len + 1 );
+                node->text = g_strdup( text );
+                xt_strip_text( node->text );
+                node->text_len = strlen( node->text );
         }
         

nick.c

@@ -243 +243 @@
                         int i;
                         
-                        irc_usermsg( irc, "Warning: Almost had an infinite loop in nick_get()! "
+                        irc_rootmsg( irc, "Warning: Almost had an infinite loop in nick_get()! "
                                           "This used to be a fatal BitlBee bug, but we tried to fix it. "
                                           "This message should *never* appear anymore. "
@@ -249 +249 @@
                                           "Please send all the following lines in your report:" );
                         
-                        irc_usermsg( irc, "Trying to get a sane nick for handle %s", bu->handle );
+                        irc_rootmsg( irc, "Trying to get a sane nick for handle %s", bu->handle );
                         for( i = 0; i < MAX_NICK_LENGTH; i ++ )
-                                irc_usermsg( irc, "Char %d: %c/%d", i, nick[i], nick[i] );
-                        
-                        irc_usermsg( irc, "FAILED. Returning an insane nick now. Things might break. "
+                                irc_rootmsg( irc, "Char %d: %c/%d", i, nick[i], nick[i] );
+                        
+                        irc_rootmsg( irc, "FAILED. Returning an insane nick now. Things might break. "
                                           "Good luck, and please don't forget to paste the lines up here "
                                           "in #bitlbee on OFTC or in a mail to wilmer@gaast.net" );

otr.c

@@ -8 +8 @@
   OTR support (cf. http://www.cypherpunks.ca/otr/)
   
-  (c) 2008-2010 Sven Moritz Hallberg <pesco@khjk.org>
+  (c) 2008-2011 Sven Moritz Hallberg <pesco@khjk.org>
   (c) 2008 funded by stonedcoder.org
     
@@ -163 +163 @@
                 const char *secret);
 
+/* update flags within the irc_user structure to reflect OTR status of context */
+void otr_update_uflags(ConnContext *context, irc_user_t *u);
+
 /* update op/voice flag of given user according to encryption state and settings
    returns 0 if neither op_buddies nor voice_buddies is set to "encrypted",
@@ -182 +185 @@
 /* find a private key by fingerprint prefix (given as any number of hex strings) */
 OtrlPrivKey *match_privkey(irc_t *irc, const char **args);
+
+/* check whether a string is safe to use in a path component */
+int strsane(const char *s);
 
 /* functions to be called for certain events */
@@ -237 +243 @@
         l = g_slist_prepend( l, "always" );
         s->eval_data = l;
+
+        s = set_add( &irc->b->set, "otr_does_html", "true", set_eval_bool, irc );
         
         return TRUE;
@@ -270 +278 @@
         int kg=0;
 
-        g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, irc->user->nick);
-        e = otrl_privkey_read(irc->otr->us, s);
-        if(e && e!=enoent) {
-                irc_usermsg(irc, "otr load: %s: %s", s, gcry_strerror(e));
-        }
-        g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->user->nick);
-        e = otrl_privkey_read_fingerprints(irc->otr->us, s, NULL, NULL);
-        if(e && e!=enoent) {
-                irc_usermsg(irc, "otr load: %s: %s", s, gcry_strerror(e));
+        if(strsane(irc->user->nick)) {
+                g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, irc->user->nick);
+                e = otrl_privkey_read(irc->otr->us, s);
+                if(e && e!=enoent) {
+                        irc_rootmsg(irc, "otr load: %s: %s", s, gcry_strerror(e));
+                }
+                g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->user->nick);
+                e = otrl_privkey_read_fingerprints(irc->otr->us, s, NULL, NULL);
+                if(e && e!=enoent) {
+                        irc_rootmsg(irc, "otr load: %s: %s", s, gcry_strerror(e));
+                }
         }
         
@@ -286 +296 @@
         }
         if(kg) {
-                irc_usermsg(irc, "Notice: "
+                irc_rootmsg(irc, "Notice: "
                         "The accounts above do not have OTR encryption keys associated with them, yet. "
                         "These keys are now being generated in the background. "
@@ -301 +311 @@
         gcry_error_t e;
 
-        g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->user->nick);
-        e = otrl_privkey_write_fingerprints(irc->otr->us, s);
-        if(e) {
-                irc_usermsg(irc, "otr save: %s: %s", s, gcry_strerror(e));
-        }
-        chmod(s, 0600);
+        if(strsane(irc->user->nick)) {
+                g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, irc->user->nick);
+                e = otrl_privkey_write_fingerprints(irc->otr->us, s);
+                if(e) {
+                        irc_rootmsg(irc, "otr save: %s: %s", s, gcry_strerror(e));
+                }
+                chmod(s, 0600);
+        }
 }
 
@@ -313 +325 @@
         char s[512];
         
-        g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, nick);
-        unlink(s);
-        g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, nick);
-        unlink(s);
+        if(strsane(nick)) {
+                g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, nick);
+                unlink(s);
+                g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, nick);
+                unlink(s);
+        }
 }
 
@@ -323 +337 @@
         char s[512], t[512];
         
-        g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, onick);
-        g_snprintf(t, 511, "%s%s.otr_keys", global.conf->configdir, nnick);
-        rename(s,t);
-        g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, onick);
-        g_snprintf(t, 511, "%s%s.otr_fprints", global.conf->configdir, nnick);
-        rename(s,t);
+        if(strsane(nnick) && strsane(onick)) {
+                g_snprintf(s, 511, "%s%s.otr_keys", global.conf->configdir, onick);
+                g_snprintf(t, 511, "%s%s.otr_keys", global.conf->configdir, nnick);
+                rename(s,t);
+                g_snprintf(s, 511, "%s%s.otr_fprints", global.conf->configdir, onick);
+                g_snprintf(t, 511, "%s%s.otr_fprints", global.conf->configdir, nnick);
+                rename(s,t);
+        }
 }
 
@@ -343 +359 @@
         k = otrl_privkey_find(irc->otr->us, a->user, a->prpl->name);
         if(k) {
-                irc_usermsg(irc, "otr: %s/%s ready", a->user, a->prpl->name);
+                irc_rootmsg(irc, "otr: %s/%s ready", a->user, a->prpl->name);
                 return 0;
         } if(keygen_in_progress(irc, a->user, a->prpl->name)) {
-                irc_usermsg(irc, "otr: keygen for %s/%s already in progress", a->user, a->prpl->name);
+                irc_rootmsg(irc, "otr: keygen for %s/%s already in progress", a->user, a->prpl->name);
                 return 0;
         } else {
-                irc_usermsg(irc, "otr: starting background keygen for %s/%s", a->user, a->prpl->name);
+                irc_rootmsg(irc, "otr: starting background keygen for %s/%s", a->user, a->prpl->name);
                 otr_keygen(irc, a->user, a->prpl->name);
                 return 1;
@@ -360 +376 @@
         char *newmsg = NULL;
         OtrlTLV *tlvs = NULL;
-        char *colormsg;
         irc_t *irc = iu->irc;
         struct im_connection *ic = iu->bu->ic;
@@ -380 +395 @@
         } else if(!newmsg) {
                 /* this was a non-OTR message */
-                return g_strdup(msg);
+                return msg;
         } else {
                 /* OTR has processed this message */
                 ConnContext *context = otrl_context_find(irc->otr->us, iu->bu->handle,
                         ic->acc->user, ic->acc->prpl->name, 0, NULL, NULL, NULL);
-                if(context && context->msgstate == OTRL_MSGSTATE_ENCRYPTED &&
-                   set_getbool(&ic->bee->set, "otr_color_encrypted")) {
-                        /* color according to f'print trust */
-                        int color;
-                        const char *trust = context->active_fingerprint->trust;
-                        if(trust && trust[0] != '\0')
-                                color=3;   /* green */
-                        else
-                                color=5;   /* red */
-
-                        if(newmsg[0] == ',') {
-                                /* could be a problem with the color code */
-                                /* insert a space between color spec and message */
-                                colormsg = g_strdup_printf("\x03%.2d %s\x0F", color, newmsg);
-                        } else {
-                                colormsg = g_strdup_printf("\x03%.2d%s\x0F", color, newmsg);
+
+                /* we're done with the original msg, which will be caller-freed. */
+                /* NB: must not change the newmsg pointer, since we free it. */
+                msg = newmsg;
+
+                if(context && context->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
+                        /* HTML decoding */
+                        /* perform any necessary stripping that the top level would miss */
+                        if(set_getbool(&ic->bee->set, "otr_does_html") &&
+                           !(ic->flags & OPT_DOES_HTML) &&
+                           set_getbool(&ic->bee->set, "strip_html")) {
+                                strip_html(msg);
                         }
-                } else {
-                        colormsg = g_strdup(newmsg);
+
+                        /* coloring */
+                        if(set_getbool(&ic->bee->set, "otr_color_encrypted")) {
+                                int color;                /* color according to f'print trust */
+                                char *pre="", *sep="";    /* optional parts */
+                                const char *trust = context->active_fingerprint->trust;
+
+                                if(trust && trust[0] != '\0')
+                                        color=3;   /* green */
+                                else
+                                        color=5;   /* red */
+
+                                /* in a query window, keep "/me " uncolored at the beginning */
+                                if(g_strncasecmp(msg, "/me ", 4) == 0
+                                   && irc_user_msgdest(iu) == irc->user->nick) {
+                                        msg += 4;  /* skip */
+                                        pre = "/me ";
+                                }
+
+                                /* comma in first place could mess with the color code */
+                                if(msg[0] == ',') {
+                                    /* insert a space between color spec and message */
+                                    sep = " ";
+                                }
+
+                                msg = g_strdup_printf("%s\x03%.2d%s%s\x0F", pre,
+                                        color, sep, msg);
+                        }
+                }
+
+                if(msg == newmsg) {
+                        msg = g_strdup(newmsg);
                 }
                 otrl_message_free(newmsg);
-                return colormsg;
+                return msg;
         }
 }
@@ -414 +455 @@
         int st;
         char *otrmsg = NULL;
+        char *emsg = msg;           /* the message as we hand it to libotr */
         ConnContext *ctx = NULL;
         irc_t *irc = iu->irc;
@@ -422 +464 @@
                 return msg;
         }
-        
-        st = otrl_message_sending(irc->otr->us, &otr_ops, ic,
-                ic->acc->user, ic->acc->prpl->name, iu->bu->handle,
-                msg, NULL, &otrmsg, NULL, NULL);
-        if(st) {
-                return NULL;
-        }
 
         ctx = otrl_context_find(irc->otr->us,
                         iu->bu->handle, ic->acc->user, ic->acc->prpl->name,
                         1, NULL, NULL, NULL);
+
+        /* HTML encoding */
+        /* consider OTR plaintext to be HTML if otr_does_html is set */
+        if(ctx && ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED &&
+           set_getbool(&ic->bee->set, "otr_does_html") &&
+           (g_strncasecmp(msg, "<html>", 6) != 0)) {
+                emsg = escape_html(msg);
+        }
+        
+        st = otrl_message_sending(irc->otr->us, &otr_ops, ic,
+                ic->acc->user, ic->acc->prpl->name, iu->bu->handle,
+                emsg, NULL, &otrmsg, NULL, NULL);
+        if(emsg != msg) {
+                g_free(emsg);   /* we're done with this one */
+        }
+        if(st) {
+                return NULL;
+        }
 
         if(otrmsg) {
@@ -480 +533 @@
         
         if(!cmd->command) {
-                irc_usermsg(irc, "%s: unknown subcommand \"%s\", see \x02help otr\x02",
+                irc_rootmsg(irc, "%s: unknown subcommand \"%s\", see \x02help otr\x02",
                         args[0], args[1]);
                 return;
@@ -486 +539 @@
         
         if(!args[cmd->required_parameters+1]) {
-                irc_usermsg(irc, "%s %s: not enough arguments (%d req.)",
+                irc_rootmsg(irc, "%s %s: not enough arguments (%d req.)",
                         args[0], args[1], cmd->required_parameters);
                 return;
@@ -558 +611 @@
         if (strcmp(accountname, recipient) == 0) {
                 /* huh? injecting messages to myself? */
-                irc_usermsg(irc, "note to self: %s", message);
+                irc_rootmsg(irc, "note to self: %s", message);
         } else {
                 /* need to drop some consts here :-( */
@@ -573 +626 @@
         char *msg = g_strdup(message);
         irc_t *irc = ic->bee->ui_data;
+        irc_user_t *u = peeruser(irc, username, protocol);
 
         strip_html(msg);
-        irc_usermsg(irc, "otr: %s", msg);
+        if(u) {
+                /* display as a notice from this particular user */
+                irc_usernotice(u, "%s", msg);
+        } else {
+                irc_rootmsg(irc, "[otr] %s", msg);
+        }
 
         g_free(msg);
@@ -587 +646 @@
         struct im_connection *ic = check_imc(opdata, accountname, protocol);
         irc_t *irc = ic->bee->ui_data;
+        irc_user_t *u = peeruser(irc, username, protocol);
         char hunam[45];         /* anybody looking? ;-) */
         
         otrl_privkey_hash_to_human(hunam, fingerprint);
-        irc_usermsg(irc, "new fingerprint for %s: %s",
-                peernick(irc, username, protocol), hunam);
+        if(u) {
+                irc_usernotice(u, "new fingerprint: %s", hunam);
+        } else {
+                /* this case shouldn't normally happen */
+                irc_rootmsg(irc, "new fingerprint for %s/%s: %s",
+                        username, protocol, hunam);
+        }
 }
 
@@ -608 +673 @@
         irc_user_t *u;
         irc_t *irc = ic->bee->ui_data;
-        const char *trust;
 
         u = peeruser(irc, context->username, context->protocol);
@@ -618 +682 @@
         }
         
-        trust = context->active_fingerprint->trust;
-        if(trust && trust[0])
-                u->flags |= IRC_USER_OTR_ENCRYPTED | IRC_USER_OTR_TRUSTED;
-        else
-                u->flags = ( u->flags & ~IRC_USER_OTR_TRUSTED ) | IRC_USER_OTR_ENCRYPTED;
-        if(!otr_update_modeflags(irc, u))
-                irc_usermsg(irc, "conversation with %s is now off the record", u->nick);
+        otr_update_uflags(context, u);
+        if(!otr_update_modeflags(irc, u)) {
+                char *trust = u->flags & IRC_USER_OTR_TRUSTED ? "trusted" : "untrusted!";
+                irc_usernotice(u, "conversation is now off the record (%s)", trust);
+        }
 }
 
@@ -641 +703 @@
                 return;
         }
-        u->flags &= ~( IRC_USER_OTR_ENCRYPTED | IRC_USER_OTR_TRUSTED );
+        otr_update_uflags(context, u);
         if(!otr_update_modeflags(irc, u))
-                irc_usermsg(irc, "conversation with %s is now in the clear", u->nick);
+                irc_usernotice(u, "conversation is now in cleartext");
 }
 
@@ -660 +722 @@
                 return;
         }
-        if(context->active_fingerprint->trust[0])
-                u->flags |= IRC_USER_OTR_ENCRYPTED | IRC_USER_OTR_TRUSTED;
-        else
-                u->flags = ( u->flags & ~IRC_USER_OTR_TRUSTED ) | IRC_USER_OTR_ENCRYPTED;
-        if(!otr_update_modeflags(irc, u))
-                irc_usermsg(irc, "otr connection with %s has been refreshed", u->nick);
+
+        otr_update_uflags(context, u);
+        if(!otr_update_modeflags(irc, u)) {
+                char *trust = u->flags & IRC_USER_OTR_TRUSTED ? "trusted" : "untrusted!";
+                irc_usernotice(u, "otr connection has been refreshed (%s)", trust);
+        }
 }
 
@@ -708 +770 @@
         u = irc_user_by_name(irc, args[1]);
         if(!u || !u->bu || !u->bu->ic) {
-                irc_usermsg(irc, "%s: unknown user", args[1]);
+                irc_rootmsg(irc, "%s: unknown user", args[1]);
                 return;
         }
@@ -733 +795 @@
         u = irc_user_by_name(irc, args[1]);
         if(!u || !u->bu || !u->bu->ic) {
-                irc_usermsg(irc, "%s: unknown user", args[1]);
+                irc_rootmsg(irc, "%s: unknown user", args[1]);
                 return;
         }
         if(!(u->bu->flags & BEE_USER_ONLINE)) {
-                irc_usermsg(irc, "%s is offline", args[1]);
+                irc_rootmsg(irc, "%s is offline", args[1]);
                 return;
         }
@@ -764 +826 @@
         u = irc_user_by_name(irc, args[1]);
         if(!u || !u->bu || !u->bu->ic) {
-                irc_usermsg(irc, "%s: unknown user", args[1]);
+                irc_rootmsg(irc, "%s: unknown user", args[1]);
                 return;
         }
@@ -771 +833 @@
                 u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
         if(!ctx) {
-                irc_usermsg(irc, "%s: no otr context with user", args[1]);
+                irc_rootmsg(irc, "%s: no otr context with user", args[1]);
                 return;
         }
@@ -783 +845 @@
                         
                         if(!*p || !*q) {
-                                irc_usermsg(irc, "failed: truncated fingerprint block %d", i+1);
+                                irc_rootmsg(irc, "failed: truncated fingerprint block %d", i+1);
                                 return;
                         }
@@ -790 +852 @@
                         y = hexval(*q);
                         if(x<0) {
-                                irc_usermsg(irc, "failed: %d. hex digit of block %d out of range", 2*j+1, i+1);
+                                irc_rootmsg(irc, "failed: %d. hex digit of block %d out of range", 2*j+1, i+1);
                                 return;
                         }
                         if(y<0) {
-                                irc_usermsg(irc, "failed: %d. hex digit of block %d out of range", 2*j+2, i+1);
+                                irc_rootmsg(irc, "failed: %d. hex digit of block %d out of range", 2*j+2, i+1);
                                 return;
                         }
@@ -803 +865 @@
         fp = otrl_context_find_fingerprint(ctx, raw, 0, NULL);
         if(!fp) {
-                irc_usermsg(irc, "failed: no such fingerprint for %s", args[1]);
+                irc_rootmsg(irc, "failed: no such fingerprint for %s", args[1]);
         } else {
                 char *trust = args[7] ? args[7] : "affirmed";
                 otrl_context_set_trust(fp, trust);
-                irc_usermsg(irc, "fingerprint match, trust set to \"%s\"", trust);
+                irc_rootmsg(irc, "fingerprint match, trust set to \"%s\"", trust);
                 if(u->flags & IRC_USER_OTR_ENCRYPTED)
                         u->flags |= IRC_USER_OTR_TRUSTED;
@@ -835 +897 @@
                         ctx = otrl_context_find(irc->otr->us, handle, myhandle, protocol, 0, NULL, NULL, NULL);
                         if(!ctx) {
-                                irc_usermsg(irc, "no such context");
+                                irc_rootmsg(irc, "no such context");
                                 g_free(arg);
                                 return;
@@ -842 +904 @@
                         irc_user_t *u = irc_user_by_name(irc, args[1]);
                         if(!u || !u->bu || !u->bu->ic) {
-                                irc_usermsg(irc, "%s: unknown user", args[1]);
+                                irc_rootmsg(irc, "%s: unknown user", args[1]);
                                 g_free(arg);
                                 return;
@@ -849 +911 @@
                                 u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
                         if(!ctx) {
-                                irc_usermsg(irc, "no otr context with %s", args[1]);
+                                irc_rootmsg(irc, "no otr context with %s", args[1]);
                                 g_free(arg);
                                 return;
@@ -857 +919 @@
                 /* show how we resolved the (nick) argument, if we did */
                 if(handle!=arg) {
-                        irc_usermsg(irc, "%s is %s/%s; we are %s/%s to them", args[1],
+                        irc_rootmsg(irc, "%s is %s/%s; we are %s/%s to them", args[1],
                                 ctx->username, ctx->protocol, ctx->accountname, ctx->protocol);
                 }
@@ -872 +934 @@
         n = atoi(args[1]);
         if(n<0 || (!n && strcmp(args[1], "0"))) {
-                irc_usermsg(irc, "%s: invalid account number", args[1]);
+                irc_rootmsg(irc, "%s: invalid account number", args[1]);
                 return;
         }
@@ -879 +941 @@
         for(i=0; i<n && a; i++, a=a->next);
         if(!a) {
-                irc_usermsg(irc, "%s: no such account", args[1]);
+                irc_rootmsg(irc, "%s: no such account", args[1]);
                 return;
         }
         
         if(keygen_in_progress(irc, a->user, a->prpl->name)) {
-                irc_usermsg(irc, "keygen for account %d already in progress", n);
+                irc_rootmsg(irc, "keygen for account %d already in progress", n);
                 return;
         }
@@ -906 +968 @@
         
         if(fp == fp->context->active_fingerprint) {
-                irc_usermsg(irc, "that fingerprint is active, terminate otr connection first");
+                irc_rootmsg(irc, "that fingerprint is active, terminate otr connection first");
                 return;
         }
@@ -922 +984 @@
         
         if(ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
-                irc_usermsg(irc, "active otr connection with %s, terminate it first",
+                irc_rootmsg(irc, "active otr connection with %s, terminate it first",
                         peernick(irc, ctx->username, ctx->protocol));
                 return;
@@ -954 +1016 @@
                 
                 if(!args[3]) {
-                        irc_usermsg(irc, "otr %s %s: not enough arguments (2 req.)", args[0], args[1]);
+                        irc_rootmsg(irc, "otr %s %s: not enough arguments (2 req.)", args[0], args[1]);
                         return;
                 }
@@ -961 +1023 @@
                 u = irc_user_by_name(irc, args[2]);
                 if(!u || !u->bu || !u->bu->ic) {
-                        irc_usermsg(irc, "%s: unknown user", args[2]);
+                        irc_rootmsg(irc, "%s: unknown user", args[2]);
                         return;
                 }
@@ -968 +1030 @@
                         u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
                 if(!ctx) {
-                        irc_usermsg(irc, "no otr context with %s", args[2]);
+                        irc_rootmsg(irc, "no otr context with %s", args[2]);
                         return;
                 }
@@ -979 +1041 @@
                 
                 if(fp == ctx->active_fingerprint) {
-                        irc_usermsg(irc, "that fingerprint is active, terminate otr connection first");
+                        irc_rootmsg(irc, "that fingerprint is active, terminate otr connection first");
                         return;
                 }
@@ -1004 +1066 @@
                 u = irc_user_by_name(irc, args[2]);
                 if(!u || !u->bu || !u->bu->ic) {
-                        irc_usermsg(irc, "%s: unknown user", args[2]);
+                        irc_rootmsg(irc, "%s: unknown user", args[2]);
                         return;
                 }
@@ -1011 +1073 @@
                         u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
                 if(!ctx) {
-                        irc_usermsg(irc, "no otr context with %s", args[2]);
+                        irc_rootmsg(irc, "no otr context with %s", args[2]);
                         return;
                 }
                 
                 if(ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
-                        irc_usermsg(irc, "active otr connection with %s, terminate it first", args[2]);
+                        irc_rootmsg(irc, "active otr connection with %s, terminate it first", args[2]);
                         return;
                 }
@@ -1049 +1111 @@
         else
         {
-                irc_usermsg(irc, "otr %s: unknown subcommand \"%s\", see \x02help otr forget\x02",
+                irc_rootmsg(irc, "otr %s: unknown subcommand \"%s\", see \x02help otr forget\x02",
                         args[0], args[1]);
         }
@@ -1075 +1137 @@
         if(!context) {
                 /* huh? out of memory or what? */
-                irc_usermsg(irc, "smp: failed to get otr context for %s", u->nick);
+                irc_rootmsg(irc, "smp: failed to get otr context for %s", u->nick);
                 otrl_message_abort_smp(us, ops, u->bu->ic, context);
                 otrl_sm_state_free(context->smstate);
@@ -1083 +1145 @@
 
         if (context->smstate->sm_prog_state == OTRL_SMP_PROG_CHEATED) {
-                irc_usermsg(irc, "smp %s: opponent violated protocol, aborting",
+                irc_rootmsg(irc, "smp %s: opponent violated protocol, aborting",
                         u->nick);
                 otrl_message_abort_smp(us, ops, u->bu->ic, context);
@@ -1093 +1155 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT1) {
-                        irc_usermsg(irc, "smp %s: spurious SMP1Q received, aborting", u->nick);
+                        irc_rootmsg(irc, "smp %s: spurious SMP1Q received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
                 } else {
                         char *question = g_strndup((char *)tlv->data, tlv->len);
-                        irc_usermsg(irc, "smp: initiated by %s with question: \x02\"%s\"\x02", u->nick,
+                        irc_rootmsg(irc, "smp: initiated by %s with question: \x02\"%s\"\x02", u->nick,
                                 question);
-                        irc_usermsg(irc, "smp: respond with \x02otr smp %s <answer>\x02",
+                        irc_rootmsg(irc, "smp: respond with \x02otr smp %s <answer>\x02",
                                 u->nick);
                         g_free(question);
@@ -1109 +1171 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT1) {
-                        irc_usermsg(irc, "smp %s: spurious SMP1 received, aborting", u->nick);
+                        irc_rootmsg(irc, "smp %s: spurious SMP1 received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
                 } else {
-                        irc_usermsg(irc, "smp: initiated by %s"
+                        irc_rootmsg(irc, "smp: initiated by %s"
                                 " - respond with \x02otr smp %s <secret>\x02",
                                 u->nick, u->nick);
@@ -1122 +1184 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT2) {
-                        irc_usermsg(irc, "smp %s: spurious SMP2 received, aborting", u->nick);
+                        irc_rootmsg(irc, "smp %s: spurious SMP2 received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
@@ -1133 +1195 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT3) {
-                        irc_usermsg(irc, "smp %s: spurious SMP3 received, aborting", u->nick);
+                        irc_rootmsg(irc, "smp %s: spurious SMP3 received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
@@ -1140 +1202 @@
                         if(context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
                                 if(context->smstate->received_question) {
-                                        irc_usermsg(irc, "smp %s: correct answer, you are trusted",
+                                        irc_rootmsg(irc, "smp %s: correct answer, you are trusted",
                                                 u->nick);
                                 } else {
-                                        irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                        irc_rootmsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
                                                 u->nick);
                                 }
                         } else {
                                 if(context->smstate->received_question) {
-                                        irc_usermsg(irc, "smp %s: wrong answer, you are not trusted",
+                                        irc_rootmsg(irc, "smp %s: wrong answer, you are not trusted",
                                                 u->nick);
                                 } else {
-                                        irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+                                        irc_rootmsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
                                                 u->nick);
                                 }
@@ -1162 +1224 @@
         if (tlv) {
                 if (nextMsg != OTRL_SMP_EXPECT4) {
-                        irc_usermsg(irc, "smp %s: spurious SMP4 received, aborting", u->nick);
+                        irc_rootmsg(irc, "smp %s: spurious SMP4 received, aborting", u->nick);
                         otrl_message_abort_smp(us, ops, u->bu->ic, context);
                         otrl_sm_state_free(context->smstate);
@@ -1168 +1230 @@
                         /* SMP4 received, otrl_message_receiving will have set fp trust */
                         if(context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
-                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                irc_rootmsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
                                         u->nick);
                         } else {
-                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+                                irc_rootmsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
                                         u->nick);
                         }
@@ -1180 +1242 @@
         tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP_ABORT);
         if (tlv) {
-                irc_usermsg(irc, "smp: received abort from %s", u->nick);
+                irc_rootmsg(irc, "smp: received abort from %s", u->nick);
                 otrl_sm_state_free(context->smstate);
                 /* smp is in back in EXPECT1 */
@@ -1195 +1257 @@
         u = irc_user_by_name(irc, nick);
         if(!u || !u->bu || !u->bu->ic) {
-                irc_usermsg(irc, "%s: unknown user", nick);
+                irc_rootmsg(irc, "%s: unknown user", nick);
                 return;
         }
         if(!(u->bu->flags & BEE_USER_ONLINE)) {
-                irc_usermsg(irc, "%s is offline", nick);
+                irc_rootmsg(irc, "%s is offline", nick);
                 return;
         }
@@ -1206 +1268 @@
                 u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
         if(!ctx || ctx->msgstate != OTRL_MSGSTATE_ENCRYPTED) {
-                irc_usermsg(irc, "smp: otr inactive with %s, try \x02otr connect"
+                irc_rootmsg(irc, "smp: otr inactive with %s, try \x02otr connect"
                                 " %s\x02", nick, nick);
                 return;
@@ -1221 +1283 @@
         if(question) {
                 /* this was 'otr smpq', just initiate */
-                irc_usermsg(irc, "smp: initiating with %s...", u->nick);
+                irc_rootmsg(irc, "smp: initiating with %s...", u->nick);
                 otrl_message_initiate_smp_q(irc->otr->us, &otr_ops, u->bu->ic, ctx,
                         question, (unsigned char *)secret, strlen(secret));
@@ -1230 +1292 @@
                    is completed or aborted! */ 
                 if(ctx->smstate->secret == NULL) {
-                        irc_usermsg(irc, "smp: initiating with %s...", u->nick);
+                        irc_rootmsg(irc, "smp: initiating with %s...", u->nick);
                         otrl_message_initiate_smp(irc->otr->us, &otr_ops,
                                 u->bu->ic, ctx, (unsigned char *)secret, strlen(secret));
@@ -1237 +1299 @@
                         /* if we're still in EXPECT1 but smstate is initialized, we must have
                            received the SMP1, so let's issue a response */
-                        irc_usermsg(irc, "smp: responding to %s...", u->nick);
+                        irc_rootmsg(irc, "smp: responding to %s...", u->nick);
                         otrl_message_respond_smp(irc->otr->us, &otr_ops,
                                 u->bu->ic, ctx, (unsigned char *)secret, strlen(secret));
@@ -1312 +1374 @@
 }
 
+void otr_update_uflags(ConnContext *context, irc_user_t *u)
+{
+        const char *trust;
+
+        if(context->active_fingerprint) {
+                u->flags |= IRC_USER_OTR_ENCRYPTED;
+
+                trust = context->active_fingerprint->trust;
+                if(trust && trust[0])
+                        u->flags |= IRC_USER_OTR_TRUSTED;
+                else
+                        u->flags &= ~IRC_USER_OTR_TRUSTED;
+        } else {
+                u->flags &= ~IRC_USER_OTR_ENCRYPTED;
+        }
+}
+
 int otr_update_modeflags(irc_t *irc, irc_user_t *u)
 {
-        return 1;
+        return 0;
 }
 
@@ -1335 +1414 @@
                 }
                 if(fp == ctx->active_fingerprint) {
-                        irc_usermsg(irc, "    \x02%s (%s)\x02", human, trust);
+                        irc_rootmsg(irc, "    \x02%s (%s)\x02", human, trust);
                 } else {
-                        irc_usermsg(irc, "    %s (%s)", human, trust);
+                        irc_rootmsg(irc, "    %s (%s)", human, trust);
                 }
         }
         if(count==0)
-                irc_usermsg(irc, "    (none)");
+                irc_rootmsg(irc, "    (none)");
 }
 
@@ -1360 +1439 @@
                         
                         if(n>=40) {
-                                irc_usermsg(irc, "too many fingerprint digits given, expected at most 40");
+                                irc_rootmsg(irc, "too many fingerprint digits given, expected at most 40");
                                 return NULL;
                         }
@@ -1367 +1446 @@
                                 *(p++) = c;
                         } else {
-                                irc_usermsg(irc, "invalid hex digit '%c' in block %d", args[i][j], i+1);
+                                irc_rootmsg(irc, "invalid hex digit '%c' in block %d", args[i][j], i+1);
                                 return NULL;
                         }
@@ -1388 +1467 @@
         }
         if(!fp) {
-                irc_usermsg(irc, "%s: no match", prefix);
+                irc_rootmsg(irc, "%s: no match", prefix);
                 return NULL;
         }
@@ -1401 +1480 @@
         }
         if(fp2) {
-                irc_usermsg(irc, "%s: multiple matches", prefix);
+                irc_rootmsg(irc, "%s: multiple matches", prefix);
                 return NULL;
         }
@@ -1424 +1503 @@
                         
                         if(n>=40) {
-                                irc_usermsg(irc, "too many fingerprint digits given, expected at most 40");
+                                irc_rootmsg(irc, "too many fingerprint digits given, expected at most 40");
                                 return NULL;
                         }
@@ -1431 +1510 @@
                                 *(p++) = c;
                         } else {
-                                irc_usermsg(irc, "invalid hex digit '%c' in block %d", args[i][j], i+1);
+                                irc_rootmsg(irc, "invalid hex digit '%c' in block %d", args[i][j], i+1);
                                 return NULL;
                         }
@@ -1452 +1531 @@
         }
         if(!k) {
-                irc_usermsg(irc, "%s: no match", prefix);
+                irc_rootmsg(irc, "%s: no match", prefix);
                 return NULL;
         }
@@ -1465 +1544 @@
         }
         if(k2) {
-                irc_usermsg(irc, "%s: multiple matches", prefix);
+                irc_rootmsg(irc, "%s: multiple matches", prefix);
                 return NULL;
         }
@@ -1480 +1559 @@
 
         /* list all privkeys (including ones being generated) */
-        irc_usermsg(irc, "\x1fprivate keys:\x1f");
+        irc_rootmsg(irc, "\x1fprivate keys:\x1f");
         for(key=irc->otr->us->privkey_root; key; key=key->next) {
                 const char *hash;
@@ -1486 +1565 @@
                 switch(key->pubkey_type) {
                 case OTRL_PUBKEY_TYPE_DSA:
-                        irc_usermsg(irc, "  %s/%s - DSA", key->accountname, key->protocol);
+                        irc_rootmsg(irc, "  %s/%s - DSA", key->accountname, key->protocol);
                         break;
                 default:
-                        irc_usermsg(irc, "  %s/%s - type %d", key->accountname, key->protocol,
+                        irc_rootmsg(irc, "  %s/%s - type %d", key->accountname, key->protocol,
                                 key->pubkey_type);
                 }
@@ -1498 +1577 @@
                 hash = otrl_privkey_fingerprint(irc->otr->us, human, key->accountname, key->protocol);
                 if(hash) /* should always succeed */
-                        irc_usermsg(irc, "    %s", human);
+                        irc_rootmsg(irc, "    %s", human);
         }
         if(irc->otr->sent_accountname) {
-                irc_usermsg(irc, "  %s/%s - DSA", irc->otr->sent_accountname,
+                irc_rootmsg(irc, "  %s/%s - DSA", irc->otr->sent_accountname,
                         irc->otr->sent_protocol);
-                irc_usermsg(irc, "    (being generated)");
+                irc_rootmsg(irc, "    (being generated)");
         }
         for(kg=irc->otr->todo; kg; kg=kg->next) {
-                irc_usermsg(irc, "  %s/%s - DSA", kg->accountname, kg->protocol);
-                irc_usermsg(irc, "    (queued)");
+                irc_rootmsg(irc, "  %s/%s - DSA", kg->accountname, kg->protocol);
+                irc_rootmsg(irc, "    (queued)");
         }
         if(key == irc->otr->us->privkey_root &&
            !irc->otr->sent_accountname &&
            kg == irc->otr->todo)
-                irc_usermsg(irc, "  (none)");
+                irc_rootmsg(irc, "  (none)");
 
         /* list all contexts */
-        irc_usermsg(irc, "%s", "");
-        irc_usermsg(irc, "\x1f" "connection contexts:\x1f (bold=currently encrypted)");
+        irc_rootmsg(irc, "%s", "");
+        irc_rootmsg(irc, "\x1f" "connection contexts:\x1f (bold=currently encrypted)");
         for(ctx=irc->otr->us->context_root; ctx; ctx=ctx->next) {\
                 irc_user_t *u;
@@ -1530 +1609 @@
                 
                 if(ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
-                        irc_usermsg(irc, "  \x02%s\x02", userstring);
+                        irc_rootmsg(irc, "  \x02%s\x02", userstring);
                 } else {
-                        irc_usermsg(irc, "  %s", userstring);
+                        irc_rootmsg(irc, "  %s", userstring);
                 }
                 
@@ -1538 +1617 @@
         }
         if(ctx == irc->otr->us->context_root)
-                irc_usermsg(irc, "  (none)");
+                irc_rootmsg(irc, "  (none)");
 }
 
@@ -1545 +1624 @@
         switch(ctx->otr_offer) {
         case OFFER_NOT:
-                irc_usermsg(irc, "  otr offer status: none sent");
+                irc_rootmsg(irc, "  otr offer status: none sent");
                 break;
         case OFFER_SENT:
-                irc_usermsg(irc, "  otr offer status: awaiting reply");
+                irc_rootmsg(irc, "  otr offer status: awaiting reply");
                 break;
         case OFFER_ACCEPTED:
-                irc_usermsg(irc, "  otr offer status: accepted our offer");
+                irc_rootmsg(irc, "  otr offer status: accepted our offer");
                 break;
         case OFFER_REJECTED:
-                irc_usermsg(irc, "  otr offer status: ignored our offer");
+                irc_rootmsg(irc, "  otr offer status: ignored our offer");
                 break;
         default:
-                irc_usermsg(irc, "  otr offer status: %d", ctx->otr_offer);
+                irc_rootmsg(irc, "  otr offer status: %d", ctx->otr_offer);
         }
 
         switch(ctx->msgstate) {
         case OTRL_MSGSTATE_PLAINTEXT:
-                irc_usermsg(irc, "  connection state: cleartext");
+                irc_rootmsg(irc, "  connection state: cleartext");
                 break;
         case OTRL_MSGSTATE_ENCRYPTED:
-                irc_usermsg(irc, "  connection state: encrypted (v%d)", ctx->protocol_version);
+                irc_rootmsg(irc, "  connection state: encrypted (v%d)", ctx->protocol_version);
                 break;
         case OTRL_MSGSTATE_FINISHED:
-                irc_usermsg(irc, "  connection state: shut down");
+                irc_rootmsg(irc, "  connection state: shut down");
                 break;
         default:
-                irc_usermsg(irc, "  connection state: %d", ctx->msgstate);
-        }
-
-        irc_usermsg(irc, "  fingerprints: (bold=active)");      
+                irc_rootmsg(irc, "  connection state: %d", ctx->msgstate);
+        }
+
+        irc_rootmsg(irc, "  fingerprints: (bold=active)");      
         show_fingerprints(irc, ctx);
 }
@@ -1614 +1693 @@
                 
                 if(pipe(to) < 0 || pipe(from) < 0) {
-                        irc_usermsg(irc, "otr keygen: couldn't create pipe: %s", strerror(errno));
+                        irc_rootmsg(irc, "otr keygen: couldn't create pipe: %s", strerror(errno));
                         return;
                 }
@@ -1621 +1700 @@
                 fromf = fdopen(from[0], "r");
                 if(!tof || !fromf) {
-                        irc_usermsg(irc, "otr keygen: couldn't streamify pipe: %s", strerror(errno));
+                        irc_rootmsg(irc, "otr keygen: couldn't streamify pipe: %s", strerror(errno));
                         return;
                 }
@@ -1627 +1706 @@
                 p = fork();
                 if(p<0) {
-                        irc_usermsg(irc, "otr keygen: couldn't fork: %s", strerror(errno));
+                        irc_rootmsg(irc, "otr keygen: couldn't fork: %s", strerror(errno));
                         return;
                 }
@@ -1707 +1786 @@
         myfgets(msg, 512, irc->otr->from);
         
-        irc_usermsg(irc, "%s", msg);
+        irc_rootmsg(irc, "%s", msg);
         if(filename[0]) {
-                char *kf = g_strdup_printf("%s%s.otr_keys", global.conf->configdir, irc->user->nick);
-                char *tmp = g_strdup_printf("%s.new", kf);
-                copyfile(filename, tmp);
-                unlink(filename);
-                rename(tmp,kf);
-                otrl_privkey_read(irc->otr->us, kf);
-                g_free(kf);
-                g_free(tmp);
+                if(strsane(irc->user->nick)) {
+                        char *kf = g_strdup_printf("%s%s.otr_keys", global.conf->configdir, irc->user->nick);
+                        char *tmp = g_strdup_printf("%s.new", kf);
+                        copyfile(filename, tmp);
+                        unlink(filename);
+                        rename(tmp,kf);
+                        otrl_privkey_read(irc->otr->us, kf);
+                        g_free(kf);
+                        g_free(tmp);
+                } else {
+                        otrl_privkey_read(irc->otr->us, filename);
+                        unlink(filename);
+                }
         }
         
@@ -1781 +1865 @@
         
         if(keygen_in_progress(irc, acc->user, acc->prpl->name)) {
-                irc_usermsg(irc, "keygen for %s/%s already in progress",
+                irc_rootmsg(irc, "keygen for %s/%s already in progress",
                         acc->user, acc->prpl->name);
         } else {
-                irc_usermsg(irc, "starting background keygen for %s/%s",
+                irc_rootmsg(irc, "starting background keygen for %s/%s",
                         acc->user, acc->prpl->name);
-                irc_usermsg(irc, "you will be notified when it completes");
+                irc_rootmsg(irc, "you will be notified when it completes");
                 otr_keygen(irc, acc->user, acc->prpl->name);
         }
 }
+
+/* check whether a string is safe to use in a path component */
+int strsane(const char *s)
+{
+        return strpbrk(s, "/\\") == NULL;
+}
+
+/* vim: set noet ts=4 sw=4: */

protocols/jabber/io.c

@@ -212 +212 @@
                                    this is an old server that can't do SASL
                                    authentication. */
-                                if( !sasl_supported( ic ) )
+                                if( !set_getbool( &ic->acc->set, "sasl") || !sasl_supported( ic ) )
                                 {
                                         /* If there's no version= tag, we suppose
@@ -375 +375 @@
            other way. jabber.com doesn't seem to do SASL while it pretends
            to be XMPP 1.0 compliant! */
-        else if( !( jd->flags & JFLAG_AUTHENTICATED ) && sasl_supported( ic ) )
+        else if( !( jd->flags & JFLAG_AUTHENTICATED ) && set_getbool( &ic->acc->set, "sasl") && sasl_supported( ic ) )
         {
                 if( !jabber_init_iq_auth( ic ) )

protocols/jabber/jabber.c

@@ -84 +84 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
+        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
+
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );
         

protocols/jabber/s5bytestream.c

@@ -877 +877 @@
 
         if( ( ( host = strchr( proxy, ',' ) ) == 0 ) ||
-             ( ( port = strchr( host+1, ',' ) ) == 0 ) ) {
+            ( ( port = strchr( host+1, ',' ) ) == 0 ) )
+        {
                 imcb_log( ic, "Error parsing proxy setting: \"%s\" (ignored)", proxy );
                 return NULL;
@@ -889 +890 @@
         sh->jid = g_strdup( jid );
         sh->host = g_strdup( host );
-        strcpy( sh->port, port );
+        g_snprintf( sh->port, sizeof( sh->port ), "%s", port );
 
         return sh;
@@ -915 +916 @@
                                 sh->jid = g_strdup( tf->ini_jid );
                                 sh->host = g_strdup( host );
-                                strcpy( sh->port, port );
+                                g_snprintf( sh->port, sizeof( sh->port ), "%s", port );
                                 bt->streamhosts = g_slist_append( bt->streamhosts, sh );
 

protocols/msn/ns.c

@@ -480 +480 @@
                 else
                 {
-                        imcb_error( ic, "Session terminated by remote server (reason unknown)" );
+                        imcb_error( ic, "Session terminated by remote server (%s)",
+                                    cmd[1] ? cmd[1] : "reason unknown)" );
                 }
                 

protocols/msn/sb.c

@@ -308 +308 @@
         struct msn_switchboard *sb = data;
         struct im_connection *ic;
-        struct msn_data *md;
         char buf[1024];
         
@@ -316 +315 @@
         
         ic = sb->ic;
-        md = ic->proto_data;
         
         if( source != sb->fd )
@@ -675 +673 @@
         struct im_connection *ic = sb->ic;
         char *body;
-        int blen = 0;
         
         if( !num_parts )
@@ -681 +678 @@
         
         if( ( body = strstr( msg, "\r\n\r\n" ) ) )
-        {
                 body += 4;
-                blen = msglen - ( body - msg );
-        }
         
         if( strcmp( cmd[0], "MSG" ) == 0 )

protocols/msn/soap.c

@@ -210 +210 @@
 {
         char *s;
-        int st;
         
         if( !getenv( "BITLBEE_DEBUG" ) )
                 return;
         
-        if( ( s = strstr( headers, "\r\n\r\n" ) ) )
-                st = write( 1, s, s - headers + 4 );
-        else
-                st = write( 1, headers, strlen( headers ) );
-        
-#ifdef DEBUG
+        if( headers )
+        {
+                if( ( s = strstr( headers, "\r\n\r\n" ) ) )
+                        write( 2, headers, s - headers + 4 );
+                else
+                        write( 2, headers, strlen( headers ) );
+        }
+        
+        if( payload )
         {
                 struct xt_node *xt = xt_from_string( payload );
@@ -227 +229 @@
                 xt_free_node( xt );
         }
-#endif
 }
 
@@ -661 +662 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%p %s %d\n", bu, handle, bd->flags );
+                fprintf( stderr, "%p %s %d\n", bu, handle, bd->flags );
         
         return XT_HANDLED;
@@ -808 +809 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%s %s\n", id, name );
+                fprintf( stderr, "%s %s\n", id, name );
         
         return XT_HANDLED;
@@ -869 +870 @@
         
         if( getenv( "BITLBEE_DEBUG" ) )
-                printf( "%s %s %s %s\n", id, type, handle, display_name );
+                fprintf( stderr, "%s %s %s %s\n", id, type, handle, display_name );
         
         return XT_HANDLED;

protocols/nogaim.c

@@ -216 +216 @@
         if( a )
                 /* FIXME(wilmer): ui_log callback or so */
-                irc_usermsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
+                irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->tag, text );
         else
-                irc_usermsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
+                irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );
         
         g_free( text );

protocols/oscar/chat.c

@@ -384 +384 @@
         char *roomname = NULL;
         struct aim_chat_roominfo roominfo;
-        guint16 tlvcount = 0;
         aim_tlvlist_t *tlvlist;
         char *roomdesc = NULL;
@@ -401 +400 @@
         }
 
-        tlvcount = aimbs_get16(bs);
+        aimbs_get16(bs); /* tlv count */
 
         /*

protocols/oscar/chatnav.c

@@ -139 +139 @@
                  * Type 0x0002: Unknown
                  */
-                if (aim_gettlv(innerlist, 0x0002, 1)) {
-                        guint16 classperms;
-
-                        classperms = aim_gettlv16(innerlist, 0x0002, 1);
-                        
-                }
+                if (aim_gettlv(innerlist, 0x0002, 1))
+                        ;
 
                 /*
@@ -205 +201 @@
                  */
                 if (aim_gettlv(innerlist, 0x00d5, 1)) {
-                        guint8 createperms;
-
-                        createperms = aim_gettlv8(innerlist, 0x00d5, 1);
+                        aim_gettlv8(innerlist, 0x00d5, 1); /* createperms */
                 }
 

protocols/oscar/icq.c

@@ -235 +235 @@
         aim_tlv_t *datatlv;
         aim_bstream_t qbs;
-        guint32 ouruin;
-        guint16 cmdlen, cmd, reqid;
+        guint16 cmd, reqid;
 
         if (!(tl = aim_readtlvchain(bs)) || !(datatlv = aim_gettlv(tl, 0x0001, 1))) {
@@ -246 +245 @@
         aim_bstream_init(&qbs, datatlv->value, datatlv->length);
 
-        cmdlen = aimbs_getle16(&qbs);
-        ouruin = aimbs_getle32(&qbs);
+        aimbs_getle16(&qbs); /* cmdlen */
+        aimbs_getle32(&qbs); /* ouruin */
         cmd = aimbs_getle16(&qbs);
         reqid = aimbs_getle16(&qbs);

protocols/oscar/im.c

@@ -919 +919 @@
         int i, ret = 0;
         aim_rxcallback_t userfunc;
-        guint8 cookie[8];
         guint16 channel;
         aim_tlvlist_t *tlvlist;
@@ -931 +930 @@
         /* ICBM Cookie. */
         for (i = 0; i < 8; i++)
-                cookie[i] = aimbs_get8(bs);
+                aimbs_get8(bs);
 
         /* Channel ID */
@@ -1414 +1413 @@
 {
         guint16 hdrlen, msglen, dc;
-        guint8 msgtype, msgflags;
+        guint8 msgtype;
     guint8 *plugin;
     int i = 0, tmp = 0;
@@ -1442 +1441 @@
 
         msgtype = aimbs_getle8(servdata);
-        msgflags = aimbs_getle8(servdata);
+        aimbs_getle8(servdata); /* msgflags */
 
         aim_bstream_advance(servdata, 0x04); /* status code and priority code */

protocols/oscar/misc.c

@@ -310 +310 @@
 {
         aim_frame_t *fr;
-        aim_snacid_t snacid;
         aim_tlvlist_t *tl = NULL;
 
@@ -330 +329 @@
                 return -ENOMEM;
 
-        snacid = aim_cachesnac(sess, 0x0002, 0x000f, 0x0000, NULL, 0);
+        aim_cachesnac(sess, 0x0002, 0x000f, 0x0000, NULL, 0);
 
         aim_putsnac(&fr->data, 0x0002, 0x000f, 0x0000, 0);

protocols/oscar/oscar.c

@@ -1072 +1072 @@
 static void gaim_icq_authgrant(void *data_) {
         struct icq_auth *data = data_;
-        char *uin, message;
+        char *uin;
         struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
         
         uin = g_strdup_printf("%u", data->uin);
-        message = 0;
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
+        // char *message = 0;
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
         imcb_ask_add(data->ic, uin, NULL);
@@ -1219 +1219 @@
 static int gaim_parse_misses(aim_session_t *sess, aim_frame_t *fr, ...) {
         va_list ap;
-        guint16 chan, nummissed, reason;
+        guint16 nummissed, reason;
         aim_userinfo_t *userinfo;
 
         va_start(ap, fr);
-        chan = (guint16)va_arg(ap, unsigned int);
+        va_arg(ap, unsigned int); /* chan */
         userinfo = va_arg(ap, aim_userinfo_t *);
         nummissed = (guint16)va_arg(ap, unsigned int);
@@ -1335 +1335 @@
 
 static int gaim_parse_motd(aim_session_t *sess, aim_frame_t *fr, ...) {
-        char *msg;
         guint16 id;
         va_list ap;
@@ -1341 +1340 @@
         va_start(ap, fr);
         id  = (guint16)va_arg(ap, unsigned int);
-        msg = va_arg(ap, char *);
+        va_arg(ap, char *); /* msg */
         va_end(ap);
 
@@ -1361 +1360 @@
         switch(type) {
                 case 0x0002: {
-                        guint8 maxrooms;
-                        struct aim_chat_exchangeinfo *exchanges;
-                        int exchangecount; // i;
-
-                        maxrooms = (guint8)va_arg(ap, unsigned int);
-                        exchangecount = va_arg(ap, int);
-                        exchanges = va_arg(ap, struct aim_chat_exchangeinfo *);
+                        va_arg(ap, unsigned int); /* maxrooms */
+                        va_arg(ap, int); /* exchangecount */
+                        va_arg(ap, struct aim_chat_exchangeinfo *); /* exchanges */
                         va_end(ap);
 
@@ -1380 +1375 @@
                         break;
                 case 0x0008: {
-                        char *fqcn, *name, *ck;
-                        guint16 instance, flags, maxmsglen, maxoccupancy, unknown, exchange;
-                        guint8 createperms;
-                        guint32 createtime;
-
-                        fqcn = va_arg(ap, char *);
+                        char *ck;
+                        guint16 instance, exchange;
+
+                        va_arg(ap, char *); /* fqcn */
                         instance = (guint16)va_arg(ap, unsigned int);
                         exchange = (guint16)va_arg(ap, unsigned int);
-                        flags = (guint16)va_arg(ap, unsigned int);
-                        createtime = va_arg(ap, guint32);
-                        maxmsglen = (guint16)va_arg(ap, unsigned int);
-                        maxoccupancy = (guint16)va_arg(ap, unsigned int);
-                        createperms = (guint8)va_arg(ap, int);
-                        unknown = (guint16)va_arg(ap, unsigned int);
-                        name = va_arg(ap, char *);
+                        va_arg(ap, unsigned int); /* flags */
+                        va_arg(ap, guint32); /* createtime */
+                        va_arg(ap, unsigned int); /* maxmsglen */
+                        va_arg(ap, unsigned int); /* maxoccupancy */
+                        va_arg(ap, int); /* createperms */
+                        va_arg(ap, unsigned int); /* unknown */
+                        va_arg(ap, char *); /* name */
                         ck = va_arg(ap, char *);
                         va_end(ap);
@@ -1456 +1449 @@
 static int gaim_chat_info_update(aim_session_t *sess, aim_frame_t *fr, ...) {
         va_list ap;
-        aim_userinfo_t *userinfo;
-        struct aim_chat_roominfo *roominfo;
-        char *roomname;
-        int usercount;
-        char *roomdesc;
-        guint16 unknown_c9, unknown_d2, unknown_d5, maxmsglen, maxvisiblemsglen;
-        guint32 creationtime;
+        guint16 maxmsglen, maxvisiblemsglen;
         struct im_connection *ic = sess->aux_data;
         struct chat_connection *ccon = find_oscar_chat_by_conn(ic, fr->conn);
 
         va_start(ap, fr);
-        roominfo = va_arg(ap, struct aim_chat_roominfo *);
-        roomname = va_arg(ap, char *);
-        usercount= va_arg(ap, int);
-        userinfo = va_arg(ap, aim_userinfo_t *);
-        roomdesc = va_arg(ap, char *);
-        unknown_c9 = (guint16)va_arg(ap, int);
-        creationtime = (guint32)va_arg(ap, unsigned long);
+        va_arg(ap, struct aim_chat_roominfo *); /* roominfo */
+        va_arg(ap, char *); /* roomname */
+        va_arg(ap, int); /* usercount */
+        va_arg(ap, aim_userinfo_t *); /* userinfo */
+        va_arg(ap, char *); /* roomdesc */
+        va_arg(ap, int); /* unknown_c9 */
+        va_arg(ap, unsigned long); /* creationtime */
         maxmsglen = (guint16)va_arg(ap, int);
-        unknown_d2 = (guint16)va_arg(ap, int);
-        unknown_d5 = (guint16)va_arg(ap, int);
+        va_arg(ap, int); /* unknown_d2 */
+        va_arg(ap, int); /* unknown_d5 */
         maxvisiblemsglen = (guint16)va_arg(ap, int);
         va_end(ap);
@@ -1517 +1504 @@
 #endif
         va_list ap;
-        guint16 code, rateclass;
-        guint32 windowsize, clear, alert, limit, disconnect, currentavg, maxavg;
+        guint16 code;
+        guint32 windowsize, clear, currentavg;
 
         va_start(ap, fr); 
         code = (guint16)va_arg(ap, unsigned int);
-        rateclass= (guint16)va_arg(ap, unsigned int);
+        va_arg(ap, unsigned int); /* rateclass */
         windowsize = (guint32)va_arg(ap, unsigned long);
         clear = (guint32)va_arg(ap, unsigned long);
-        alert = (guint32)va_arg(ap, unsigned long);
-        limit = (guint32)va_arg(ap, unsigned long);
-        disconnect = (guint32)va_arg(ap, unsigned long);
+        va_arg(ap, unsigned long); /* alert */
+        va_arg(ap, unsigned long); /* limit */
+        va_arg(ap, unsigned long); /* disconnect */
         currentavg = (guint32)va_arg(ap, unsigned long);
-        maxavg = (guint32)va_arg(ap, unsigned long);
+        va_arg(ap, unsigned long); /* maxavg */
         va_end(ap);
 
@@ -2102 +2089 @@
                                 aim_ssi_addbuddies( sess, fr->conn, OSCAR_GROUP, &list, 1, 1 );
                         }
+                        else if( st == 0x0A )
+                        {
+                                imcb_error( sess->aux_data, "Buddy %s is already in your list", list );
+                        }
                         else
                         {
@@ -2413 +2404 @@
         struct im_connection * ic = sess->aux_data;
         va_list ap;
-        guint16 type1, type2;
+        guint16 type2;
         char * sn;
 
         va_start(ap, fr);
-        type1 = va_arg(ap, int);
+        va_arg(ap, int); /* type1 */
         sn = va_arg(ap, char*);
         type2 = va_arg(ap, int);
@@ -2537 +2528 @@
 
         if((cur = aim_getconn_type(od->sess, AIM_CONN_TYPE_CHATNAV))) {
-                int st;
-                
-                st = aim_chatnav_createroom(od->sess, cur, room, exchange_number);
+                aim_chatnav_createroom(od->sess, cur, room, exchange_number);
                 
                 return ret;
@@ -2566 +2555 @@
         static int chat_id = 0;
         char * chatname, *s;
-        struct groupchat *c;
         
         chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
@@ -2575 +2563 @@
                         *s = '0';
         
-        c = imcb_chat_new(ic, chatname);
         ret = oscar_chat_join_internal(ic, chatname, NULL, NULL, 4);
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
@@ -2581 +2568 @@
         g_free(chatname);
         
-        return NULL;
+        return ret;
 }
 

protocols/oscar/rxqueue.c

@@ -388 +388 @@
          */
         if (aimbs_get8(&flaphdr) != 0x2a) {
-                guint8 start;
-
                 aim_bstream_rewind(&flaphdr);
-                start = aimbs_get8(&flaphdr);
+                aimbs_get8(&flaphdr);
                 imcb_error(sess->aux_data, "FLAP framing disrupted");
                 aim_conn_close(conn);

protocols/oscar/service.c

@@ -563 +563 @@
         groupcount = aimbs_get16(bs);
         for (i = 0; i < groupcount; i++) {
-                guint16 group;
-
-                group = aimbs_get16(bs);
+                aimbs_get16(bs);
 
                 imcb_error(sess->aux_data, "bifurcated migration unsupported");
@@ -701 +699 @@
 static int hostversions(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
-        int vercount;
         guint8 *versions;
 
         /* This is frivolous. (Thank you SmarterChild.) */
-        vercount = aim_bstream_empty(bs)/4;
+        aim_bstream_empty(bs); /* == vercount * 4 */
         versions = aimbs_getraw(bs, aim_bstream_empty(bs));
         g_free(versions);
@@ -731 +728 @@
         aim_tlvlist_t *tl = NULL;
         guint32 data;
-        int tlvlen;
         struct im_connection *ic = sess ? sess->aux_data : NULL;
 
@@ -739 +735 @@
                 data |= AIM_ICQ_STATE_WEBAWARE;
 
-        tlvlen = aim_addtlvtochain32(&tl, 0x0006, data);
+        aim_addtlvtochain32(&tl, 0x0006, data); /* tlvlen */
 
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8)))

protocols/purple/purple.c

@@ -181 +181 @@
                         /** No way to talk to the user right now, invent one when
                         this becomes important.
-                        irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
+                        irc_rootmsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
                                      name, purple_account_option_get_type( o ) );
                         */
@@ -750 +750 @@
                 if( bud->server_alias )
                         imcb_rename_buddy( ic, bud->name, bud->server_alias );
+                else if( bud->alias )
+                        imcb_rename_buddy( ic, bud->name, bud->alias );
                 
                 if( group )

protocols/twitter/twitter.c

@@ -30 +30 @@
 
 #define twitter_msg( ic, fmt... ) \
-        do {                                                        \
-                struct twitter_data *td = ic->proto_data;           \
-                if( td->home_timeline_gc )                          \
-                        imcb_chat_log( td->home_timeline_gc, fmt ); \
-                else                                                \
-                        imcb_log( ic, fmt );                        \
+        do {                                            \
+                struct twitter_data *td = ic->proto_data;   \
+                if( td->timeline_gc )                       \
+                        imcb_chat_log( td->timeline_gc, fmt );  \
+                else                                        \
+                        imcb_log( ic, fmt );                    \
         } while( 0 );
 
@@ -52 +52 @@
 
         // Do stuff..
-        twitter_get_home_timeline(ic, -1);
+        twitter_get_timeline(ic, -1);
 
         // If we are still logged in run this function again after timeout.
@@ -69 +69 @@
         // Queue the main_loop
         // Save the return value, so we can remove the timeout on logout.
-        td->main_loop_id = b_timeout_add(60000, twitter_main_loop, ic);
+        td->main_loop_id =
+            b_timeout_add(set_getint(&ic->acc->set, "fetch_interval") * 1000, twitter_main_loop, ic);
 }
 
@@ -77 +78 @@
 {
         struct twitter_data *td = ic->proto_data;
+
+        td->flags &= ~TWITTER_DOING_TIMELINE;
 
         if (set_getbool(&ic->acc->set, "oauth") && !td->oauth_info)
@@ -90 +93 @@
 
 static const struct oauth_service twitter_oauth = {
-        "http://api.twitter.com/oauth/request_token",
-        "http://api.twitter.com/oauth/access_token",
+        "https://api.twitter.com/oauth/request_token",
+        "https://api.twitter.com/oauth/access_token",
         "https://api.twitter.com/oauth/authorize",
         .consumer_key = "xsDNKJuNZYkZyMcu914uEA",
@@ -98 +101 @@
 
 static const struct oauth_service identica_oauth = {
-        "http://identi.ca/api/oauth/request_token",
-        "http://identi.ca/api/oauth/access_token",
+        "https://identi.ca/api/oauth/request_token",
+        "https://identi.ca/api/oauth/access_token",
         "https://identi.ca/api/oauth/authorize",
         .consumer_key = "e147ff789fcbd8a5a07963afbb43f9da",
@@ -216 +219 @@
                 def_oauth = "true";
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
-
                 def_url = IDENTICA_API_URL;
                 def_oauth = "false";
@@ -228 +230 @@
         s = set_add(&acc->set, "commands", "true", set_eval_bool, acc);
 
+        s = set_add(&acc->set, "fetch_interval", "60", set_eval_int, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "fetch_mentions", "true", set_eval_bool, acc);
+
         s = set_add(&acc->set, "message_length", "140", set_eval_int, acc);
 
@@ -235 +242 @@
         s = set_add(&acc->set, "show_ids", "false", set_eval_bool, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc);
 
         s = set_add(&acc->set, "oauth", def_oauth, set_eval_bool, acc);
@@ -317 +326 @@
         b_event_remove(td->main_loop_id);
 
-        if (td->home_timeline_gc)
-                imcb_chat_free(td->home_timeline_gc);
+        if (td->timeline_gc)
+                imcb_chat_free(td->timeline_gc);
 
         if (td) {
@@ -404 +413 @@
         struct twitter_data *td = c->ic->proto_data;
 
-        if (c != td->home_timeline_gc)
+        if (c != td->timeline_gc)
                 return;         /* WTF? */
 
         /* If the user leaves the channel: Fine. Rejoin him/her once new
            tweets come in. */
-        imcb_chat_free(td->home_timeline_gc);
-        td->home_timeline_gc = NULL;
+        imcb_chat_free(td->timeline_gc);
+        td->timeline_gc = NULL;
 }
 
@@ -465 +474 @@
                 guint64 id;
 
-                if (cmd[1])
-                        id = g_ascii_strtoull(cmd[1], NULL, 10);
-                else
-                        id = td->last_status_id;
-
-                /* TODO: User feedback. */
-                if (id)
+                if (cmd[1] == NULL)
+                        twitter_status_destroy(ic, td->last_status_id);
+                else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1) {
+                        if (id < TWITTER_LOG_LENGTH && td->log)
+                                id = td->log[id].id;
+                        
                         twitter_status_destroy(ic, id);
-                else
+                } else
                         twitter_msg(ic, "Could not undo last action");
 
@@ -491 +499 @@
                 guint64 id;
 
-                if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
+                if (g_str_has_prefix(cmd[1], "#") &&
+                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1) {
+                        if (id < TWITTER_LOG_LENGTH && td->log)
+                                id = td->log[id].id;
+                } else if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
                     (tud = bu->data) && tud->last_id)
                         id = tud->last_id;
-                else {
-                        id = g_ascii_strtoull(cmd[1], NULL, 10);
+                else if (sscanf(cmd[1], "%" G_GUINT64_FORMAT, &id) == 1){
                         if (id < TWITTER_LOG_LENGTH && td->log)
                                 id = td->log[id].id;
@@ -514 +525 @@
                 guint64 id = 0;
 
-                if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
+                if (g_str_has_prefix(cmd[1], "#") &&
+                    sscanf(cmd[1] + 1, "%" G_GUINT64_FORMAT, &id) == 1 &&
+                    (id < TWITTER_LOG_LENGTH) && td->log) {
+                        bu = td->log[id].bu;
+                        if (g_slist_find(ic->bee->users, bu))
+                                id = td->log[id].id;
+                        else
+                                bu = NULL;
+                } else if ((bu = bee_user_by_handle(ic->bee, ic, cmd[1])) &&
                     (tud = bu->data) && tud->last_id) {
                         id = tud->last_id;
@@ -525 +544 @@
                                 bu = NULL;
                 }
+
                 if (!id || !bu) {
                         twitter_msg(ic, "User `%s' does not exist or didn't "

protocols/twitter/twitter.h

@@ -36 +36 @@
 {
         TWITTER_HAVE_FRIENDS = 1,
+        TWITTER_DOING_TIMELINE = 0x10000,
+        TWITTER_GOT_TIMELINE = 0x20000,
+        TWITTER_GOT_MENTIONS = 0x40000,
 } twitter_flags_t;
 
@@ -44 +47 @@
         char* user;
         struct oauth_info *oauth_info;
+
+        gpointer home_timeline_obj;
+        gpointer mentions_obj;
+
+        guint64 timeline_id;
+
         GSList *follow_ids;
         
-        guint64 home_timeline_id;
         guint64 last_status_id; /* For undo */
         gint main_loop_id;
-        struct groupchat *home_timeline_gc;
+        struct groupchat *timeline_gc;
         gint http_fails;
         twitter_flags_t flags;

protocols/twitter/twitter_lib.c

@@ -78 +78 @@
         if (txu == NULL)
                 return;
+
         g_free(txu->name);
         g_free(txu->screen_name);
@@ -83 +84 @@
 }
 
-
 /**
  * Frees a twitter_xml_status struct.
@@ -89 +89 @@
 static void txs_free(struct twitter_xml_status *txs)
 {
+        if (txs == NULL)
+                return;
+
         g_free(txs->text);
         txu_free(txs->user);
@@ -103 +106 @@
         if (txl == NULL)
                 return;
-        for (l = txl->list; l; l = g_slist_next(l))
-                if (txl->type == TXL_STATUS)
+
+        for (l = txl->list; l; l = g_slist_next(l)) {
+                if (txl->type == TXL_STATUS) {
                         txs_free((struct twitter_xml_status *) l->data);
-                else if (txl->type == TXL_ID)
+                } else if (txl->type == TXL_ID) {
                         g_free(l->data);
-                else if (txl->type == TXL_USER)
+                } else if (txl->type == TXL_USER) {
                         txu_free(l->data);
+                }
+        }
+
         g_slist_free(txl->list);
         g_free(txl);
@@ -115 +122 @@
 
 /**
- * Add a buddy if it is not allready added, set the status to logged in.
+ * Compare status elements
+ */
+static gint twitter_compare_elements(gconstpointer a, gconstpointer b)
+{
+        struct twitter_xml_status *a_status = (struct twitter_xml_status *) a;
+        struct twitter_xml_status *b_status = (struct twitter_xml_status *) b;
+
+        if (a_status->created_at < b_status->created_at) {
+                return -1;
+        } else if (a_status->created_at > b_status->created_at) {
+                return 1;
+        } else {
+                return 0;
+        }
+}
+
+/**
+ * Add a buddy if it is not already added, set the status to logged in.
  */
 static void twitter_add_buddy(struct im_connection *ic, char *name, const char *fullname)
@@ -132 +156 @@
                            exact Twitter username. */
                         imcb_buddy_nick_hint(ic, name, name);
-                        imcb_chat_add_buddy(td->home_timeline_gc, name);
+                        imcb_chat_add_buddy(td->timeline_gc, name);
                 } else if (g_strcasecmp(mode, "many") == 0)
                         imcb_buddy_status(ic, name, OPT_LOGGED_IN, NULL, NULL);
@@ -260 +284 @@
 
         /* Create the room now that we "logged in". */
-        if (!td->home_timeline_gc && g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
+        if (!td->timeline_gc && g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
                 twitter_groupchat_init(ic);
 
@@ -436 +460 @@
 {
         struct xt_node *child, *rt = NULL;
-        gboolean truncated = FALSE;
 
         // Walk over the nodes children.
@@ -442 +465 @@
                 if (g_strcasecmp("text", child->name) == 0) {
                         txs->text = g_memdup(child->text, child->text_len + 1);
-                } else if (g_strcasecmp("truncated", child->name) == 0 && child->text) {
-                        truncated = bool2int(child->text);
                 } else if (g_strcasecmp("retweeted_status", child->name) == 0) {
                         rt = child;
@@ -464 +485 @@
         }
 
-        /* If it's a truncated retweet, get the original because dots suck. */
-        if (truncated && rt) {
+        /* If it's a (truncated) retweet, get the original. Even if the API claims it
+           wasn't truncated because it may be lying. */
+        if (rt) {
                 struct twitter_xml_status *rtxs = g_new0(struct twitter_xml_status, 1);
                 if (twitter_xt_get_status(rt, rtxs) != XT_HANDLED) {
@@ -475 +497 @@
                 txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
                 txs_free(rtxs);
+        } else {
+                struct xt_node *urls, *url;
+                
+                urls = xt_find_path(node, "entities/urls");
+                for (url = urls ? urls->children : NULL; url; url = url->next) {
+                        /* "short" is a reserved word. :-P */
+                        struct xt_node *kort = xt_find_node(url->children, "url");
+                        struct xt_node *disp = xt_find_node(url->children, "display_url");
+                        char *pos, *new;
+                        
+                        if (!kort || !kort->text || !disp || !disp->text ||
+                            !(pos = strstr(txs->text, kort->text)))
+                                continue;
+                        
+                        *pos = '\0';
+                        new = g_strdup_printf("%s%s &lt;%s&gt;%s", txs->text, kort->text,
+                                              disp->text, pos + strlen(kort->text));
+                        
+                        g_free(txs->text);
+                        txs->text = new;
+                }
         }
 
@@ -520 +563 @@
 
         return XT_HANDLED;
-}
-
-static void twitter_http_get_home_timeline(struct http_request *req);
-
-/**
- * Get the timeline.
- */
-void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor)
-{
-        struct twitter_data *td = ic->proto_data;
-
-        char *args[4];
-        args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
-        if (td->home_timeline_id) {
-                args[2] = "since_id";
-                args[3] = g_strdup_printf("%llu", (long long unsigned int) td->home_timeline_id);
-        }
-
-        twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
-                     td->home_timeline_id ? 4 : 2);
-
-        g_free(args[1]);
-        if (td->home_timeline_id) {
-                g_free(args[3]);
-        }
 }
 
@@ -586 +603 @@
         GSList *l;
 
-        td->home_timeline_gc = gc = imcb_chat_new(ic, "home/timeline");
+        td->timeline_gc = gc = imcb_chat_new(ic, "twitter/timeline");
 
         name_hint = g_strdup_printf("%s_%s", td->prefix, ic->acc->user);
@@ -595 +612 @@
                 bee_user_t *bu = l->data;
                 if (bu->ic == ic)
-                        imcb_chat_add_buddy(td->home_timeline_gc, bu->handle);
+                        imcb_chat_add_buddy(td->timeline_gc, bu->handle);
         }
 }
@@ -608 +625 @@
         struct twitter_xml_status *status;
         struct groupchat *gc;
+        guint64 last_id = 0;
 
         // Create a new groupchat if it does not exsist.
-        if (!td->home_timeline_gc)
+        if (!td->timeline_gc)
                 twitter_groupchat_init(ic);
 
-        gc = td->home_timeline_gc;
+        gc = td->timeline_gc;
         if (!gc->joined)
                 imcb_chat_add_buddy(gc, ic->acc->user);
@@ -621 +639 @@
 
                 status = l->data;
-                if (status->user == NULL || status->text == NULL)
+                if (status->user == NULL || status->text == NULL || last_id == status->id)
                         continue;
 
-                twitter_add_buddy(ic, status->user->screen_name, status->user->name);
+                last_id = status->id;
 
                 strip_html(status->text);
+
                 msg = twitter_msg_add_id(ic, status, "");
 
                 // Say it!
-                if (g_strcasecmp(td->user, status->user->screen_name) == 0)
+                if (g_strcasecmp(td->user, status->user->screen_name) == 0) {
                         imcb_chat_log(gc, "You: %s", msg ? msg : status->text);
-                else
+                } else {
+                        twitter_add_buddy(ic, status->user->screen_name, status->user->name);
+
                         imcb_chat_msg(gc, status->user->screen_name,
                                       msg ? msg : status->text, 0, status->created_at);
+                }
 
                 g_free(msg);
 
-                // Update the home_timeline_id to hold the highest id, so that by the next request
+                // Update the timeline_id to hold the highest id, so that by the next request
                 // we won't pick up the updates already in the list.
-                td->home_timeline_id = MAX(td->home_timeline_id, status->id);
+                td->timeline_id = MAX(td->timeline_id, status->id);
         }
 }
@@ -654 +676 @@
         char from[MAX_STRING];
         gboolean mode_one;
+        guint64 last_id = 0;
 
         mode_one = g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "one") == 0;
@@ -666 +689 @@
 
                 status = l->data;
+                if (status->user == NULL || status->text == NULL || last_id == status->id)
+                        continue;
+
+                last_id = status->id;
 
                 strip_html(status->text);
@@ -680 +707 @@
                                text ? text : status->text, 0, status->created_at);
 
-                // Update the home_timeline_id to hold the highest id, so that by the next request
+                // Update the timeline_id to hold the highest id, so that by the next request
                 // we won't pick up the updates already in the list.
-                td->home_timeline_id = MAX(td->home_timeline_id, status->id);
+                td->timeline_id = MAX(td->timeline_id, status->id);
 
                 g_free(text);
                 g_free(prefix);
+        }
+}
+
+static void twitter_http_get_home_timeline(struct http_request *req);
+static void twitter_http_get_mentions(struct http_request *req);
+
+/**
+ * Get the timeline with optionally mentions
+ */
+void twitter_get_timeline(struct im_connection *ic, gint64 next_cursor)
+{
+        struct twitter_data *td = ic->proto_data;
+        gboolean include_mentions = set_getbool(&ic->acc->set, "fetch_mentions");
+
+        if (td->flags & TWITTER_DOING_TIMELINE) {
+                return;
+        }
+
+        td->flags |= TWITTER_DOING_TIMELINE;
+
+        twitter_get_home_timeline(ic, next_cursor);
+
+        if (include_mentions) {
+                twitter_get_mentions(ic, next_cursor);
+        }
+}
+
+/**
+ * Call this one after receiving timeline/mentions. Show to user once we have
+ * both.
+ */
+void twitter_flush_timeline(struct im_connection *ic)
+{
+        struct twitter_data *td = ic->proto_data;
+        gboolean include_mentions = set_getbool(&ic->acc->set, "fetch_mentions");
+        gboolean show_old_mentions = set_getbool(&ic->acc->set, "show_old_mentions");
+        struct twitter_xml_list *home_timeline = td->home_timeline_obj;
+        struct twitter_xml_list *mentions = td->mentions_obj;
+        GSList *output = NULL;
+        GSList *l;
+
+        if (!(td->flags & TWITTER_GOT_TIMELINE)) {
+                return;
+        }
+
+        if (include_mentions && !(td->flags & TWITTER_GOT_MENTIONS)) {
+                return;
+        }
+
+        if (home_timeline && home_timeline->list) {
+                for (l = home_timeline->list; l; l = g_slist_next(l)) {
+                        output = g_slist_insert_sorted(output, l->data, twitter_compare_elements);
+                }
+        }
+
+        if (include_mentions && mentions && mentions->list) {
+                for (l = mentions->list; l; l = g_slist_next(l)) {
+                        if (!show_old_mentions && output && twitter_compare_elements(l->data, output->data) < 0) {
+                                continue;
+                        }
+
+                        output = g_slist_insert_sorted(output, l->data, twitter_compare_elements);
+                }
+        }
+
+        // See if the user wants to see the messages in a groupchat window or as private messages.
+        if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
+                twitter_groupchat(ic, output);
+        else
+                twitter_private_message_chat(ic, output);
+
+        g_slist_free(output);
+
+        if (home_timeline && home_timeline->list) {
+                txl_free(home_timeline);
+        }
+
+        if (mentions && mentions->list) {
+                txl_free(mentions);
+        }
+
+        td->flags &= ~(TWITTER_DOING_TIMELINE | TWITTER_GOT_TIMELINE | TWITTER_GOT_MENTIONS);
+}
+
+/**
+ * Get the timeline.
+ */
+void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor)
+{
+        struct twitter_data *td = ic->proto_data;
+
+        td->home_timeline_obj = NULL;
+        td->flags &= ~TWITTER_GOT_TIMELINE;
+
+        char *args[6];
+        args[0] = "cursor";
+        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[2] = "include_entities";
+        args[3] = "true";
+        if (td->timeline_id) {
+                args[4] = "since_id";
+                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+        }
+
+        if (twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
+                     td->timeline_id ? 6 : 4) == NULL) {
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_HOME_TIMELINE_URL, "connection failed");
+                td->flags |= TWITTER_GOT_TIMELINE;
+                twitter_flush_timeline(ic);
+        }
+
+        g_free(args[1]);
+        if (td->timeline_id) {
+                g_free(args[5]);
+        }
+}
+
+/**
+ * Get mentions.
+ */
+void twitter_get_mentions(struct im_connection *ic, gint64 next_cursor)
+{
+        struct twitter_data *td = ic->proto_data;
+
+        td->mentions_obj = NULL;
+        td->flags &= ~TWITTER_GOT_MENTIONS;
+
+        char *args[6];
+        args[0] = "cursor";
+        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[2] = "include_entities";
+        args[3] = "true";
+        if (td->timeline_id) {
+                args[4] = "since_id";
+                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+        }
+
+        if (twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions, ic, 0, args,
+                     td->timeline_id ? 6 : 4) == NULL) {
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_MENTIONS_URL, "connection failed");
+                td->flags |= TWITTER_GOT_MENTIONS;
+                twitter_flush_timeline(ic);
+        }
+
+        g_free(args[1]);
+        if (td->timeline_id) {
+                g_free(args[5]);
         }
 }
@@ -713 +891 @@
                 imcb_error(ic, "Authentication failure");
                 imc_logout(ic, FALSE);
-                return;
+                goto end;
         } else {
                 // It didn't go well, output the error and return.
@@ -720 +898 @@
                                    TWITTER_HOME_TIMELINE_URL, twitter_parse_error(req));
 
-                return;
+                goto end;
         }
 
@@ -733 +911 @@
         xt_free(parser);
 
-        // See if the user wants to see the messages in a groupchat window or as private messages.
-        if (txl->list == NULL);
-        else if (g_strcasecmp(set_getstr(&ic->acc->set, "mode"), "chat") == 0)
-                twitter_groupchat(ic, txl->list);
-        else
-                twitter_private_message_chat(ic, txl->list);
-
-        // Free the structure.  
-        txl_free(txl);
+        td->home_timeline_obj = txl;
+
+      end:
+        td->flags |= TWITTER_GOT_TIMELINE;
+
+        twitter_flush_timeline(ic);
+}
+
+/**
+ * Callback for getting mentions.
+ */
+static void twitter_http_get_mentions(struct http_request *req)
+{
+        struct im_connection *ic = req->data;
+        struct twitter_data *td;
+        struct xt_parser *parser;
+        struct twitter_xml_list *txl;
+
+        // Check if the connection is still active.
+        if (!g_slist_find(twitter_connections, ic))
+                return;
+
+        td = ic->proto_data;
+
+        // Check if the HTTP request went well.
+        if (req->status_code == 200) {
+                td->http_fails = 0;
+                if (!(ic->flags & OPT_LOGGED_IN))
+                        imcb_connected(ic);
+        } else if (req->status_code == 401) {
+                imcb_error(ic, "Authentication failure");
+                imc_logout(ic, FALSE);
+                goto end;
+        } else {
+                // It didn't go well, output the error and return.
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_MENTIONS_URL, twitter_parse_error(req));
+
+                goto end;
+        }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = NULL;
+
+        // Parse the data.
+        parser = xt_new(NULL, txl);
+        xt_feed(parser, req->reply_body, req->body_size);
+        // The root <statuses> node should hold the list of statuses <status>
+        twitter_xt_get_status_list(ic, parser->root, txl);
+        xt_free(parser);
+
+        td->mentions_obj = txl;
+
+      end:
+        td->flags |= TWITTER_GOT_MENTIONS;
+
+        twitter_flush_timeline(ic);
 }
 

protocols/twitter/twitter_lib.h

@@ -76 +76 @@
 #define TWITTER_BLOCKS_DESTROY_URL "/blocks/destroy/"
 
+void twitter_get_timeline(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_home_timeline(struct im_connection *ic, gint64 next_cursor);
+void twitter_get_mentions(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_statuses_friends(struct im_connection *ic, gint64 next_cursor);
 

protocols/yahoo/libyahoo2.c

@@ -1809 +1809 @@
         struct yahoo_input_data *yid = had->yid;
         struct yahoo_data *yd = yid->yd;
-        struct http_request *req;
         char *login, *passwd, *chal;
         char *url;
@@ -1823 +1822 @@
                                (int) time(NULL), login, passwd, chal);
         
-        req = http_dorequest_url(url, yahoo_https_auth_token_finish, had);
+        http_dorequest_url(url, yahoo_https_auth_token_finish, had);
         
         g_free(url);
@@ -1870 +1869 @@
 static void yahoo_https_auth_init(struct yahoo_https_auth_data *had)
 {
-        struct http_request *req;
         char *url;
         
@@ -1876 +1874 @@
                               (int) time(NULL), had->token);
         
-        req = http_dorequest_url(url, yahoo_https_auth_finish, had);
+        http_dorequest_url(url, yahoo_https_auth_finish, had);
         
         g_free(url);
@@ -1990 +1988 @@
 {
         struct yahoo_data *yd = yid->yd;
-        char *login_id;
-        char *handle;
         char *url = NULL;
         int login_status = -1;
@@ -2000 +1996 @@
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 0)
-                        login_id = pair->value;
+                        ; /* login_id */
                 else if (pair->key == 1)
-                        handle = pair->value;
+                        ; /* handle */
                 else if (pair->key == 20)
                         url = pair->value;
@@ -2089 +2085 @@
         char *msg = NULL;
         char *name = NULL;
-        long tm = 0L;
         int state = YAHOO_STATUS_AVAILABLE;
-        int online = 0;
         int away = 0;
         int idle = 0;
@@ -2111 +2105 @@
                         state = strtol(pair->value, NULL, 10);
                 else if (pair->key == 15)
-                        tm = strtol(pair->value, NULL, 10);
+                        ; /* tm */
                 else if (pair->key == 13)
-                        online = strtol(pair->value, NULL, 10);
+                        ; /* online */
                 else if (pair->key == 47)
                         away = strtol(pair->value, NULL, 10);
@@ -2140 +2134 @@
         char *where = NULL;
         int status = 0;
-        char *me = NULL;
 
         struct yahoo_buddy *bud = NULL;
@@ -2148 +2141 @@
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 1)
-                        me = pair->value;
+                        ; /* Me... don't care */
                 if (pair->key == 7)
                         who = pair->value;
@@ -2204 +2197 @@
         char *who = NULL;
         char *where = NULL;
-        int unk_66 = 0;
-        char *me = NULL;
         struct yahoo_buddy *bud;
 
@@ -2214 +2205 @@
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 1)
-                        me = pair->value;
+                        ; /* Me... don't care */
                 else if (pair->key == 7)
                         who = pair->value;
@@ -2220 +2211 @@
                         where = pair->value;
                 else if (pair->key == 66)
-                        unk_66 = strtol(pair->value, NULL, 10);
+                        ; /* unk_66 */
                 else
                         DEBUG_MSG(("unknown key: %d = %s", pair->key,
@@ -2256 +2247 @@
         struct yahoo_packet *pkt)
 {
-        char *who = NULL;
-        int status = 0;
-        char *me = NULL;
-        int un_ignore = 0;
-
         YList *l;
         for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 0)
-                        who = pair->value;
+                        ; /* who */
                 if (pair->key == 1)
-                        me = pair->value;
+                        ; /* Me... don't care */
                 if (pair->key == 13)    /* 1 == ignore, 2 == unignore */
-                        un_ignore = strtol(pair->value, NULL, 10);
+                        ;
                 if (pair->key == 66)
-                        status = strtol(pair->value, NULL, 10);
+                        ; /* status */
         }
 
@@ -2293 +2279 @@
         char *me = NULL;
         char *room = NULL;
-        char *voice_room = NULL;
 
         YList *l;
@@ -2303 +2288 @@
                         me = pair->value;
                 if (pair->key == 13)
-                        voice_room = pair->value;
+                        ; /* voice room */
                 if (pair->key == 57)
                         room = pair->value;
@@ -2438 +2423 @@
         struct yahoo_packet *pkt)
 {
-        char *me = NULL;
         char *key = NULL;
         char *who = NULL;
@@ -2447 +2431 @@
                 struct yahoo_pair *pair = l->data;
                 if (pair->key == 5)
-                        me = pair->value;
+                        ; /* me */
                 if (pair->key == 61)
                         key = pair->value;
@@ -3369 +3353 @@
         struct yahoo_webcam *wcm = y->wcm;
         struct yahoo_input_data *yid;
-        struct yahoo_server_settings *yss;
 
         if (!wcm || !wcm->server || !wcm->key)
@@ -3381 +3364 @@
         yid->wcm = y->wcm;
         y->wcm = NULL;
-
-        yss = y->yd->server_settings;
 
         yid->wcd = y_new0(struct yahoo_webcam_data, 1);
@@ -4975 +4956 @@
         YList *l;
         struct send_file_data *sfd;
-        char *who = NULL;
-        char *filename = NULL;
         char *id = NULL;
         char *token = NULL;
@@ -4984 +4963 @@
                 switch (pair->key) {
                 case 4:
-                        who = pair->value;
+                        /* who */
                         break;
                 case 5:
@@ -4998 +4977 @@
                         break;
                 case 27:
-                        filename = pair->value;
+                        /* filename */
                         break;
                 }
@@ -5023 +5002 @@
 {
         YList *l;
-        char *who = NULL;
-        char *filename = NULL;
         char *id = NULL;
         char *token = NULL;
@@ -5036 +5013 @@
                 case 1:
                 case 4:
-                        who = pair->value;
+                        /* who */
                         break;
                 case 5:
@@ -5053 +5030 @@
                         break;
                 case 27:
-                        filename = pair->value;
+                        /* filename */
                         break;
                 }

query.c

@@ -150 +150 @@
                         imcb_log( q->ic, "Accepted: %s", q->question );
                 else
-                        irc_usermsg( irc, "Accepted: %s", q->question );
+                        irc_rootmsg( irc, "Accepted: %s", q->question );
                 if( q->yes )
                         q->yes( q->data );
@@ -159 +159 @@
                         imcb_log( q->ic, "Rejected: %s", q->question );
                 else
-                        irc_usermsg( irc, "Rejected: %s", q->question );
+                        irc_rootmsg( irc, "Rejected: %s", q->question );
                 if( q->no )
                         q->no( q->data );
@@ -179 +179 @@
         else
         {
-                irc_usermsg( irc, "New request: %s\nYou can use the \2yes\2/\2no\2 commands to accept/reject this request.", q->question );
+                irc_rootmsg( irc, "New request: %s\nYou can use the \2yes\2/\2no\2 commands to accept/reject this request.", q->question );
         }
 }

root_commands.c

@@ -42 +42 @@
                         if( cmd[blaat] == NULL )                               \
                         {                                                      \
-                                irc_usermsg( irc, "Not enough parameters given (need %d).", x ); \
+                                irc_rootmsg( irc, "Not enough parameters given (need %d).", x ); \
                                 return y;                                      \
                         }                                                      \
@@ -69 +69 @@
                 }
         
-        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
+        irc_rootmsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
 }
 
@@ -90 +90 @@
         if( s )
         {
-                irc_usermsg( irc, "%s", s );
+                irc_rootmsg( irc, "%s", s );
                 g_free( s );
         }
         else
         {
-                irc_usermsg( irc, "Error opening helpfile." );
+                irc_rootmsg( irc, "Error opening helpfile." );
         }
 }
@@ -110 +110 @@
         if( irc->status & USTATUS_IDENTIFIED )
         {
-                irc_usermsg( irc, "You're already logged in." );
+                irc_rootmsg( irc, "You're already logged in." );
                 return;
         }
@@ -128 +128 @@
         else if( irc->b->accounts != NULL )
         {
-                irc_usermsg( irc,
+                irc_rootmsg( irc,
                              "You're trying to identify yourself, but already have "
                              "at least one IM account set up. "
@@ -138 +138 @@
         if( password == NULL )
         {
-                irc_usermsg( irc, "About to identify, use /OPER to enter the password" );
+                irc_rootmsg( irc, "About to identify, use /OPER to enter the password" );
                 irc->status |= OPER_HACK_IDENTIFY;
                 return;
@@ -150 +150 @@
         switch (status) {
         case STORAGE_INVALID_PASSWORD:
-                irc_usermsg( irc, "Incorrect password" );
+                irc_rootmsg( irc, "Incorrect password" );
                 break;
         case STORAGE_NO_SUCH_USER:
-                irc_usermsg( irc, "The nick is (probably) not registered" );
+                irc_rootmsg( irc, "The nick is (probably) not registered" );
                 break;
         case STORAGE_OK:
-                irc_usermsg( irc, "Password accepted%s",
+                irc_rootmsg( irc, "Password accepted%s",
                              load ? ", settings and accounts loaded" : "" );
                 irc_setpass( irc, password );
@@ -192 +192 @@
         case STORAGE_OTHER_ERROR:
         default:
-                irc_usermsg( irc, "Unknown error while loading configuration" );
+                irc_rootmsg( irc, "Unknown error while loading configuration" );
                 break;
         }
@@ -215 +215 @@
         if( global.conf->authmode == AUTHMODE_REGISTERED )
         {
-                irc_usermsg( irc, "This server does not allow registering new accounts" );
+                irc_rootmsg( irc, "This server does not allow registering new accounts" );
                 return;
         }
@@ -221 +221 @@
         if( cmd[1] == NULL )
         {
-                irc_usermsg( irc, "About to register, use /OPER to enter the password" );
+                irc_rootmsg( irc, "About to register, use /OPER to enter the password" );
                 irc->status |= OPER_HACK_REGISTER;
                 return;
@@ -228 +228 @@
         switch( storage_save( irc, cmd[1], FALSE ) ) {
                 case STORAGE_ALREADY_EXISTS:
-                        irc_usermsg( irc, "Nick is already registered" );
+                        irc_rootmsg( irc, "Nick is already registered" );
                         break;
                         
                 case STORAGE_OK:
-                        irc_usermsg( irc, "Account successfully created" );
+                        irc_rootmsg( irc, "Account successfully created" );
                         irc_setpass( irc, cmd[1] );
                         irc->status |= USTATUS_IDENTIFIED;
@@ -245 +245 @@
 
                 default:
-                        irc_usermsg( irc, "Error registering" );
+                        irc_rootmsg( irc, "Error registering" );
                         break;
         }
@@ -257 +257 @@
         switch (status) {
         case STORAGE_NO_SUCH_USER:
-                irc_usermsg( irc, "That account does not exist" );
+                irc_rootmsg( irc, "That account does not exist" );
                 break;
         case STORAGE_INVALID_PASSWORD:
-                irc_usermsg( irc, "Password invalid" );
+                irc_rootmsg( irc, "Password invalid" );
                 break;
         case STORAGE_OK:
@@ -266 +266 @@
                 irc->status &= ~USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "-R", 1 );
-                irc_usermsg( irc, "Account `%s' removed", irc->user->nick );
+                irc_rootmsg( irc, "Account `%s' removed", irc->user->nick );
                 break;
         default:
-                irc_usermsg( irc, "Error: `%d'", status );
+                irc_rootmsg( irc, "Error: `%d'", status );
                 break;
         }
@@ -277 +277 @@
 {
         if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
-                irc_usermsg( irc, "Please create an account first" );
+                irc_rootmsg( irc, "Please create an account first" );
         else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
-                irc_usermsg( irc, "Configuration saved" );
-        else
-                irc_usermsg( irc, "Configuration could not be saved!" );
+                irc_rootmsg( irc, "Configuration saved" );
+        else
+                irc_rootmsg( irc, "Configuration could not be saved!" );
 }
 
@@ -290 +290 @@
         
         if( ( val = set_getstr( head, key ) ) )
-                irc_usermsg( irc, "%s = `%s'", key, val );
+                irc_rootmsg( irc, "%s = `%s'", key, val );
         else if( !( set = set_find( head, key ) ) )
         {
-                irc_usermsg( irc, "Setting `%s' does not exist.", key );
+                irc_rootmsg( irc, "Setting `%s' does not exist.", key );
                 if( *head == irc->b->set )
-                        irc_usermsg( irc, "It might be an account or channel setting. "
+                        irc_rootmsg( irc, "It might be an account or channel setting. "
                                      "See \x02help account set\x02 and \x02help channel set\x02." );
         }
         else if( set->flags & SET_PASSWORD )
-                irc_usermsg( irc, "%s = `********' (hidden)", key );
-        else
-                irc_usermsg( irc, "%s is empty", key );
+                irc_rootmsg( irc, "%s = `********' (hidden)", key );
+        else
+                irc_rootmsg( irc, "%s is empty", key );
 }
 
@@ -344 +344 @@
                            feedback. */
                         if( st )
-                                irc_usermsg( irc, "Setting changed successfully" );
+                                irc_rootmsg( irc, "Setting changed successfully" );
                         else
-                                irc_usermsg( irc, "Failed to change setting" );
+                                irc_rootmsg( irc, "Failed to change setting" );
                 }
                 else
@@ -362 +362 @@
                 while( s )
                 {
-                        if( !( s->flags & SET_HIDDEN ) )
+                        if( set_isvisible( s ) )
                                 cmd_showset( irc, &s, s->key );
                         s = s->next;
@@ -377 +377 @@
         if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
         {
-                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
+                irc_rootmsg( irc, "This setting can only be changed when the account is %s-line", "off" );
                 return 0;
         }
         else if( !a->ic && s && s->flags & ACC_SET_ONLINE_ONLY )
         {
-                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
+                irc_rootmsg( irc, "This setting can only be changed when the account is %s-line", "on" );
                 return 0;
         }
@@ -396 +396 @@
         if( global.conf->authmode == AUTHMODE_REGISTERED && !( irc->status & USTATUS_IDENTIFIED ) )
         {
-                irc_usermsg( irc, "This server only accepts registered users" );
+                irc_rootmsg( irc, "This server only accepts registered users" );
                 return;
         }
@@ -413 +413 @@
                                 if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
                                 {
-                                        irc_usermsg( irc, "Enter password for account %s(%s) "
-                                                     "first (use /OPER)", a->prpl->name, a->user );
+                                        irc_rootmsg( irc, "Enter password for account %s "
+                                                     "first (use /OPER)", a->tag );
                                         return;
                                 }
@@ -425 +425 @@
                 if( prpl == NULL )
                 {
-                        irc_usermsg( irc, "Unknown protocol" );
+                        irc_rootmsg( irc, "Unknown protocol" );
                         return;
                 }
@@ -431 +431 @@
                 for( a = irc->b->accounts; a; a = a->next )
                         if( a->prpl == prpl && prpl->handle_cmp( a->user, cmd[3] ) == 0 )
-                                irc_usermsg( irc, "Warning: You already have an account with "
+                                irc_rootmsg( irc, "Warning: You already have an account with "
                                              "protocol `%s' and username `%s'. Are you accidentally "
                                              "trying to add it twice?", prpl->name, cmd[3] );
@@ -438 +438 @@
                 if( cmd[5] )
                 {
-                        irc_usermsg( irc, "Warning: Passing a servername/other flags to `account add' "
+                        irc_rootmsg( irc, "Warning: Passing a servername/other flags to `account add' "
                                           "is now deprecated. Use `account set' instead." );
                         set_setstr( &a->set, "server", cmd[5] );
                 }
                 
-                irc_usermsg( irc, "Account successfully added%s", cmd[4] ? "" :
+                irc_rootmsg( irc, "Account successfully added with tag %s%s",
+                             a->tag, cmd[4] ? "" :
                              ", now use /OPER to enter the password" );
                 
@@ -453 +454 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_usermsg( irc, "Account list:" );
+                        irc_rootmsg( irc, "Account list:" );
                 
                 for( a = irc->b->accounts; a; a = a->next )
@@ -468 +469 @@
                                 con = "";
                         
-                        irc_usermsg( irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con );
+                        irc_rootmsg( irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con );
                         
                         i ++;
                 }
-                irc_usermsg( irc, "End of account list" );
+                irc_rootmsg( irc, "End of account list" );
                 
                 return;
@@ -484 +485 @@
                 if ( irc->b->accounts )
                 {
-                        irc_usermsg( irc, "Trying to get all accounts connected..." );
+                        irc_rootmsg( irc, "Trying to get all accounts connected..." );
                 
                         for( a = irc->b->accounts; a; a = a->next )
@@ -490 +491 @@
                                 {
                                         if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                                                irc_usermsg( irc, "Enter password for account %s(%s) "
-                                                             "first (use /OPER)", a->prpl->name, a->user );
+                                                irc_rootmsg( irc, "Enter password for account %s "
+                                                             "first (use /OPER)", a->tag );
                                         else
                                                 account_on( irc->b, a );
@@ -498 +499 @@
                 else
                 {
-                        irc_usermsg( irc, "No accounts known. Use `account add' to add one." );
+                        irc_rootmsg( irc, "No accounts known. Use `account add' to add one." );
                 }
                 
@@ -505 +506 @@
         else if( len >= 2 && g_strncasecmp( cmd[1], "off", len ) == 0 )
         {
-                irc_usermsg( irc, "Deactivating all active (re)connections..." );
+                irc_rootmsg( irc, "Deactivating all active (re)connections..." );
                 
                 for( a = irc->b->accounts; a; a = a->next )
@@ -530 +531 @@
             ( a = account_get( irc->b, cmd[1] ) ) == NULL )
         {
-                irc_usermsg( irc, "Could not find account `%s'. Note that the syntax "
+                irc_rootmsg( irc, "Could not find account `%s'. Note that the syntax "
                              "of the account command changed, see \x02help account\x02.", cmd[1] );
                 
@@ -540 +541 @@
                 if( a->ic )
                 {
-                        irc_usermsg( irc, "Account is still logged in, can't delete" );
+                        irc_rootmsg( irc, "Account is still logged in, can't delete" );
                 }
                 else
                 {
                         account_del( irc->b, a );
-                        irc_usermsg( irc, "Account deleted" );
+                        irc_rootmsg( irc, "Account deleted" );
                 }
         }
@@ -551 +552 @@
         {
                 if( a->ic )
-                        irc_usermsg( irc, "Account already online" );
+                        irc_rootmsg( irc, "Account already online" );
                 else if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                        irc_usermsg( irc, "Enter password for account %s(%s) "
-                                     "first (use /OPER)", a->prpl->name, a->user );
+                        irc_rootmsg( irc, "Enter password for account %s "
+                                     "first (use /OPER)", a->tag );
                 else
                         account_on( irc->b, a );
@@ -567 +568 @@
                 {
                         cancel_auto_reconnect( a );
-                        irc_usermsg( irc, "Reconnect cancelled" );
-                }
-                else
-                {
-                        irc_usermsg( irc, "Account already offline" );
+                        irc_rootmsg( irc, "Reconnect cancelled" );
+                }
+                else
+                {
+                        irc_rootmsg( irc, "Account already offline" );
                 }
         }
@@ -580 +581 @@
         else
         {
-                irc_usermsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "account", cmd[2] );
+                irc_rootmsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "account", cmd[2] );
         }
 }
@@ -597 +598 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_usermsg( irc, "Channel list:" );
+                        irc_rootmsg( irc, "Channel list:" );
                 
                 for( l = irc->channels; l; l = l->next )
@@ -603 +604 @@
                         irc_channel_t *ic = l->data;
                         
-                        irc_usermsg( irc, "%2d. %s, %s channel%s", i, ic->name,
+                        irc_rootmsg( irc, "%2d. %s, %s channel%s", i, ic->name,
                                      set_getstr( &ic->set, "type" ),
                                      ic->flags & IRC_CHANNEL_JOINED ? " (joined)" : "" );
@@ -609 +610 @@
                         i ++;
                 }
-                irc_usermsg( irc, "End of channel list" );
+                irc_rootmsg( irc, "End of channel list" );
                 
                 return;
@@ -623 +624 @@
                         cmd_set_real( irc, cmd + 1, &ic->set, NULL );
                 else
-                        irc_usermsg( irc, "Could not find channel `%s'", cmd[1] );
+                        irc_rootmsg( irc, "Could not find channel `%s'", cmd[1] );
                 
                 return;
@@ -640 +641 @@
                     ic != ic->irc->default_channel )
                 {
-                        irc_usermsg( irc, "Channel %s deleted.", ic->name );
+                        irc_rootmsg( irc, "Channel %s deleted.", ic->name );
                         irc_channel_free( ic );
                 }
                 else
-                        irc_usermsg( irc, "Couldn't remove channel (main channel %s or "
+                        irc_rootmsg( irc, "Couldn't remove channel (main channel %s or "
                                           "channels you're still in cannot be deleted).",
                                           irc->default_channel->name );
@@ -650 +651 @@
         else
         {
-                irc_usermsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "channel", cmd[1] );
+                irc_rootmsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "channel", cmd[1] );
         }
 }
@@ -668 +669 @@
         if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_usermsg( irc, "Invalid account" );
+                irc_rootmsg( irc, "Invalid account" );
                 return;
         }
         else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_usermsg( irc, "That account is not on-line" );
+                irc_rootmsg( irc, "That account is not on-line" );
                 return;
         }
@@ -681 +682 @@
                 if( !nick_ok( cmd[3] ) )
                 {
-                        irc_usermsg( irc, "The requested nick `%s' is invalid", cmd[3] );
+                        irc_rootmsg( irc, "The requested nick `%s' is invalid", cmd[3] );
                         return;
                 }
                 else if( irc_user_by_name( irc, cmd[3] ) )
                 {
-                        irc_usermsg( irc, "The requested nick `%s' already exists", cmd[3] );
+                        irc_rootmsg( irc, "The requested nick `%s' already exists", cmd[3] );
                         return;
                 }
@@ -704 +705 @@
                     strcmp( s, "group" ) == 0 &&
                     ( group = set_getstr( &ic->set, "group" ) ) )
-                        irc_usermsg( irc, "Adding `%s' to contact list (group %s)",
+                        irc_rootmsg( irc, "Adding `%s' to contact list (group %s)",
                                      cmd[2], group );
                 else
-                        irc_usermsg( irc, "Adding `%s' to contact list", cmd[2] );
+                        irc_rootmsg( irc, "Adding `%s' to contact list", cmd[2] );
                 
                 a->prpl->add_buddy( a->ic, cmd[2], group );
@@ -720 +721 @@
                 if( ( bu = bee_user_new( irc->b, a->ic, cmd[2], BEE_USER_LOCAL ) ) &&
                     ( iu = bu->ui_data ) )
-                        irc_usermsg( irc, "Temporarily assigned nickname `%s' "
+                        irc_rootmsg( irc, "Temporarily assigned nickname `%s' "
                                      "to contact `%s'", iu->nick, cmd[2] );
         }
@@ -734 +735 @@
         if( !( iu = irc_user_by_name( irc, cmd[1] ) ) || !( bu = iu->bu ) )
         {
-                irc_usermsg( irc, "Buddy `%s' not found", cmd[1] );
+                irc_rootmsg( irc, "Buddy `%s' not found", cmd[1] );
                 return;
         }
@@ -744 +745 @@
                 bee_user_free( irc->b, bu );
         
-        irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
+        irc_rootmsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
         g_free( s );
         
@@ -760 +761 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -768 +769 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_usermsg( irc, "Invalid account" );
+                irc_rootmsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_usermsg( irc, "That account is not on-line" );
+                irc_rootmsg( irc, "That account is not on-line" );
                 return;
         }
@@ -779 +780 @@
         if( !ic->acc->prpl->get_info )
         {
-                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -796 +797 @@
         if( iu == NULL )
         {
-                irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
+                irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
         }
         else if( del )
@@ -802 +803 @@
                 if( iu->bu )
                         bee_irc_user_nick_reset( iu );
-                irc_usermsg( irc, "Nickname reset to `%s'", iu->nick );
+                irc_rootmsg( irc, "Nickname reset to `%s'", iu->nick );
         }
         else if( iu == irc->user )
         {
-                irc_usermsg( irc, "Use /nick to change your own nickname" );
+                irc_rootmsg( irc, "Use /nick to change your own nickname" );
         }
         else if( !nick_ok( cmd[2] ) )
         {
-                irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
+                irc_rootmsg( irc, "Nick `%s' is invalid", cmd[2] );
         }
         else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu )
         {
-                irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
+                irc_rootmsg( irc, "Nick `%s' already exists", cmd[2] );
         }
         else
@@ -820 +821 @@
                 if( !irc_user_set_nick( iu, cmd[2] ) )
                 {
-                        irc_usermsg( irc, "Error while changing nick" );
+                        irc_rootmsg( irc, "Error while changing nick" );
                         return;
                 }
@@ -836 +837 @@
                 }
                 
-                irc_usermsg( irc, "Nick successfully changed" );
+                irc_rootmsg( irc, "Nick successfully changed" );
         }
 }
@@ -869 +870 @@
                         format = "%-32.32s  %-16.16s";
                 
-                irc_usermsg( irc, format, "Handle", "Nickname" );
+                irc_rootmsg( irc, format, "Handle", "Nickname" );
                 for( l = a->ic->deny; l; l = l->next )
                 {
                         bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
                         irc_user_t *iu = bu ? bu->ui_data : NULL;
-                        irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
-                }
-                irc_usermsg( irc, "End of list." );
+                        irc_rootmsg( irc, format, l->data, iu ? iu->nick : "(none)" );
+                }
+                irc_rootmsg( irc, "End of list." );
                 
                 return;
@@ -885 +886 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -893 +894 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_usermsg( irc, "Invalid account" );
+                irc_rootmsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_usermsg( irc, "That account is not on-line" );
+                irc_rootmsg( irc, "That account is not on-line" );
                 return;
         }
@@ -904 +905 @@
         if( !ic->acc->prpl->add_deny || !ic->acc->prpl->rem_permit )
         {
-                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -910 +911 @@
                 imc_rem_allow( ic, cmd[2] );
                 imc_add_block( ic, cmd[2] );
-                irc_usermsg( irc, "Buddy `%s' moved from allow- to block-list", cmd[2] );
+                irc_rootmsg( irc, "Buddy `%s' moved from allow- to block-list", cmd[2] );
         }
 }
@@ -929 +930 @@
                         format = "%-32.32s  %-16.16s";
                 
-                irc_usermsg( irc, format, "Handle", "Nickname" );
+                irc_rootmsg( irc, format, "Handle", "Nickname" );
                 for( l = a->ic->permit; l; l = l->next )
                 {
                         bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
                         irc_user_t *iu = bu ? bu->ui_data : NULL;
-                        irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
-                }
-                irc_usermsg( irc, "End of list." );
+                        irc_rootmsg( irc, format, l->data, iu ? iu->nick : "(none)" );
+                }
+                irc_rootmsg( irc, "End of list." );
                 
                 return;
@@ -945 +946 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -953 +954 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_usermsg( irc, "Invalid account" );
+                irc_rootmsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_usermsg( irc, "That account is not on-line" );
+                irc_rootmsg( irc, "That account is not on-line" );
                 return;
         }
@@ -964 +965 @@
         if( !ic->acc->prpl->rem_deny || !ic->acc->prpl->add_permit )
         {
-                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -971 +972 @@
                 imc_add_allow( ic, cmd[2] );
                 
-                irc_usermsg( irc, "Buddy `%s' moved from block- to allow-list", cmd[2] );
+                irc_rootmsg( irc, "Buddy `%s' moved from block- to allow-list", cmd[2] );
         }
 }
@@ -998 +999 @@
                         if( ( ++times >= 3 ) )
                         {
-                                irc_usermsg( irc, "%s", msg[rand()%(sizeof(msg)/sizeof(char*))] );
+                                irc_rootmsg( irc, "%s", msg[rand()%(sizeof(msg)/sizeof(char*))] );
                                 last_irc = NULL;
                                 times = 0;
@@ -1011 +1012 @@
                 }
                 
-                irc_usermsg( irc, "Did I ask you something?" );
+                irc_rootmsg( irc, "Did I ask you something?" );
                 return;
         }
@@ -1021 +1022 @@
                 if( sscanf( cmd[1], "%d", &numq ) != 1 )
                 {
-                        irc_usermsg( irc, "Invalid query number" );
+                        irc_rootmsg( irc, "Invalid query number" );
                         return;
                 }
@@ -1031 +1032 @@
                 if( !q )
                 {
-                        irc_usermsg( irc, "Uhm, I never asked you something like that..." );
+                        irc_rootmsg( irc, "Uhm, I never asked you something like that..." );
                         return;
                 }
@@ -1071 +1072 @@
                 format = "%-16.16s  %-40.40s  %s";
         
-        irc_usermsg( irc, format, "Nick", "Handle/Account", "Status" );
+        irc_rootmsg( irc, format, "Nick", "Handle/Account", "Status" );
         
         if( irc->root->last_channel &&
@@ -1093 +1094 @@
                                 g_snprintf( st, sizeof( st ) - 1, "Online (%s)", bu->status_msg );
                         
-                        g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_usermsg( irc, format, iu->nick, s, st );
+                        g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
+                        irc_rootmsg( irc, format, iu->nick, s, st );
                 }
                 
@@ -1111 +1112 @@
                 if( away == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_usermsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
+                        g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
+                        irc_rootmsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
                 }
                 n_away ++;
@@ -1128 +1129 @@
                 if( offline == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_usermsg( irc, format, iu->nick, s, "Offline" );
+                        g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
+                        irc_rootmsg( irc, format, iu->nick, s, "Offline" );
                 }
                 n_offline ++;
         }
         
-        irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
+        irc_rootmsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
 }
 
@@ -1144 +1145 @@
         if( !q )
         {
-                irc_usermsg( irc, "There are no pending questions." );
-                return;
-        }
-        
-        irc_usermsg( irc, "Pending queries:" );
+                irc_rootmsg( irc, "There are no pending questions." );
+                return;
+        }
+        
+        irc_rootmsg( irc, "Pending queries:" );
         
         for( num = 0; q; q = q->next, num ++ )
                 if( q->ic ) /* Not necessary yet, but it might come later */
-                        irc_usermsg( irc, "%d, %s(%s): %s", num, q->ic->acc->prpl->name, q->ic->acc->user, q->question );
-                else
-                        irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
+                        irc_rootmsg( irc, "%d, %s: %s", num, q->ic->acc->tag, q->question );
+                else
+                        irc_rootmsg( irc, "%d, BitlBee: %s", num, q->question );
 }
 
@@ -1170 +1171 @@
                 if( !( acc = account_get( irc->b, cmd[2] ) ) )
                 {
-                        irc_usermsg( irc, "Invalid account" );
+                        irc_rootmsg( irc, "Invalid account" );
                         return;
                 }
                 else if( !acc->prpl->chat_join )
                 {
-                        irc_usermsg( irc, "Named chatrooms not supported on that account." );
+                        irc_rootmsg( irc, "Named chatrooms not supported on that account." );
                         return;
                 }
@@ -1205 +1206 @@
                     set_setstr( &ic->set, "room", cmd[3] ) )
                 {
-                        irc_usermsg( irc, "Chatroom successfully added." );
+                        irc_rootmsg( irc, "Chatroom successfully added." );
                 }
                 else
@@ -1212 +1213 @@
                                 irc_channel_free( ic );
                         
-                        irc_usermsg( irc, "Could not add chatroom." );
+                        irc_rootmsg( irc, "Could not add chatroom." );
                 }
                 g_free( channel );
@@ -1227 +1228 @@
                         if( !iu->bu->ic->acc->prpl->chat_with( iu->bu->ic, iu->bu->handle ) )
                         {
-                                irc_usermsg( irc, "(Possible) failure while trying to open "
+                                irc_rootmsg( irc, "(Possible) failure while trying to open "
                                                   "a groupchat with %s.", iu->nick );
                         }
@@ -1233 +1234 @@
                 else
                 {
-                        irc_usermsg( irc, "Can't open a groupchat with %s.", cmd[2] );
+                        irc_rootmsg( irc, "Can't open a groupchat with %s.", cmd[2] );
                 }
         }
@@ -1240 +1241 @@
                  g_strcasecmp( cmd[1], "del" ) == 0 )
         {
-                irc_usermsg( irc, "Warning: The \002chat\002 command was mostly replaced with the \002channel\002 command." );
+                irc_rootmsg( irc, "Warning: The \002chat\002 command was mostly replaced with the \002channel\002 command." );
                 cmd_channel( irc, cmd );
         }
         else
         {
-                irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
+                irc_rootmsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
         }
 }
@@ -1260 +1261 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_usermsg( irc, "Group list:" );
+                        irc_rootmsg( irc, "Group list:" );
                 
                 for( l = irc->b->groups; l; l = l->next )
                 {
                         bee_group_t *bg = l->data;
-                        irc_usermsg( irc, "%d. %s", n ++, bg->name );
-                }
-                irc_usermsg( irc, "End of group list" );
-        }
-        else
-        {
-                irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "group", cmd[1] );
+                        irc_rootmsg( irc, "%d. %s", n ++, bg->name );
+                }
+                irc_rootmsg( irc, "End of group list" );
+        }
+        else
+        {
+                irc_rootmsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "group", cmd[1] );
         }
 }
@@ -1284 +1285 @@
         if( !files )
         {
-                irc_usermsg( irc, "No pending transfers" );
+                irc_rootmsg( irc, "No pending transfers" );
                 return;
         }
@@ -1305 +1306 @@
                 case LIST:
                         if ( file->status == FT_STATUS_LISTENING )
-                                irc_usermsg( irc, 
+                                irc_rootmsg( irc, 
                                         "Pending file(id %d): %s (Listening...)", file->local_id, file->file_name);
                         else 
@@ -1314 +1315 @@
                                         kb_per_s = file->bytes_transferred / 1024 / diff;
                                         
-                                irc_usermsg( irc, 
+                                irc_rootmsg( irc, 
                                         "Pending file(id %d): %s (%10zd/%zd kb, %d kb/s)", file->local_id, file->file_name, 
                                         file->bytes_transferred/1024, file->file_size/1024, kb_per_s);
@@ -1322 +1323 @@
                         if( file->status == FT_STATUS_LISTENING )
                         {
-                                irc_usermsg( irc, "Rejecting file transfer for %s", file->file_name );
+                                irc_rootmsg( irc, "Rejecting file transfer for %s", file->file_name );
                                 imcb_file_canceled( file->ic, file, "Denied by user" );
                         }
@@ -1329 +1330 @@
                         if( file->local_id == fid )
                         {
-                                irc_usermsg( irc, "Canceling file transfer for %s", file->file_name );
+                                irc_rootmsg( irc, "Canceling file transfer for %s", file->file_name );
                                 imcb_file_canceled( file->ic, file, "Canceled by user" );
                         }
@@ -1339 +1340 @@
 static void cmd_nick( irc_t *irc, char **cmd )
 {
-        irc_usermsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
+        irc_rootmsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
 }
 
@@ -1354 +1355 @@
         
         if( msg )
-                irc_usermsg( irc, "%s: This seems to be your first time using this "
+                irc_rootmsg( irc, "%s: This seems to be your first time using this "
                                   "this version of BitlBee. Here's a list of new "
                                   "features you may like to know about:\n\n%s\n",

set.c

@@ -112 +112 @@
 }
 
+int set_isvisible( set_t *set )
+{
+        /* the default value is not stored in value, only in def */
+        return !( ( set->flags & SET_HIDDEN ) ||
+                  ( ( set->flags & SET_HIDDEN_DEFAULT ) &&
+                    ( set->value == NULL ) ) );
+}
+
 int set_setstr( set_t **head, const char *key, char *value )
 {

set.h

@@ -49 +49 @@
         SET_HIDDEN = 0x0200,
         SET_PASSWORD = 0x0400,
+        SET_HIDDEN_DEFAULT = 0x0800,
 } set_flags_t;
 
@@ -98 +99 @@
 int set_reset( set_t **head, const char *key );
 
+/* returns true if a setting shall be shown to the user */
+int set_isvisible( set_t *set );
+
 /* Two very useful generic evaluators. */
 char *set_eval_int( set_t *set, char *value );

storage_xml.c

@@ -269 +269 @@
         {
                 xd->unknown_tag ++;
-                irc_usermsg( irc, "Warning: Unknown XML tag found in configuration file (%s). "
+                irc_rootmsg( irc, "Warning: Unknown XML tag found in configuration file (%s). "
                                   "This may happen when downgrading BitlBee versions. "
                                   "This tag will be skipped and the information will be lost "
@@ -397 +397 @@
                         {
                                 if( gerr && irc )
-                                        irc_usermsg( irc, "Error from XML-parser: %s", gerr->message );
+                                        irc_rootmsg( irc, "Error from XML-parser: %s", gerr->message );
                                 
                                 g_clear_error( &gerr );
@@ -473 +473 @@
         if( ( fd = mkstemp( path ) ) < 0 )
         {
-                irc_usermsg( irc, "Error while opening configuration file." );
+                irc_rootmsg( irc, "Error while opening configuration file." );
                 return STORAGE_OTHER_ERROR;
         }
@@ -570 +570 @@
         if( rename( path, path2 ) != 0 )
         {
-                irc_usermsg( irc, "Error while renaming temporary configuration file." );
+                irc_rootmsg( irc, "Error while renaming temporary configuration file." );
                 
                 g_free( path2 );
@@ -585 +585 @@
         g_free( pass_buf );
         
-        irc_usermsg( irc, "Write error. Disk full?" );
+        irc_rootmsg( irc, "Write error. Disk full?" );
         close( fd );