8 files changed, 264 insertions, 36 deletions

diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index 899b642f99ac..be17997f96d7 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.9.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/
 
@@ -15,6 +14,7 @@ MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Gajim is a Jabber client based on a plugin system
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
 
 USE_X_PREFIX=	yes
 USE_PYTHON=	2.3+
diff --git a/net-im/gajim-devel/distinfo b/net-im/gajim-devel/distinfo
index 5ed5d511055e..548ade7d57b4 100644
--- a/net-im/gajim-devel/distinfo
+++ b/net-im/gajim-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (gajim-0.8.2.tar.bz2) = 14b00f8ed7d84d90793782db7df40ec1
-SIZE (gajim-0.8.2.tar.bz2) = 775069
+MD5 (gajim-0.9.1.tar.bz2) = ca82dfb7ab5c51984357ea7bab0e99af
+SHA256 (gajim-0.9.1.tar.bz2) = 4826ebe054af3a117058f1211185ad705cf7ecfbace57f9cd133a7f8a4506fdb
+SIZE (gajim-0.9.1.tar.bz2) = 1613954
diff --git a/net-im/gajim-devel/files/patch-scripts_gajim b/net-im/gajim-devel/files/patch-scripts_gajim
deleted file mode 100644
index 6de6724ef7ad..000000000000
--- a/net-im/gajim-devel/files/patch-scripts_gajim
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/gajim.orig	Thu May 26 16:40:05 2005
-+++ scripts/gajim	Thu May 26 16:40:23 2005
-@@ -23,4 +23,4 @@
- 
- cd PREFIX/share/gajim/src
- export PYTHONPATH="$PYTHONPATH:PREFIX/lib/gajim"
--python -OO gajim.pyo
-+python -OO gajim.py
diff --git a/net-im/gajim-devel/pkg-plist b/net-im/gajim-devel/pkg-plist
index c867d8acb090..b467a12915fb 100644
--- a/net-im/gajim-devel/pkg-plist
+++ b/net-im/gajim-devel/pkg-plist
@@ -4,6 +4,7 @@ lib/gajim/gtkspell.so
 lib/gajim/idle.so
 lib/gajim/trayicon.so
 %%DATADIR%%/COPYING
+%%DATADIR%%/THANKS
 %%DATADIR%%/data/emoticons/angry.png
 %%DATADIR%%/data/emoticons/bat.png
 %%DATADIR%%/data/emoticons/beer.png
@@ -42,6 +43,20 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/emoticons/unhappy.png
 %%DATADIR%%/data/emoticons/wink.png
 %%DATADIR%%/data/emoticons/yes.png
+%%DATADIR%%/data/iconsets/crystal/16x16/offline.png
+%%DATADIR%%/data/iconsets/crystal/16x16/chat.png
+%%DATADIR%%/data/iconsets/crystal/16x16/away.png
+%%DATADIR%%/data/iconsets/crystal/16x16/requested.png
+%%DATADIR%%/data/iconsets/crystal/16x16/invisible.png
+%%DATADIR%%/data/iconsets/crystal/16x16/online.png
+%%DATADIR%%/data/iconsets/crystal/16x16/dnd.png
+%%DATADIR%%/data/iconsets/crystal/16x16/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/crystal/16x16/message.gif
+%%DATADIR%%/data/iconsets/crystal/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/crystal/16x16/xa.png
+%%DATADIR%%/data/iconsets/crystal/16x16/closed.png
+%%DATADIR%%/data/iconsets/crystal/16x16/error.png
+%%DATADIR%%/data/iconsets/crystal/16x16/opened.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/away.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/chat.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/closed.png
@@ -105,7 +120,6 @@ lib/gajim/trayicon.so
 %%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/typing.png
 %%DATADIR%%/data/iconsets/gossip/16x16/xa.png
 %%DATADIR%%/data/iconsets/gota/16x16/away.png
 %%DATADIR%%/data/iconsets/gota/16x16/chat.png
