- Update to 0.9.9

PR:		ports/105172
Submitted by:	Toni Schmidbauer

6 files changed, 312 insertions, 318 deletions

diff --git a/net-im/tkabber/Makefile b/net-im/tkabber/Makefile
index 60d014372106..ecd10caa4669 100644
--- a/net-im/tkabber/Makefile
+++ b/net-im/tkabber/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tkabber
-PORTVERSION=	0.9.7
+PORTVERSION=	0.9.9
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.jabber.ru/files/tkabber/
 
@@ -24,7 +24,7 @@ RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
 WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	yes
 
-SUBDIRS=	aniemoteicons emoticons-tkabber ifaceck ifacetk plugins \
+SUBDIRS=	aniemoteicons emoticons-tkabber ifacetk plugins \
 		jabberlib-tclxml pixmaps sounds textundo msgs mclistbox-1.02
 
 do-install:
diff --git a/net-im/tkabber/distinfo b/net-im/tkabber/distinfo
index bd1433bb8b0d..12570f4340d8 100644
--- a/net-im/tkabber/distinfo
+++ b/net-im/tkabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (tkabber-0.9.7.tar.gz) = 41a0f24239415edb8e3d2cd86e532f38
-SHA256 (tkabber-0.9.7.tar.gz) = 1ebe0c8fceec0ec3bf6e5d14238ea6f8a23c997d700feab1e5fbe95f4d8cb6d8
-SIZE (tkabber-0.9.7.tar.gz) = 714184
+MD5 (tkabber-0.9.9.tar.gz) = 72adb238e77018cee7ee5ac6358bdc51
+SHA256 (tkabber-0.9.9.tar.gz) = a5d3f38654a480d1ea2df60be3a5d9180d867fe400424ff09f8154fc86fc067a
+SIZE (tkabber-0.9.9.tar.gz) = 785288
diff --git a/net-im/tkabber/files/patch-Makefile b/net-im/tkabber/files/patch-Makefile
new file mode 100644
index 000000000000..35b540c4cdf5
--- /dev/null
+++ b/net-im/tkabber/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- Makefile.orig	Tue Oct 31 13:24:25 2006
++++ Makefile	Tue Oct 31 13:28:00 2006
+@@ -21,6 +21,6 @@
+ 	cp README COPYING AUTHORS $(DESTDIR)/$(PREFIX)/share/doc/tkabber
+ 	cp doc/tkabber.html $(DESTDIR)/$(PREFIX)/share/doc/tkabber/html
+ 	mkdir -p $(DESTDIR)/$(PREFIX)/bin/
+-	echo -e "#!/bin/sh\nexec wish $(PREFIX)/share/tkabber/tkabber.tcl -name tkabber \"\$$@\"\n" > $(DESTDIR)/$(PREFIX)/bin/tkabber
++	echo -e "#!/bin/sh\nexec wish8.4 $(PREFIX)/share/tkabber/tkabber.tcl -name tkabber \"\$$@\"\n" > $(DESTDIR)/$(PREFIX)/bin/tkabber
+ 	chmod +x $(DESTDIR)/$(PREFIX)/bin/tkabber
+ 
diff --git a/net-im/tkabber/files/patch-login.tcl b/net-im/tkabber/files/patch-login.tcl
index 22f7687b9d12..ba28084d0317 100644
--- a/net-im/tkabber/files/patch-login.tcl
+++ b/net-im/tkabber/files/patch-login.tcl
@@ -1,15 +1,18 @@
---- login.tcl.orig	Tue Aug  3 14:35:36 2004
-+++ login.tcl	Tue Aug  3 14:35:54 2004
-@@ -36,10 +36,10 @@
- custom::defvar loginconf(usedigest) 1 \
-     [::msgcat::mc "Use hashed password transmission."] \
-     -group Login -type boolean
--custom::defvar loginconf(resource) "tkabber" \
-+custom::defvar loginconf(resource) "TKabber" \
-     [::msgcat::mc "Resource."] \
+--- login.tcl.orig      Tue Oct 31 13:08:19 2006
++++ login.tcl   Tue Oct 31 13:08:45 2006
+@@ -46,13 +46,13 @@
+ custom::defvar loginconf(user) "" \
+     [::msgcat::mc "User name."] \
      -group Login -type string
 -custom::defvar loginconf(server) "localhost" \
 +custom::defvar loginconf(server) "jabber.ru" \
      [::msgcat::mc "Server name."] \
      -group Login -type string
- custom::defvar loginconf(port) "5222" \
+ custom::defvar loginconf(password) "" \
+     [::msgcat::mc "Password."] \
+     -group Login -type password
+-custom::defvar loginconf(resource) "tkabber" \
++custom::defvar loginconf(resource) "TKabber" \
+     [::msgcat::mc "Resource."] \
+     -group Login -type string
+ custom::defvar loginconf(priority) "8" \
diff --git a/net-im/tkabber/files/patch-tkabber.tcl b/net-im/tkabber/files/patch-tkabber.tcl
index 194b89eea4b9..efcbf706e079 100644
--- a/net-im/tkabber/files/patch-tkabber.tcl
+++ b/net-im/tkabber/files/patch-tkabber.tcl
@@ -1,19 +1,19 @@
---- tkabber.tcl.orig	Tue Jul 27 17:37:59 2004
-+++ tkabber.tcl	Tue Aug  3 14:34:43 2004
+--- tkabber.tcl.orig    Tue Oct 31 13:04:08 2006
++++ tkabber.tcl Tue Oct 31 13:06:18 2006
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # the next line restarts using the correct interpreter \
 -exec wish "$0" -name tkabber "$@"
 +exec wish8.4 "$0" -name tkabber "$@"
  
- # $Id: tkabber.tcl,v 1.219 2004/07/10 20:05:04 aleksey Exp $
+ # $Id: tkabber.tcl,v 1.236 2006/06/08 20:21:44 aleksey Exp $
  
-@@ -118,7 +118,7 @@
-             debugmsg tkabber "closed $chan '$res'"
-         }
-     }
+@@ -107,7 +107,7 @@
+     hook::run quit_hook
+     catch { bind $::ifacetk::mf <Destroy> {} }
+     destroy .
 -    exit $status
 +    quit $status
  }
  
- namespace eval ssj {}
+ namespace eval ifacetk {}
diff --git a/net-im/tkabber/pkg-plist b/net-im/tkabber/pkg-plist
index 9544a24466fb..642d083f6e85 100644
--- a/net-im/tkabber/pkg-plist
+++ b/net-im/tkabber/pkg-plist
@@ -1,12 +1,9 @@
-bin/tkabber
 %%DATADIR%%/Tclx.tcl
 %%DATADIR%%/aniemoteicons/aniemoteicons.tcl
 %%DATADIR%%/aniemoteicons/anigif.tcl
