- Update to 0.10.1

PR:		ports/98770
Submitted by:	Stephan Maka <stephan@spaceboyz.net> (maintainer)

8 files changed, 256 insertions, 258 deletions

diff --git a/net-im/gajim-devel/Makefile b/net-im/gajim-devel/Makefile
index c8c11fa23d1..58f7b97f582 100644
--- a/net-im/gajim-devel/Makefile
+++ b/net-im/gajim-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.10.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/
 
@@ -17,8 +16,6 @@ COMMENT=	Gajim is a Jabber client based on a plugin system
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
 
-PATCH_DIST_STRIP=-p1
-
 USE_X_PREFIX=	yes
 USE_PYTHON=	2.3+
 USE_GMAKE=	yes
diff --git a/net-im/gajim-devel/distinfo b/net-im/gajim-devel/distinfo
index 1b2b989f116..40243afaeba 100644
--- a/net-im/gajim-devel/distinfo
+++ b/net-im/gajim-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gajim-0.10.tar.bz2) = 0d568857ea25acf8366cff43d2317757
-SHA256 (gajim-0.10.tar.bz2) = 77b0069e4283d1905ba640a7fa87d2f8acac4248c9b58de7f3d1fdffc86d4c2a
-SIZE (gajim-0.10.tar.bz2) = 2073760
+MD5 (gajim-0.10.1.tar.bz2) = 392d9d1e06f6db49a892b9aea4a178c7
+SHA256 (gajim-0.10.1.tar.bz2) = b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174
+SIZE (gajim-0.10.1.tar.bz2) = 2066396
diff --git a/net-im/gajim-devel/files/patch-Changeset6314 b/net-im/gajim-devel/files/patch-Changeset6314
deleted file mode 100644
index c828e687ffc..00000000000
--- a/net-im/gajim-devel/files/patch-Changeset6314
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN gajim-0.10/src/common/proxy65_manager.py gajim-0.10-patched/src/common/proxy65_manager.py
---- src/common/proxy65_manager.py	Mon May  1 18:49:14 2006
-+++ src/common/proxy65_manager.py	Tue May 16 19:55:10 2006
-@@ -15,6 +15,7 @@
- ##
- import socket 
- import struct
-+import errno
- 
- import common.xmpp
- from common import gajim
-@@ -246,16 +247,18 @@
- 			self._recv=self._sock.recv
- 		except Exception, ee:
- 			(errnum, errstr) = ee
--			if errnum == 111:
--				self.on_failure()
--				return None
-+			if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): 
-+				# still trying to connect
-+				return
- 			# win32 needs this
--			elif errnum != 10056 or self.state != 0:
--				return None
--			else: # socket is already connected
--				self._sock.setblocking(False)
--				self._send=self._sock.send
--				self._recv=self._sock.recv
-+			if errnum not in (0, 10056, errno.EISCONN):
-+				# connection failed
-+				self.on_failure()
-+				return
-+			# socket is already connected
-+			self._sock.setblocking(False)
-+			self._send=self._sock.send
-+			self._recv=self._sock.recv
- 		self.buff = ''
- 		self.state = 1 # connected
- 		self.idlequeue.plug_idle(self, True, False)
diff --git a/net-im/gajim-devel/pkg-plist b/net-im/gajim-devel/pkg-plist
index 5b1d8dbf20c..21be9e6f57f 100644
--- a/net-im/gajim-devel/pkg-plist
+++ b/net-im/gajim-devel/pkg-plist
@@ -71,11 +71,11 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/animated/brheart.png
 %%DATADIR%%/data/emoticons/animated/lamp.png
 %%DATADIR%%/data/emoticons/animated/frowning.png
-%%DATADIR%%/data/emoticons/static/flower.png
-%%DATADIR%%/data/emoticons/static/cry.png
+%%DATADIR%%/data/emoticons/static/hugleft.png
 %%DATADIR%%/data/emoticons/static/girl.png
+%%DATADIR%%/data/emoticons/static/cry.png
 %%DATADIR%%/data/emoticons/static/coolglasses.png
-%%DATADIR%%/data/emoticons/static/hugleft.png
+%%DATADIR%%/data/emoticons/static/flower.png
 %%DATADIR%%/data/emoticons/static/devil.png
 %%DATADIR%%/data/emoticons/static/emoticons.py
 %%DATADIR%%/data/emoticons/static/bat.png
@@ -94,54 +94,96 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/static/photo.png
 %%DATADIR%%/data/emoticons/static/boy.png
 %%DATADIR%%/data/emoticons/static/yes.png
-%%DATADIR%%/data/emoticons/static/tongue.png
 %%DATADIR%%/data/emoticons/static/rainbow.png
+%%DATADIR%%/data/emoticons/static/tongue.png
 %%DATADIR%%/data/emoticons/static/heart.png
-%%DATADIR%%/data/emoticons/static/cuffs.png
 %%DATADIR%%/data/emoticons/static/oh.png
+%%DATADIR%%/data/emoticons/static/cuffs.png
 %%DATADIR%%/data/emoticons/static/moon.png
-%%DATADIR%%/data/emoticons/static/star.png
 %%DATADIR%%/data/emoticons/static/kiss.png
 %%DATADIR%%/data/emoticons/static/smile.png
+%%DATADIR%%/data/emoticons/static/star.png
 %%DATADIR%%/data/emoticons/static/beer.png
 %%DATADIR%%/data/emoticons/static/blush.png
 %%DATADIR%%/data/emoticons/static/biggrin.png
 %%DATADIR%%/data/emoticons/static/pussy.png
 %%DATADIR%%/data/emoticons/static/brheart.png
-%%DATADIR%%/data/emoticons/static/frowning.png
 %%DATADIR%%/data/emoticons/static/lamp.png