@@ -149,6 +163,20 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/nuvola/16x16/opened.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/requested.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/xa.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/offline.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/chat.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/away.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/requested.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/invisible.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/message.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/online.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/dnd.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/connecting.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/xa.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/closed.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/error.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/opened.png
 %%DATADIR%%/data/iconsets/stellar/16x16/away.png
 %%DATADIR%%/data/iconsets/stellar/16x16/chat.png
 %%DATADIR%%/data/iconsets/stellar/16x16/closed.png
@@ -188,6 +216,15 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/aim/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/aim/16x16/requested.png
 %%DATADIR%%/data/iconsets/transports/aim/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/requested.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/xa.png
 %%DATADIR%%/data/iconsets/transports/gadugadu/16x16/away.png
 %%DATADIR%%/data/iconsets/transports/gadugadu/16x16/chat.png
 %%DATADIR%%/data/iconsets/transports/gadugadu/16x16/dnd.png
@@ -210,6 +247,15 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/icq/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/icq/16x16/requested.png
 %%DATADIR%%/data/iconsets/transports/icq/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/requested.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/xa.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
@@ -232,6 +278,16 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/msn/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/requested.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/requested.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/message.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/xa.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
@@ -247,7 +303,7 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/dnd.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/error.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/invisible.png
-%%DATADIR%%/data/iconsets/transports/tlen/16x16/message.png
+%%DATADIR%%/data/iconsets/transports/tlen/16x16/message.gif
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/not_in_the_roster.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/offline.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/online.png
@@ -264,6 +320,15 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/requested.png
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/requested.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/xa.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
@@ -274,41 +339,80 @@ lib/gajim/trayicon.so
 %%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/other/servers.xml
 %%DATADIR%%/data/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/gajim.png
+%%DATADIR%%/data/pixmaps/agents/weather.png
+%%DATADIR%%/data/pixmaps/agents/msn.png
+%%DATADIR%%/data/pixmaps/agents/gadu-gadu.png
+%%DATADIR%%/data/pixmaps/agents/pubsub.png
+%%DATADIR%%/data/pixmaps/agents/sms.png
+%%DATADIR%%/data/pixmaps/agents/bytestreams.png
+%%DATADIR%%/data/pixmaps/agents/http-ws.png
+%%DATADIR%%/data/pixmaps/agents/aim.png
+%%DATADIR%%/data/pixmaps/agents/rss.png
+%%DATADIR%%/data/pixmaps/agents/conference.png
+%%DATADIR%%/data/pixmaps/agents/icq.png
+%%DATADIR%%/data/pixmaps/agents/irc.png
+%%DATADIR%%/data/pixmaps/agents/yahoo.png
+%%DATADIR%%/data/pixmaps/agents/mail.png
+%%DATADIR%%/data/pixmaps/agents/jud.png
+%%DATADIR%%/data/pixmaps/agents/jabber.png
+%%DATADIR%%/data/pixmaps/agents/error.png
+%%DATADIR%%/data/pixmaps/agents/sip.png
+%%DATADIR%%/data/pixmaps/events/contact_offline.png
+%%DATADIR%%/data/pixmaps/events/ft_done.png
+%%DATADIR%%/data/pixmaps/events/contact_online.png
+%%DATADIR%%/data/pixmaps/events/ft_request.png
+%%DATADIR%%/data/pixmaps/events/ft_error.png
+%%DATADIR%%/data/pixmaps/events/chat_msg_recv.png
+%%DATADIR%%/data/pixmaps/events/priv_msg_recv.png
+%%DATADIR%%/data/pixmaps/events/single_msg_recv.png
+%%DATADIR%%/data/pixmaps/events/ft_stopped.png
+%%DATADIR%%/data/pixmaps/muc_separator.png
+%%DATADIR%%/data/pixmaps/rename.png
 %%DATADIR%%/data/sounds/connected.wav
 %%DATADIR%%/data/sounds/disconnected.wav