-%%DATADIR%%/avatars.tcl
 %%DATADIR%%/balloon.tcl
 %%DATADIR%%/browser.tcl
 %%DATADIR%%/chats.tcl
-%%DATADIR%%/ckabber.tcl
 %%DATADIR%%/custom.tcl
 %%DATADIR%%/datagathering.tcl
 %%DATADIR%%/default.tcl
@@ -27,32 +24,38 @@ bin/tkabber
 %%DATADIR%%/gpgme.tcl
 %%DATADIR%%/hooks.tcl
 %%DATADIR%%/iface.tcl
-%%DATADIR%%/ifaceck/default.xrdb
-%%DATADIR%%/ifaceck/iface.tcl
-%%DATADIR%%/ifaceck/ilogin.tcl
-%%DATADIR%%/ifaceck/iroster.tcl
-%%DATADIR%%/ifaceck/widgets.tcl
 %%DATADIR%%/ifacetk/bwidget_workarounds.tcl
 %%DATADIR%%/ifacetk/default.xrdb
 %%DATADIR%%/ifacetk/idefault.tcl
 %%DATADIR%%/ifacetk/iface.tcl
 %%DATADIR%%/ifacetk/ilogin.tcl
 %%DATADIR%%/ifacetk/iroster.tcl
+%%DATADIR%%/ifacetk/systray.tcl
+%%DATADIR%%/ifacetk/unix.xrdb
 %%DATADIR%%/iq.tcl
 %%DATADIR%%/itemedit.tcl
+%%DATADIR%%/jabberlib-tclxml/idna.tcl
 %%DATADIR%%/jabberlib-tclxml/jabberlib.tcl
+%%DATADIR%%/jabberlib-tclxml/jlibauth.tcl
+%%DATADIR%%/jabberlib-tclxml/jlibcomponent.tcl
+%%DATADIR%%/jabberlib-tclxml/jlibcompress.tcl
+%%DATADIR%%/jabberlib-tclxml/jlibdns.tcl
+%%DATADIR%%/jabberlib-tclxml/jlibsasl.tcl
+%%DATADIR%%/jabberlib-tclxml/jlibtls.tcl
+%%DATADIR%%/jabberlib-tclxml/namespaces.tcl
+%%DATADIR%%/jabberlib-tclxml/ntlm.tcl
 %%DATADIR%%/jabberlib-tclxml/pkgIndex.tcl
+%%DATADIR%%/jabberlib-tclxml/stanzaerror.tcl
+%%DATADIR%%/jabberlib-tclxml/streamerror.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/pkgIndex.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.1.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/sgmlparser.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.1.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.1.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xml__tcl.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xmldep.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xpath.tcl
+%%DATADIR%%/jabberlib-tclxml/transports.tcl
 %%DATADIR%%/jabberlib-tclxml/wrapper.tcl
 %%DATADIR%%/jidlink.tcl
 %%DATADIR%%/joingrdialog.tcl
@@ -74,15 +77,12 @@ bin/tkabber
 %%DATADIR%%/msgs/ro.msg
 %%DATADIR%%/msgs/ru.msg
 %%DATADIR%%/msgs/ru.rc
-%%DATADIR%%/msgs/ua.msg
+%%DATADIR%%/msgs/uk.msg
 %%DATADIR%%/muc.tcl
 %%DATADIR%%/negotiate.tcl
-%%DATADIR%%/pixmaps/amibulb/browser/aim_online.gif
-%%DATADIR%%/pixmaps/amibulb/browser/icq_online.gif
-%%DATADIR%%/pixmaps/amibulb/browser/msn_online.gif
-%%DATADIR%%/pixmaps/amibulb/browser/user.gif
-%%DATADIR%%/pixmaps/amibulb/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps.tcl
 %%DATADIR%%/pixmaps/amibulb/docking/tkabber.ico
+%%DATADIR%%/pixmaps/amibulb/icondef.xml
 %%DATADIR%%/pixmaps/amibulb/roster/available-away.gif
 %%DATADIR%%/pixmaps/amibulb/roster/available-chat.gif
 %%DATADIR%%/pixmaps/amibulb/roster/available-dnd.gif
@@ -94,101 +94,98 @@ bin/tkabber
 %%DATADIR%%/pixmaps/amibulb/roster/invisible.gif
 %%DATADIR%%/pixmaps/amibulb/roster/stalker.gif
 %%DATADIR%%/pixmaps/amibulb/roster/unavailable.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/jb.gif
-%%DATADIR%%/pixmaps/default/browser/aim_online.gif
-%%DATADIR%%/pixmaps/default/browser/gg_online.gif
-%%DATADIR%%/pixmaps/default/browser/glade-message.gif
-%%DATADIR%%/pixmaps/default/browser/group_on.gif
-%%DATADIR%%/pixmaps/default/browser/icq_online.gif
-%%DATADIR%%/pixmaps/default/browser/jud.gif
-%%DATADIR%%/pixmaps/default/browser/msn_online.gif
-%%DATADIR%%/pixmaps/default/browser/service-jabber.gif
-%%DATADIR%%/pixmaps/default/browser/unknown.gif
-%%DATADIR%%/pixmaps/default/browser/user.gif
-%%DATADIR%%/pixmaps/default/browser/weather_online.gif
-%%DATADIR%%/pixmaps/default/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/default/docking/available-away.gif
 %%DATADIR%%/pixmaps/default/docking/available-chat.gif
 %%DATADIR%%/pixmaps/default/docking/available-dnd.gif
 %%DATADIR%%/pixmaps/default/docking/available-xa.gif
 %%DATADIR%%/pixmaps/default/docking/available.gif
+%%DATADIR%%/pixmaps/default/docking/blank.gif
 %%DATADIR%%/pixmaps/default/docking/invisible.gif
+%%DATADIR%%/pixmaps/default/docking/message-personal.gif
+%%DATADIR%%/pixmaps/default/docking/message-server.gif
+%%DATADIR%%/pixmaps/default/docking/message.gif
 %%DATADIR%%/pixmaps/default/docking/tkabber.ico
 %%DATADIR%%/pixmaps/default/docking/unavailable.gif
+%%DATADIR%%/pixmaps/default/icondef.xml
 %%DATADIR%%/pixmaps/default/roster/available-away.gif
 %%DATADIR%%/pixmaps/default/roster/available-chat.gif
 %%DATADIR%%/pixmaps/default/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/default/roster/available-xa.gif
 %%DATADIR%%/pixmaps/default/roster/available.gif
+%%DATADIR%%/pixmaps/default/roster/conference-available.gif
+%%DATADIR%%/pixmaps/default/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/default/roster/group-closed.gif
 %%DATADIR%%/pixmaps/default/roster/group-opened.gif
-%%DATADIR%%/pixmaps/default/roster/group_off.gif
-%%DATADIR%%/pixmaps/default/roster/group_on.gif
 %%DATADIR%%/pixmaps/default/roster/invisible.gif
 %%DATADIR%%/pixmaps/default/roster/stalker.gif
 %%DATADIR%%/pixmaps/default/roster/unavailable.gif