-%%DATADIR%%/data/iconsets/crystal/16x16/message.gif
+%%DATADIR%%/data/emoticons/static/frowning.png
+%%DATADIR%%/data/glade/invitation_received_dialog.glade
+%%DATADIR%%/data/glade/choose_gpg_key_dialog.glade
+%%DATADIR%%/data/glade/systray_context_menu.glade
+%%DATADIR%%/data/glade/progress_dialog.glade
+%%DATADIR%%/data/glade/message_window.glade
+%%DATADIR%%/data/glade/input_dialog.glade
+%%DATADIR%%/data/glade/gtkgui.glade
+%%DATADIR%%/data/glade/change_status_message_dialog.glade
+%%DATADIR%%/data/glade/single_message_window.glade
+%%DATADIR%%/data/glade/manage_accounts_window.glade
+%%DATADIR%%/data/glade/roster_contact_context_menu.glade
+%%DATADIR%%/data/glade/advanced_configuration_window.glade
+%%DATADIR%%/data/glade/subscription_request_window.glade
+%%DATADIR%%/data/glade/account_context_menu.glade
+%%DATADIR%%/data/glade/change_password_dialog.glade
+%%DATADIR%%/data/glade/chat_control_popup_menu.glade
+%%DATADIR%%/data/glade/account_creation_wizard_window.glade
+%%DATADIR%%/data/glade/preferences_window.glade
+%%DATADIR%%/data/glade/history_window.glade
+%%DATADIR%%/data/glade/history_manager.glade
+%%DATADIR%%/data/glade/gc_occupants_menu.glade
+%%DATADIR%%/data/glade/advanced_menuitem_menu.glade
+%%DATADIR%%/data/glade/gc_control_popup_menu.glade
+%%DATADIR%%/data/glade/join_groupchat_window.glade
+%%DATADIR%%/data/glade/roster_window.glade
+%%DATADIR%%/data/glade/accounts_window.glade
+%%DATADIR%%/data/glade/chat_context_menu.glade
+%%DATADIR%%/data/glade/filetransfers.glade
+%%DATADIR%%/data/glade/account_modification_window.glade
+%%DATADIR%%/data/glade/xml_console_window.glade
+%%DATADIR%%/data/glade/service_discovery_window.glade
+%%DATADIR%%/data/glade/service_registration_window.glade
+%%DATADIR%%/data/glade/data_form_window.glade
+%%DATADIR%%/data/glade/gajim_themes_window.glade
+%%DATADIR%%/data/glade/manage_bookmarks_window.glade
+%%DATADIR%%/data/glade/passphrase_dialog.glade
+%%DATADIR%%/data/glade/manage_proxies_window.glade
+%%DATADIR%%/data/glade/vcard_information_window.glade
+%%DATADIR%%/data/glade/popup_notification_window.glade
+%%DATADIR%%/data/glade/remove_account_window.glade
+%%DATADIR%%/data/glade/add_new_contact_window.glade
+%%DATADIR%%/data/glade/edit_groups_dialog.glade
+%%DATADIR%%/data/iconsets/crystal/16x16/chat.png
+%%DATADIR%%/data/iconsets/crystal/16x16/requested.png
 %%DATADIR%%/data/iconsets/crystal/16x16/away.png
+%%DATADIR%%/data/iconsets/crystal/16x16/message.gif
 %%DATADIR%%/data/iconsets/crystal/16x16/dnd.png
-%%DATADIR%%/data/iconsets/crystal/16x16/requested.png
-%%DATADIR%%/data/iconsets/crystal/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/crystal/16x16/muc_inactive.png
 %%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/opened.png
 %%DATADIR%%/data/iconsets/crystal/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/crystal/16x16/chat.png
-%%DATADIR%%/data/iconsets/crystal/16x16/offline.png
+%%DATADIR%%/data/iconsets/crystal/16x16/opened.png
 %%DATADIR%%/data/iconsets/crystal/16x16/invisible.png
+%%DATADIR%%/data/iconsets/crystal/16x16/offline.png
 %%DATADIR%%/data/iconsets/crystal/16x16/online.png
+%%DATADIR%%/data/iconsets/crystal/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/crystal/16x16/error.png
 %%DATADIR%%/data/iconsets/crystal/48x48/offline.png
 %%DATADIR%%/data/iconsets/crystal/48x48/online.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/closed.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/chat.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/requested.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/away.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/dnd.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/requested.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/xa.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/xa.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/closed.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/muc_active.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/opened.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/offline.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/chat.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/invisible.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/message.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/offline.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/online.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/message.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/connecting.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/error.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/offline.png
@@ -151,30 +193,30 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/requested.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/invisible.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/message.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/connecting.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/online.png
-%%DATADIR%%/data/iconsets/dcraven/32x32/closed.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/dnd.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/closed.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/xa.png
-%%DATADIR%%/data/iconsets/dcraven/32x32/connecting.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/error.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/opened.png
 %%DATADIR%%/data/iconsets/dcraven/48x48/offline.png
 %%DATADIR%%/data/iconsets/dcraven/48x48/online.png
-%%DATADIR%%/data/iconsets/gnome/16x16/message.gif
+%%DATADIR%%/data/iconsets/gnome/16x16/chat.png
+%%DATADIR%%/data/iconsets/gnome/16x16/requested.png
 %%DATADIR%%/data/iconsets/gnome/16x16/away.png
+%%DATADIR%%/data/iconsets/gnome/16x16/message.gif
 %%DATADIR%%/data/iconsets/gnome/16x16/dnd.png
-%%DATADIR%%/data/iconsets/gnome/16x16/requested.png
-%%DATADIR%%/data/iconsets/gnome/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gnome/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/gnome/16x16/connecting.gif
 %%DATADIR%%/data/iconsets/gnome/16x16/xa.png
 %%DATADIR%%/data/iconsets/gnome/16x16/closed.png
-%%DATADIR%%/data/iconsets/gnome/16x16/opened.png
 %%DATADIR%%/data/iconsets/gnome/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/gnome/16x16/chat.png
-%%DATADIR%%/data/iconsets/gnome/16x16/offline.png
+%%DATADIR%%/data/iconsets/gnome/16x16/opened.png
 %%DATADIR%%/data/iconsets/gnome/16x16/invisible.png
+%%DATADIR%%/data/iconsets/gnome/16x16/offline.png
 %%DATADIR%%/data/iconsets/gnome/16x16/online.png
+%%DATADIR%%/data/iconsets/gnome/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gnome/16x16/error.png
 %%DATADIR%%/data/iconsets/gnome/32x32/offline.png
 %%DATADIR%%/data/iconsets/gnome/32x32/chat.png
@@ -195,60 +237,60 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/goojim/16x16/opened.png
 %%DATADIR%%/data/iconsets/goojim/16x16/chat.png
 %%DATADIR%%/data/iconsets/goojim/16x16/offline.png
+%%DATADIR%%/data/iconsets/goojim/16x16/connecting.png
 %%DATADIR%%/data/iconsets/goojim/16x16/message.png
 %%DATADIR%%/data/iconsets/goojim/16x16/online.png
 %%DATADIR%%/data/iconsets/goojim/16x16/not_in_the_roster.png
-%%DATADIR%%/data/iconsets/goojim/16x16/connecting.png
 %%DATADIR%%/data/iconsets/goojim/16x16/error.png
 %%DATADIR%%/data/iconsets/goojim/32x32/offline.png
 %%DATADIR%%/data/iconsets/goojim/32x32/chat.png
 %%DATADIR%%/data/iconsets/goojim/32x32/away.png
 %%DATADIR%%/data/iconsets/goojim/32x32/requested.png
-%%DATADIR%%/data/iconsets/goojim/32x32/online.png
-%%DATADIR%%/data/iconsets/goojim/32x32/message.png
 %%DATADIR%%/data/iconsets/goojim/32x32/invisible.png
