3 files changed, 137 insertions, 162 deletions

diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index 1ed4f2d5f36e..8679f96e7556 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	emesene
-PORTVERSION=	0.20070523
-PORTREVISION=	1
+PORTVERSION=	0.20070703
 CATEGORIES=	net-im python
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-230507
+DISTNAME=	${PORTNAME}-030707
 
 MAINTAINER=	relaxbsd@gmail.com
 COMMENT=	MSN Messenger client
@@ -21,7 +20,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
-USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	pygtk2
diff --git a/net-im/emesene/distinfo b/net-im/emesene/distinfo
index 6525bd41da20..d938c3a25588 100644
--- a/net-im/emesene/distinfo
+++ b/net-im/emesene/distinfo
@@ -1,3 +1,3 @@
-MD5 (emesene-230507.zip) = 0d3a1b86d96c3dbc7f6c650a1aa33dae
-SHA256 (emesene-230507.zip) = 04baa0a166fca4058d5d9c222ab6695d54632705c27b9433c363e2d6ce75bc91
-SIZE (emesene-230507.zip) = 884370
+MD5 (emesene-030707.tar.gz) = 6344f16a56c9f16831f8aae7ae46051a
+SHA256 (emesene-030707.tar.gz) = fb669c14a6f0c81656b35c99275ecec819b5ec0f47c991cd8b5748dabe41caf8
+SIZE (emesene-030707.tar.gz) = 577962
diff --git a/net-im/emesene/pkg-plist b/net-im/emesene/pkg-plist
index 2e3592c539da..c5dbeacef744 100644
--- a/net-im/emesene/pkg-plist
+++ b/net-im/emesene/pkg-plist
@@ -61,6 +61,9 @@ share/applications/emesene.desktop
 %%DATADIR%%/MainWindow.py
 %%DATADIR%%/MainWindow.pyc
 %%DATADIR%%/MainWindow.pyo
+%%DATADIR%%/Parser.py
+%%DATADIR%%/Parser.pyc
+%%DATADIR%%/Parser.pyo
 %%DATADIR%%/PluginManager.py
 %%DATADIR%%/PluginManager.pyc
 %%DATADIR%%/PluginManager.pyo
@@ -98,6 +101,7 @@ share/applications/emesene.desktop
 %%DATADIR%%/UserPanel.pyc
 %%DATADIR%%/UserPanel.pyo
 %%DATADIR%%/conversation_themes/default/theme
+%%DATADIR%%/conversation_themes/gtalk/theme
 %%DATADIR%%/conversation_themes/irc/theme
 %%DATADIR%%/desktop.py
 %%DATADIR%%/desktop.pyc
@@ -112,6 +116,7 @@ share/applications/emesene.desktop
 %%DATADIR%%/emesenecommon.py
 %%DATADIR%%/emesenecommon.pyc
 %%DATADIR%%/emesenecommon.pyo
+%%DATADIR%%/emesenelib howto.txt
 %%DATADIR%%/emesenelib/ContactData.py
 %%DATADIR%%/emesenelib/ContactData.pyc
 %%DATADIR%%/emesenelib/ContactData.pyo
@@ -145,32 +150,41 @@ share/applications/emesene.desktop
 %%DATADIR%%/emesenelib/core.py
 %%DATADIR%%/emesenelib/core.pyc
 %%DATADIR%%/emesenelib/core.pyo
+%%DATADIR%%/emesenelib/docp2p.txt
 %%DATADIR%%/emesenelib/uuid.py
 %%DATADIR%%/emesenelib/uuid.pyc
 %%DATADIR%%/emesenelib/uuid.pyo
+%%DATADIR%%/ex1.py
+%%DATADIR%%/ex1.pyc
+%%DATADIR%%/ex1.pyo
+%%DATADIR%%/example1.py
+%%DATADIR%%/example1.pyc
+%%DATADIR%%/example1.pyo
 %%DATADIR%%/hotmlog.htm
 %%DATADIR%%/htmltextview.py
+%%DATADIR%%/htmltextview.py.orig
 %%DATADIR%%/htmltextview.pyc
 %%DATADIR%%/htmltextview.pyo
 %%DATADIR%%/messages.po
 %%DATADIR%%/msnPlusMarkup.py
 %%DATADIR%%/msnPlusMarkup.pyc
 %%DATADIR%%/msnPlusMarkup.pyo