-%%DATADIR%%/pixmaps/default/services/aim_away.xpm
-%%DATADIR%%/pixmaps/default/services/aim_chat.xpm
-%%DATADIR%%/pixmaps/default/services/aim_dnd.xpm
-%%DATADIR%%/pixmaps/default/services/aim_offline.xpm
-%%DATADIR%%/pixmaps/default/services/aim_online.xpm
-%%DATADIR%%/pixmaps/default/services/aim_xa.xpm
+%%DATADIR%%/pixmaps/default/services/aim_away.gif
+%%DATADIR%%/pixmaps/default/services/aim_chat.gif
+%%DATADIR%%/pixmaps/default/services/aim_dnd.gif
+%%DATADIR%%/pixmaps/default/services/aim_offline.gif
+%%DATADIR%%/pixmaps/default/services/aim_online.gif
+%%DATADIR%%/pixmaps/default/services/aim_xa.gif
 %%DATADIR%%/pixmaps/default/services/gg_away.gif
 %%DATADIR%%/pixmaps/default/services/gg_chat.gif
 %%DATADIR%%/pixmaps/default/services/gg_dnd.gif
 %%DATADIR%%/pixmaps/default/services/gg_offline.gif
 %%DATADIR%%/pixmaps/default/services/gg_online.gif
 %%DATADIR%%/pixmaps/default/services/gg_xa.gif
-%%DATADIR%%/pixmaps/default/services/icq_away.xpm
-%%DATADIR%%/pixmaps/default/services/icq_chat.xpm
-%%DATADIR%%/pixmaps/default/services/icq_dnd.xpm
-%%DATADIR%%/pixmaps/default/services/icq_offline.xpm
-%%DATADIR%%/pixmaps/default/services/icq_online.xpm
-%%DATADIR%%/pixmaps/default/services/icq_xa.xpm
+%%DATADIR%%/pixmaps/default/services/icq_away.gif
+%%DATADIR%%/pixmaps/default/services/icq_chat.gif
+%%DATADIR%%/pixmaps/default/services/icq_dnd.gif
+%%DATADIR%%/pixmaps/default/services/icq_offline.gif
+%%DATADIR%%/pixmaps/default/services/icq_online.gif
+%%DATADIR%%/pixmaps/default/services/icq_xa.gif
 %%DATADIR%%/pixmaps/default/services/jud.gif
-%%DATADIR%%/pixmaps/default/services/msn_away.xpm
-%%DATADIR%%/pixmaps/default/services/msn_chat.xpm
-%%DATADIR%%/pixmaps/default/services/msn_dnd.xpm
-%%DATADIR%%/pixmaps/default/services/msn_offline.xpm
-%%DATADIR%%/pixmaps/default/services/msn_online.xpm
-%%DATADIR%%/pixmaps/default/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/default/services/rss.xpm
-%%DATADIR%%/pixmaps/default/services/rss2.xpm
-%%DATADIR%%/pixmaps/default/services/rss3.xpm
-%%DATADIR%%/pixmaps/default/services/sms.xpm
+%%DATADIR%%/pixmaps/default/services/msn_away.gif
+%%DATADIR%%/pixmaps/default/services/msn_chat.gif
+%%DATADIR%%/pixmaps/default/services/msn_dnd.gif
+%%DATADIR%%/pixmaps/default/services/msn_offline.gif
+%%DATADIR%%/pixmaps/default/services/msn_online.gif
+%%DATADIR%%/pixmaps/default/services/msn_xa.gif
+%%DATADIR%%/pixmaps/default/services/rss_away.gif
+%%DATADIR%%/pixmaps/default/services/rss_chat.gif
+%%DATADIR%%/pixmaps/default/services/rss_dnd.gif
+%%DATADIR%%/pixmaps/default/services/rss_offline.gif
+%%DATADIR%%/pixmaps/default/services/rss_online.gif
+%%DATADIR%%/pixmaps/default/services/rss_xa.gif
+%%DATADIR%%/pixmaps/default/services/sms.gif
 %%DATADIR%%/pixmaps/default/services/weather_away.gif
 %%DATADIR%%/pixmaps/default/services/weather_chat.gif
 %%DATADIR%%/pixmaps/default/services/weather_dnd.gif
 %%DATADIR%%/pixmaps/default/services/weather_offline.gif
 %%DATADIR%%/pixmaps/default/services/weather_online.gif
 %%DATADIR%%/pixmaps/default/services/weather_xa.gif
-%%DATADIR%%/pixmaps/default/services/yahoo_away.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_chat.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_dnd.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_offline.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_online.xpm
-%%DATADIR%%/pixmaps/default/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/default/tkabber/bookmark.xpm
-%%DATADIR%%/pixmaps/default/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-online.gif
+%%DATADIR%%/pixmaps/default/services/yahoo_away.gif
+%%DATADIR%%/pixmaps/default/services/yahoo_chat.gif
+%%DATADIR%%/pixmaps/default/services/yahoo_dnd.gif
+%%DATADIR%%/pixmaps/default/services/yahoo_offline.gif
+%%DATADIR%%/pixmaps/default/services/yahoo_online.gif
+%%DATADIR%%/pixmaps/default/services/yahoo_xa.gif
+%%DATADIR%%/pixmaps/default/tkabber/chat-bookmark.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-badsigned.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-encrypted.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-signed.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-unencrypted.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-unsigned.gif
-%%DATADIR%%/pixmaps/default/tkabber/jb.gif
-%%DATADIR%%/pixmaps/default/tkabber/mainlogo.gif
 %%DATADIR%%/pixmaps/default/tkabber/new-msg.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_bk.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_case.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_exact.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_fw.gif
+%%DATADIR%%/pixmaps/default/tkabber/tkabber-logo.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/feather22/icondef.xml
 %%DATADIR%%/pixmaps/feather22/roster/available-away.gif
 %%DATADIR%%/pixmaps/feather22/roster/available-chat.gif
 %%DATADIR%%/pixmaps/feather22/roster/available-dnd.gif
@@ -196,74 +193,69 @@ bin/tkabber
 %%DATADIR%%/pixmaps/feather22/roster/available.gif
 %%DATADIR%%/pixmaps/feather22/roster/invisible.gif
 %%DATADIR%%/pixmaps/feather22/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gabber/browser/aim_online.gif
-%%DATADIR%%/pixmaps/gabber/browser/glade-message.gif
-%%DATADIR%%/pixmaps/gabber/browser/group_on.gif
-%%DATADIR%%/pixmaps/gabber/browser/icq_online.gif
-%%DATADIR%%/pixmaps/gabber/browser/jud.gif
-%%DATADIR%%/pixmaps/gabber/browser/msn_online.gif
-%%DATADIR%%/pixmaps/gabber/browser/user.gif
-%%DATADIR%%/pixmaps/gabber/browser/yahoo_online.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-away.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-chat.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-dnd.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-xa.gif
 %%DATADIR%%/pixmaps/gabber/docking/available.gif
 %%DATADIR%%/pixmaps/gabber/docking/invisible.gif