+%%DATADIR%%/data/sounds/gc_message1.wav
+%%DATADIR%%/data/sounds/gc_message2.wav
 %%DATADIR%%/data/sounds/message1.wav
 %%DATADIR%%/data/sounds/message2.wav
 %%DATADIR%%/data/sounds/sent.wav
 share/locale/bg/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/es/LC_MESSAGES/gajim.mo
+share/locale/eu/LC_MESSAGES/gajim.mo
 share/locale/fr/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/pl/LC_MESSAGES/gajim.mo
 share/locale/pt/LC_MESSAGES/gajim.mo
 share/locale/pt_BR/LC_MESSAGES/gajim.mo
-share/locale/nl/LC_MESSAGES/gajim.mo
 share/locale/ru/LC_MESSAGES/gajim.mo
-share/locale/cs/LC_MESSAGES/gajim.mo
-share/locale/nb/LC_MESSAGES/gajim.mo
+share/locale/sk/LC_MESSAGES/gajim.mo
+share/locale/sv/LC_MESSAGES/gajim.mo
 %%DATADIR%%/src/gajim-remote.py
 %%DATADIR%%/src/advanced.py
 %%DATADIR%%/src/cell_renderer_image.py
 %%DATADIR%%/src/chat.py
-%%DATADIR%%/src/check_for_new_version.py
 %%DATADIR%%/src/common/GnuPG.py
 %%DATADIR%%/src/common/GnuPGInterface.py
 %%DATADIR%%/src/common/__init__.py
+%%DATADIR%%/src/common/check_paths.py
 %%DATADIR%%/src/common/config.py
 %%DATADIR%%/src/common/connection.py
+%%DATADIR%%/src/common/exceptions.py
 %%DATADIR%%/src/common/gajim.py
 %%DATADIR%%/src/common/helpers.py
 %%DATADIR%%/src/common/i18n.py
 %%DATADIR%%/src/common/logger.py
+%%DATADIR%%/src/common/migrate_logs_to_dot9_db.py
 %%DATADIR%%/src/common/optparser.py
 %%DATADIR%%/src/common/sleepy.py
+%%DATADIR%%/src/common/xmpp_stringprep.py
 %%DATADIR%%/src/common/xmpp/__init__.py
 %%DATADIR%%/src/common/xmpp/auth.py
 %%DATADIR%%/src/common/xmpp/browser.py
@@ -324,11 +428,17 @@ share/locale/nb/LC_MESSAGES/gajim.mo
 %%DATADIR%%/src/common/xmpp/simplexml.py
 %%DATADIR%%/src/common/xmpp/transports.py
 %%DATADIR%%/src/config.py
+%%DATADIR%%/src/conversation_textview.py
+%%DATADIR%%/src/dbus_support.py
 %%DATADIR%%/src/dialogs.py
+%%DATADIR%%/src/disco.py
 %%DATADIR%%/src/gajim.py
 %%DATADIR%%/src/groupchat_window.py
+%%DATADIR%%/src/gtkexcepthook.py
 %%DATADIR%%/src/gtkgui.glade
 %%DATADIR%%/src/history_window.py
+%%DATADIR%%/src/message_textview.py
+%%DATADIR%%/src/notify.py
 %%DATADIR%%/src/roster_window.py
 %%DATADIR%%/src/systray.py
 %%DATADIR%%/src/tabbed_chat_window.py
@@ -350,26 +460,32 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/data/iconsets/transports/weather/16x16
 @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
 @dirrm %%DATADIR%%/data/iconsets/transports/tlen/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/tlen
 @dirrm %%DATADIR%%/data/iconsets/transports/sms/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/sms
 @dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/msn
 @dirrm %%DATADIR%%/data/iconsets/transports/irc/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/irc
 @dirrm %%DATADIR%%/data/iconsets/transports/icq/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/icq/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/icq
 @dirrm %%DATADIR%%/data/iconsets/transports/gadugadu/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/gadugadu
 @dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/aim
 @dirrm %%DATADIR%%/data/iconsets/transports
 @dirrm %%DATADIR%%/data/iconsets/sun/16x16
 @dirrm %%DATADIR%%/data/iconsets/sun
 @dirrm %%DATADIR%%/data/iconsets/stellar/16x16
 @dirrm %%DATADIR%%/data/iconsets/stellar