-%%DATADIR%%/plugins_base/Amarok.py
-%%DATADIR%%/plugins_base/Amarok.pyc
-%%DATADIR%%/plugins_base/Amarok.pyo
+%%DATADIR%%/plugins_base/CurrentSong.py
+%%DATADIR%%/plugins_base/CurrentSong.pyc
+%%DATADIR%%/plugins_base/CurrentSong.pyo
 %%DATADIR%%/plugins_base/Dbus.py
 %%DATADIR%%/plugins_base/Dbus.pyc
 %%DATADIR%%/plugins_base/Dbus.pyo
-%%DATADIR%%/plugins_base/Exaile.py
-%%DATADIR%%/plugins_base/Exaile.pyc
-%%DATADIR%%/plugins_base/Exaile.pyo
+%%DATADIR%%/plugins_base/Eval.py
+%%DATADIR%%/plugins_base/Eval.pyc
+%%DATADIR%%/plugins_base/Eval.pyo
 %%DATADIR%%/plugins_base/LibNotify.py
 %%DATADIR%%/plugins_base/LibNotify.pyc
 %%DATADIR%%/plugins_base/LibNotify.pyo
 %%DATADIR%%/plugins_base/Listen.py
 %%DATADIR%%/plugins_base/Listen.pyc
 %%DATADIR%%/plugins_base/Listen.pyo
+%%DATADIR%%/plugins_base/MPD-r2.patch
 %%DATADIR%%/plugins_base/MPD.py
 %%DATADIR%%/plugins_base/MPD.pyc
 %%DATADIR%%/plugins_base/MPD.pyo
@@ -183,30 +197,39 @@ share/applications/emesene.desktop
 %%DATADIR%%/plugins_base/Plugin.py
 %%DATADIR%%/plugins_base/Plugin.pyc
 %%DATADIR%%/plugins_base/Plugin.pyo
-%%DATADIR%%/plugins_base/QuodLibet.py
-%%DATADIR%%/plugins_base/QuodLibet.pyc
-%%DATADIR%%/plugins_base/QuodLibet.pyo
-%%DATADIR%%/plugins_base/Rhythmbox.py
-%%DATADIR%%/plugins_base/Rhythmbox.pyc
-%%DATADIR%%/plugins_base/Rhythmbox.pyo
+%%DATADIR%%/plugins_base/SickLogger.py
+%%DATADIR%%/plugins_base/SickLogger.pyc
+%%DATADIR%%/plugins_base/SickLogger.pyo
 %%DATADIR%%/plugins_base/Sound.py
 %%DATADIR%%/plugins_base/Sound.pyc
 %%DATADIR%%/plugins_base/Sound.pyo
 %%DATADIR%%/plugins_base/Spell.py
 %%DATADIR%%/plugins_base/Spell.pyc
 %%DATADIR%%/plugins_base/Spell.pyo
-%%DATADIR%%/plugins_base/Winamp.py
-%%DATADIR%%/plugins_base/Winamp.pyc
-%%DATADIR%%/plugins_base/Winamp.pyo
 %%DATADIR%%/plugins_base/WindowTremblingNudge.py
 %%DATADIR%%/plugins_base/WindowTremblingNudge.pyc
 %%DATADIR%%/plugins_base/WindowTremblingNudge.pyo
-%%DATADIR%%/plugins_base/Xmms.py
-%%DATADIR%%/plugins_base/Xmms.pyc
-%%DATADIR%%/plugins_base/Xmms.pyo
 %%DATADIR%%/plugins_base/__init__.py
 %%DATADIR%%/plugins_base/__init__.pyc
 %%DATADIR%%/plugins_base/__init__.pyo
+%%DATADIR%%/plugins_base/currentSong/Amarok.py
+%%DATADIR%%/plugins_base/currentSong/Amarok.pyc
+%%DATADIR%%/plugins_base/currentSong/Amarok.pyo
+%%DATADIR%%/plugins_base/currentSong/CurrentSong.py
+%%DATADIR%%/plugins_base/currentSong/CurrentSong.pyc
+%%DATADIR%%/plugins_base/currentSong/CurrentSong.pyo
+%%DATADIR%%/plugins_base/currentSong/Exaile.py
+%%DATADIR%%/plugins_base/currentSong/Exaile.pyc
+%%DATADIR%%/plugins_base/currentSong/Exaile.pyo
+%%DATADIR%%/plugins_base/currentSong/Winamp.py
+%%DATADIR%%/plugins_base/currentSong/Winamp.pyc
+%%DATADIR%%/plugins_base/currentSong/Winamp.pyo
+%%DATADIR%%/plugins_base/currentSong/Xmms.py
+%%DATADIR%%/plugins_base/currentSong/Xmms.pyc
+%%DATADIR%%/plugins_base/currentSong/Xmms.pyo
+%%DATADIR%%/plugins_base/currentSong/__init__.py
+%%DATADIR%%/plugins_base/currentSong/__init__.pyc
+%%DATADIR%%/plugins_base/currentSong/__init__.pyo
 %%DATADIR%%/po/ar/LC_MESSAGES/emesen.mo
 %%DATADIR%%/po/ar/LC_MESSAGES/emesen.po
 %%DATADIR%%/po/de/LC_MESSAGES/emesene.mo