+%%DATADIR%%/pixmaps/gabber/docking/message-personal.gif
+%%DATADIR%%/pixmaps/gabber/docking/message-server.gif
+%%DATADIR%%/pixmaps/gabber/docking/message.gif
 %%DATADIR%%/pixmaps/gabber/docking/tkabber.ico
 %%DATADIR%%/pixmaps/gabber/docking/unavailable.gif
+%%DATADIR%%/pixmaps/gabber/icondef.xml
 %%DATADIR%%/pixmaps/gabber/roster/available-away.gif
 %%DATADIR%%/pixmaps/gabber/roster/available-chat.gif
 %%DATADIR%%/pixmaps/gabber/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/gabber/roster/available-xa.gif
 %%DATADIR%%/pixmaps/gabber/roster/available.gif
-%%DATADIR%%/pixmaps/gabber/roster/glade-groupchat-menu.xpm
+%%DATADIR%%/pixmaps/gabber/roster/conference-available.gif
+%%DATADIR%%/pixmaps/gabber/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/gabber/roster/group-closed.gif
 %%DATADIR%%/pixmaps/gabber/roster/group-opened.gif
-%%DATADIR%%/pixmaps/gabber/roster/group_off.gif
-%%DATADIR%%/pixmaps/gabber/roster/group_on.gif
+%%DATADIR%%/pixmaps/gabber/roster/invisible.gif
 %%DATADIR%%/pixmaps/gabber/roster/stalker.gif
 %%DATADIR%%/pixmaps/gabber/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gabber/services/aim_away.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_chat.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_dnd.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_offline.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_online.xpm
-%%DATADIR%%/pixmaps/gabber/services/aim_xa.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_away.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_chat.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_dnd.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_offline.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_online.xpm
-%%DATADIR%%/pixmaps/gabber/services/icq_xa.xpm
+%%DATADIR%%/pixmaps/gabber/services/aim_away.gif
+%%DATADIR%%/pixmaps/gabber/services/aim_chat.gif
+%%DATADIR%%/pixmaps/gabber/services/aim_dnd.gif
+%%DATADIR%%/pixmaps/gabber/services/aim_offline.gif
+%%DATADIR%%/pixmaps/gabber/services/aim_online.gif
+%%DATADIR%%/pixmaps/gabber/services/aim_xa.gif
+%%DATADIR%%/pixmaps/gabber/services/icq_away.gif
+%%DATADIR%%/pixmaps/gabber/services/icq_chat.gif
+%%DATADIR%%/pixmaps/gabber/services/icq_dnd.gif
+%%DATADIR%%/pixmaps/gabber/services/icq_offline.gif
+%%DATADIR%%/pixmaps/gabber/services/icq_online.gif
+%%DATADIR%%/pixmaps/gabber/services/icq_xa.gif
 %%DATADIR%%/pixmaps/gabber/services/jud.gif
-%%DATADIR%%/pixmaps/gabber/services/msn_away.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_chat.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_dnd.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_offline.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_online.xpm
-%%DATADIR%%/pixmaps/gabber/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss2.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss3.xpm
-%%DATADIR%%/pixmaps/gabber/services/sms.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_away.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_chat.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_dnd.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_offline.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_online.xpm
-%%DATADIR%%/pixmaps/gabber/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/jb.gif
-%%DATADIR%%/pixmaps/gush/browser/aim_online.gif
-%%DATADIR%%/pixmaps/gush/browser/icq_online.gif
-%%DATADIR%%/pixmaps/gush/browser/msn_online.gif
-%%DATADIR%%/pixmaps/gush/browser/user.gif
-%%DATADIR%%/pixmaps/gush/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/gabber/services/msn_away.gif
+%%DATADIR%%/pixmaps/gabber/services/msn_chat.gif
+%%DATADIR%%/pixmaps/gabber/services/msn_dnd.gif
+%%DATADIR%%/pixmaps/gabber/services/msn_offline.gif
+%%DATADIR%%/pixmaps/gabber/services/msn_online.gif
+%%DATADIR%%/pixmaps/gabber/services/msn_xa.gif
+%%DATADIR%%/pixmaps/gabber/services/rss_away.gif
+%%DATADIR%%/pixmaps/gabber/services/rss_chat.gif
+%%DATADIR%%/pixmaps/gabber/services/rss_dnd.gif
+%%DATADIR%%/pixmaps/gabber/services/rss_offline.gif
+%%DATADIR%%/pixmaps/gabber/services/rss_online.gif
+%%DATADIR%%/pixmaps/gabber/services/rss_xa.gif
+%%DATADIR%%/pixmaps/gabber/services/sms.gif
+%%DATADIR%%/pixmaps/gabber/services/yahoo_away.gif
+%%DATADIR%%/pixmaps/gabber/services/yahoo_chat.gif
+%%DATADIR%%/pixmaps/gabber/services/yahoo_dnd.gif
+%%DATADIR%%/pixmaps/gabber/services/yahoo_offline.gif
+%%DATADIR%%/pixmaps/gabber/services/yahoo_online.gif
+%%DATADIR%%/pixmaps/gabber/services/yahoo_xa.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/gush/docking/tkabber.ico
+%%DATADIR%%/pixmaps/gush/icondef.xml
 %%DATADIR%%/pixmaps/gush/roster/available-away.gif
 %%DATADIR%%/pixmaps/gush/roster/available-chat.gif
 %%DATADIR%%/pixmaps/gush/roster/available-dnd.gif
@@ -275,11 +267,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gush/roster/invisible.gif
 %%DATADIR%%/pixmaps/gush/roster/stalker.gif
 %%DATADIR%%/pixmaps/gush/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/gush/tkabber/jb.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/icq/docking/available-away.gif
 %%DATADIR%%/pixmaps/icq/docking/available-chat.gif
 %%DATADIR%%/pixmaps/icq/docking/available-dnd.gif
@@ -287,6 +279,7 @@ bin/tkabber
 %%DATADIR%%/pixmaps/icq/docking/available.gif
 %%DATADIR%%/pixmaps/icq/docking/invisible.gif
 %%DATADIR%%/pixmaps/icq/docking/unavailable.gif
+%%DATADIR%%/pixmaps/icq/icondef.xml
 %%DATADIR%%/pixmaps/icq/roster/available-away.gif
 %%DATADIR%%/pixmaps/icq/roster/available-chat.gif
 %%DATADIR%%/pixmaps/icq/roster/available-dnd.gif