+@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16
+@dirrm %%DATADIR%%/data/iconsets/simplebulb
 @dirrm %%DATADIR%%/data/iconsets/nuvola/16x16
 @dirrm %%DATADIR%%/data/iconsets/nuvola
 @dirrm %%DATADIR%%/data/iconsets/gota/32x32
@@ -383,7 +499,12 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/data/iconsets/dcraven/32x32
 @dirrm %%DATADIR%%/data/iconsets/dcraven/16x16
 @dirrm %%DATADIR%%/data/iconsets/dcraven
+@dirrm %%DATADIR%%/data/iconsets/crystal/16x16
+@dirrm %%DATADIR%%/data/iconsets/crystal
 @dirrm %%DATADIR%%/data/iconsets
+@dirrm %%DATADIR%%/data/other
+@dirrm %%DATADIR%%/data/pixmaps/agents
+@dirrm %%DATADIR%%/data/pixmaps/events
 @dirrm %%DATADIR%%/data/pixmaps
 @dirrm %%DATADIR%%/data/sounds
 @dirrm %%DATADIR%%/data
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 899b642f99ac..be17997f96d7 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.9.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/
 
@@ -15,6 +14,7 @@ MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Gajim is a Jabber client based on a plugin system
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
 
 USE_X_PREFIX=	yes
 USE_PYTHON=	2.3+
diff --git a/net-im/gajim/distinfo b/net-im/gajim/distinfo
index 5ed5d511055e..548ade7d57b4 100644
--- a/net-im/gajim/distinfo
+++ b/net-im/gajim/distinfo
@@ -1,2 +1,3 @@
-MD5 (gajim-0.8.2.tar.bz2) = 14b00f8ed7d84d90793782db7df40ec1
-SIZE (gajim-0.8.2.tar.bz2) = 775069
+MD5 (gajim-0.9.1.tar.bz2) = ca82dfb7ab5c51984357ea7bab0e99af
+SHA256 (gajim-0.9.1.tar.bz2) = 4826ebe054af3a117058f1211185ad705cf7ecfbace57f9cd133a7f8a4506fdb
+SIZE (gajim-0.9.1.tar.bz2) = 1613954
diff --git a/net-im/gajim/files/patch-scripts_gajim b/net-im/gajim/files/patch-scripts_gajim
deleted file mode 100644
index 6de6724ef7ad..000000000000
--- a/net-im/gajim/files/patch-scripts_gajim
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/gajim.orig	Thu May 26 16:40:05 2005
-+++ scripts/gajim	Thu May 26 16:40:23 2005
-@@ -23,4 +23,4 @@
- 
- cd PREFIX/share/gajim/src
- export PYTHONPATH="$PYTHONPATH:PREFIX/lib/gajim"
--python -OO gajim.pyo
-+python -OO gajim.py
diff --git a/net-im/gajim/pkg-plist b/net-im/gajim/pkg-plist
index c867d8acb090..b467a12915fb 100644
--- a/net-im/gajim/pkg-plist
+++ b/net-im/gajim/pkg-plist
@@ -4,6 +4,7 @@ lib/gajim/gtkspell.so
 lib/gajim/idle.so
 lib/gajim/trayicon.so
 %%DATADIR%%/COPYING
+%%DATADIR%%/THANKS
 %%DATADIR%%/data/emoticons/angry.png
 %%DATADIR%%/data/emoticons/bat.png
 %%DATADIR%%/data/emoticons/beer.png