@@ -248,7 +271,91 @@ share/applications/emesene.desktop
 %%DATADIR%%/po/zh-tw/LC_MESSAGES/plugin_sound.mo
 %%DATADIR%%/po/zh-tw/LC_MESSAGES/plugin_sound.po
 %%DATADIR%%/setup
-%%DATADIR%%/themes/default/Thumbs.db
+%%DATADIR%%/smilies/default/Airplane.png
+%%DATADIR%%/smilies/default/Auto.png
+%%DATADIR%%/smilies/default/Baring_teeth_smiley.png
+%%DATADIR%%/smilies/default/Birthday_cake.png
+%%DATADIR%%/smilies/default/Black_sheep.png
+%%DATADIR%%/smilies/default/Bowl.png
+%%DATADIR%%/smilies/default/Boy.png
+%%DATADIR%%/smilies/default/Cigarette.png
+%%DATADIR%%/smilies/default/Clock.png
+%%DATADIR%%/smilies/default/Dog_face.png
+%%DATADIR%%/smilies/default/Dont_tell_anyone.png
+%%DATADIR%%/smilies/default/Eye_rolling_smiley.png
+%%DATADIR%%/smilies/default/Fingerscrossed.png
+%%DATADIR%%/smilies/default/Gift_with_a_bow.png
+%%DATADIR%%/smilies/default/Girl.png
+%%DATADIR%%/smilies/default/Hi_five.png
+%%DATADIR%%/smilies/default/Island_with_a_palm_tree.png
+%%DATADIR%%/smilies/default/Messenger.png
+%%DATADIR%%/smilies/default/Money.png
+%%DATADIR%%/smilies/default/Pizza.png
+%%DATADIR%%/smilies/default/Plate.png
+%%DATADIR%%/smilies/default/Sarcastic_smiley.png
+%%DATADIR%%/smilies/default/Secret_telling_smiley.png
+%%DATADIR%%/smilies/default/Snail.png
+%%DATADIR%%/smilies/default/Soccer_ball.png
+%%DATADIR%%/smilies/default/Telephone_receiver.png
+%%DATADIR%%/smilies/default/Thinking_smiley.png
+%%DATADIR%%/smilies/default/Turtle.png
+%%DATADIR%%/smilies/default/Umbrella.png
+%%DATADIR%%/smilies/default/Xbox.png
+%%DATADIR%%/smilies/default/andy.png
+%%DATADIR%%/smilies/default/angel.png
+%%DATADIR%%/smilies/default/angry.png
+%%DATADIR%%/smilies/default/audio-x-generic.png
+%%DATADIR%%/smilies/default/bat.png
+%%DATADIR%%/smilies/default/beer.png
+%%DATADIR%%/smilies/default/blushing.png
+%%DATADIR%%/smilies/default/brflower.png
+%%DATADIR%%/smilies/default/brheart.png
+%%DATADIR%%/smilies/default/coffee.png
+%%DATADIR%%/smilies/default/computer.png
+%%DATADIR%%/smilies/default/confused.png
+%%DATADIR%%/smilies/default/coolglasses.png
+%%DATADIR%%/smilies/default/cry.png
+%%DATADIR%%/smilies/default/cuffs.png
+%%DATADIR%%/smilies/default/devil.png
+%%DATADIR%%/smilies/default/drink.png
+%%DATADIR%%/smilies/default/emblem-favorite.png
+%%DATADIR%%/smilies/default/face-glasses.png
+%%DATADIR%%/smilies/default/flower.png
+%%DATADIR%%/smilies/default/goat.png
+%%DATADIR%%/smilies/default/grin.png
+%%DATADIR%%/smilies/default/hugleft.png
+%%DATADIR%%/smilies/default/hugright.png
+%%DATADIR%%/smilies/default/kiss.png
+%%DATADIR%%/smilies/default/lamp.png
+%%DATADIR%%/smilies/default/mail.png
+%%DATADIR%%/smilies/default/oh.png
+%%DATADIR%%/smilies/default/party_smiley.png
+%%DATADIR%%/smilies/default/phone.png
+%%DATADIR%%/smilies/default/photo.png
+%%DATADIR%%/smilies/default/pussy.png
+%%DATADIR%%/smilies/default/rainbow.png
+%%DATADIR%%/smilies/default/sick.png
+%%DATADIR%%/smilies/default/sleeping.png
+%%DATADIR%%/smilies/default/smile.png
+%%DATADIR%%/smilies/default/star.png
+%%DATADIR%%/smilies/default/stare.png
+%%DATADIR%%/smilies/default/thumbdown.png
+%%DATADIR%%/smilies/default/thumbup.png
+%%DATADIR%%/smilies/default/tongue.png
+%%DATADIR%%/smilies/default/unhappy.png
+%%DATADIR%%/smilies/default/video-x-generic.png
+%%DATADIR%%/smilies/default/weather-clear-night.png
+%%DATADIR%%/smilies/default/weather-clear.png
+%%DATADIR%%/smilies/default/weather-showers-scattered.png
+%%DATADIR%%/smilies/default/weather-storm.png
+%%DATADIR%%/smilies/default/wink.png
+%%DATADIR%%/sounds/alarm.wav
+%%DATADIR%%/sounds/newemail.wav
+%%DATADIR%%/sounds/nudge.wav
+%%DATADIR%%/sounds/offline.wav
+%%DATADIR%%/sounds/online.wav
+%%DATADIR%%/sounds/type.wav
+%%DATADIR%%/svn.log
 %%DATADIR%%/themes/default/away.png
 %%DATADIR%%/themes/default/blocked.png
 %%DATADIR%%/themes/default/brb.png