@@ -297,20 +290,13 @@ bin/tkabber
 %%DATADIR%%/pixmaps/icq/roster/send.gif
 %%DATADIR%%/pixmaps/icq/roster/stalker.gif
 %%DATADIR%%/pixmaps/icq/roster/unavailable.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/icq/tkabber/jb.gif
-%%DATADIR%%/pixmaps/icq/tkabber/mainlogo.gif
 %%DATADIR%%/pixmaps/icq/tkabber/new-msg.gif
-%%DATADIR%%/pixmaps/jajc/browser/aim_online.gif
-%%DATADIR%%/pixmaps/jajc/browser/group_on.gif
-%%DATADIR%%/pixmaps/jajc/browser/icq_online.gif
-%%DATADIR%%/pixmaps/jajc/browser/jud.gif
-%%DATADIR%%/pixmaps/jajc/browser/msn_online.gif
-%%DATADIR%%/pixmaps/jajc/browser/user.gif
-%%DATADIR%%/pixmaps/jajc/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/icq/tkabber/tkabber-logo.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-away.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-chat.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-dnd.gif
@@ -318,49 +304,51 @@ bin/tkabber
 %%DATADIR%%/pixmaps/jajc/docking/available.gif
 %%DATADIR%%/pixmaps/jajc/docking/tkabber.ico
 %%DATADIR%%/pixmaps/jajc/docking/unavailable.gif
+%%DATADIR%%/pixmaps/jajc/icondef.xml
 %%DATADIR%%/pixmaps/jajc/roster/available-away.gif
 %%DATADIR%%/pixmaps/jajc/roster/available-chat.gif
 %%DATADIR%%/pixmaps/jajc/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/jajc/roster/available-xa.gif
 %%DATADIR%%/pixmaps/jajc/roster/available.gif
+%%DATADIR%%/pixmaps/jajc/roster/conference-available.gif
+%%DATADIR%%/pixmaps/jajc/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/jajc/roster/group-closed.gif
 %%DATADIR%%/pixmaps/jajc/roster/group-opened.gif
 %%DATADIR%%/pixmaps/jajc/roster/group_closed.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_off.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_on.gif
 %%DATADIR%%/pixmaps/jajc/roster/group_opened.gif
 %%DATADIR%%/pixmaps/jajc/roster/unavailable.gif
-%%DATADIR%%/pixmaps/jajc/services/aim_away.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_chat.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_dnd.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_offline.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_online.xpm
-%%DATADIR%%/pixmaps/jajc/services/aim_xa.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_away.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_chat.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_dnd.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_offline.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_online.xpm
-%%DATADIR%%/pixmaps/jajc/services/icq_xa.xpm
+%%DATADIR%%/pixmaps/jajc/services/aim_away.gif
+%%DATADIR%%/pixmaps/jajc/services/aim_chat.gif
+%%DATADIR%%/pixmaps/jajc/services/aim_dnd.gif
+%%DATADIR%%/pixmaps/jajc/services/aim_offline.gif
+%%DATADIR%%/pixmaps/jajc/services/aim_online.gif
+%%DATADIR%%/pixmaps/jajc/services/aim_xa.gif
+%%DATADIR%%/pixmaps/jajc/services/icq_away.gif
+%%DATADIR%%/pixmaps/jajc/services/icq_chat.gif
+%%DATADIR%%/pixmaps/jajc/services/icq_dnd.gif
+%%DATADIR%%/pixmaps/jajc/services/icq_offline.gif
+%%DATADIR%%/pixmaps/jajc/services/icq_online.gif
+%%DATADIR%%/pixmaps/jajc/services/icq_xa.gif
 %%DATADIR%%/pixmaps/jajc/services/jud.gif
-%%DATADIR%%/pixmaps/jajc/services/msn_away.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_chat.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_dnd.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_offline.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_online.xpm
-%%DATADIR%%/pixmaps/jajc/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/jajc/services/sms.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_away.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_chat.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_dnd.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_offline.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_online.xpm
-%%DATADIR%%/pixmaps/jajc/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/jb.gif
+%%DATADIR%%/pixmaps/jajc/services/msn_away.gif
+%%DATADIR%%/pixmaps/jajc/services/msn_chat.gif
+%%DATADIR%%/pixmaps/jajc/services/msn_dnd.gif
+%%DATADIR%%/pixmaps/jajc/services/msn_offline.gif
+%%DATADIR%%/pixmaps/jajc/services/msn_online.gif
+%%DATADIR%%/pixmaps/jajc/services/msn_xa.gif
+%%DATADIR%%/pixmaps/jajc/services/sms.gif
+%%DATADIR%%/pixmaps/jajc/services/yahoo_away.gif
+%%DATADIR%%/pixmaps/jajc/services/yahoo_chat.gif
+%%DATADIR%%/pixmaps/jajc/services/yahoo_dnd.gif
+%%DATADIR%%/pixmaps/jajc/services/yahoo_offline.gif
+%%DATADIR%%/pixmaps/jajc/services/yahoo_online.gif
+%%DATADIR%%/pixmaps/jajc/services/yahoo_xa.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/jarl/icondef.xml
 %%DATADIR%%/pixmaps/jarl/roster/available-away.gif
 %%DATADIR%%/pixmaps/jarl/roster/available-chat.gif
 %%DATADIR%%/pixmaps/jarl/roster/available-dnd.gif
@@ -368,18 +356,6 @@ bin/tkabber
 %%DATADIR%%/pixmaps/jarl/roster/available.gif
 %%DATADIR%%/pixmaps/jarl/roster/invisible.gif
 %%DATADIR%%/pixmaps/jarl/roster/unavailable.gif
-%%DATADIR%%/pixmaps/kroc/browser/aim_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/gg_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/glade-message.gif
-%%DATADIR%%/pixmaps/kroc/browser/group_on.gif
-%%DATADIR%%/pixmaps/kroc/browser/icq_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/jud.gif
-%%DATADIR%%/pixmaps/kroc/browser/msn_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/service-jabber.gif
-%%DATADIR%%/pixmaps/kroc/browser/unknown.gif
-%%DATADIR%%/pixmaps/kroc/browser/user.gif
-%%DATADIR%%/pixmaps/kroc/browser/weather_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/yahoo_online.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-away.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-chat.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-dnd.gif
@@ -388,81 +364,80 @@ bin/tkabber
 %%DATADIR%%/pixmaps/kroc/docking/invisible.gif
 %%DATADIR%%/pixmaps/kroc/docking/tkabber.ico
 %%DATADIR%%/pixmaps/kroc/docking/unavailable.gif
+%%DATADIR%%/pixmaps/kroc/icondef.xml
 %%DATADIR%%/pixmaps/kroc/roster/available-away.gif
 %%DATADIR%%/pixmaps/kroc/roster/available-chat.gif
 %%DATADIR%%/pixmaps/kroc/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/kroc/roster/available-xa.gif
 %%DATADIR%%/pixmaps/kroc/roster/available.gif