@@ -42,6 +43,20 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/emoticons/unhappy.png
 %%DATADIR%%/data/emoticons/wink.png
 %%DATADIR%%/data/emoticons/yes.png
+%%DATADIR%%/data/iconsets/crystal/16x16/offline.png
+%%DATADIR%%/data/iconsets/crystal/16x16/chat.png
+%%DATADIR%%/data/iconsets/crystal/16x16/away.png
+%%DATADIR%%/data/iconsets/crystal/16x16/requested.png
+%%DATADIR%%/data/iconsets/crystal/16x16/invisible.png
+%%DATADIR%%/data/iconsets/crystal/16x16/online.png
+%%DATADIR%%/data/iconsets/crystal/16x16/dnd.png
+%%DATADIR%%/data/iconsets/crystal/16x16/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/crystal/16x16/message.gif
+%%DATADIR%%/data/iconsets/crystal/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/crystal/16x16/xa.png
+%%DATADIR%%/data/iconsets/crystal/16x16/closed.png
+%%DATADIR%%/data/iconsets/crystal/16x16/error.png
+%%DATADIR%%/data/iconsets/crystal/16x16/opened.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/away.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/chat.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/closed.png
@@ -105,7 +120,6 @@ lib/gajim/trayicon.so
 %%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/typing.png
 %%DATADIR%%/data/iconsets/gossip/16x16/xa.png
 %%DATADIR%%/data/iconsets/gota/16x16/away.png
 %%DATADIR%%/data/iconsets/gota/16x16/chat.png
@@ -149,6 +163,20 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/nuvola/16x16/opened.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/requested.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/xa.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/offline.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/chat.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/away.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/requested.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/invisible.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/message.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/online.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/dnd.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/connecting.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/xa.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/closed.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/error.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/opened.png
 %%DATADIR%%/data/iconsets/stellar/16x16/away.png
 %%DATADIR%%/data/iconsets/stellar/16x16/chat.png
 %%DATADIR%%/data/iconsets/stellar/16x16/closed.png
@@ -188,6 +216,15 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/aim/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/aim/16x16/requested.png
 %%DATADIR%%/data/iconsets/transports/aim/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/requested.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/transports/aim/32x32/xa.png
 %%DATADIR%%/data/iconsets/transports/gadugadu/16x16/away.png
 %%DATADIR%%/data/iconsets/transports/gadugadu/16x16/chat.png
 %%DATADIR%%/data/iconsets/transports/gadugadu/16x16/dnd.png
@@ -210,6 +247,15 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/icq/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/icq/16x16/requested.png
 %%DATADIR%%/data/iconsets/transports/icq/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/requested.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/transports/icq/32x32/xa.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
@@ -232,6 +278,16 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/msn/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/requested.png
 %%DATADIR%%/data/iconsets/transports/msn/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/requested.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/message.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/transports/msn/32x32/xa.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
@@ -247,7 +303,7 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/dnd.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/error.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/invisible.png
-%%DATADIR%%/data/iconsets/transports/tlen/16x16/message.png
+%%DATADIR%%/data/iconsets/transports/tlen/16x16/message.gif
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/not_in_the_roster.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/offline.png
 %%DATADIR%%/data/iconsets/transports/tlen/16x16/online.png
@@ -264,6 +320,15 @@ lib/gajim/trayicon.so
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/online.png
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/requested.png
 %%DATADIR%%/data/iconsets/transports/yahoo/16x16/xa.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/offline.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/chat.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/away.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/requested.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/invisible.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/online.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/dnd.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/not_in_the_roster.png
+%%DATADIR%%/data/iconsets/transports/yahoo/32x32/xa.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
@@ -274,41 +339,80 @@ lib/gajim/trayicon.so
 %%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/other/servers.xml
 %%DATADIR%%/data/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/gajim.png