+%%DATADIR%%/data/iconsets/goojim/32x32/message.png
+%%DATADIR%%/data/iconsets/goojim/32x32/online.png
 %%DATADIR%%/data/iconsets/goojim/32x32/dnd.png
-%%DATADIR%%/data/iconsets/goojim/32x32/xa.png
 %%DATADIR%%/data/iconsets/goojim/32x32/not_in_the_roster.png
 %%DATADIR%%/data/iconsets/goojim/32x32/connecting.png
+%%DATADIR%%/data/iconsets/goojim/32x32/xa.png
 %%DATADIR%%/data/iconsets/goojim/32x32/closed.png
 %%DATADIR%%/data/iconsets/goojim/32x32/error.png
 %%DATADIR%%/data/iconsets/goojim/32x32/opened.png
 %%DATADIR%%/data/iconsets/goojim/48x48/offline.png
 %%DATADIR%%/data/iconsets/goojim/48x48/online.png
-%%DATADIR%%/data/iconsets/gossip/16x16/closed.png
+%%DATADIR%%/data/iconsets/gossip/16x16/chat.png
+%%DATADIR%%/data/iconsets/gossip/16x16/requested.png
 %%DATADIR%%/data/iconsets/gossip/16x16/away.png
 %%DATADIR%%/data/iconsets/gossip/16x16/dnd.png
-%%DATADIR%%/data/iconsets/gossip/16x16/requested.png
-%%DATADIR%%/data/iconsets/gossip/16x16/xa.png
 %%DATADIR%%/data/iconsets/gossip/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/gossip/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/gossip/16x16/xa.png
+%%DATADIR%%/data/iconsets/gossip/16x16/closed.png
 %%DATADIR%%/data/iconsets/gossip/16x16/muc_active.png
 %%DATADIR%%/data/iconsets/gossip/16x16/opened.png
-%%DATADIR%%/data/iconsets/gossip/16x16/offline.png
-%%DATADIR%%/data/iconsets/gossip/16x16/chat.png
-%%DATADIR%%/data/iconsets/gossip/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gossip/16x16/invisible.png
-%%DATADIR%%/data/iconsets/gossip/16x16/message.png
+%%DATADIR%%/data/iconsets/gossip/16x16/offline.png
 %%DATADIR%%/data/iconsets/gossip/16x16/online.png
+%%DATADIR%%/data/iconsets/gossip/16x16/message.png
+%%DATADIR%%/data/iconsets/gossip/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gossip/16x16/error.png
 %%DATADIR%%/data/iconsets/gossip/48x48/offline.png
 %%DATADIR%%/data/iconsets/gossip/48x48/online.png
-%%DATADIR%%/data/iconsets/gota/16x16/message.gif
+%%DATADIR%%/data/iconsets/gota/16x16/chat.png
+%%DATADIR%%/data/iconsets/gota/16x16/requested.png
 %%DATADIR%%/data/iconsets/gota/16x16/away.png
+%%DATADIR%%/data/iconsets/gota/16x16/message.gif
 %%DATADIR%%/data/iconsets/gota/16x16/dnd.png
-%%DATADIR%%/data/iconsets/gota/16x16/requested.png
-%%DATADIR%%/data/iconsets/gota/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gota/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/gota/16x16/connecting.gif
 %%DATADIR%%/data/iconsets/gota/16x16/xa.png
 %%DATADIR%%/data/iconsets/gota/16x16/closed.png
-%%DATADIR%%/data/iconsets/gota/16x16/opened.png
 %%DATADIR%%/data/iconsets/gota/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/gota/16x16/chat.png
-%%DATADIR%%/data/iconsets/gota/16x16/offline.png
+%%DATADIR%%/data/iconsets/gota/16x16/opened.png
 %%DATADIR%%/data/iconsets/gota/16x16/invisible.png
+%%DATADIR%%/data/iconsets/gota/16x16/offline.png
 %%DATADIR%%/data/iconsets/gota/16x16/online.png
+%%DATADIR%%/data/iconsets/gota/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gota/16x16/error.png
 %%DATADIR%%/data/iconsets/gota/32x32/offline.png
 %%DATADIR%%/data/iconsets/gota/32x32/chat.png
@@ -256,12 +298,12 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/gota/32x32/not_in_roster.png
 %%DATADIR%%/data/iconsets/gota/32x32/requested.png
 %%DATADIR%%/data/iconsets/gota/32x32/invisible.png
+%%DATADIR%%/data/iconsets/gota/32x32/connecting.gif
 %%DATADIR%%/data/iconsets/gota/32x32/online.png
-%%DATADIR%%/data/iconsets/gota/32x32/message.gif
 %%DATADIR%%/data/iconsets/gota/32x32/dnd.png
-%%DATADIR%%/data/iconsets/gota/32x32/connecting.gif
-%%DATADIR%%/data/iconsets/gota/32x32/xa.png
+%%DATADIR%%/data/iconsets/gota/32x32/message.gif
 %%DATADIR%%/data/iconsets/gota/32x32/closed.png
+%%DATADIR%%/data/iconsets/gota/32x32/xa.png
 %%DATADIR%%/data/iconsets/gota/32x32/error.png
 %%DATADIR%%/data/iconsets/gota/32x32/opened.png
 %%DATADIR%%/data/iconsets/gota/48x48/offline.png
@@ -289,62 +331,62 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/requested.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/invisible.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/online.png
-%%DATADIR%%/data/iconsets/jabberbulb/32x32/error.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/dnd.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/xa.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/error.png
 %%DATADIR%%/data/iconsets/jabberbulb/48x48/offline.png
 %%DATADIR%%/data/iconsets/jabberbulb/48x48/online.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/message.gif
+%%DATADIR%%/data/iconsets/nuvola/16x16/chat.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/requested.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/away.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/message.gif
 %%DATADIR%%/data/iconsets/nuvola/16x16/dnd.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/requested.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/xa.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/closed.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/opened.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/chat.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/offline.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/opened.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/invisible.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/offline.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/online.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/connecting.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/error.png
 %%DATADIR%%/data/iconsets/nuvola/48x48/offline.png
 %%DATADIR%%/data/iconsets/nuvola/48x48/online.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/closed.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/chat.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/requested.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/away.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/dnd.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/requested.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/xa.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/xa.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/closed.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/muc_active.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/opened.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/offline.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/chat.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/invisible.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/message.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/offline.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/online.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/message.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/connecting.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/error.png
 %%DATADIR%%/data/iconsets/simplebulb/48x48/offline.png
 %%DATADIR%%/data/iconsets/simplebulb/48x48/online.png
-%%DATADIR%%/data/iconsets/stellar/16x16/message.gif
+%%DATADIR%%/data/iconsets/stellar/16x16/chat.png
+%%DATADIR%%/data/iconsets/stellar/16x16/requested.png
 %%DATADIR%%/data/iconsets/stellar/16x16/away.png