+%%DATADIR%%/pixmaps/kroc/roster/conference-available.gif
+%%DATADIR%%/pixmaps/kroc/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/kroc/roster/group-closed.gif
 %%DATADIR%%/pixmaps/kroc/roster/group-opened.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_closed.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_off.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_on.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_opened.gif
 %%DATADIR%%/pixmaps/kroc/roster/invisible.gif
 %%DATADIR%%/pixmaps/kroc/roster/stalker.gif
 %%DATADIR%%/pixmaps/kroc/roster/unavailable.gif
-%%DATADIR%%/pixmaps/kroc/services/aim_away.xpm
-%%DATADIR%%/pixmaps/kroc/services/aim_chat.xpm
-%%DATADIR%%/pixmaps/kroc/services/aim_dnd.xpm
-%%DATADIR%%/pixmaps/kroc/services/aim_offline.xpm
-%%DATADIR%%/pixmaps/kroc/services/aim_online.xpm
-%%DATADIR%%/pixmaps/kroc/services/aim_xa.xpm
+%%DATADIR%%/pixmaps/kroc/roster/unsubscribed.gif
+%%DATADIR%%/pixmaps/kroc/services/aim_away.gif
+%%DATADIR%%/pixmaps/kroc/services/aim_chat.gif
+%%DATADIR%%/pixmaps/kroc/services/aim_dnd.gif
+%%DATADIR%%/pixmaps/kroc/services/aim_offline.gif
+%%DATADIR%%/pixmaps/kroc/services/aim_online.gif
+%%DATADIR%%/pixmaps/kroc/services/aim_xa.gif
 %%DATADIR%%/pixmaps/kroc/services/gg_away.gif
 %%DATADIR%%/pixmaps/kroc/services/gg_chat.gif
 %%DATADIR%%/pixmaps/kroc/services/gg_dnd.gif
 %%DATADIR%%/pixmaps/kroc/services/gg_offline.gif
 %%DATADIR%%/pixmaps/kroc/services/gg_online.gif
 %%DATADIR%%/pixmaps/kroc/services/gg_xa.gif
-%%DATADIR%%/pixmaps/kroc/services/icq_away.xpm
-%%DATADIR%%/pixmaps/kroc/services/icq_chat.xpm
-%%DATADIR%%/pixmaps/kroc/services/icq_dnd.xpm
-%%DATADIR%%/pixmaps/kroc/services/icq_offline.xpm
-%%DATADIR%%/pixmaps/kroc/services/icq_online.xpm
-%%DATADIR%%/pixmaps/kroc/services/icq_xa.xpm
+%%DATADIR%%/pixmaps/kroc/services/icq_away.gif
+%%DATADIR%%/pixmaps/kroc/services/icq_chat.gif
+%%DATADIR%%/pixmaps/kroc/services/icq_dnd.gif
+%%DATADIR%%/pixmaps/kroc/services/icq_offline.gif
+%%DATADIR%%/pixmaps/kroc/services/icq_online.gif
+%%DATADIR%%/pixmaps/kroc/services/icq_xa.gif
 %%DATADIR%%/pixmaps/kroc/services/jud.gif
-%%DATADIR%%/pixmaps/kroc/services/msn_away.xpm
-%%DATADIR%%/pixmaps/kroc/services/msn_chat.xpm
-%%DATADIR%%/pixmaps/kroc/services/msn_dnd.xpm
-%%DATADIR%%/pixmaps/kroc/services/msn_offline.xpm
-%%DATADIR%%/pixmaps/kroc/services/msn_online.xpm
-%%DATADIR%%/pixmaps/kroc/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss2.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss3.xpm
-%%DATADIR%%/pixmaps/kroc/services/sms.xpm
+%%DATADIR%%/pixmaps/kroc/services/msn_away.gif
+%%DATADIR%%/pixmaps/kroc/services/msn_chat.gif
+%%DATADIR%%/pixmaps/kroc/services/msn_dnd.gif
+%%DATADIR%%/pixmaps/kroc/services/msn_offline.gif
+%%DATADIR%%/pixmaps/kroc/services/msn_online.gif
+%%DATADIR%%/pixmaps/kroc/services/msn_xa.gif
+%%DATADIR%%/pixmaps/kroc/services/rss_away.gif
+%%DATADIR%%/pixmaps/kroc/services/rss_chat.gif
+%%DATADIR%%/pixmaps/kroc/services/rss_dnd.gif
+%%DATADIR%%/pixmaps/kroc/services/rss_offline.gif
+%%DATADIR%%/pixmaps/kroc/services/rss_online.gif
+%%DATADIR%%/pixmaps/kroc/services/rss_xa.gif
+%%DATADIR%%/pixmaps/kroc/services/sms.gif
 %%DATADIR%%/pixmaps/kroc/services/weather_away.gif
 %%DATADIR%%/pixmaps/kroc/services/weather_chat.gif
 %%DATADIR%%/pixmaps/kroc/services/weather_dnd.gif
 %%DATADIR%%/pixmaps/kroc/services/weather_offline.gif
 %%DATADIR%%/pixmaps/kroc/services/weather_online.gif
 %%DATADIR%%/pixmaps/kroc/services/weather_xa.gif
-%%DATADIR%%/pixmaps/kroc/services/yahoo_away.xpm
-%%DATADIR%%/pixmaps/kroc/services/yahoo_chat.xpm
-%%DATADIR%%/pixmaps/kroc/services/yahoo_dnd.xpm
-%%DATADIR%%/pixmaps/kroc/services/yahoo_offline.xpm
-%%DATADIR%%/pixmaps/kroc/services/yahoo_online.xpm
-%%DATADIR%%/pixmaps/kroc/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-online.gif
+%%DATADIR%%/pixmaps/kroc/services/yahoo_away.gif
+%%DATADIR%%/pixmaps/kroc/services/yahoo_chat.gif
+%%DATADIR%%/pixmaps/kroc/services/yahoo_dnd.gif
+%%DATADIR%%/pixmaps/kroc/services/yahoo_offline.gif
+%%DATADIR%%/pixmaps/kroc/services/yahoo_online.gif
+%%DATADIR%%/pixmaps/kroc/services/yahoo_xa.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-badsigned.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-encrypted.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-signed.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-unencrypted.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-unsigned.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/jb.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/new-msg.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_bk.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_case.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_exact.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_fw.gif
-%%DATADIR%%/pixmaps/psi/browser/aim_online.gif
-%%DATADIR%%/pixmaps/psi/browser/icq_online.gif
-%%DATADIR%%/pixmaps/psi/browser/msn_online.gif
-%%DATADIR%%/pixmaps/psi/browser/user.gif
-%%DATADIR%%/pixmaps/psi/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/psi/icondef.xml
 %%DATADIR%%/pixmaps/psi/roster/available-away.gif
 %%DATADIR%%/pixmaps/psi/roster/available-chat.gif
 %%DATADIR%%/pixmaps/psi/roster/available-dnd.gif