+%%DATADIR%%/data/pixmaps/agents/weather.png
+%%DATADIR%%/data/pixmaps/agents/msn.png
+%%DATADIR%%/data/pixmaps/agents/gadu-gadu.png
+%%DATADIR%%/data/pixmaps/agents/pubsub.png
+%%DATADIR%%/data/pixmaps/agents/sms.png
+%%DATADIR%%/data/pixmaps/agents/bytestreams.png
+%%DATADIR%%/data/pixmaps/agents/http-ws.png
+%%DATADIR%%/data/pixmaps/agents/aim.png
+%%DATADIR%%/data/pixmaps/agents/rss.png
+%%DATADIR%%/data/pixmaps/agents/conference.png
+%%DATADIR%%/data/pixmaps/agents/icq.png
+%%DATADIR%%/data/pixmaps/agents/irc.png
+%%DATADIR%%/data/pixmaps/agents/yahoo.png
+%%DATADIR%%/data/pixmaps/agents/mail.png
+%%DATADIR%%/data/pixmaps/agents/jud.png
+%%DATADIR%%/data/pixmaps/agents/jabber.png
+%%DATADIR%%/data/pixmaps/agents/error.png
+%%DATADIR%%/data/pixmaps/agents/sip.png
+%%DATADIR%%/data/pixmaps/events/contact_offline.png
+%%DATADIR%%/data/pixmaps/events/ft_done.png
+%%DATADIR%%/data/pixmaps/events/contact_online.png
+%%DATADIR%%/data/pixmaps/events/ft_request.png
+%%DATADIR%%/data/pixmaps/events/ft_error.png
+%%DATADIR%%/data/pixmaps/events/chat_msg_recv.png
+%%DATADIR%%/data/pixmaps/events/priv_msg_recv.png
+%%DATADIR%%/data/pixmaps/events/single_msg_recv.png
+%%DATADIR%%/data/pixmaps/events/ft_stopped.png
+%%DATADIR%%/data/pixmaps/muc_separator.png
+%%DATADIR%%/data/pixmaps/rename.png
 %%DATADIR%%/data/sounds/connected.wav
 %%DATADIR%%/data/sounds/disconnected.wav
+%%DATADIR%%/data/sounds/gc_message1.wav
+%%DATADIR%%/data/sounds/gc_message2.wav
 %%DATADIR%%/data/sounds/message1.wav
 %%DATADIR%%/data/sounds/message2.wav
 %%DATADIR%%/data/sounds/sent.wav
 share/locale/bg/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/es/LC_MESSAGES/gajim.mo
+share/locale/eu/LC_MESSAGES/gajim.mo
 share/locale/fr/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/pl/LC_MESSAGES/gajim.mo
 share/locale/pt/LC_MESSAGES/gajim.mo
 share/locale/pt_BR/LC_MESSAGES/gajim.mo
-share/locale/nl/LC_MESSAGES/gajim.mo
 share/locale/ru/LC_MESSAGES/gajim.mo
-share/locale/cs/LC_MESSAGES/gajim.mo
-share/locale/nb/LC_MESSAGES/gajim.mo
+share/locale/sk/LC_MESSAGES/gajim.mo
+share/locale/sv/LC_MESSAGES/gajim.mo
 %%DATADIR%%/src/gajim-remote.py
 %%DATADIR%%/src/advanced.py
 %%DATADIR%%/src/cell_renderer_image.py
 %%DATADIR%%/src/chat.py
-%%DATADIR%%/src/check_for_new_version.py
 %%DATADIR%%/src/common/GnuPG.py
 %%DATADIR%%/src/common/GnuPGInterface.py
 %%DATADIR%%/src/common/__init__.py
+%%DATADIR%%/src/common/check_paths.py
 %%DATADIR%%/src/common/config.py
 %%DATADIR%%/src/common/connection.py
+%%DATADIR%%/src/common/exceptions.py
 %%DATADIR%%/src/common/gajim.py
 %%DATADIR%%/src/common/helpers.py
 %%DATADIR%%/src/common/i18n.py
 %%DATADIR%%/src/common/logger.py