+%%DATADIR%%/data/iconsets/stellar/16x16/message.gif
 %%DATADIR%%/data/iconsets/stellar/16x16/dnd.png
-%%DATADIR%%/data/iconsets/stellar/16x16/requested.png
-%%DATADIR%%/data/iconsets/stellar/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/stellar/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/stellar/16x16/connecting.gif
 %%DATADIR%%/data/iconsets/stellar/16x16/xa.png
 %%DATADIR%%/data/iconsets/stellar/16x16/closed.png
-%%DATADIR%%/data/iconsets/stellar/16x16/opened.png
 %%DATADIR%%/data/iconsets/stellar/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/stellar/16x16/chat.png
-%%DATADIR%%/data/iconsets/stellar/16x16/offline.png
+%%DATADIR%%/data/iconsets/stellar/16x16/opened.png
 %%DATADIR%%/data/iconsets/stellar/16x16/invisible.png
+%%DATADIR%%/data/iconsets/stellar/16x16/offline.png
 %%DATADIR%%/data/iconsets/stellar/16x16/online.png
+%%DATADIR%%/data/iconsets/stellar/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/stellar/16x16/error.png
 %%DATADIR%%/data/iconsets/stellar/48x48/offline.png
 %%DATADIR%%/data/iconsets/stellar/48x48/online.png
@@ -354,8 +396,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/sun/16x16/message.gif
 %%DATADIR%%/data/iconsets/sun/16x16/dnd.png
 %%DATADIR%%/data/iconsets/sun/16x16/muc_inactive.png
-%%DATADIR%%/data/iconsets/sun/16x16/xa.png
 %%DATADIR%%/data/iconsets/sun/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/sun/16x16/xa.png
 %%DATADIR%%/data/iconsets/sun/16x16/closed.png
 %%DATADIR%%/data/iconsets/sun/16x16/muc_active.png
 %%DATADIR%%/data/iconsets/sun/16x16/opened.png
@@ -496,8 +538,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/events/single_msg_recv.png
 %%DATADIR%%/data/pixmaps/events/ft_stopped.png
 %%DATADIR%%/data/pixmaps/kbd_input.png
-%%DATADIR%%/data/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/muc_separator.png
+%%DATADIR%%/data/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/gajim.png
 %%DATADIR%%/data/sounds/gc_message1.wav
 %%DATADIR%%/data/sounds/message1.wav
@@ -523,46 +565,45 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/src/common/xmpp/transports.py
 %%DATADIR%%/src/common/xmpp/auth_nb.py
 %%DATADIR%%/src/common/xmpp/idlequeue.py
-%%DATADIR%%/src/common/xmpp/session.py
 %%DATADIR%%/src/common/xmpp/browser.py
+%%DATADIR%%/src/common/xmpp/session.py
 %%DATADIR%%/src/common/xmpp/filetransfer.py
 %%DATADIR%%/src/common/xmpp/dispatcher.py
 %%DATADIR%%/src/common/xmpp/debug.py
+%%DATADIR%%/src/common/GnuPGInterface.py
 %%DATADIR%%/src/common/connection.py
 %%DATADIR%%/src/common/__init__.py
-%%DATADIR%%/src/common/connection_handlers.py
-%%DATADIR%%/src/common/xmpp_stringprep.py
+%%DATADIR%%/src/common/check_paths.py
 %%DATADIR%%/src/common/sleepy.py
-%%DATADIR%%/src/common/GnuPGInterface.py
 %%DATADIR%%/src/common/helpers.py
+%%DATADIR%%/src/common/xmpp_stringprep.py
 %%DATADIR%%/src/common/config.py
 %%DATADIR%%/src/common/socks5.py
 %%DATADIR%%/src/common/nslookup.py
-%%DATADIR%%/src/common/check_paths.py
+%%DATADIR%%/src/common/exceptions.py
 %%DATADIR%%/src/common/contacts.py
 %%DATADIR%%/src/common/logger.py
-%%DATADIR%%/src/common/optparser.py
 %%DATADIR%%/src/common/i18n.py
+%%DATADIR%%/src/common/optparser.py
 %%DATADIR%%/src/common/GnuPG.py
-%%DATADIR%%/src/common/exceptions.py
+%%DATADIR%%/src/common/connection_handlers.py
 %%DATADIR%%/src/common/gajim.py
 %%DATADIR%%/src/common/proxy65_manager.py
 %%DATADIR%%/src/remote_control.py
 %%DATADIR%%/src/cell_renderer_image.py
 %%DATADIR%%/src/history_manager.py
 %%DATADIR%%/src/vcard.py
-%%DATADIR%%/src/config.py
-%%DATADIR%%/src/advanced.py
 %%DATADIR%%/src/roster_window.py
+%%DATADIR%%/src/advanced.py
+%%DATADIR%%/src/config.py
 %%DATADIR%%/src/gajim-remote.py
 %%DATADIR%%/src/notify.py
 %%DATADIR%%/src/systray.py
 %%DATADIR%%/src/conversation_textview.py
-%%DATADIR%%/src/gtkgui.glade
-%%DATADIR%%/src/migrate_logs_to_dot9_db.py
-%%DATADIR%%/src/history_manager.glade
 %%DATADIR%%/src/dialogs.py
 %%DATADIR%%/src/gajim.py
+%%DATADIR%%/src/migrate_logs_to_dot9_db.py
+%%DATADIR%%/src/tooltips.py
 %%DATADIR%%/src/gajim_themes_window.py
 %%DATADIR%%/src/filetransfers_window.py
 %%DATADIR%%/src/history_window.py
@@ -571,7 +612,6 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/src/disco.py
 %%DATADIR%%/src/message_window.py
 %%DATADIR%%/src/gtkgui_helpers.py
-%%DATADIR%%/src/tooltips.py
 %%DATADIR%%/src/gtkexcepthook.py
 %%DATADIR%%/src/chat_control.py
 %%DATADIR%%/src/message_textview.py
@@ -584,6 +624,7 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/src/common/xmpp
 @dirrm %%DATADIR%%/src/common
 @dirrm %%DATADIR%%/src
+@dirrm %%DATADIR%%/data/glade
 @dirrm %%DATADIR%%/data/sounds
 @dirrm %%DATADIR%%/data/pixmaps/events
 @dirrm %%DATADIR%%/data/pixmaps/agents
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index c8c11fa23d1..58f7b97f582 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gajim
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.10.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.gajim.org/downloads/
 
@@ -17,8 +16,6 @@ COMMENT=	Gajim is a Jabber client based on a plugin system
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21
 
-PATCH_DIST_STRIP=-p1
-
 USE_X_PREFIX=	yes
 USE_PYTHON=	2.3+
 USE_GMAKE=	yes