@@ -472,23 +447,22 @@ bin/tkabber
 %%DATADIR%%/pixmaps/psi/roster/group-opened.gif
 %%DATADIR%%/pixmaps/psi/roster/stalker.gif
 %%DATADIR%%/pixmaps/psi/roster/unavailable.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/psi/tkabber/jb.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-show-online.gif
 %%DATADIR%%/plugins.tcl
 %%DATADIR%%/plugins/chat/bookmark_highlighted.tcl
+%%DATADIR%%/plugins/chat/chatstate.tcl
 %%DATADIR%%/plugins/chat/clear.tcl
 %%DATADIR%%/plugins/chat/complete_last_nick.tcl
 %%DATADIR%%/plugins/chat/completion.tcl
-%%DATADIR%%/plugins/chat/draw_encrypted.tcl
 %%DATADIR%%/plugins/chat/draw_error.tcl
 %%DATADIR%%/plugins/chat/draw_info.tcl
 %%DATADIR%%/plugins/chat/draw_message.tcl
 %%DATADIR%%/plugins/chat/draw_normal_message.tcl
 %%DATADIR%%/plugins/chat/draw_server_message.tcl
-%%DATADIR%%/plugins/chat/draw_signed.tcl
 %%DATADIR%%/plugins/chat/draw_timestamp.tcl
 %%DATADIR%%/plugins/chat/draw_xhtml_message.tcl
 %%DATADIR%%/plugins/chat/empty_body.tcl
@@ -497,25 +471,38 @@ bin/tkabber
 %%DATADIR%%/plugins/chat/highlight.tcl
 %%DATADIR%%/plugins/chat/history.tcl
 %%DATADIR%%/plugins/chat/info_commands.tcl
+%%DATADIR%%/plugins/chat/insert_nick.tcl
 %%DATADIR%%/plugins/chat/irc_commands.tcl
 %%DATADIR%%/plugins/chat/logger.tcl
 %%DATADIR%%/plugins/chat/me_command.tcl
 %%DATADIR%%/plugins/chat/nick_colors.tcl
+%%DATADIR%%/plugins/chat/open_chat.tcl
 %%DATADIR%%/plugins/chat/open_window.tcl
 %%DATADIR%%/plugins/chat/popupmenu.tcl
+%%DATADIR%%/plugins/chat/search.tcl
 %%DATADIR%%/plugins/chat/send_message.tcl
 %%DATADIR%%/plugins/chat/unisymbols.tcl
 %%DATADIR%%/plugins/filetransfer/http.tcl
 %%DATADIR%%/plugins/filetransfer/jidlink.tcl
 %%DATADIR%%/plugins/filetransfer/si.tcl
+%%DATADIR%%/plugins/general/annotations.tcl
 %%DATADIR%%/plugins/general/autoaway.tcl
+%%DATADIR%%/plugins/general/avatars.tcl
 %%DATADIR%%/plugins/general/clientinfo.tcl
 %%DATADIR%%/plugins/general/conferenceinfo.tcl
+%%DATADIR%%/plugins/general/conferences.tcl
+%%DATADIR%%/plugins/general/headlines.tcl
+%%DATADIR%%/plugins/general/jitworkaround.tcl
 %%DATADIR%%/plugins/general/message_archive.tcl
-%%DATADIR%%/plugins/general/presenceinfo.tcl
+%%DATADIR%%/plugins/general/offline.tcl
 %%DATADIR%%/plugins/general/rawxml.tcl
+%%DATADIR%%/plugins/general/roster_delimiter.tcl
+%%DATADIR%%/plugins/general/rosterx.tcl
+%%DATADIR%%/plugins/general/sound.tcl
 %%DATADIR%%/plugins/general/stats.tcl
+%%DATADIR%%/plugins/general/subscribe_gateway.tcl
 %%DATADIR%%/plugins/general/tkcon.tcl
+%%DATADIR%%/plugins/general/xcommands.tcl
 %%DATADIR%%/plugins/iq/browse.tcl
 %%DATADIR%%/plugins/iq/last.tcl
 %%DATADIR%%/plugins/iq/oob.tcl
@@ -529,17 +516,18 @@ bin/tkabber
 %%DATADIR%%/plugins/unix/ispell.tcl
 %%DATADIR%%/plugins/unix/menu.tcl
 %%DATADIR%%/plugins/unix/menu8.4.tcl
+%%DATADIR%%/plugins/unix/systray.tcl
+%%DATADIR%%/plugins/unix/tktray.tcl
 %%DATADIR%%/plugins/unix/wmdock.tcl
 %%DATADIR%%/plugins/windows/console.tcl
 %%DATADIR%%/plugins/windows/mousewheel.tcl
 %%DATADIR%%/plugins/windows/taskbar.tcl
 %%DATADIR%%/presence.tcl
 %%DATADIR%%/privacy.tcl
-%%DATADIR%%/register.tcl
 %%DATADIR%%/roster.tcl
+%%DATADIR%%/register.tcl
 %%DATADIR%%/search.tcl
 %%DATADIR%%/si.tcl
-%%DATADIR%%/sound.tcl
 %%DATADIR%%/sounds/default/chat_their_message.wav
 %%DATADIR%%/sounds/default/connected.wav
 %%DATADIR%%/sounds/default/groupchat_server_message.wav
@@ -561,47 +549,55 @@ bin/tkabber
 %%DATADIR%%/userinfo.tcl
 %%DATADIR%%/utils.tcl
 %%DATADIR%%/xmppmime.tcl
-%%EXAMPLESDIR%%/badlop-config-home.tcl
-%%EXAMPLESDIR%%/badlop-config.tcl
-%%EXAMPLESDIR%%/badlop-dark.xrdb
-%%EXAMPLESDIR%%/black.xrdb
-%%EXAMPLESDIR%%/config.tcl
-%%EXAMPLESDIR%%/dark.xrdb
-%%EXAMPLESDIR%%/dark2.xrdb
-%%EXAMPLESDIR%%/ermine.xrdb
-%%EXAMPLESDIR%%/green.xrdb
-%%EXAMPLESDIR%%/ice.xrdb
-%%EXAMPLESDIR%%/light.xrdb
-%%EXAMPLESDIR%%/mtr-config.tcl
-%%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/build.sh
-%%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/tclCarbonNotification.tcl
-%%EXAMPLESDIR%%/teo-config.tcl
-%%EXAMPLESDIR%%/teopetuk.xrdb
-%%EXAMPLESDIR%%/tkabber_setstatus
-%%EXAMPLESDIR%%/tools/howto.txt
-%%EXAMPLESDIR%%/tools/jbot
-%%EXAMPLESDIR%%/tools/jsend.tcl
-%%EXAMPLESDIR%%/tools/rssbot
-%%EXAMPLESDIR%%/tools/rssbot.tcl
-%%EXAMPLESDIR%%/warm.xrdb
-
+%%PORTDOCS%%%%EXAMPLESDIR%%/badlop-config-home.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/badlop-config.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/badlop-dark.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/black.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/dark.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/dark2.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/green.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/ice.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/light.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/mtr-config.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/ocean-deep.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/build.sh
+%%PORTDOCS%%%%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/tclCarbonNotification.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/teo-config.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/teopetuk.xrdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/tkabber_setstatus
+%%PORTDOCS%%%%EXAMPLESDIR%%/tools/howto.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/tools/jbot
+%%PORTDOCS%%%%EXAMPLESDIR%%/tools/jsend.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/tools/rssbot
+%%PORTDOCS%%%%EXAMPLESDIR%%/tools/rssbot.tcl
+%%PORTDOCS%%%%EXAMPLESDIR%%/warm.xrdb
 %%PORTDOCS%%%%DOCSDIR%%/tkabber.html
 %%PORTDOCS%%%%DOCSDIR%%/tkabber.xml