@@ -272,136 +379,12 @@ share/applications/emesene.desktop
 %%DATADIR%%/themes/default/online.png
 %%DATADIR%%/themes/default/phone.png
 %%DATADIR%%/themes/default/reverse.png
-%%DATADIR%%/themes/default/smilies/Airplane.png
-%%DATADIR%%/themes/default/smilies/Auto.png
-%%DATADIR%%/themes/default/smilies/Baring_teeth_smiley.png
-%%DATADIR%%/themes/default/smilies/Be_Right_Back.png
-%%DATADIR%%/themes/default/smilies/Birthday_cake.png
-%%DATADIR%%/themes/default/smilies/Black_sheep.png
-%%DATADIR%%/themes/default/smilies/Bowl.png
-%%DATADIR%%/themes/default/smilies/Boy.png
-%%DATADIR%%/themes/default/smilies/Cigarette.png
-%%DATADIR%%/themes/default/smilies/Clock.png
-%%DATADIR%%/themes/default/smilies/Disappointed_smiley.png
-%%DATADIR%%/themes/default/smilies/Dog_face.png
-%%DATADIR%%/themes/default/smilies/Dont_tell_anyone.png
-%%DATADIR%%/themes/default/smilies/Embarrassed_smiley.png
-%%DATADIR%%/themes/default/smilies/Eye_rolling_smiley.png
-%%DATADIR%%/themes/default/smilies/Fingerscrossed.png
-%%DATADIR%%/themes/default/smilies/Gift_with_a_bow.png
-%%DATADIR%%/themes/default/smilies/Girl.png
-%%DATADIR%%/themes/default/smilies/Hi_five.png
-%%DATADIR%%/themes/default/smilies/Island_with_a_palm_tree.png
-%%DATADIR%%/themes/default/smilies/Messenger.png
-%%DATADIR%%/themes/default/smilies/Money.png
-%%DATADIR%%/themes/default/smilies/Pizza.png
-%%DATADIR%%/themes/default/smilies/Plate.png
-%%DATADIR%%/themes/default/smilies/Red_heart.png
-%%DATADIR%%/themes/default/smilies/Sarcastic_smiley.png
-%%DATADIR%%/themes/default/smilies/Secret_telling_smiley.png
-%%DATADIR%%/themes/default/smilies/Snail.png
-%%DATADIR%%/themes/default/smilies/Soccer_ball.png
-%%DATADIR%%/themes/default/smilies/Telephone_receiver.png
-%%DATADIR%%/themes/default/smilies/Thinking_smiley.png
-%%DATADIR%%/themes/default/smilies/Thumbs.db
-%%DATADIR%%/themes/default/smilies/Turtle.png
-%%DATADIR%%/themes/default/smilies/Umbrella.png
-%%DATADIR%%/themes/default/smilies/Xbox.png
-%%DATADIR%%/themes/default/smilies/andy.png
-%%DATADIR%%/themes/default/smilies/angel.png
-%%DATADIR%%/themes/default/smilies/angry.png
-%%DATADIR%%/themes/default/smilies/audio-x-generic.png
-%%DATADIR%%/themes/default/smilies/bat.png
-%%DATADIR%%/themes/default/smilies/beer.png
-%%DATADIR%%/themes/default/smilies/blushing.png
-%%DATADIR%%/themes/default/smilies/brflower.png
-%%DATADIR%%/themes/default/smilies/brheart.png
-%%DATADIR%%/themes/default/smilies/coffee.png
-%%DATADIR%%/themes/default/smilies/computer.png
-%%DATADIR%%/themes/default/smilies/confused.png
-%%DATADIR%%/themes/default/smilies/coolglasses.png
-%%DATADIR%%/themes/default/smilies/cry.png
-%%DATADIR%%/themes/default/smilies/cuffs.png
-%%DATADIR%%/themes/default/smilies/devil.png
-%%DATADIR%%/themes/default/smilies/drink.png
-%%DATADIR%%/themes/default/smilies/emblem-favorite.png
-%%DATADIR%%/themes/default/smilies/face-angel.png
-%%DATADIR%%/themes/default/smilies/face-glasses.png
-%%DATADIR%%/themes/default/smilies/flower.png
-%%DATADIR%%/themes/default/smilies/goat.png
-%%DATADIR%%/themes/default/smilies/grin.png
-%%DATADIR%%/themes/default/smilies/help-browser.png
-%%DATADIR%%/themes/default/smilies/hugleft.png
-%%DATADIR%%/themes/default/smilies/hugright.png
-%%DATADIR%%/themes/default/smilies/i_dont_know.png
-%%DATADIR%%/themes/default/smilies/kiss.png
-%%DATADIR%%/themes/default/smilies/lamp.png
-%%DATADIR%%/themes/default/smilies/mail.png
-%%DATADIR%%/themes/default/smilies/oh.png
-%%DATADIR%%/themes/default/smilies/party_smiley.png
-%%DATADIR%%/themes/default/smilies/phone.png
-%%DATADIR%%/themes/default/smilies/photo.png
-%%DATADIR%%/themes/default/smilies/pussy.png
-%%DATADIR%%/themes/default/smilies/rainbow.png
-%%DATADIR%%/themes/default/smilies/sick.png
-%%DATADIR%%/themes/default/smilies/sleeping.png
-%%DATADIR%%/themes/default/smilies/smile.png
-%%DATADIR%%/themes/default/smilies/star.png
-%%DATADIR%%/themes/default/smilies/stare.png
-%%DATADIR%%/themes/default/smilies/thumbdown.png
-%%DATADIR%%/themes/default/smilies/thumbup.png
-%%DATADIR%%/themes/default/smilies/tongue.png
-%%DATADIR%%/themes/default/smilies/uncertain.png
-%%DATADIR%%/themes/default/smilies/unhappy.png
-%%DATADIR%%/themes/default/smilies/video-x-generic.png
-%%DATADIR%%/themes/default/smilies/weather-clear-night.png
-%%DATADIR%%/themes/default/smilies/weather-clear.png
-%%DATADIR%%/themes/default/smilies/weather-showers-scattered.png
-%%DATADIR%%/themes/default/smilies/weather-storm.png
-%%DATADIR%%/themes/default/smilies/wink.png
-%%DATADIR%%/themes/default/sounds/alarm.wav
-%%DATADIR%%/themes/default/sounds/newemail.wav
-%%DATADIR%%/themes/default/sounds/nudge.wav
-%%DATADIR%%/themes/default/sounds/offline.wav
-%%DATADIR%%/themes/default/sounds/online.wav
-%%DATADIR%%/themes/default/sounds/type.wav
 %%DATADIR%%/themes/default/space.png
 %%DATADIR%%/themes/default/status-blocked.png
 %%DATADIR%%/themes/default/trayicon.ico
 %%DATADIR%%/themes/default/trayicon.png
 %%DATADIR%%/themes/default/typing.png
 %%DATADIR%%/themes/default/userPanel.png