diff --git a/net-im/gajim/distinfo b/net-im/gajim/distinfo
index 1b2b989f116..40243afaeba 100644
--- a/net-im/gajim/distinfo
+++ b/net-im/gajim/distinfo
@@ -1,3 +1,3 @@
-MD5 (gajim-0.10.tar.bz2) = 0d568857ea25acf8366cff43d2317757
-SHA256 (gajim-0.10.tar.bz2) = 77b0069e4283d1905ba640a7fa87d2f8acac4248c9b58de7f3d1fdffc86d4c2a
-SIZE (gajim-0.10.tar.bz2) = 2073760
+MD5 (gajim-0.10.1.tar.bz2) = 392d9d1e06f6db49a892b9aea4a178c7
+SHA256 (gajim-0.10.1.tar.bz2) = b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174
+SIZE (gajim-0.10.1.tar.bz2) = 2066396
diff --git a/net-im/gajim/files/patch-Changeset6314 b/net-im/gajim/files/patch-Changeset6314
deleted file mode 100644
index c828e687ffc..00000000000
--- a/net-im/gajim/files/patch-Changeset6314
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN gajim-0.10/src/common/proxy65_manager.py gajim-0.10-patched/src/common/proxy65_manager.py
---- src/common/proxy65_manager.py	Mon May  1 18:49:14 2006
-+++ src/common/proxy65_manager.py	Tue May 16 19:55:10 2006
-@@ -15,6 +15,7 @@
- ##
- import socket 
- import struct
-+import errno
- 
- import common.xmpp
- from common import gajim
-@@ -246,16 +247,18 @@
- 			self._recv=self._sock.recv
- 		except Exception, ee:
- 			(errnum, errstr) = ee
--			if errnum == 111:
--				self.on_failure()
--				return None
-+			if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): 
-+				# still trying to connect
-+				return
- 			# win32 needs this
--			elif errnum != 10056 or self.state != 0:
--				return None
--			else: # socket is already connected
--				self._sock.setblocking(False)
--				self._send=self._sock.send
--				self._recv=self._sock.recv
-+			if errnum not in (0, 10056, errno.EISCONN):
-+				# connection failed
-+				self.on_failure()
-+				return
-+			# socket is already connected
-+			self._sock.setblocking(False)
-+			self._send=self._sock.send
-+			self._recv=self._sock.recv
- 		self.buff = ''
- 		self.state = 1 # connected
- 		self.idlequeue.plug_idle(self, True, False)
diff --git a/net-im/gajim/pkg-plist b/net-im/gajim/pkg-plist
index 5b1d8dbf20c..21be9e6f57f 100644
--- a/net-im/gajim/pkg-plist
+++ b/net-im/gajim/pkg-plist
@@ -71,11 +71,11 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/animated/brheart.png
 %%DATADIR%%/data/emoticons/animated/lamp.png
 %%DATADIR%%/data/emoticons/animated/frowning.png
-%%DATADIR%%/data/emoticons/static/flower.png
-%%DATADIR%%/data/emoticons/static/cry.png
+%%DATADIR%%/data/emoticons/static/hugleft.png
 %%DATADIR%%/data/emoticons/static/girl.png
+%%DATADIR%%/data/emoticons/static/cry.png
 %%DATADIR%%/data/emoticons/static/coolglasses.png
-%%DATADIR%%/data/emoticons/static/hugleft.png
+%%DATADIR%%/data/emoticons/static/flower.png
 %%DATADIR%%/data/emoticons/static/devil.png
 %%DATADIR%%/data/emoticons/static/emoticons.py
 %%DATADIR%%/data/emoticons/static/bat.png
@@ -94,54 +94,96 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/emoticons/static/photo.png
 %%DATADIR%%/data/emoticons/static/boy.png
 %%DATADIR%%/data/emoticons/static/yes.png
-%%DATADIR%%/data/emoticons/static/tongue.png
 %%DATADIR%%/data/emoticons/static/rainbow.png
+%%DATADIR%%/data/emoticons/static/tongue.png
 %%DATADIR%%/data/emoticons/static/heart.png
-%%DATADIR%%/data/emoticons/static/cuffs.png
 %%DATADIR%%/data/emoticons/static/oh.png
+%%DATADIR%%/data/emoticons/static/cuffs.png
 %%DATADIR%%/data/emoticons/static/moon.png
-%%DATADIR%%/data/emoticons/static/star.png
 %%DATADIR%%/data/emoticons/static/kiss.png
 %%DATADIR%%/data/emoticons/static/smile.png
+%%DATADIR%%/data/emoticons/static/star.png
 %%DATADIR%%/data/emoticons/static/beer.png
 %%DATADIR%%/data/emoticons/static/blush.png
 %%DATADIR%%/data/emoticons/static/biggrin.png
 %%DATADIR%%/data/emoticons/static/pussy.png
 %%DATADIR%%/data/emoticons/static/brheart.png
-%%DATADIR%%/data/emoticons/static/frowning.png
 %%DATADIR%%/data/emoticons/static/lamp.png
-%%DATADIR%%/data/iconsets/crystal/16x16/message.gif
+%%DATADIR%%/data/emoticons/static/frowning.png
+%%DATADIR%%/data/glade/invitation_received_dialog.glade
+%%DATADIR%%/data/glade/choose_gpg_key_dialog.glade
+%%DATADIR%%/data/glade/systray_context_menu.glade
+%%DATADIR%%/data/glade/progress_dialog.glade
+%%DATADIR%%/data/glade/message_window.glade
+%%DATADIR%%/data/glade/input_dialog.glade
+%%DATADIR%%/data/glade/gtkgui.glade
+%%DATADIR%%/data/glade/change_status_message_dialog.glade
+%%DATADIR%%/data/glade/single_message_window.glade
+%%DATADIR%%/data/glade/manage_accounts_window.glade
+%%DATADIR%%/data/glade/roster_contact_context_menu.glade
+%%DATADIR%%/data/glade/advanced_configuration_window.glade
+%%DATADIR%%/data/glade/subscription_request_window.glade
+%%DATADIR%%/data/glade/account_context_menu.glade
+%%DATADIR%%/data/glade/change_password_dialog.glade
+%%DATADIR%%/data/glade/chat_control_popup_menu.glade
+%%DATADIR%%/data/glade/account_creation_wizard_window.glade
+%%DATADIR%%/data/glade/preferences_window.glade
+%%DATADIR%%/data/glade/history_window.glade
+%%DATADIR%%/data/glade/history_manager.glade
+%%DATADIR%%/data/glade/gc_occupants_menu.glade
+%%DATADIR%%/data/glade/advanced_menuitem_menu.glade
+%%DATADIR%%/data/glade/gc_control_popup_menu.glade
+%%DATADIR%%/data/glade/join_groupchat_window.glade
+%%DATADIR%%/data/glade/roster_window.glade
+%%DATADIR%%/data/glade/accounts_window.glade
+%%DATADIR%%/data/glade/chat_context_menu.glade
+%%DATADIR%%/data/glade/filetransfers.glade
+%%DATADIR%%/data/glade/account_modification_window.glade
+%%DATADIR%%/data/glade/xml_console_window.glade
+%%DATADIR%%/data/glade/service_discovery_window.glade
+%%DATADIR%%/data/glade/service_registration_window.glade
+%%DATADIR%%/data/glade/data_form_window.glade
+%%DATADIR%%/data/glade/gajim_themes_window.glade
+%%DATADIR%%/data/glade/manage_bookmarks_window.glade
+%%DATADIR%%/data/glade/passphrase_dialog.glade
+%%DATADIR%%/data/glade/manage_proxies_window.glade
+%%DATADIR%%/data/glade/vcard_information_window.glade
+%%DATADIR%%/data/glade/popup_notification_window.glade
+%%DATADIR%%/data/glade/remove_account_window.glade
+%%DATADIR%%/data/glade/add_new_contact_window.glade
+%%DATADIR%%/data/glade/edit_groups_dialog.glade
+%%DATADIR%%/data/iconsets/crystal/16x16/chat.png
+%%DATADIR%%/data/iconsets/crystal/16x16/requested.png
 %%DATADIR%%/data/iconsets/crystal/16x16/away.png