+bin/tkabber
+
+@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/tclCarbonNotification-1.0.0
+@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/tools
+@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/aniemoteicons
-@dirrm %%DATADIR%%/emoticons-tkabber
-@dirrm %%DATADIR%%/ifaceck
-@dirrm %%DATADIR%%/ifacetk
-@dirrm %%DATADIR%%/jabberlib-tclxml/tclxml
-@dirrm %%DATADIR%%/jabberlib-tclxml
-@dirrm %%DATADIR%%/mclistbox-1.02
 @dirrm %%DATADIR%%/msgs
-@dirrm %%DATADIR%%/pixmaps/amibulb/browser
-@dirrm %%DATADIR%%/pixmaps/amibulb/docking
-@dirrm %%DATADIR%%/pixmaps/amibulb/roster
-@dirrm %%DATADIR%%/pixmaps/amibulb/tkabber
-@dirrm %%DATADIR%%/pixmaps/amibulb
-@dirrm %%DATADIR%%/pixmaps/default/browser
+@dirrm %%DATADIR%%/aniemoteicons
+@dirrm %%DATADIR%%/sounds/default
+@dirrm %%DATADIR%%/sounds/psi
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/plugins/jidlink
+@dirrm %%DATADIR%%/plugins/filetransfer
+@dirrm %%DATADIR%%/plugins/general
+@dirrm %%DATADIR%%/plugins/iq
+@dirrm %%DATADIR%%/plugins/chat
+@dirrm %%DATADIR%%/plugins/si
+@dirrm %%DATADIR%%/plugins/unix
+@dirrm %%DATADIR%%/plugins/windows
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/pixmaps/icq/docking
+@dirrm %%DATADIR%%/pixmaps/icq/roster
+@dirrm %%DATADIR%%/pixmaps/icq/tkabber
+@dirrm %%DATADIR%%/pixmaps/icq
 @dirrm %%DATADIR%%/pixmaps/default/docking
 @dirrm %%DATADIR%%/pixmaps/default/roster
 @dirrm %%DATADIR%%/pixmaps/default/services
@@ -609,22 +605,19 @@ bin/tkabber
 @dirrm %%DATADIR%%/pixmaps/default
 @dirrm %%DATADIR%%/pixmaps/feather22/roster
 @dirrm %%DATADIR%%/pixmaps/feather22
-@dirrm %%DATADIR%%/pixmaps/gabber/browser
 @dirrm %%DATADIR%%/pixmaps/gabber/docking
 @dirrm %%DATADIR%%/pixmaps/gabber/roster
 @dirrm %%DATADIR%%/pixmaps/gabber/services
 @dirrm %%DATADIR%%/pixmaps/gabber/tkabber
 @dirrm %%DATADIR%%/pixmaps/gabber
-@dirrm %%DATADIR%%/pixmaps/gush/browser
 @dirrm %%DATADIR%%/pixmaps/gush/docking
 @dirrm %%DATADIR%%/pixmaps/gush/roster
 @dirrm %%DATADIR%%/pixmaps/gush/tkabber
 @dirrm %%DATADIR%%/pixmaps/gush
-@dirrm %%DATADIR%%/pixmaps/icq/docking
-@dirrm %%DATADIR%%/pixmaps/icq/roster
-@dirrm %%DATADIR%%/pixmaps/icq/tkabber
-@dirrm %%DATADIR%%/pixmaps/icq
-@dirrm %%DATADIR%%/pixmaps/jajc/browser
+@dirrm %%DATADIR%%/pixmaps/amibulb/docking
+@dirrm %%DATADIR%%/pixmaps/amibulb/roster
+@dirrm %%DATADIR%%/pixmaps/amibulb/tkabber
+@dirrm %%DATADIR%%/pixmaps/amibulb
 @dirrm %%DATADIR%%/pixmaps/jajc/docking
 @dirrm %%DATADIR%%/pixmaps/jajc/roster
 @dirrm %%DATADIR%%/pixmaps/jajc/services
@@ -632,31 +625,19 @@ bin/tkabber
 @dirrm %%DATADIR%%/pixmaps/jajc
 @dirrm %%DATADIR%%/pixmaps/jarl/roster
 @dirrm %%DATADIR%%/pixmaps/jarl
-@dirrm %%DATADIR%%/pixmaps/kroc/browser
 @dirrm %%DATADIR%%/pixmaps/kroc/docking
 @dirrm %%DATADIR%%/pixmaps/kroc/roster
 @dirrm %%DATADIR%%/pixmaps/kroc/services
 @dirrm %%DATADIR%%/pixmaps/kroc/tkabber
 @dirrm %%DATADIR%%/pixmaps/kroc
-@dirrm %%DATADIR%%/pixmaps/psi/browser
 @dirrm %%DATADIR%%/pixmaps/psi/roster
 @dirrm %%DATADIR%%/pixmaps/psi/tkabber
 @dirrm %%DATADIR%%/pixmaps/psi
 @dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/plugins/chat
-@dirrm %%DATADIR%%/plugins/filetransfer
-@dirrm %%DATADIR%%/plugins/general
-@dirrm %%DATADIR%%/plugins/iq
-@dirrm %%DATADIR%%/plugins/jidlink
-@dirrm %%DATADIR%%/plugins/si
-@dirrm %%DATADIR%%/plugins/unix
-@dirrm %%DATADIR%%/plugins/windows
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/sounds/default
-@dirrm %%DATADIR%%/sounds/psi
-@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/emoticons-tkabber
+@dirrm %%DATADIR%%/mclistbox-1.02
+@dirrm %%DATADIR%%/jabberlib-tclxml/tclxml
+@dirrm %%DATADIR%%/jabberlib-tclxml
+@dirrm %%DATADIR%%/ifacetk
 @dirrm %%DATADIR%%/textundo
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0
-@dirrm %%EXAMPLESDIR%%/tools
-@dirrm %%EXAMPLESDIR%%