-%%DATADIR%%/themes/defaultSmall/Thumbs.db
-%%DATADIR%%/themes/defaultSmall/away.png
-%%DATADIR%%/themes/defaultSmall/blocked.png
-%%DATADIR%%/themes/defaultSmall/brb.png
-%%DATADIR%%/themes/defaultSmall/busy.png
-%%DATADIR%%/themes/defaultSmall/close.png
-%%DATADIR%%/themes/defaultSmall/guif.png
-%%DATADIR%%/themes/defaultSmall/icon.png
-%%DATADIR%%/themes/defaultSmall/idle.png
-%%DATADIR%%/themes/defaultSmall/invisible.png
-%%DATADIR%%/themes/defaultSmall/loading.gif
-%%DATADIR%%/themes/defaultSmall/login.png
-%%DATADIR%%/themes/defaultSmall/lunch.png
-%%DATADIR%%/themes/defaultSmall/mobile.png
-%%DATADIR%%/themes/defaultSmall/nudge.png
-%%DATADIR%%/themes/defaultSmall/offline.png
-%%DATADIR%%/themes/defaultSmall/online.png
-%%DATADIR%%/themes/defaultSmall/phone.png
-%%DATADIR%%/themes/defaultSmall/reverse.png
-%%DATADIR%%/themes/defaultSmall/sounds/alarm.wav
-%%DATADIR%%/themes/defaultSmall/sounds/newemail.wav
-%%DATADIR%%/themes/defaultSmall/sounds/nudge.wav
-%%DATADIR%%/themes/defaultSmall/sounds/offline.wav
-%%DATADIR%%/themes/defaultSmall/sounds/online.wav
-%%DATADIR%%/themes/defaultSmall/sounds/type.wav
-%%DATADIR%%/themes/defaultSmall/space.png
-%%DATADIR%%/themes/defaultSmall/trayicon.ico
-%%DATADIR%%/themes/defaultSmall/trayicon.png
-%%DATADIR%%/themes/defaultSmall/typing.png
-%%DATADIR%%/themes/defaultSmall/userPanel.png
-%%DATADIR%%/themes/tango/Thumbs.db
 %%DATADIR%%/themes/tango/away.png
 %%DATADIR%%/themes/tango/blocked.png
 %%DATADIR%%/themes/tango/brb.png