+%%DATADIR%%/data/iconsets/crystal/16x16/message.gif
 %%DATADIR%%/data/iconsets/crystal/16x16/dnd.png
-%%DATADIR%%/data/iconsets/crystal/16x16/requested.png
-%%DATADIR%%/data/iconsets/crystal/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/crystal/16x16/muc_inactive.png
 %%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/opened.png
 %%DATADIR%%/data/iconsets/crystal/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/crystal/16x16/chat.png
-%%DATADIR%%/data/iconsets/crystal/16x16/offline.png
+%%DATADIR%%/data/iconsets/crystal/16x16/opened.png
 %%DATADIR%%/data/iconsets/crystal/16x16/invisible.png
+%%DATADIR%%/data/iconsets/crystal/16x16/offline.png
 %%DATADIR%%/data/iconsets/crystal/16x16/online.png
+%%DATADIR%%/data/iconsets/crystal/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/crystal/16x16/error.png
 %%DATADIR%%/data/iconsets/crystal/48x48/offline.png
 %%DATADIR%%/data/iconsets/crystal/48x48/online.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/closed.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/chat.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/requested.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/away.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/dnd.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/requested.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/xa.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/xa.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/closed.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/muc_active.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/opened.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/offline.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/chat.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/invisible.png
-%%DATADIR%%/data/iconsets/dcraven/16x16/message.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/offline.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/online.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/message.png
+%%DATADIR%%/data/iconsets/dcraven/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/connecting.png
 %%DATADIR%%/data/iconsets/dcraven/16x16/error.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/offline.png
@@ -151,30 +193,30 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/requested.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/invisible.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/message.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/connecting.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/online.png
-%%DATADIR%%/data/iconsets/dcraven/32x32/closed.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/dnd.png
+%%DATADIR%%/data/iconsets/dcraven/32x32/closed.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/xa.png
-%%DATADIR%%/data/iconsets/dcraven/32x32/connecting.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/error.png
 %%DATADIR%%/data/iconsets/dcraven/32x32/opened.png
 %%DATADIR%%/data/iconsets/dcraven/48x48/offline.png
 %%DATADIR%%/data/iconsets/dcraven/48x48/online.png
-%%DATADIR%%/data/iconsets/gnome/16x16/message.gif
+%%DATADIR%%/data/iconsets/gnome/16x16/chat.png
+%%DATADIR%%/data/iconsets/gnome/16x16/requested.png
 %%DATADIR%%/data/iconsets/gnome/16x16/away.png
+%%DATADIR%%/data/iconsets/gnome/16x16/message.gif
 %%DATADIR%%/data/iconsets/gnome/16x16/dnd.png
-%%DATADIR%%/data/iconsets/gnome/16x16/requested.png
-%%DATADIR%%/data/iconsets/gnome/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gnome/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/gnome/16x16/connecting.gif
 %%DATADIR%%/data/iconsets/gnome/16x16/xa.png
 %%DATADIR%%/data/iconsets/gnome/16x16/closed.png
-%%DATADIR%%/data/iconsets/gnome/16x16/opened.png
 %%DATADIR%%/data/iconsets/gnome/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/gnome/16x16/chat.png
-%%DATADIR%%/data/iconsets/gnome/16x16/offline.png
+%%DATADIR%%/data/iconsets/gnome/16x16/opened.png
 %%DATADIR%%/data/iconsets/gnome/16x16/invisible.png
+%%DATADIR%%/data/iconsets/gnome/16x16/offline.png
 %%DATADIR%%/data/iconsets/gnome/16x16/online.png
+%%DATADIR%%/data/iconsets/gnome/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gnome/16x16/error.png
 %%DATADIR%%/data/iconsets/gnome/32x32/offline.png
 %%DATADIR%%/data/iconsets/gnome/32x32/chat.png
@@ -195,60 +237,60 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/goojim/16x16/opened.png
 %%DATADIR%%/data/iconsets/goojim/16x16/chat.png
 %%DATADIR%%/data/iconsets/goojim/16x16/offline.png
+%%DATADIR%%/data/iconsets/goojim/16x16/connecting.png
 %%DATADIR%%/data/iconsets/goojim/16x16/message.png
 %%DATADIR%%/data/iconsets/goojim/16x16/online.png
 %%DATADIR%%/data/iconsets/goojim/16x16/not_in_the_roster.png
-%%DATADIR%%/data/iconsets/goojim/16x16/connecting.png
 %%DATADIR%%/data/iconsets/goojim/16x16/error.png
 %%DATADIR%%/data/iconsets/goojim/32x32/offline.png
 %%DATADIR%%/data/iconsets/goojim/32x32/chat.png
 %%DATADIR%%/data/iconsets/goojim/32x32/away.png
 %%DATADIR%%/data/iconsets/goojim/32x32/requested.png
-%%DATADIR%%/data/iconsets/goojim/32x32/online.png
-%%DATADIR%%/data/iconsets/goojim/32x32/message.png
 %%DATADIR%%/data/iconsets/goojim/32x32/invisible.png
+%%DATADIR%%/data/iconsets/goojim/32x32/message.png
+%%DATADIR%%/data/iconsets/goojim/32x32/online.png
 %%DATADIR%%/data/iconsets/goojim/32x32/dnd.png
-%%DATADIR%%/data/iconsets/goojim/32x32/xa.png
 %%DATADIR%%/data/iconsets/goojim/32x32/not_in_the_roster.png
 %%DATADIR%%/data/iconsets/goojim/32x32/connecting.png
