7 files changed, 832 insertions, 86 deletions

diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 5fb31cd208ed..bf263093eff1 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -1,66 +1,82 @@
 # New ports collection makefile for:	gajim
-# Date created:				27 April 2005
-# Whom:					Vsevolod Stakhov <vsevolod@highsecure.ru>
+# Date created:				Sun Nov 26 16:36:07 MSK 2006
+# Whom:					Denis Shaposhnikov <dsh@vlink.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gajim
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Jabber client based on a plugin system
+MAINTAINER=	dsh@vlink.ru
+COMMENT=	Gajim is a Jabber client based on a plugin system
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21 \
-		bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_GNOME=	gnometarget intlhack pygtk2
-USE_PYTHON=	2.4+
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
-
-MAN1=		gajim.1 \
-		gajim-remote.1
+USE_GNOME=	pygtk2
+USE_PYTHON=	2.4+
+USE_XLIB=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I ${X11BASE}/include" PYTHON=${PYTHON_CMD}
 
-.if defined(WITHOUT_DBUS)
-CONFIGURE_ARGS+=	--disable-remote
-PLIST_SUB+=	DBUS="@comment "
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
 .else
-LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
-PLIST_SUB+=	DBUS=""
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_GTKSPELL)
-CONFIGURE_ARGS+=	--disable-gtkspell
-PLIST_SUB+=	GTKSPELL="@comment "
-.else
-LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
-PLIST_SUB+=	GTKSPELL=""
-.endif
+MAN1=		gajim.1 gajim-remote.1
+
+EMOTICONS=	animated static
+ICONSETS=	crystal dcraven gnome goojim gossip gota jabberbulb nuvola \
+		simplebulb stellar sun transports
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|: install-docfilesDATA|:|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e \
-		's|^#!.*|#!${LOCALBASE}/bin/bash|g' ${WRKSRC}/scripts/gajim.in
+.for i in gajim-remote.py gajim.py history_manager.py
+		${REINPLACE_CMD} -e '1,1s/python/${PYTHON_VERSION}/' \
+			${WRKSRC}/src/$i
+.endfor
+
+pre-build:
+		${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/src
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog README README.html THANKS
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+		${MKDIR} ${DATADIR}/data/emoticons
+		(cd ${WRKSRC}/data/emoticons && \
+		${CP} -R ${EMOTICONS} ${DATADIR}/data/emoticons)
+
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/data/emoticons
+		${FIND} ${DATADIR}/data/emoticons -type d -print0 | \
+			${XARGS} -0 ${CHMOD} 755
+		${FIND} ${DATADIR}/data/emoticons -type f -print0 | \
+			${XARGS} -0 ${CHMOD} ${SHAREMODE}
+
+		${MKDIR} ${DATADIR}/data/iconsets
+		(cd ${WRKSRC}/data/iconsets && \
+		${CP} -R ${ICONSETS} ${DATADIR}/data/iconsets)
+
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/data/iconsets
+		${FIND} ${DATADIR}/data/iconsets -type d -print0 | \
+			${XARGS} -0 ${CHMOD} 755
+		${FIND} ${DATADIR}/data/iconsets -type f -print0 | \
+			${XARGS} -0 ${CHMOD} ${SHAREMODE}
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} >= 250
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+.else
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/gajim/files/patch-data-Makefile.in b/net-im/gajim/files/patch-data-Makefile.in
new file mode 100644
index 000000000000..1c82b7033fb5
--- /dev/null
+++ b/net-im/gajim/files/patch-data-Makefile.in
@@ -0,0 +1,11 @@
+--- data/Makefile.in.orig	Thu Nov 23 03:01:40 2006
++++ data/Makefile.in	Fri Nov 24 23:09:19 2006
+@@ -258,7 +258,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = glade emoticons pixmaps iconsets 
++SUBDIRS = glade pixmaps 
+ desktopdir = $(datadir)/applications
+ desktop_in_files = gajim.desktop.in.in 
+ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
diff --git a/net-im/gajim/files/patch-po-Makefile.in.in b/net-im/gajim/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..d85f89737e19
--- /dev/null
+++ b/net-im/gajim/files/patch-po-Makefile.in.in
@@ -0,0 +1,23 @@
+--- po/Makefile.in.in.orig	Tue Oct 24 23:52:06 2006
++++ po/Makefile.in.in	Thu Nov 23 17:25:06 2006
+@@ -33,8 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+@@ -44,8 +43,8 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+-GMSGFMT = @GMSGFMT@
+-MSGFMT = @MSGFMT@
++GMSGFMT = @INTLTOOL_MSGFMT@
++MSGFMT = @INTLTOOL_MSGFMT@
+ XGETTEXT = @XGETTEXT@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
diff --git a/net-im/gajim/files/patch-scripts-gajim.in b/net-im/gajim/files/patch-scripts-gajim.in
new file mode 100644
index 000000000000..35363ca7cbcf
--- /dev/null
+++ b/net-im/gajim/files/patch-scripts-gajim.in
@@ -0,0 +1,14 @@
+--- scripts/gajim.in.orig	Wed Oct 11 23:10:46 2006
++++ scripts/gajim.in	Fri Nov 24 14:15:58 2006
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ ##      gajim
+ ##
+ ## Contributors for this file:
+@@ -32,4 +32,4 @@
+ 
+ cd ${datadir}/gajim/src
+ export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
+-exec -a gajim ${PYTHON_EXEC} -OO gajim.py $@
++exec ${PYTHON_EXEC} -OO gajim.py $@
diff --git a/net-im/gajim/files/patch-src-Makefile.in b/net-im/gajim/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..9b94ff73f623
--- /dev/null
+++ b/net-im/gajim/files/patch-src-Makefile.in
@@ -0,0 +1,25 @@
+--- src/Makefile.in.orig	Wed Dec 27 03:01:21 2006
++++ src/Makefile.in	Wed Dec 27 12:47:12 2006
+@@ -324,18 +324,18 @@
+ 
+ @BUILD_TRAYICON_TRUE@trayicon_la_CFLAGS = $(PYGTK_CFLAGS)
+ gajimsrcdir = $(pkgdatadir)/src
+-gajimsrc_DATA = $(srcdir)/*.py 
++gajimsrc_DATA = $(srcdir)/*.py $(srcdir)/*.pyc
+ gajimsrc1dir = $(pkgdatadir)/src/common
+ gajimsrc1_DATA = \
+-				$(srcdir)/common/*.py 
++				$(srcdir)/common/*.py $(srcdir)/common/*.pyc
+ 
+ gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
+ gajimsrc2_DATA = \
+-				$(srcdir)/common/xmpp/*.py 
++				$(srcdir)/common/xmpp/*.py $(srcdir)/common/xmpp/*.pyc
+ 
+ gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
+ gajimsrc3_DATA = \
+-				$(srcdir)/common/zeroconf/*.py 
++				$(srcdir)/common/zeroconf/*.py $(srcdir)/common/zeroconf/*.pyc
+ 
+ DISTCLEANFILES = 
+ EXTRA_DIST = $(gajimsrc_DATA) \
diff --git a/net-im/gajim/files/patch-src-roster_window.py b/net-im/gajim/files/patch-src-roster_window.py
new file mode 100644
index 000000000000..75f35d7284bd
--- /dev/null
+++ b/net-im/gajim/files/patch-src-roster_window.py
@@ -0,0 +1,22 @@
+--- src/roster_window.py.orig	Wed Nov 22 03:01:11 2006
++++ src/roster_window.py	Sun Nov 26 17:01:25 2006
+@@ -18,6 +18,7 @@
+ import gtk
+ import gobject
+ import os
++import sys
+ import time
+ import urllib
+ 
+@@ -744,9 +745,9 @@
+ 			if os.path.exists('history_manager.exe'): # user is running stable
+ 				helpers.exec_command('history_manager.exe')
+ 			else: # user is running svn
+-				helpers.exec_command('python history_manager.py')
++				helpers.exec_command('%s history_manager.py' % (sys.executable,))
+ 		else: # Unix user
+-			helpers.exec_command('python history_manager.py &')
++			helpers.exec_command('%s history_manager.py &' % (sys.executable,))
+ 
+ 	def get_and_connect_advanced_menuitem_menu(self, account):
+ 		'''adds FOR ACCOUNT options'''
diff --git a/net-im/gajim/pkg-plist b/net-im/gajim/pkg-plist
index 004a966e4252..f18333e476fe 100644
--- a/net-im/gajim/pkg-plist
+++ b/net-im/gajim/pkg-plist
@@ -1,20 +1,122 @@
 bin/gajim
-%%DBUS%%bin/gajim-remote
-%%GTKSPELL%%lib/gajim/gtkspell.a
-%%GTKSPELL%%lib/gajim/gtkspell.la
-%%GTKSPELL%%lib/gajim/gtkspell.so
-lib/gajim/idle.a
+lib/gajim/gtkspell.la
+lib/gajim/gtkspell.so
 lib/gajim/idle.la
 lib/gajim/idle.so
-lib/gajim/trayicon.a
 lib/gajim/trayicon.la
 lib/gajim/trayicon.so
+%%NLS%%share/locale/be/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/br/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/el/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/no/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gajim.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gajim.mo
 share/applications/gajim.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
+share/pixmaps/gajim.png
+share/pixmaps/gajim_about.png
+%%DATADIR%%/data/emoticons/animated/angry.png
+%%DATADIR%%/data/emoticons/animated/bat.gif
+%%DATADIR%%/data/emoticons/animated/beer.png
+%%DATADIR%%/data/emoticons/animated/biggrin.png
+%%DATADIR%%/data/emoticons/animated/blush.png
+%%DATADIR%%/data/emoticons/animated/boy.png
+%%DATADIR%%/data/emoticons/animated/brflower.png
+%%DATADIR%%/data/emoticons/animated/brheart.png
+%%DATADIR%%/data/emoticons/animated/cake.gif
+%%DATADIR%%/data/emoticons/animated/cigarette.gif
+%%DATADIR%%/data/emoticons/animated/coffee.png
+%%DATADIR%%/data/emoticons/animated/coolglasses.png
+%%DATADIR%%/data/emoticons/animated/cry.gif
+%%DATADIR%%/data/emoticons/animated/cuffs.png
+%%DATADIR%%/data/emoticons/animated/devil.png
+%%DATADIR%%/data/emoticons/animated/dontknow.gif
+%%DATADIR%%/data/emoticons/animated/drink.png
+%%DATADIR%%/data/emoticons/animated/emoticons.py
+%%DATADIR%%/data/emoticons/animated/eyeroll.gif
+%%DATADIR%%/data/emoticons/animated/flower.png
+%%DATADIR%%/data/emoticons/animated/frowning.png
+%%DATADIR%%/data/emoticons/animated/girl.png
+%%DATADIR%%/data/emoticons/animated/heart.png
+%%DATADIR%%/data/emoticons/animated/hugleft.png
+%%DATADIR%%/data/emoticons/animated/hugright.png
+%%DATADIR%%/data/emoticons/animated/kiss.png
+%%DATADIR%%/data/emoticons/animated/lamp.png
+%%DATADIR%%/data/emoticons/animated/lightning.gif
+%%DATADIR%%/data/emoticons/animated/mail.png
+%%DATADIR%%/data/emoticons/animated/moon.png
+%%DATADIR%%/data/emoticons/animated/music.png
+%%DATADIR%%/data/emoticons/animated/oh.png
+%%DATADIR%%/data/emoticons/animated/party.gif
+%%DATADIR%%/data/emoticons/animated/phone.png
+%%DATADIR%%/data/emoticons/animated/photo.png
+%%DATADIR%%/data/emoticons/animated/pussy.png
+%%DATADIR%%/data/emoticons/animated/rainbow.png
+%%DATADIR%%/data/emoticons/animated/sleepy.gif
+%%DATADIR%%/data/emoticons/animated/smile.png
+%%DATADIR%%/data/emoticons/animated/star.png
+%%DATADIR%%/data/emoticons/animated/stare.png
+%%DATADIR%%/data/emoticons/animated/think.gif
+%%DATADIR%%/data/emoticons/animated/thumbdown.png
+%%DATADIR%%/data/emoticons/animated/thumbup.png
+%%DATADIR%%/data/emoticons/animated/tongue.png
+%%DATADIR%%/data/emoticons/animated/unhappy.png
+%%DATADIR%%/data/emoticons/animated/wink.gif
+%%DATADIR%%/data/emoticons/static/angry.png
+%%DATADIR%%/data/emoticons/static/bat.png
+%%DATADIR%%/data/emoticons/static/beer.png
+%%DATADIR%%/data/emoticons/static/biggrin.png
+%%DATADIR%%/data/emoticons/static/blush.png
+%%DATADIR%%/data/emoticons/static/boy.png
+%%DATADIR%%/data/emoticons/static/brflower.png
+%%DATADIR%%/data/emoticons/static/brheart.png
+%%DATADIR%%/data/emoticons/static/coffee.png
+%%DATADIR%%/data/emoticons/static/coolglasses.png
+%%DATADIR%%/data/emoticons/static/cry.png
+%%DATADIR%%/data/emoticons/static/cuffs.png
+%%DATADIR%%/data/emoticons/static/devil.png
+%%DATADIR%%/data/emoticons/static/drink.png
+%%DATADIR%%/data/emoticons/static/emoticons.py
+%%DATADIR%%/data/emoticons/static/flower.png
+%%DATADIR%%/data/emoticons/static/frowning.png
+%%DATADIR%%/data/emoticons/static/girl.png
+%%DATADIR%%/data/emoticons/static/heart.png
+%%DATADIR%%/data/emoticons/static/hugleft.png
+%%DATADIR%%/data/emoticons/static/hugright.png
+%%DATADIR%%/data/emoticons/static/kiss.png
+%%DATADIR%%/data/emoticons/static/lamp.png
+%%DATADIR%%/data/emoticons/static/mail.png
+%%DATADIR%%/data/emoticons/static/moon.png
+%%DATADIR%%/data/emoticons/static/music.png
+%%DATADIR%%/data/emoticons/static/oh.png
+%%DATADIR%%/data/emoticons/static/phone.png
+%%DATADIR%%/data/emoticons/static/photo.png
+%%DATADIR%%/data/emoticons/static/pussy.png
+%%DATADIR%%/data/emoticons/static/rainbow.png
+%%DATADIR%%/data/emoticons/static/smile.png
+%%DATADIR%%/data/emoticons/static/star.png
+%%DATADIR%%/data/emoticons/static/stare.png
+%%DATADIR%%/data/emoticons/static/thumbdown.png
+%%DATADIR%%/data/emoticons/static/thumbup.png
+%%DATADIR%%/data/emoticons/static/tongue.png
+%%DATADIR%%/data/emoticons/static/unhappy.png
+%%DATADIR%%/data/emoticons/static/wink.png
 %%DATADIR%%/data/glade/account_context_menu.glade
 %%DATADIR%%/data/glade/account_creation_wizard_window.glade
 %%DATADIR%%/data/glade/account_modification_window.glade
@@ -68,6 +170,396 @@ share/applications/gajim.desktop
 %%DATADIR%%/data/glade/zeroconf_context_menu.glade
 %%DATADIR%%/data/glade/zeroconf_information_window.glade
 %%DATADIR%%/data/glade/zeroconf_properties_window.glade
+%%DATADIR%%/data/iconsets/crystal/16x16/away.png
+%%DATADIR%%/data/iconsets/crystal/16x16/chat.png
+%%DATADIR%%/data/iconsets/crystal/16x16/closed.png
+%%DATADIR%%/data/iconsets/crystal/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/crystal/16x16/dnd.png
+%%DATADIR%%/data/iconsets/crystal/16x16/error.png
+%%DATADIR%%/data/iconsets/crystal/16x16/invisible.png
+%%DATADIR%%/data/iconsets/crystal/16x16/message.gif
+%%DATADIR%%/data/iconsets/crystal/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/crystal/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/crystal/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/crystal/16x16/offline.png
+%%DATADIR%%/data/iconsets/crystal/16x16/online.png
+%%DATADIR%%/data/iconsets/crystal/16x16/opened.png
+%%DATADIR%%/data/iconsets/crystal/16x16/requested.png
+%%DATADIR%%/data/iconsets/crystal/16x16/xa.png
+%%DATADIR%%/data/iconsets/crystal/48x48/offline.png
+%%DATADIR%%/data/iconsets/crystal/48x48/online.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/away.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/chat.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/closed.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/connecting.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/dnd.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/error.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/invisible.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/message.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/offline.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/online.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/opened.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/requested.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/xa.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/away.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/chat.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/closed.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/connecting.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/dnd.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/error.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/invisible.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/message.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/muc_inactive.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/not_in_roster.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/offline.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/online.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/opened.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/requested.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/xa.png
+%%DATADIR%%/data/iconsets/dcraven/48x48/offline.png
+%%DATADIR%%/data/iconsets/dcraven/48x48/online.png
+%%DATADIR%%/data/iconsets/gnome/16x16/away.png
+%%DATADIR%%/data/iconsets/gnome/16x16/chat.png
+%%DATADIR%%/data/iconsets/gnome/16x16/closed.png
+%%DATADIR%%/data/iconsets/gnome/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/gnome/16x16/dnd.png
+%%DATADIR%%/data/iconsets/gnome/16x16/error.png
+%%DATADIR%%/data/iconsets/gnome/16x16/invisible.png
+%%DATADIR%%/data/iconsets/gnome/16x16/message.gif
+%%DATADIR%%/data/iconsets/gnome/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/gnome/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/gnome/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/gnome/16x16/offline.png
+%%DATADIR%%/data/iconsets/gnome/16x16/online.png
+%%DATADIR%%/data/iconsets/gnome/16x16/opened.png
+%%DATADIR%%/data/iconsets/gnome/16x16/requested.png
+%%DATADIR%%/data/iconsets/gnome/16x16/xa.png
+%%DATADIR%%/data/iconsets/gnome/32x32/away.png
+%%DATADIR%%/data/iconsets/gnome/32x32/chat.png
+%%DATADIR%%/data/iconsets/gnome/32x32/dnd.png
+%%DATADIR%%/data/iconsets/gnome/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/gnome/32x32/muc_inactive.png
+%%DATADIR%%/data/iconsets/gnome/32x32/not_in_roster.png
+%%DATADIR%%/data/iconsets/gnome/32x32/offline.png
+%%DATADIR%%/data/iconsets/gnome/32x32/online.png
+%%DATADIR%%/data/iconsets/gnome/32x32/requested.png
+%%DATADIR%%/data/iconsets/gnome/32x32/xa.png
+%%DATADIR%%/data/iconsets/gnome/48x48/offline.png
+%%DATADIR%%/data/iconsets/gnome/48x48/online.png
+%%DATADIR%%/data/iconsets/goojim/16x16/away.png
+%%DATADIR%%/data/iconsets/goojim/16x16/chat.png
+%%DATADIR%%/data/iconsets/goojim/16x16/closed.png
+%%DATADIR%%/data/iconsets/goojim/16x16/connecting.png
+%%DATADIR%%/data/iconsets/goojim/16x16/dnd.png
+%%DATADIR%%/data/iconsets/goojim/16x16/error.png
+%%DATADIR%%/data/iconsets/goojim/16x16/invisible.png
+%%DATADIR%%/data/iconsets/goojim/16x16/message.png
+%%DATADIR%%/data/iconsets/goojim/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/goojim/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/goojim/16x16/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/goojim/16x16/offline.png
+%%DATADIR%%/data/iconsets/goojim/16x16/online.png
+%%DATADIR%%/data/iconsets/goojim/16x16/opened.png
+%%DATADIR%%/data/iconsets/goojim/16x16/requested.png
+%%DATADIR%%/data/iconsets/goojim/16x16/xa.png
+%%DATADIR%%/data/iconsets/goojim/32x32/away.png
+%%DATADIR%%/data/iconsets/goojim/32x32/chat.png
+%%DATADIR%%/data/iconsets/goojim/32x32/closed.png
+%%DATADIR%%/data/iconsets/goojim/32x32/connecting.png
+%%DATADIR%%/data/iconsets/goojim/32x32/dnd.png
+%%DATADIR%%/data/iconsets/goojim/32x32/error.png
+%%DATADIR%%/data/iconsets/goojim/32x32/invisible.png
+%%DATADIR%%/data/iconsets/goojim/32x32/message.png
+%%DATADIR%%/data/iconsets/goojim/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/goojim/32x32/muc_inactive.png
+%%DATADIR%%/data/iconsets/goojim/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/goojim/32x32/offline.png
+%%DATADIR%%/data/iconsets/goojim/32x32/online.png
+%%DATADIR%%/data/iconsets/goojim/32x32/opened.png
+%%DATADIR%%/data/iconsets/goojim/32x32/requested.png
+%%DATADIR%%/data/iconsets/goojim/32x32/xa.png
+%%DATADIR%%/data/iconsets/goojim/48x48/offline.png
+%%DATADIR%%/data/iconsets/goojim/48x48/online.png
+%%DATADIR%%/data/iconsets/gossip/16x16/away.png
+%%DATADIR%%/data/iconsets/gossip/16x16/chat.png
+%%DATADIR%%/data/iconsets/gossip/16x16/closed.png
+%%DATADIR%%/data/iconsets/gossip/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/gossip/16x16/dnd.png
+%%DATADIR%%/data/iconsets/gossip/16x16/error.png
+%%DATADIR%%/data/iconsets/gossip/16x16/invisible.png
+%%DATADIR%%/data/iconsets/gossip/16x16/message.png
+%%DATADIR%%/data/iconsets/gossip/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/gossip/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/gossip/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/gossip/16x16/offline.png
+%%DATADIR%%/data/iconsets/gossip/16x16/online.png
+%%DATADIR%%/data/iconsets/gossip/16x16/opened.png
+%%DATADIR%%/data/iconsets/gossip/16x16/requested.png
+%%DATADIR%%/data/iconsets/gossip/16x16/xa.png
+%%DATADIR%%/data/iconsets/gossip/48x48/offline.png
+%%DATADIR%%/data/iconsets/gossip/48x48/online.png
+%%DATADIR%%/data/iconsets/gota/16x16/away.png
+%%DATADIR%%/data/iconsets/gota/16x16/chat.png
+%%DATADIR%%/data/iconsets/gota/16x16/closed.png
+%%DATADIR%%/data/iconsets/gota/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/gota/16x16/dnd.png
+%%DATADIR%%/data/iconsets/gota/16x16/error.png
+%%DATADIR%%/data/iconsets/gota/16x16/invisible.png
+%%DATADIR%%/data/iconsets/gota/16x16/message.gif
+%%DATADIR%%/data/iconsets/gota/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/gota/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/gota/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/gota/16x16/offline.png
+%%DATADIR%%/data/iconsets/gota/16x16/online.png
+%%DATADIR%%/data/iconsets/gota/16x16/opened.png
+%%DATADIR%%/data/iconsets/gota/16x16/requested.png
+%%DATADIR%%/data/iconsets/gota/16x16/xa.png
+%%DATADIR%%/data/iconsets/gota/32x32/away.png
+%%DATADIR%%/data/iconsets/gota/32x32/chat.png
+%%DATADIR%%/data/iconsets/gota/32x32/closed.png
+%%DATADIR%%/data/iconsets/gota/32x32/connecting.gif
+%%DATADIR%%/data/iconsets/gota/32x32/dnd.png
+%%DATADIR%%/data/iconsets/gota/32x32/error.png
+%%DATADIR%%/data/iconsets/gota/32x32/invisible.png
+%%DATADIR%%/data/iconsets/gota/32x32/message.gif
+%%DATADIR%%/data/iconsets/gota/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/gota/32x32/muc_inactive.png
+%%DATADIR%%/data/iconsets/gota/32x32/not_in_roster.png
+%%DATADIR%%/data/iconsets/gota/32x32/offline.png
+%%DATADIR%%/data/iconsets/gota/32x32/online.png
+%%DATADIR%%/data/iconsets/gota/32x32/opened.png
+%%DATADIR%%/data/iconsets/gota/32x32/requested.png
+%%DATADIR%%/data/iconsets/gota/32x32/xa.png
+%%DATADIR%%/data/iconsets/gota/48x48/offline.png
+%%DATADIR%%/data/iconsets/gota/48x48/online.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/away.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/chat.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/closed.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/connecting.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/dnd.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/error.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/invisible.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/message.gif
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/offline.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/online.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/opened.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/requested.png
+%%DATADIR%%/data/iconsets/jabberbulb/16x16/xa.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/away.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/chat.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/dnd.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/error.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/invisible.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/muc_active.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/muc_inactive.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/not_in_roster.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/offline.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/online.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/requested.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/xa.png
+%%DATADIR%%/data/iconsets/jabberbulb/48x48/offline.png
+%%DATADIR%%/data/iconsets/jabberbulb/48x48/online.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/away.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/chat.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/closed.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/connecting.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/dnd.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/error.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/invisible.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/message.gif
+%%DATADIR%%/data/iconsets/nuvola/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/offline.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/online.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/opened.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/requested.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/xa.png
+%%DATADIR%%/data/iconsets/nuvola/48x48/offline.png
+%%DATADIR%%/data/iconsets/nuvola/48x48/online.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/away.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/chat.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/closed.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/connecting.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/dnd.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/error.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/invisible.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/message.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/offline.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/online.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/opened.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/requested.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/xa.png
+%%DATADIR%%/data/iconsets/simplebulb/48x48/offline.png
+%%DATADIR%%/data/iconsets/simplebulb/48x48/online.png
+%%DATADIR%%/data/iconsets/stellar/16x16/away.png
+%%DATADIR%%/data/iconsets/stellar/16x16/chat.png
+%%DATADIR%%/data/iconsets/stellar/16x16/closed.png
+%%DATADIR%%/data/iconsets/stellar/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/stellar/16x16/dnd.png
+%%DATADIR%%/data/iconsets/stellar/16x16/error.png
+%%DATADIR%%/data/iconsets/stellar/16x16/invisible.png
+%%DATADIR%%/data/iconsets/stellar/16x16/message.gif
+%%DATADIR%%/data/iconsets/stellar/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/stellar/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/stellar/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/stellar/16x16/offline.png
+%%DATADIR%%/data/iconsets/stellar/16x16/online.png
+%%DATADIR%%/data/iconsets/stellar/16x16/opened.png
+%%DATADIR%%/data/iconsets/stellar/16x16/requested.png
+%%DATADIR%%/data/iconsets/stellar/16x16/xa.png
+%%DATADIR%%/data/iconsets/stellar/48x48/offline.png
+%%DATADIR%%/data/iconsets/stellar/48x48/online.png
+%%DATADIR%%/data/iconsets/sun/16x16/away.png
+%%DATADIR%%/data/iconsets/sun/16x16/chat.png
+%%DATADIR%%/data/iconsets/sun/16x16/closed.png
+%%DATADIR%%/data/iconsets/sun/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/sun/16x16/dnd.png
+%%DATADIR%%/data/iconsets/sun/16x16/error.png
+%%DATADIR%%/data/iconsets/sun/16x16/invisible.png
+%%DATADIR%%/data/iconsets/sun/16x16/message.gif
+%%DATADIR%%/data/iconsets/sun/16x16/muc_active.png
+%%DATADIR%%/data/iconsets/sun/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/sun/16x16/not_in_roster.png
+%%DATADIR%%/data/iconsets/sun/16x16/offline.png
+%%DATADIR%%/data/iconsets/sun/16x16/online.png
+%%DATADIR%%/data/iconsets/sun/16x16/opened.png
+%%DATADIR%%/data/iconsets/sun/16x16/requested.png
+%%DATADIR%%/data/iconsets/sun/16x16/xa.png
+%%DATADIR%%/data/iconsets/sun/48x48/offline.png
+%%DATADIR%%/data/iconsets/sun/48x48/online.png
+%%DATADIR%%/data/iconsets/transports/aim/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/aim/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/aim/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/aim/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/aim/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/aim/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/aim/48x48/offline.png
+%%DATADIR%%/data/iconsets/transports/aim/48x48/online.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/invisible.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/48x48/offline.png
+%%DATADIR%%/data/iconsets/transports/gadu-gadu/48x48/online.png
+%%DATADIR%%/data/iconsets/transports/icq/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/icq/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/icq/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/icq/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/icq/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/icq/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/icq/48x48/offline.png
+%%DATADIR%%/data/iconsets/transports/icq/48x48/online.png
+%%DATADIR%%/data/iconsets/transports/irc/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/irc/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/irc/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/irc/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/irc/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/irc/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/irc/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/msn/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/msn/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/msn/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/msn/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/msn/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/msn/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/msn/48x48/offline.png
+%%DATADIR%%/data/iconsets/transports/msn/48x48/online.png
+%%DATADIR%%/data/iconsets/transports/sms/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/sms/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/sms/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/sms/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/sms/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/sms/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/sms/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/tlen/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/tlen/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/tlen/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/tlen/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/tlen/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/tlen/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/tlen/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/tlen/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/tlen/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/tlen/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/tlen/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/tlen/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/tlen/48x48/offline.png
+%%DATADIR%%/data/iconsets/transports/tlen/48x48/online.png
+%%DATADIR%%/data/iconsets/transports/weather/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/weather/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/weather/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/weather/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/weather/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/weather/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/weather/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/yahoo/16x16/away.png
+%%DATADIR%%/data/iconsets/transports/yahoo/16x16/chat.png
+%%DATADIR%%/data/iconsets/transports/yahoo/16x16/dnd.png
+%%DATADIR%%/data/iconsets/transports/yahoo/16x16/offline.png
+%%DATADIR%%/data/iconsets/transports/yahoo/16x16/online.png
+%%DATADIR%%/data/iconsets/transports/yahoo/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/xa.png
+%%DATADIR%%/data/iconsets/transports/yahoo/48x48/offline.png
+%%DATADIR%%/data/iconsets/transports/yahoo/48x48/online.png
 %%DATADIR%%/data/other/servers.xml
 %%DATADIR%%/data/pixmaps/agents/aim.png
 %%DATADIR%%/data/pixmaps/agents/bytestreams.png
@@ -114,139 +606,282 @@ share/applications/gajim.desktop
 %%DATADIR%%/data/sounds/message2.wav
 %%DATADIR%%/data/sounds/sent.wav
 %%DATADIR%%/src/adhoc_commands.py
+%%DATADIR%%/src/adhoc_commands.pyc
 %%DATADIR%%/src/advanced.py
+%%DATADIR%%/src/advanced.pyc
 %%DATADIR%%/src/atom_window.py
+%%DATADIR%%/src/atom_window.pyc
 %%DATADIR%%/src/cell_renderer_image.py
+%%DATADIR%%/src/cell_renderer_image.pyc
 %%DATADIR%%/src/chat_control.py
+%%DATADIR%%/src/chat_control.pyc
 %%DATADIR%%/src/common/GnuPG.py
+%%DATADIR%%/src/common/GnuPG.pyc
 %%DATADIR%%/src/common/GnuPGInterface.py
+%%DATADIR%%/src/common/GnuPGInterface.pyc
 %%DATADIR%%/src/common/__init__.py
+%%DATADIR%%/src/common/__init__.pyc
 %%DATADIR%%/src/common/atom.py
+%%DATADIR%%/src/common/atom.pyc
 %%DATADIR%%/src/common/check_paths.py
+%%DATADIR%%/src/common/check_paths.pyc
 %%DATADIR%%/src/common/commands.py
+%%DATADIR%%/src/common/commands.pyc
 %%DATADIR%%/src/common/config.py
+%%DATADIR%%/src/common/config.pyc
 %%DATADIR%%/src/common/configpaths.py
+%%DATADIR%%/src/common/configpaths.pyc
 %%DATADIR%%/src/common/connection.py
+%%DATADIR%%/src/common/connection.pyc
 %%DATADIR%%/src/common/connection_handlers.py
+%%DATADIR%%/src/common/connection_handlers.pyc
 %%DATADIR%%/src/common/contacts.py
+%%DATADIR%%/src/common/contacts.pyc
 %%DATADIR%%/src/common/dataforms.py
+%%DATADIR%%/src/common/dataforms.pyc
 %%DATADIR%%/src/common/dbus_support.py
+%%DATADIR%%/src/common/dbus_support.pyc
 %%DATADIR%%/src/common/defs.py
+%%DATADIR%%/src/common/defs.pyc
 %%DATADIR%%/src/common/events.py
+%%DATADIR%%/src/common/events.pyc
 %%DATADIR%%/src/common/exceptions.py
+%%DATADIR%%/src/common/exceptions.pyc
 %%DATADIR%%/src/common/fuzzyclock.py
+%%DATADIR%%/src/common/fuzzyclock.pyc
 %%DATADIR%%/src/common/gajim.py
+%%DATADIR%%/src/common/gajim.pyc
 %%DATADIR%%/src/common/helpers.py
+%%DATADIR%%/src/common/helpers.pyc
 %%DATADIR%%/src/common/i18n.py
+%%DATADIR%%/src/common/i18n.pyc
 %%DATADIR%%/src/common/logger.py
+%%DATADIR%%/src/common/logger.pyc
 %%DATADIR%%/src/common/nslookup.py
+%%DATADIR%%/src/common/nslookup.pyc
 %%DATADIR%%/src/common/optparser.py
+%%DATADIR%%/src/common/optparser.pyc
 %%DATADIR%%/src/common/passwords.py
+%%DATADIR%%/src/common/passwords.pyc
 %%DATADIR%%/src/common/proxy65_manager.py
+%%DATADIR%%/src/common/proxy65_manager.pyc
 %%DATADIR%%/src/common/pubsub.py
+%%DATADIR%%/src/common/pubsub.pyc
 %%DATADIR%%/src/common/rst_xhtml_generator.py
+%%DATADIR%%/src/common/rst_xhtml_generator.pyc
 %%DATADIR%%/src/common/sleepy.py
+%%DATADIR%%/src/common/sleepy.pyc
 %%DATADIR%%/src/common/socks5.py
+%%DATADIR%%/src/common/socks5.pyc
 %%DATADIR%%/src/common/xmpp/__init__.py
+%%DATADIR%%/src/common/xmpp/__init__.pyc
 %%DATADIR%%/src/common/xmpp/auth.py
+%%DATADIR%%/src/common/xmpp/auth.pyc
 %%DATADIR%%/src/common/xmpp/auth_nb.py
+%%DATADIR%%/src/common/xmpp/auth_nb.pyc
 %%DATADIR%%/src/common/xmpp/browser.py
+%%DATADIR%%/src/common/xmpp/browser.pyc
 %%DATADIR%%/src/common/xmpp/client.py
+%%DATADIR%%/src/common/xmpp/client.pyc
 %%DATADIR%%/src/common/xmpp/client_nb.py
+%%DATADIR%%/src/common/xmpp/client_nb.pyc
 %%DATADIR%%/src/common/xmpp/commands.py
+%%DATADIR%%/src/common/xmpp/commands.pyc
 %%DATADIR%%/src/common/xmpp/debug.py
+%%DATADIR%%/src/common/xmpp/debug.pyc
 %%DATADIR%%/src/common/xmpp/dispatcher.py
+%%DATADIR%%/src/common/xmpp/dispatcher.pyc
 %%DATADIR%%/src/common/xmpp/dispatcher_nb.py
+%%DATADIR%%/src/common/xmpp/dispatcher_nb.pyc
 %%DATADIR%%/src/common/xmpp/features.py
+%%DATADIR%%/src/common/xmpp/features.pyc
 %%DATADIR%%/src/common/xmpp/features_nb.py
+%%DATADIR%%/src/common/xmpp/features_nb.pyc
 %%DATADIR%%/src/common/xmpp/filetransfer.py
+%%DATADIR%%/src/common/xmpp/filetransfer.pyc
 %%DATADIR%%/src/common/xmpp/idlequeue.py
+%%DATADIR%%/src/common/xmpp/idlequeue.pyc
 %%DATADIR%%/src/common/xmpp/protocol.py
+%%DATADIR%%/src/common/xmpp/protocol.pyc
 %%DATADIR%%/src/common/xmpp/roster.py
+%%DATADIR%%/src/common/xmpp/roster.pyc
 %%DATADIR%%/src/common/xmpp/roster_nb.py
+%%DATADIR%%/src/common/xmpp/roster_nb.pyc
 %%DATADIR%%/src/common/xmpp/session.py
+%%DATADIR%%/src/common/xmpp/session.pyc
 %%DATADIR%%/src/common/xmpp/simplexml.py
+%%DATADIR%%/src/common/xmpp/simplexml.pyc
 %%DATADIR%%/src/common/xmpp/transports.py
+%%DATADIR%%/src/common/xmpp/transports.pyc
 %%DATADIR%%/src/common/xmpp/transports_nb.py
+%%DATADIR%%/src/common/xmpp/transports_nb.pyc
 %%DATADIR%%/src/common/xmpp_stringprep.py
+%%DATADIR%%/src/common/xmpp_stringprep.pyc
 %%DATADIR%%/src/common/zeroconf/__init__.py
+%%DATADIR%%/src/common/zeroconf/__init__.pyc
 %%DATADIR%%/src/common/zeroconf/client_zeroconf.py
+%%DATADIR%%/src/common/zeroconf/client_zeroconf.pyc
 %%DATADIR%%/src/common/zeroconf/connection_handlers_zeroconf.py
+%%DATADIR%%/src/common/zeroconf/connection_handlers_zeroconf.pyc
 %%DATADIR%%/src/common/zeroconf/connection_zeroconf.py
+%%DATADIR%%/src/common/zeroconf/connection_zeroconf.pyc
 %%DATADIR%%/src/common/zeroconf/roster_zeroconf.py
+%%DATADIR%%/src/common/zeroconf/roster_zeroconf.pyc
 %%DATADIR%%/src/common/zeroconf/zeroconf.py
+%%DATADIR%%/src/common/zeroconf/zeroconf.pyc
 %%DATADIR%%/src/config.py
+%%DATADIR%%/src/config.pyc
 %%DATADIR%%/src/conversation_textview.py
+%%DATADIR%%/src/conversation_textview.pyc
 %%DATADIR%%/src/dataforms_widget.py
+%%DATADIR%%/src/dataforms_widget.pyc
 %%DATADIR%%/src/dialogs.py
+%%DATADIR%%/src/dialogs.pyc
 %%DATADIR%%/src/disco.py
+%%DATADIR%%/src/disco.pyc
 %%DATADIR%%/src/filetransfers_window.py
+%%DATADIR%%/src/filetransfers_window.pyc
 %%DATADIR%%/src/gajim-remote.py
+%%DATADIR%%/src/gajim-remote.pyc
 %%DATADIR%%/src/gajim.py
+%%DATADIR%%/src/gajim.pyc
 %%DATADIR%%/src/gajim_themes_window.py
+%%DATADIR%%/src/gajim_themes_window.pyc
 %%DATADIR%%/src/groupchat_control.py
+%%DATADIR%%/src/groupchat_control.pyc
 %%DATADIR%%/src/groups.py
+%%DATADIR%%/src/groups.pyc
 %%DATADIR%%/src/gtkexcepthook.py
+%%DATADIR%%/src/gtkexcepthook.pyc
 %%DATADIR%%/src/gtkgui_helpers.py
+%%DATADIR%%/src/gtkgui_helpers.pyc
 %%DATADIR%%/src/history_manager.py
+%%DATADIR%%/src/history_manager.pyc
 %%DATADIR%%/src/history_window.py
+%%DATADIR%%/src/history_window.pyc
 %%DATADIR%%/src/htmltextview.py
+%%DATADIR%%/src/htmltextview.pyc
 %%DATADIR%%/src/message_control.py
+%%DATADIR%%/src/message_control.pyc
 %%DATADIR%%/src/message_textview.py
+%%DATADIR%%/src/message_textview.pyc
 %%DATADIR%%/src/message_window.py
+%%DATADIR%%/src/message_window.pyc
 %%DATADIR%%/src/music_track_listener.py
+%%DATADIR%%/src/music_track_listener.pyc
 %%DATADIR%%/src/network_manager_listener.py
+%%DATADIR%%/src/network_manager_listener.pyc
 %%DATADIR%%/src/notify.py
+%%DATADIR%%/src/notify.pyc
 %%DATADIR%%/src/profile_window.py
+%%DATADIR%%/src/profile_window.pyc
 %%DATADIR%%/src/remote_control.py
+%%DATADIR%%/src/remote_control.pyc
 %%DATADIR%%/src/roster_window.py
+%%DATADIR%%/src/roster_window.pyc
 %%DATADIR%%/src/statusicon.py
+%%DATADIR%%/src/statusicon.pyc
 %%DATADIR%%/src/systray.py
+%%DATADIR%%/src/systray.pyc
 %%DATADIR%%/src/tooltips.py
+%%DATADIR%%/src/tooltips.pyc
 %%DATADIR%%/src/vcard.py
-share/locale/be/LC_MESSAGES/gajim.mo
-share/locale/bg/LC_MESSAGES/gajim.mo
-share/locale/br/LC_MESSAGES/gajim.mo
-share/locale/cs/LC_MESSAGES/gajim.mo
-share/locale/de/LC_MESSAGES/gajim.mo
-share/locale/el/LC_MESSAGES/gajim.mo
-share/locale/en_GB/LC_MESSAGES/gajim.mo
-share/locale/eo/LC_MESSAGES/gajim.mo
-share/locale/es/LC_MESSAGES/gajim.mo
-share/locale/eu/LC_MESSAGES/gajim.mo
-share/locale/fr/LC_MESSAGES/gajim.mo
-share/locale/hr/LC_MESSAGES/gajim.mo
-share/locale/it/LC_MESSAGES/gajim.mo
-share/locale/nb/LC_MESSAGES/gajim.mo
-share/locale/nl/LC_MESSAGES/gajim.mo
-share/locale/no/LC_MESSAGES/gajim.mo
-share/locale/pl/LC_MESSAGES/gajim.mo
-share/locale/pt/LC_MESSAGES/gajim.mo
-share/locale/pt_BR/LC_MESSAGES/gajim.mo
-share/locale/ru/LC_MESSAGES/gajim.mo
-share/locale/sk/LC_MESSAGES/gajim.mo
-share/locale/sv/LC_MESSAGES/gajim.mo
-share/locale/zh_CN/LC_MESSAGES/gajim.mo
-share/pixmaps/gajim.png
-share/pixmaps/gajim_about.png
+%%DATADIR%%/src/vcard.pyc
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README.html
+%%DOCSDIR%%/THANKS
+@dirrm lib/gajim
+@dirrmtry share/applications
 @dirrmtry share/pixmaps
-@dirrm %%DATADIR%%/src/common/zeroconf
 @dirrm %%DATADIR%%/src/common/xmpp
+@dirrm %%DATADIR%%/src/common/zeroconf
 @dirrm %%DATADIR%%/src/common
 @dirrm %%DATADIR%%/src
-@dirrm %%DATADIR%%/data/sounds
-@dirrm %%DATADIR%%/data/pixmaps/events
+@dirrm %%DATADIR%%/data/glade
 @dirrm %%DATADIR%%/data/pixmaps/agents
+@dirrm %%DATADIR%%/data/pixmaps/events
 @dirrm %%DATADIR%%/data/pixmaps
 @dirrm %%DATADIR%%/data/other
-@dirrm %%DATADIR%%/data/iconsets
-@dirrm %%DATADIR%%/data/glade
-@dirrm %%DATADIR%%/data/emoticons/static-big
+@dirrm %%DATADIR%%/data/sounds
 @dirrm %%DATADIR%%/data/emoticons/static
 @dirrm %%DATADIR%%/data/emoticons/animated
 @dirrm %%DATADIR%%/data/emoticons
+@dirrm %%DATADIR%%/data/iconsets/gota/16x16
+@dirrm %%DATADIR%%/data/iconsets/gota/32x32
+@dirrm %%DATADIR%%/data/iconsets/gota/48x48
+@dirrm %%DATADIR%%/data/iconsets/gota
+@dirrm %%DATADIR%%/data/iconsets/sun/16x16
+@dirrm %%DATADIR%%/data/iconsets/sun/48x48
+@dirrm %%DATADIR%%/data/iconsets/sun
+@dirrm %%DATADIR%%/data/iconsets/stellar/16x16
+@dirrm %%DATADIR%%/data/iconsets/stellar/48x48
+@dirrm %%DATADIR%%/data/iconsets/stellar
+@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16
+@dirrm %%DATADIR%%/data/iconsets/simplebulb/48x48
+@dirrm %%DATADIR%%/data/iconsets/simplebulb
+@dirrm %%DATADIR%%/data/iconsets/nuvola/16x16
+@dirrm %%DATADIR%%/data/iconsets/nuvola/48x48
+@dirrm %%DATADIR%%/data/iconsets/nuvola
+@dirrm %%DATADIR%%/data/iconsets/jabberbulb/16x16
+@dirrm %%DATADIR%%/data/iconsets/jabberbulb/32x32
+@dirrm %%DATADIR%%/data/iconsets/jabberbulb/48x48
+@dirrm %%DATADIR%%/data/iconsets/jabberbulb
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/msn
+@dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/gadu-gadu
+@dirrm %%DATADIR%%/data/iconsets/transports/icq/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/icq/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/icq/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/icq
+@dirrm %%DATADIR%%/data/iconsets/transports/irc/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/irc/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/irc
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/aim
+@dirrm %%DATADIR%%/data/iconsets/transports/sms/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/sms/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/sms
+@dirrm %%DATADIR%%/data/iconsets/transports/tlen/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/tlen/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/tlen/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/tlen
+@dirrm %%DATADIR%%/data/iconsets/transports/weather/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/weather/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/weather
+@dirrm %%DATADIR%%/data/iconsets/transports/yahoo/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/yahoo/32x32
+@dirrm %%DATADIR%%/data/iconsets/transports/yahoo/48x48
+@dirrm %%DATADIR%%/data/iconsets/transports/yahoo
+@dirrm %%DATADIR%%/data/iconsets/transports
+@dirrm %%DATADIR%%/data/iconsets/gossip/16x16
+@dirrm %%DATADIR%%/data/iconsets/gossip/48x48
+@dirrm %%DATADIR%%/data/iconsets/gossip
+@dirrm %%DATADIR%%/data/iconsets/goojim/16x16
+@dirrm %%DATADIR%%/data/iconsets/goojim/32x32
+@dirrm %%DATADIR%%/data/iconsets/goojim/48x48
+@dirrm %%DATADIR%%/data/iconsets/goojim
+@dirrm %%DATADIR%%/data/iconsets/gnome/16x16
+@dirrm %%DATADIR%%/data/iconsets/gnome/32x32
+@dirrm %%DATADIR%%/data/iconsets/gnome/48x48
+@dirrm %%DATADIR%%/data/iconsets/gnome
+@dirrm %%DATADIR%%/data/iconsets/dcraven/16x16
+@dirrm %%DATADIR%%/data/iconsets/dcraven/32x32
+@dirrm %%DATADIR%%/data/iconsets/dcraven/48x48
+@dirrm %%DATADIR%%/data/iconsets/dcraven
+@dirrm %%DATADIR%%/data/iconsets/crystal/16x16
+@dirrm %%DATADIR%%/data/iconsets/crystal/48x48
+@dirrm %%DATADIR%%/data/iconsets/crystal
+@dirrm %%DATADIR%%/data/iconsets
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
-@dirrm lib/gajim
+@dirrm %%DOCSDIR%%