@@ -421,26 +404,17 @@ share/applications/emesene.desktop
 %%DATADIR%%/themes/tango/online.png
 %%DATADIR%%/themes/tango/phone.png
 %%DATADIR%%/themes/tango/reverse.png
-%%DATADIR%%/themes/tango/sounds/alarm.wav
-%%DATADIR%%/themes/tango/sounds/newemail.wav
-%%DATADIR%%/themes/tango/sounds/nudge.wav
-%%DATADIR%%/themes/tango/sounds/offline.wav
-%%DATADIR%%/themes/tango/sounds/online.wav
-%%DATADIR%%/themes/tango/sounds/type.wav
 %%DATADIR%%/themes/tango/space.png
 %%DATADIR%%/themes/tango/trayicon.ico
 %%DATADIR%%/themes/tango/trayicon.png
 %%DATADIR%%/themes/tango/typing.png
 %%DATADIR%%/themes/tango/userPanel.png
-@dirrmtry share/applications
-@dirrm %%DATADIR%%/themes/tango/sounds
 @dirrm %%DATADIR%%/themes/tango
-@dirrm %%DATADIR%%/themes/defaultSmall/sounds
-@dirrm %%DATADIR%%/themes/defaultSmall
-@dirrm %%DATADIR%%/themes/default/sounds
-@dirrm %%DATADIR%%/themes/default/smilies
 @dirrm %%DATADIR%%/themes/default
 @dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/smilies/default
+@dirrm %%DATADIR%%/smilies
 @dirrm %%DATADIR%%/po/zh-tw/LC_MESSAGES
 @dirrm %%DATADIR%%/po/zh-tw
 @dirrm %%DATADIR%%/po/zh-cn/LC_MESSAGES
@@ -470,10 +444,13 @@ share/applications/emesene.desktop
 @dirrm %%DATADIR%%/po/ar/LC_MESSAGES
 @dirrm %%DATADIR%%/po/ar
 @dirrm %%DATADIR%%/po
+@dirrm %%DATADIR%%/plugins_base/currentSong
 @dirrm %%DATADIR%%/plugins_base
 @dirrm %%DATADIR%%/emesenelib
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/conversation_themes/irc
+@dirrm %%DATADIR%%/conversation_themes/gtalk
 @dirrm %%DATADIR%%/conversation_themes/default
 @dirrm %%DATADIR%%/conversation_themes
 @dirrm %%DATADIR%%
+@dirrmtry share/applications