+%%DATADIR%%/data/iconsets/goojim/32x32/xa.png
 %%DATADIR%%/data/iconsets/goojim/32x32/closed.png
 %%DATADIR%%/data/iconsets/goojim/32x32/error.png
 %%DATADIR%%/data/iconsets/goojim/32x32/opened.png
 %%DATADIR%%/data/iconsets/goojim/48x48/offline.png
 %%DATADIR%%/data/iconsets/goojim/48x48/online.png
-%%DATADIR%%/data/iconsets/gossip/16x16/closed.png
+%%DATADIR%%/data/iconsets/gossip/16x16/chat.png
+%%DATADIR%%/data/iconsets/gossip/16x16/requested.png
 %%DATADIR%%/data/iconsets/gossip/16x16/away.png
 %%DATADIR%%/data/iconsets/gossip/16x16/dnd.png
-%%DATADIR%%/data/iconsets/gossip/16x16/requested.png
-%%DATADIR%%/data/iconsets/gossip/16x16/xa.png
 %%DATADIR%%/data/iconsets/gossip/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/gossip/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/gossip/16x16/xa.png
+%%DATADIR%%/data/iconsets/gossip/16x16/closed.png
 %%DATADIR%%/data/iconsets/gossip/16x16/muc_active.png
 %%DATADIR%%/data/iconsets/gossip/16x16/opened.png
-%%DATADIR%%/data/iconsets/gossip/16x16/offline.png
-%%DATADIR%%/data/iconsets/gossip/16x16/chat.png
-%%DATADIR%%/data/iconsets/gossip/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gossip/16x16/invisible.png
-%%DATADIR%%/data/iconsets/gossip/16x16/message.png
+%%DATADIR%%/data/iconsets/gossip/16x16/offline.png
 %%DATADIR%%/data/iconsets/gossip/16x16/online.png
+%%DATADIR%%/data/iconsets/gossip/16x16/message.png
+%%DATADIR%%/data/iconsets/gossip/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gossip/16x16/error.png
 %%DATADIR%%/data/iconsets/gossip/48x48/offline.png
 %%DATADIR%%/data/iconsets/gossip/48x48/online.png
-%%DATADIR%%/data/iconsets/gota/16x16/message.gif
+%%DATADIR%%/data/iconsets/gota/16x16/chat.png
+%%DATADIR%%/data/iconsets/gota/16x16/requested.png
 %%DATADIR%%/data/iconsets/gota/16x16/away.png
+%%DATADIR%%/data/iconsets/gota/16x16/message.gif
 %%DATADIR%%/data/iconsets/gota/16x16/dnd.png
-%%DATADIR%%/data/iconsets/gota/16x16/requested.png
-%%DATADIR%%/data/iconsets/gota/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gota/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/gota/16x16/connecting.gif
 %%DATADIR%%/data/iconsets/gota/16x16/xa.png
 %%DATADIR%%/data/iconsets/gota/16x16/closed.png
-%%DATADIR%%/data/iconsets/gota/16x16/opened.png
 %%DATADIR%%/data/iconsets/gota/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/gota/16x16/chat.png
-%%DATADIR%%/data/iconsets/gota/16x16/offline.png
+%%DATADIR%%/data/iconsets/gota/16x16/opened.png
 %%DATADIR%%/data/iconsets/gota/16x16/invisible.png
+%%DATADIR%%/data/iconsets/gota/16x16/offline.png
 %%DATADIR%%/data/iconsets/gota/16x16/online.png
+%%DATADIR%%/data/iconsets/gota/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/gota/16x16/error.png
 %%DATADIR%%/data/iconsets/gota/32x32/offline.png
 %%DATADIR%%/data/iconsets/gota/32x32/chat.png
@@ -256,12 +298,12 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/gota/32x32/not_in_roster.png
 %%DATADIR%%/data/iconsets/gota/32x32/requested.png
 %%DATADIR%%/data/iconsets/gota/32x32/invisible.png
+%%DATADIR%%/data/iconsets/gota/32x32/connecting.gif
 %%DATADIR%%/data/iconsets/gota/32x32/online.png
-%%DATADIR%%/data/iconsets/gota/32x32/message.gif
 %%DATADIR%%/data/iconsets/gota/32x32/dnd.png
-%%DATADIR%%/data/iconsets/gota/32x32/connecting.gif
-%%DATADIR%%/data/iconsets/gota/32x32/xa.png
+%%DATADIR%%/data/iconsets/gota/32x32/message.gif
 %%DATADIR%%/data/iconsets/gota/32x32/closed.png
+%%DATADIR%%/data/iconsets/gota/32x32/xa.png
 %%DATADIR%%/data/iconsets/gota/32x32/error.png
 %%DATADIR%%/data/iconsets/gota/32x32/opened.png
 %%DATADIR%%/data/iconsets/gota/48x48/offline.png
@@ -289,62 +331,62 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/requested.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/invisible.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/online.png
-%%DATADIR%%/data/iconsets/jabberbulb/32x32/error.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/dnd.png
 %%DATADIR%%/data/iconsets/jabberbulb/32x32/xa.png
+%%DATADIR%%/data/iconsets/jabberbulb/32x32/error.png
 %%DATADIR%%/data/iconsets/jabberbulb/48x48/offline.png
 %%DATADIR%%/data/iconsets/jabberbulb/48x48/online.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/message.gif
+%%DATADIR%%/data/iconsets/nuvola/16x16/chat.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/requested.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/away.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/message.gif
 %%DATADIR%%/data/iconsets/nuvola/16x16/dnd.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/requested.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/xa.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/closed.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/opened.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/chat.png
-%%DATADIR%%/data/iconsets/nuvola/16x16/offline.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/opened.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/invisible.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/offline.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/online.png
+%%DATADIR%%/data/iconsets/nuvola/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/connecting.png
 %%DATADIR%%/data/iconsets/nuvola/16x16/error.png
 %%DATADIR%%/data/iconsets/nuvola/48x48/offline.png
 %%DATADIR%%/data/iconsets/nuvola/48x48/online.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/closed.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/chat.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/requested.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/away.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/dnd.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/requested.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/xa.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/muc_inactive.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/xa.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/closed.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/muc_active.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/opened.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/offline.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/chat.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/invisible.png
-%%DATADIR%%/data/iconsets/simplebulb/16x16/message.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/offline.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/online.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/message.png
+%%DATADIR%%/data/iconsets/simplebulb/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/connecting.png
 %%DATADIR%%/data/iconsets/simplebulb/16x16/error.png
 %%DATADIR%%/data/iconsets/simplebulb/48x48/offline.png
 %%DATADIR%%/data/iconsets/simplebulb/48x48/online.png
-%%DATADIR%%/data/iconsets/stellar/16x16/message.gif
+%%DATADIR%%/data/iconsets/stellar/16x16/chat.png
+%%DATADIR%%/data/iconsets/stellar/16x16/requested.png
 %%DATADIR%%/data/iconsets/stellar/16x16/away.png