+%%DATADIR%%/src/common/migrate_logs_to_dot9_db.py
 %%DATADIR%%/src/common/optparser.py
 %%DATADIR%%/src/common/sleepy.py
+%%DATADIR%%/src/common/xmpp_stringprep.py
 %%DATADIR%%/src/common/xmpp/__init__.py
 %%DATADIR%%/src/common/xmpp/auth.py
 %%DATADIR%%/src/common/xmpp/browser.py
@@ -324,11 +428,17 @@ share/locale/nb/LC_MESSAGES/gajim.mo
 %%DATADIR%%/src/common/xmpp/simplexml.py
 %%DATADIR%%/src/common/xmpp/transports.py
 %%DATADIR%%/src/config.py
+%%DATADIR%%/src/conversation_textview.py
+%%DATADIR%%/src/dbus_support.py
 %%DATADIR%%/src/dialogs.py
+%%DATADIR%%/src/disco.py
 %%DATADIR%%/src/gajim.py
 %%DATADIR%%/src/groupchat_window.py
+%%DATADIR%%/src/gtkexcepthook.py
 %%DATADIR%%/src/gtkgui.glade
 %%DATADIR%%/src/history_window.py
+%%DATADIR%%/src/message_textview.py
+%%DATADIR%%/src/notify.py
 %%DATADIR%%/src/roster_window.py
 %%DATADIR%%/src/systray.py
 %%DATADIR%%/src/tabbed_chat_window.py
@@ -350,26 +460,32 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/data/iconsets/transports/weather/16x16
 @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
 @dirrm %%DATADIR%%/data/iconsets/transports/tlen/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/tlen
 @dirrm %%DATADIR%%/data/iconsets/transports/sms/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/sms
 @dirrm %%DATADIR%%/data/iconsets/transports/msn/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/msn/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/msn
 @dirrm %%DATADIR%%/data/iconsets/transports/irc/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/irc
 @dirrm %%DATADIR%%/data/iconsets/transports/icq/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/icq/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/icq
 @dirrm %%DATADIR%%/data/iconsets/transports/gadugadu/16x16
 @dirrm %%DATADIR%%/data/iconsets/transports/gadugadu
 @dirrm %%DATADIR%%/data/iconsets/transports/aim/16x16
+@dirrm %%DATADIR%%/data/iconsets/transports/aim/32x32
 @dirrm %%DATADIR%%/data/iconsets/transports/aim
 @dirrm %%DATADIR%%/data/iconsets/transports
 @dirrm %%DATADIR%%/data/iconsets/sun/16x16
 @dirrm %%DATADIR%%/data/iconsets/sun
 @dirrm %%DATADIR%%/data/iconsets/stellar/16x16
 @dirrm %%DATADIR%%/data/iconsets/stellar
+@dirrm %%DATADIR%%/data/iconsets/simplebulb/16x16
+@dirrm %%DATADIR%%/data/iconsets/simplebulb
 @dirrm %%DATADIR%%/data/iconsets/nuvola/16x16
 @dirrm %%DATADIR%%/data/iconsets/nuvola
 @dirrm %%DATADIR%%/data/iconsets/gota/32x32
@@ -383,7 +499,12 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/data/iconsets/dcraven/32x32
 @dirrm %%DATADIR%%/data/iconsets/dcraven/16x16
 @dirrm %%DATADIR%%/data/iconsets/dcraven
+@dirrm %%DATADIR%%/data/iconsets/crystal/16x16
+@dirrm %%DATADIR%%/data/iconsets/crystal
 @dirrm %%DATADIR%%/data/iconsets
+@dirrm %%DATADIR%%/data/other
+@dirrm %%DATADIR%%/data/pixmaps/agents
+@dirrm %%DATADIR%%/data/pixmaps/events
 @dirrm %%DATADIR%%/data/pixmaps
 @dirrm %%DATADIR%%/data/sounds
 @dirrm %%DATADIR%%/data