+%%DATADIR%%/data/iconsets/stellar/16x16/message.gif
 %%DATADIR%%/data/iconsets/stellar/16x16/dnd.png
-%%DATADIR%%/data/iconsets/stellar/16x16/requested.png
-%%DATADIR%%/data/iconsets/stellar/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/stellar/16x16/muc_inactive.png
 %%DATADIR%%/data/iconsets/stellar/16x16/connecting.gif
 %%DATADIR%%/data/iconsets/stellar/16x16/xa.png
 %%DATADIR%%/data/iconsets/stellar/16x16/closed.png
-%%DATADIR%%/data/iconsets/stellar/16x16/opened.png
 %%DATADIR%%/data/iconsets/stellar/16x16/muc_active.png
-%%DATADIR%%/data/iconsets/stellar/16x16/chat.png
-%%DATADIR%%/data/iconsets/stellar/16x16/offline.png
+%%DATADIR%%/data/iconsets/stellar/16x16/opened.png
 %%DATADIR%%/data/iconsets/stellar/16x16/invisible.png
+%%DATADIR%%/data/iconsets/stellar/16x16/offline.png
 %%DATADIR%%/data/iconsets/stellar/16x16/online.png
+%%DATADIR%%/data/iconsets/stellar/16x16/not_in_roster.png
 %%DATADIR%%/data/iconsets/stellar/16x16/error.png
 %%DATADIR%%/data/iconsets/stellar/48x48/offline.png
 %%DATADIR%%/data/iconsets/stellar/48x48/online.png
@@ -354,8 +396,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/iconsets/sun/16x16/message.gif
 %%DATADIR%%/data/iconsets/sun/16x16/dnd.png
 %%DATADIR%%/data/iconsets/sun/16x16/muc_inactive.png
-%%DATADIR%%/data/iconsets/sun/16x16/xa.png
 %%DATADIR%%/data/iconsets/sun/16x16/connecting.gif
+%%DATADIR%%/data/iconsets/sun/16x16/xa.png
 %%DATADIR%%/data/iconsets/sun/16x16/closed.png
 %%DATADIR%%/data/iconsets/sun/16x16/muc_active.png
 %%DATADIR%%/data/iconsets/sun/16x16/opened.png
@@ -496,8 +538,8 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/events/single_msg_recv.png
 %%DATADIR%%/data/pixmaps/events/ft_stopped.png
 %%DATADIR%%/data/pixmaps/kbd_input.png
-%%DATADIR%%/data/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/muc_separator.png
+%%DATADIR%%/data/pixmaps/gajim_about.png
 %%DATADIR%%/data/pixmaps/gajim.png
 %%DATADIR%%/data/sounds/gc_message1.wav
 %%DATADIR%%/data/sounds/message1.wav
@@ -523,46 +565,45 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/src/common/xmpp/transports.py
 %%DATADIR%%/src/common/xmpp/auth_nb.py
 %%DATADIR%%/src/common/xmpp/idlequeue.py
-%%DATADIR%%/src/common/xmpp/session.py
 %%DATADIR%%/src/common/xmpp/browser.py
+%%DATADIR%%/src/common/xmpp/session.py
 %%DATADIR%%/src/common/xmpp/filetransfer.py
 %%DATADIR%%/src/common/xmpp/dispatcher.py
 %%DATADIR%%/src/common/xmpp/debug.py
+%%DATADIR%%/src/common/GnuPGInterface.py
 %%DATADIR%%/src/common/connection.py
 %%DATADIR%%/src/common/__init__.py
-%%DATADIR%%/src/common/connection_handlers.py
-%%DATADIR%%/src/common/xmpp_stringprep.py
+%%DATADIR%%/src/common/check_paths.py
 %%DATADIR%%/src/common/sleepy.py
-%%DATADIR%%/src/common/GnuPGInterface.py
 %%DATADIR%%/src/common/helpers.py
+%%DATADIR%%/src/common/xmpp_stringprep.py
 %%DATADIR%%/src/common/config.py
 %%DATADIR%%/src/common/socks5.py
 %%DATADIR%%/src/common/nslookup.py
-%%DATADIR%%/src/common/check_paths.py
+%%DATADIR%%/src/common/exceptions.py
 %%DATADIR%%/src/common/contacts.py
 %%DATADIR%%/src/common/logger.py
-%%DATADIR%%/src/common/optparser.py
 %%DATADIR%%/src/common/i18n.py
+%%DATADIR%%/src/common/optparser.py
 %%DATADIR%%/src/common/GnuPG.py
-%%DATADIR%%/src/common/exceptions.py
+%%DATADIR%%/src/common/connection_handlers.py
 %%DATADIR%%/src/common/gajim.py
 %%DATADIR%%/src/common/proxy65_manager.py
 %%DATADIR%%/src/remote_control.py
 %%DATADIR%%/src/cell_renderer_image.py
 %%DATADIR%%/src/history_manager.py
 %%DATADIR%%/src/vcard.py
-%%DATADIR%%/src/config.py
-%%DATADIR%%/src/advanced.py
 %%DATADIR%%/src/roster_window.py
+%%DATADIR%%/src/advanced.py
+%%DATADIR%%/src/config.py
 %%DATADIR%%/src/gajim-remote.py
 %%DATADIR%%/src/notify.py
 %%DATADIR%%/src/systray.py
 %%DATADIR%%/src/conversation_textview.py
-%%DATADIR%%/src/gtkgui.glade
-%%DATADIR%%/src/migrate_logs_to_dot9_db.py
-%%DATADIR%%/src/history_manager.glade
 %%DATADIR%%/src/dialogs.py
 %%DATADIR%%/src/gajim.py
+%%DATADIR%%/src/migrate_logs_to_dot9_db.py
+%%DATADIR%%/src/tooltips.py
 %%DATADIR%%/src/gajim_themes_window.py
 %%DATADIR%%/src/filetransfers_window.py
 %%DATADIR%%/src/history_window.py
@@ -571,7 +612,6 @@ share/pixmaps/gajim_about.png
 %%DATADIR%%/src/disco.py
 %%DATADIR%%/src/message_window.py
 %%DATADIR%%/src/gtkgui_helpers.py
-%%DATADIR%%/src/tooltips.py
 %%DATADIR%%/src/gtkexcepthook.py
 %%DATADIR%%/src/chat_control.py
 %%DATADIR%%/src/message_textview.py
@@ -584,6 +624,7 @@ share/pixmaps/gajim_about.png
 @dirrm %%DATADIR%%/src/common/xmpp
 @dirrm %%DATADIR%%/src/common
 @dirrm %%DATADIR%%/src
+@dirrm %%DATADIR%%/data/glade
 @dirrm %%DATADIR%%/data/sounds
 @dirrm %%DATADIR%%/data/pixmaps/events
 @dirrm %%DATADIR%%/data/pixmaps/agents