5 files changed, 325 insertions, 134 deletions

diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 0a076a873422..747b038dbe45 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=		kadu
-PORTVERSION=		0.5.0
-PORTREVISION=	1
+PORTVERSION=		0.6.0
 PORTEPOCH=		1
 CATEGORIES=		polish net-im
 MASTER_SITES=		http://www.kadu.net/download/stable/:kadu \
 			http://www.kadu.net/download/additions/:additions \
+			http://www.kadu.net/download/modules_extra/spellchecker/:aspell \
 			http://www.kadu.net/download/modules_mirror/:modules \
-			http://scripts.one.pl/spellchecker/stable/${PORTVERSION}/:aspell
+			http://kadu.net/~arvenil/tabs/download/${PORTVERSION}/:modtab
 DISTFILES=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:kadu
 DIST_SUBDIR=		kadu
 EXTRACT_ONLY=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -24,12 +24,13 @@ COMMENT=		QT Gadu-Gadu client
 LIB_DEPENDS=		gadu.3:${PORTSDIR}/polish/libgadu\
 			sndfile.1:${PORTSDIR}/audio/libsndfile
 
-TABS_MOD_DISTFILE=	tabs-20061223.tar.bz2
-ASPELL_MOD_DISTFILE=	spellchecker-0.20.tar.gz
+TABS_MOD_DISTFILE=	kadu-tabs-1.1.5.tar.bz2
+ASPELL_MOD_DISTFILE=	spellchecker-20071230.tar.bz2
 
 GG6_EMOTS_DISTFILE=	kompatybilne_z_GG6.tar.gz
 GG7_EMOTS_DISTFILE=	dodatkowe_emoty_GG7.tar.gz
 
+USE_AUTOTOOLS=		autoconf:261
 USE_BZIP2=		yes
 USE_GMAKE=		yes
 USE_OPENSSL=		yes
@@ -37,7 +38,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-existing-libgadu="${LOCALBASE}" \
 			--with-includes="${LOCALBASE}/include ${X11BASE}/include" \
 			--with-libs="${LOCALBASE}/lib ${X11BASE}/lib" \
-			--program-transform-name=''
+			--program-transform-name='' \
+			--disable-autodownload
 CONFIGURE_ENV=		QTDIR="${QT_PREFIX}"
 
 USE_QT_VER=		3
@@ -57,7 +59,7 @@ OPTIONS=	ASPELL	"Build spell checking module"	off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_ASPELL)
-LIB_DEPENDS+=	pspell.16:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 PLIST_SUB+=	ASPELL_MOD=""
 DISTFILES+=	${ASPELL_MOD_DISTFILE}:aspell
 KADU_SHARED_MODULES+=	spellchecker
@@ -96,21 +98,26 @@ USE_GCC=		3.4+
 
 .if defined(WITH_TABS)
 PLIST_SUB+=	TABS_MOD=""
-DISTFILES+=	${TABS_MOD_DISTFILE}:modules
+DISTFILES+=	${TABS_MOD_DISTFILE}:modtab
 KADU_SHARED_MODULES+=	tabs
 .else
 PLIST_SUB+=	TABS_MOD="@comment "
 .endif
 
+KADU_DISABLED_MODULES=	alsa_sound
+
 post-patch:
-	@${ECHO} "#!/usr/bin/true" > ${WRKSRC}/varia/scripts/autodownload
+
+.for module in ${KADU_DISABLED_MODULES}
+	@${REINPLACE_CMD} -e 's|module_${module}=.|module_${module}=n|g' ${WRKSRC}/.config
+.endfor
 
 .for module in ${KADU_SHARED_MODULES}
-	@${REINPLACE_CMD} -e 's|module_${module}=n|module_${module}=m|g' ${WRKSRC}/.config
+	@${REINPLACE_CMD} -e 's|module_${module}=.|module_${module}=m|g' ${WRKSRC}/.config
 .endfor
 
 .for module in ${KADU_STATIC_MODULES}
-	@${REINPLACE_CMD} -e 's|module_${module}=n|module_${module}=y|g' ${WRKSRC}/.config
+	@${REINPLACE_CMD} -e 's|module_${module}=.|module_${module}=y|g' ${WRKSRC}/.config
 .endfor
 
 .if defined(WITH_ASPELL)
@@ -131,6 +138,6 @@ post-patch:
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/kadu/kadu.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/kadu-core/kadu.desktop ${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>
diff --git a/polish/kadu/distinfo b/polish/kadu/distinfo
index ec2eb078e09c..db69cfb00384 100644
--- a/polish/kadu/distinfo
+++ b/polish/kadu/distinfo
@@ -1,15 +1,15 @@
-MD5 (kadu/kadu-0.5.0.tar.bz2) = 895f7c88d36dbb188e8bc26664fbf430
-SHA256 (kadu/kadu-0.5.0.tar.bz2) = 32f0e5de02a808b7a1125808d04a980a2a63b484008f4f05891fe0ab6f5771a4
-SIZE (kadu/kadu-0.5.0.tar.bz2) = 1310892
-MD5 (kadu/spellchecker-0.20.tar.gz) = 384e3e039e3c1022b36780f9067caf4d
-SHA256 (kadu/spellchecker-0.20.tar.gz) = 05987e4a4c5767c4881328ede23b43c4078f2b1cb1143221fd25804c0e531868
-SIZE (kadu/spellchecker-0.20.tar.gz) = 9459
+MD5 (kadu/kadu-0.6.0.tar.bz2) = 8f1ee07558c82573d2c6e7ccd05f224f
+SHA256 (kadu/kadu-0.6.0.tar.bz2) = f0e31b5ef00c64cad75a43220842b5564b8ec1dfd0c4481f0f3ac8b88fb9e752
+SIZE (kadu/kadu-0.6.0.tar.bz2) = 1583937
+MD5 (kadu/spellchecker-20071230.tar.bz2) = a46eab2f3d9c31cee13ccf3a441bceec
+SHA256 (kadu/spellchecker-20071230.tar.bz2) = ecde5f7ad2b60f53dbd7715df52459531cac8cce06670d016014da82589483d0
+SIZE (kadu/spellchecker-20071230.tar.bz2) = 9504
 MD5 (kadu/kompatybilne_z_GG6.tar.gz) = 16cbc9e657549b35ee8d8a32f4b6a47d
 SHA256 (kadu/kompatybilne_z_GG6.tar.gz) = f8a84acd8512fd8fc38e394aa564e6b6d7ec2e9fe9864bdf0c5b8f2edb23da6f
 SIZE (kadu/kompatybilne_z_GG6.tar.gz) = 254637
 MD5 (kadu/dodatkowe_emoty_GG7.tar.gz) = f9b0404cc1e1599ddf5eda4c15f1abce
 SHA256 (kadu/dodatkowe_emoty_GG7.tar.gz) = aebeb45b6ac9139620032436f7b565aa5729a0165d1c361a473c1195b8807450
 SIZE (kadu/dodatkowe_emoty_GG7.tar.gz) = 113257
-MD5 (kadu/tabs-20061223.tar.bz2) = bda5770b0ba6930c226ae59d74d266e2
-SHA256 (kadu/tabs-20061223.tar.bz2) = e31e9b9981200e65ef2a9c8a55f444705765b50590f498568c683e3f103abdf7
-SIZE (kadu/tabs-20061223.tar.bz2) = 12027
+MD5 (kadu/kadu-tabs-1.1.5.tar.bz2) = 8313ae2aa85b4a6f890203ed5f93fa1b
+SHA256 (kadu/kadu-tabs-1.1.5.tar.bz2) = 78bfb2737f5b900e98f2a192d22fa832a05bf5e5ce4ec136893d4d592ebf1ee3
+SIZE (kadu/kadu-tabs-1.1.5.tar.bz2) = 16719
diff --git a/polish/kadu/files/patch-configure b/polish/kadu/files/patch-configure
new file mode 100644
index 000000000000..bfe54c8d1909
--- /dev/null
+++ b/polish/kadu/files/patch-configure
@@ -0,0 +1,31 @@
+--- configure.ac.orig	2008-02-26 01:07:33.000000000 +0100
++++ configure.ac	2008-03-23 18:11:17.000000000 +0100
+@@ -335,7 +335,7 @@
+ 				done; \
+ 			fi && \
+ 
+-			if test $enable_final == yes; then \
++			if test "$enable_final" = "yes"; then \
+ 				for src in $MODULE_SOURCES; do \
+ 					if test "`echo $src | sed 's/.*\.\(.*\)$/\1/'`" == "cpp"; then \
+ 						echo "#include \"$src\"" >> modules/$mod/.final2.cpp; \
+@@ -762,6 +762,7 @@
+ 	with_existing_libgadu=no
+ fi
+ if test "$with_existing_libgadu" != "no"; then
++	save_CXXFLAGS="$CXXFLAGS"
+ 	FIND_HEADER([libgadu.h],[$with_existing_libgadu $with_existing_libgadu/include],
+ 	[
+ 		GADU_INCLUDES="-I$FILE_DIR"
+@@ -771,9 +772,11 @@
+ 	[
+ 		GADU_LIBS="$GADU_LIBS -L$FILE_DIR"
+ 	])
++	CXXFLAGS="$CXXFLAGS $GADU_INCLUDES"
+ 	AC_CHECK_MEMBER([struct gg_dcc7.uin], [],
+ 	[AC_MSG_ERROR([Your libgadu doesn't support for dcc7, please use our SVN snapshot by removing --with-existing-libgadu option !])],
+ 	[#include <libgadu.h>])
++	CXXFLAGS="$save_CXXFLAGS"
+ else
+ 	MY_SUBDIRS="$MY_SUBDIRS libgadu"
+ 	GADU_LIBS="../libgadu/src/.libs/libgadu.a"
diff --git a/polish/kadu/files/patch-kadu_Makefile.in b/polish/kadu/files/patch-kadu_Makefile.in
index 78752d34c028..ee5cb8d0d122 100644
--- a/polish/kadu/files/patch-kadu_Makefile.in
+++ b/polish/kadu/files/patch-kadu_Makefile.in
@@ -1,5 +1,5 @@
---- kadu/Makefile.in.orig	Fri Nov 10 20:16:44 2006
-+++ kadu/Makefile.in	Fri Feb  9 19:59:29 2007
+--- kadu-core/Makefile.in.orig	Fri Nov 10 20:16:44 2006
++++ kadu-core/Makefile.in	Fri Feb  9 19:59:29 2007
 @@ -880,7 +880,8 @@
  install-data-local:
  #	$(mkinstalldirs) "$(DESTDIR)/$(includedir)/kadu/"
diff --git a/polish/kadu/pkg-plist b/polish/kadu/pkg-plist
index 5cdb00452b1c..9728e08d603c 100644
--- a/polish/kadu/pkg-plist
+++ b/polish/kadu/pkg-plist
@@ -3,27 +3,30 @@ bin/kadu-config
 bin/kadu-mozilla
 include/kadu/about.h
 include/kadu/action.h
-include/kadu/chat.h
-include/kadu/chat_colors.h
+include/kadu/activate.h
 include/kadu/chat_manager.h
-include/kadu/chat_manager_slots.h
 include/kadu/chat_message.h
-include/kadu/chat_styles.h
+include/kadu/chat_messages_view.h
+include/kadu/chat_widget.h
+include/kadu/chat_window.h
+include/kadu/color_button.h
 include/kadu/color_selector.h
-include/kadu/config_dialog.h
 include/kadu/config_file.h
+include/kadu/configuration_aware_object.h
+include/kadu/configuration_window.h
+include/kadu/configuration_window_widgets.h
 include/kadu/custom_input.h
 include/kadu/debug.h
 include/kadu/dnshandler.h
 include/kadu/dockarea.h
+include/kadu/drag_simple.h
 include/kadu/emoticons.h
 include/kadu/expimp.h
 include/kadu/gadu-private.h
 include/kadu/gadu.h
 include/kadu/gadu_images_manager.h
-include/kadu/gadu_rich_text.h
 include/kadu/groups_manager.h
-include/kadu/history.h
+include/kadu/hot_key.h
 include/kadu/html_document.h
 include/kadu/http_client.h
 include/kadu/icons_manager.h
@@ -33,27 +36,42 @@ include/kadu/kadu.h
 include/kadu/kadu_parser.h
 include/kadu/kadu_splitter.h
 include/kadu/kadu_text_browser.h
+include/kadu/main_configuration_window.h
 include/kadu/message_box.h
 include/kadu/misc.h
 include/kadu/modules.h
 include/kadu/modules/account_management.h
-include/kadu/modules/addons.h
+include/kadu/modules/advanced_userlist.h
 include/kadu/modules/autoaway.h
 include/kadu/modules/autoresponder.h
 include/kadu/modules/change_password.h
+include/kadu/modules/connection_error_notification.h
 include/kadu/modules/dcc.h
+include/kadu/modules/dcc_handler.h
+include/kadu/modules/dcc_socket.h
 include/kadu/modules/default_sms.h
 include/kadu/modules/docking.h
 include/kadu/modules/dsp_sound.h
 include/kadu/modules/encryption.h
+include/kadu/modules/exec_notify.h
 include/kadu/modules/file_transfer.h
+include/kadu/modules/file_transfer_manager.h
+include/kadu/modules/file_transfer_notifications.h
+include/kadu/modules/file_transfer_window.h
 include/kadu/modules/hint.h
 include/kadu/modules/hint_manager.h
-include/kadu/modules/hint_manager_slots.h
+include/kadu/modules/hints_configuration_widget.h
+include/kadu/modules/history.h
+include/kadu/modules/history_dialog.h
+include/kadu/modules/history_module.h
+include/kadu/modules/history_search_dialog.h
+include/kadu/modules/keys_manager.h
 include/kadu/modules/migration.h
+include/kadu/modules/new_message_notification.h
+include/kadu/modules/notification.h
 include/kadu/modules/notify.h
-include/kadu/modules/notify_slots.h
 include/kadu/modules/player_external.h
+include/kadu/modules/protocol_notification.h
 include/kadu/modules/register.h
 include/kadu/modules/remind_password.h
 include/kadu/modules/simlite.h
@@ -61,17 +79,24 @@ include/kadu/modules/sms.h
 include/kadu/modules/sound.h
 include/kadu/modules/sound_file.h
 include/kadu/modules/sound_slots.h
+include/kadu/modules/status_changed_notification.h
 include/kadu/modules/unregister.h
 include/kadu/modules/voice.h
 include/kadu/modules/window_notify.h
 include/kadu/modules/wizard.h
 include/kadu/modules/x11_docking.h
+include/kadu/path_list_edit.h
 include/kadu/pending_msgs.h
 include/kadu/personal_info.h
+include/kadu/preview.h
 include/kadu/protocol.h
 include/kadu/protocols_manager.h
 include/kadu/search.h
+include/kadu/select_file.h
+include/kadu/select_font.h
 include/kadu/status.h
+include/kadu/status_changer.h
+include/kadu/syntax_editor.h
 include/kadu/tabbar.h
 include/kadu/themes.h
 include/kadu/toolbar.h
@@ -84,6 +109,7 @@ include/kadu/userlist-private.h
 include/kadu/userlist.h
 include/kadu/userlistelement.h
 lib/kadu/modules/account_management.so
+lib/kadu/modules/advanced_userlist.so
 lib/kadu/modules/autoaway.so
 lib/kadu/modules/autoresponder.so
 lib/kadu/modules/config_wizard.so
@@ -91,8 +117,10 @@ lib/kadu/modules/dcc.so
 lib/kadu/modules/default_sms.so
 lib/kadu/modules/dsp_sound.so
 lib/kadu/modules/encryption.so
+lib/kadu/modules/exec_notify.so
 lib/kadu/modules/ext_sound.so
 lib/kadu/modules/hints.so
+lib/kadu/modules/history.so
 lib/kadu/modules/migration.so
 lib/kadu/modules/sms.so
 lib/kadu/modules/voice.so
@@ -104,10 +132,30 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/HISTORY
 %%DATADIR%%/README
 %%DATADIR%%/THANKS
+%%DATADIR%%/configuration/dialog-look-chat-advanced.ui
+%%DATADIR%%/configuration/dialog.ui
 %%DATADIR%%/modules/account_management.desc
+%%DATADIR%%/modules/advanced_userlist.desc
 %%DATADIR%%/modules/autoaway.desc
 %%DATADIR%%/modules/autoresponder.desc
 %%DATADIR%%/modules/config_wizard.desc
+%%DATADIR%%/modules/configuration/advanced_userlist.ui
+%%DATADIR%%/modules/configuration/autoaway.ui
+%%DATADIR%%/modules/configuration/autoresponder.ui
+%%DATADIR%%/modules/configuration/dcc.ui
+%%DATADIR%%/modules/configuration/default_sms.ui
+%%DATADIR%%/modules/configuration/docking.ui
+%%DATADIR%%/modules/configuration/dsp_sound.ui
+%%DATADIR%%/modules/configuration/encryption.ui
+%%DATADIR%%/modules/configuration/ext_sound.ui
+%%DATADIR%%/modules/configuration/hints.ui
+%%DATADIR%%/modules/configuration/history.ui
+%%DATADIR%%/modules/configuration/notify.ui
+%%DATADIR%%/modules/configuration/sms.ui
+%%DATADIR%%/modules/configuration/sound.ui
+%%ASPELL_MOD%%%%DATADIR%%/modules/configuration/spellchecker.ui
+%%TABS_MOD%%%%DATADIR%%/modules/configuration/tabs.ui
+%%DATADIR%%/modules/configuration/voice.ui
 %%DATADIR%%/modules/data/config_wizard/joi/brak.jpg
 %%DATADIR%%/modules/data/config_wizard/ronk2/Blocking.png
 %%DATADIR%%/modules/data/config_wizard/ronk2/Busy (d.).png
@@ -127,8 +175,10 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/docking.desc
 %%DATADIR%%/modules/dsp_sound.desc
 %%DATADIR%%/modules/encryption.desc
+%%DATADIR%%/modules/exec_notify.desc
 %%DATADIR%%/modules/ext_sound.desc
 %%DATADIR%%/modules/hints.desc
+%%DATADIR%%/modules/history.desc
 %%DATADIR%%/modules/migration.desc
 %%DATADIR%%/modules/notify.desc
 %%DATADIR%%/modules/sms.desc
@@ -137,6 +187,10 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/translations/account_management_fr.qm
 %%DATADIR%%/modules/translations/account_management_it.qm
 %%DATADIR%%/modules/translations/account_management_pl.qm
+%%DATADIR%%/modules/translations/advanced_userlist_de.qm
+%%DATADIR%%/modules/translations/advanced_userlist_fr.qm
+%%DATADIR%%/modules/translations/advanced_userlist_it.qm
+%%DATADIR%%/modules/translations/advanced_userlist_pl.qm
 %%DATADIR%%/modules/translations/autoaway_de.qm
 %%DATADIR%%/modules/translations/autoaway_fr.qm
 %%DATADIR%%/modules/translations/autoaway_it.qm
@@ -169,6 +223,10 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/translations/encryption_fr.qm
 %%DATADIR%%/modules/translations/encryption_it.qm
 %%DATADIR%%/modules/translations/encryption_pl.qm
+%%DATADIR%%/modules/translations/exec_notify_de.qm
+%%DATADIR%%/modules/translations/exec_notify_fr.qm
+%%DATADIR%%/modules/translations/exec_notify_it.qm
+%%DATADIR%%/modules/translations/exec_notify_pl.qm
 %%DATADIR%%/modules/translations/ext_sound_de.qm
 %%DATADIR%%/modules/translations/ext_sound_fr.qm
 %%DATADIR%%/modules/translations/ext_sound_it.qm
@@ -177,6 +235,10 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/translations/hints_fr.qm
 %%DATADIR%%/modules/translations/hints_it.qm
 %%DATADIR%%/modules/translations/hints_pl.qm
+%%DATADIR%%/modules/translations/history_de.qm
+%%DATADIR%%/modules/translations/history_fr.qm
+%%DATADIR%%/modules/translations/history_it.qm
+%%DATADIR%%/modules/translations/history_pl.qm
 %%DATADIR%%/modules/translations/migration_de.qm
 %%DATADIR%%/modules/translations/migration_fr.qm
 %%DATADIR%%/modules/translations/migration_it.qm
@@ -208,6 +270,189 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/modules/voice.desc
 %%DATADIR%%/modules/window_notify.desc
 %%DATADIR%%/modules/x11_docking.desc
+%%DATADIR%%/syntax/chat/cheester.syntax
+%%DATADIR%%/syntax/chat/filozof.syntax
+%%DATADIR%%/syntax/chat/fuku.syntax
+%%DATADIR%%/syntax/chat/hapi.syntax
+%%DATADIR%%/syntax/chat/irc.syntax
+%%DATADIR%%/syntax/chat/kadu.syntax
+%%DATADIR%%/syntax/infopanel/Arvenil.syntax
+%%DATADIR%%/syntax/infopanel/abaddon.syntax
+%%DATADIR%%/syntax/infopanel/ciuciu.syntax
+%%DATADIR%%/syntax/infopanel/default.syntax
+%%DATADIR%%/syntax/infopanel/dorr.syntax
+%%DATADIR%%/syntax/infopanel/maz.syntax
+%%DATADIR%%/syntax/infopanel/ronk.syntax
+%%DATADIR%%/themes/icons/default/HOWTO
+%%DATADIR%%/themes/icons/default/README
+%%DATADIR%%/themes/icons/default/external_modules/module_agent.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mail.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-button.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-button_dis.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer.png
+%%DATADIR%%/themes/icons/default/external_modules/module_profiles-configure.png
+%%DATADIR%%/themes/icons/default/external_modules/module_profiles-user.png
+%%DATADIR%%/themes/icons/default/external_modules/module_profiles.png
+%%DATADIR%%/themes/icons/default/external_modules/module_screenshot-shot.png
+%%DATADIR%%/themes/icons/default/external_modules/module_screenshot-shot_dis.png
+%%DATADIR%%/themes/icons/default/external_modules/module_screenshot.png
+%%DATADIR%%/themes/icons/default/external_modules/module_tabs-close.png
+%%DATADIR%%/themes/icons/default/external_modules/module_tabs-detach.png
+%%DATADIR%%/themes/icons/default/external_modules/module_tabs-detach_dis.png
+%%DATADIR%%/themes/icons/default/external_modules/module_tabs-remove.png
+%%DATADIR%%/themes/icons/default/external_modules/module_weather-show.png
+%%DATADIR%%/themes/icons/default/external_modules/module_weather.png
+%%DATADIR%%/themes/icons/default/external_modules/module_xosd.png
+%%DATADIR%%/themes/icons/default/icons.conf
+%%DATADIR%%/themes/icons/default/kadu/application-exit.png
+%%DATADIR%%/themes/icons/default/kadu/audio-input-microphone.png
+%%DATADIR%%/themes/icons/default/kadu/audio-volume-high.png
+%%DATADIR%%/themes/icons/default/kadu/audio-volume-muted.png
+%%DATADIR%%/themes/icons/default/kadu/configure.png
+%%DATADIR%%/themes/icons/default/kadu/configure_big.png
+%%DATADIR%%/themes/icons/default/kadu/contact-new.png
+%%DATADIR%%/themes/icons/default/kadu/contact-new_big.png
+%%DATADIR%%/themes/icons/default/kadu/contact-new_dis.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-apply.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-cancel.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-cancel_dis.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-error.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-error_big.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-information.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-ok.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-password.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-password_big.png
+%%DATADIR%%/themes/icons/default/kadu/dialog-warning.png
+%%DATADIR%%/themes/icons/default/kadu/document-open.png
+%%DATADIR%%/themes/icons/default/kadu/document-open_dis.png
+%%DATADIR%%/themes/icons/default/kadu/document-save.png
+%%DATADIR%%/themes/icons/default/kadu/document-save_dis.png
+%%DATADIR%%/themes/icons/default/kadu/edit-clear.png
+%%DATADIR%%/themes/icons/default/kadu/edit-clear_dis.png
+%%DATADIR%%/themes/icons/default/kadu/edit-copy.png
+%%DATADIR%%/themes/icons/default/kadu/edit-delete.png
+%%DATADIR%%/themes/icons/default/kadu/edit-find.png
+%%DATADIR%%/themes/icons/default/kadu/edit-find_dis.png
+%%DATADIR%%/themes/icons/default/kadu/edit.png
+%%DATADIR%%/themes/icons/default/kadu/edit_big.png
+%%DATADIR%%/themes/icons/default/kadu/edit_dis.png
+%%DATADIR%%/themes/icons/default/kadu/face-smile.png
+%%DATADIR%%/themes/icons/default/kadu/face-smile_dis.png
+%%DATADIR%%/themes/icons/default/kadu/format-text-bold.png
+%%DATADIR%%/themes/icons/default/kadu/format-text-bold_dis.png
+%%DATADIR%%/themes/icons/default/kadu/format-text-italic.png
+%%DATADIR%%/themes/icons/default/kadu/format-text-italic_dis.png
+%%DATADIR%%/themes/icons/default/kadu/format-text-underline.png
+%%DATADIR%%/themes/icons/default/kadu/format-text-underline_dis.png
+%%DATADIR%%/themes/icons/default/kadu/go-bottom.png
+%%DATADIR%%/themes/icons/default/kadu/go-jump.png
+%%DATADIR%%/themes/icons/default/kadu/go-next.png
+%%DATADIR%%/themes/icons/default/kadu/go-next_dis.png
+%%DATADIR%%/themes/icons/default/kadu/go-previous.png
+%%DATADIR%%/themes/icons/default/kadu/help-about-kadu.png
+%%DATADIR%%/themes/icons/default/kadu/help-about-kadu_big.png
+%%DATADIR%%/themes/icons/default/kadu/help-contents.png
+%%DATADIR%%/themes/icons/default/kadu/history-clear.png
+%%DATADIR%%/themes/icons/default/kadu/history.png
+%%DATADIR%%/themes/icons/default/kadu/history_dis.png
+%%DATADIR%%/themes/icons/default/kadu/identity.png
+%%DATADIR%%/themes/icons/default/kadu/identity_big.png
+%%DATADIR%%/themes/icons/default/kadu/image-loading.png
+%%DATADIR%%/themes/icons/default/kadu/insert-image.png
+%%DATADIR%%/themes/icons/default/kadu/insert-image_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-blocking.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-blocking_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-chat.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-chat_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-chat_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-colors.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-colors_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-contacts.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-copypersonal.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-decrypted.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-decrypted_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-descriptions_off.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-descriptions_off_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-descriptions_on.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-descriptions_on_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-email.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-encrypted.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-encrypted_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-encrypted_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-enter.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-enter_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-eraser.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-eraser_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-exporttofile.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-exporttofile_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-exportuserlist.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-exportuserlist_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-impexp.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-impexp_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-importfromfile.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-importuserlist.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-importuserlist_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-kadu.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-look.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-manageignored.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-manageignored_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-manageignored_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-message.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-message_anim.gif
+%%DATADIR%%/themes/icons/default/kadu/kadu-modmanager.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-modmanager_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-notifications.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-notifyaboutuser.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-onoff_onlineandd.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-onoff_onlineandd_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-onoff_onlineandd_off.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-onoff_onlineandd_off_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-registeraccount.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-registeraccount_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-remindpassword.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-remindpassword_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-saveuserlist.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-shortcuts.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-showdescriptionusers.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-showdescriptionusers_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-showdescriptionusers_off.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-showdescriptionusers_off_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-showoffliners.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-showoffliners_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-showoffliners_off.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-showoffliners_off_dis.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-status.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-transfer_receive.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-transfer_send.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-transfers.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-unregisteraccount.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-unregisteraccount_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-wizard.png
+%%DATADIR%%/themes/icons/default/kadu/list-add.png
+%%DATADIR%%/themes/icons/default/kadu/list-remove.png
+%%DATADIR%%/themes/icons/default/kadu/list-remove_dis.png
+%%DATADIR%%/themes/icons/default/kadu/mail-attachment.png
+%%DATADIR%%/themes/icons/default/kadu/mail-attachment_dis.png
+%%DATADIR%%/themes/icons/default/kadu/phone.png
+%%DATADIR%%/themes/icons/default/kadu/phone_big.png
+%%DATADIR%%/themes/icons/default/kadu/view-refresh.png
+%%DATADIR%%/themes/icons/default/kadu/view-refresh_dis.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-away.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-away_d.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-away_d_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-away_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-invisible.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-invisible_d.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-invisible_d_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-invisible_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-offline.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-offline_d.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-offline_d_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-offline_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-online.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-online_d.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-online_d_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-online_m.png
 %%GG_EMOTS%%%%DATADIR%%/themes/emoticons/gg6_compatible/1/8P.gif
 %%GG_EMOTS%%%%DATADIR%%/themes/emoticons/gg6_compatible/1/8P_na.gif
 %%GG_EMOTS%%%%DATADIR%%/themes/emoticons/gg6_compatible/1/beksa.gif
@@ -884,105 +1129,6 @@ lib/kadu/modules/x11_docking.so
 %%DATADIR%%/themes/emoticons/penguins/zly.gif
 %%DATADIR%%/themes/emoticons/penguins/zmeczony.gif
 %%DATADIR%%/themes/emoticons/penguins/zniesmaczony.gif
-%%DATADIR%%/themes/icons/default/abouticon.png
-%%DATADIR%%/themes/icons/default/abouticon16.png
-%%DATADIR%%/themes/icons/default/add.png
-%%DATADIR%%/themes/icons/default/adduser.png
-%%DATADIR%%/themes/icons/default/autoresponder.png
-%%DATADIR%%/themes/icons/default/back.png
-%%DATADIR%%/themes/icons/default/blocking.png
-%%DATADIR%%/themes/icons/default/busy.png
-%%DATADIR%%/themes/icons/default/busy_d.png
-%%DATADIR%%/themes/icons/default/busy_d_m.png
-%%DATADIR%%/themes/icons/default/busy_m.png
-%%DATADIR%%/themes/icons/default/chat.png
-%%DATADIR%%/themes/icons/default/chat16.png
-%%DATADIR%%/themes/icons/default/configure.png
-%%DATADIR%%/themes/icons/default/connect_creating.png
-%%DATADIR%%/themes/icons/default/decrypted.png
-%%DATADIR%%/themes/icons/default/deluser.png
-%%DATADIR%%/themes/icons/default/deluserlist.png
-%%DATADIR%%/themes/icons/default/emoticon.png
-%%DATADIR%%/themes/icons/default/encrypted.png
-%%DATADIR%%/themes/icons/default/erasechat.png
-%%DATADIR%%/themes/icons/default/erasehistory.png
-%%DATADIR%%/themes/icons/default/eraser.png
-%%DATADIR%%/themes/icons/default/exit.png
-%%DATADIR%%/themes/icons/default/exporttofile.png
-%%DATADIR%%/themes/icons/default/exportuserlist.png
-%%DATADIR%%/themes/icons/default/fileopen.png
-%%DATADIR%%/themes/icons/default/filesave.png
-%%DATADIR%%/themes/icons/default/forward.png
-%%DATADIR%%/themes/icons/default/generals.png
-%%DATADIR%%/themes/icons/default/help.png
-%%DATADIR%%/themes/icons/default/hide.png
-%%DATADIR%%/themes/icons/default/hints.png
-%%DATADIR%%/themes/icons/default/history.png
-%%DATADIR%%/themes/icons/default/history_1.png
-%%DATADIR%%/themes/icons/default/icons.conf
-%%DATADIR%%/themes/icons/default/icons.png
-%%DATADIR%%/themes/icons/default/identity.png
-%%DATADIR%%/themes/icons/default/impexpicon.png
-%%DATADIR%%/themes/icons/default/impexpicon16.png
-%%DATADIR%%/themes/icons/default/importfromfile.png
-%%DATADIR%%/themes/icons/default/importuserlist.png
-%%DATADIR%%/themes/icons/default/invisible.png
-%%DATADIR%%/themes/icons/default/invisible_d.png
-%%DATADIR%%/themes/icons/default/invisible_d_m.png
-%%DATADIR%%/themes/icons/default/invisible_m.png
-%%DATADIR%%/themes/icons/default/kadu.png
-%%DATADIR%%/themes/icons/default/key_enter.png
-%%DATADIR%%/themes/icons/default/language.png
-%%DATADIR%%/themes/icons/default/loading.png
-%%DATADIR%%/themes/icons/default/look.png
-%%DATADIR%%/themes/icons/default/mail.png
-%%DATADIR%%/themes/icons/default/mail_generic.png
-%%DATADIR%%/themes/icons/default/manageignored.png
-%%DATADIR%%/themes/icons/default/manageignored16.png
-%%DATADIR%%/themes/icons/default/manusricon.png
-%%DATADIR%%/themes/icons/default/mergeuserlist.png
-%%DATADIR%%/themes/icons/default/message.png
-%%DATADIR%%/themes/icons/default/message_anim.gif
-%%DATADIR%%/themes/icons/default/mobile.png
-%%DATADIR%%/themes/icons/default/modmanager.png
-%%DATADIR%%/themes/icons/default/msgbox_warning.png
-%%DATADIR%%/themes/icons/default/mute.png
-%%DATADIR%%/themes/icons/default/network.png
-%%DATADIR%%/themes/icons/default/newuser.png
-%%DATADIR%%/themes/icons/default/notify.png
-%%DATADIR%%/themes/icons/default/offline.png
-%%DATADIR%%/themes/icons/default/offline_d.png
-%%DATADIR%%/themes/icons/default/offline_d_m.png
-%%DATADIR%%/themes/icons/default/offline_m.png
-%%DATADIR%%/themes/icons/default/online.png
-%%DATADIR%%/themes/icons/default/online_d.png
-%%DATADIR%%/themes/icons/default/online_d_m.png
-%%DATADIR%%/themes/icons/default/online_m.png
-%%DATADIR%%/themes/icons/default/pass-mail.png
-%%DATADIR%%/themes/icons/default/password.png
-%%DATADIR%%/themes/icons/default/password16.png
-%%DATADIR%%/themes/icons/default/personalinfo.png
-%%DATADIR%%/themes/icons/default/registeraccount.png
-%%DATADIR%%/themes/icons/default/reload.png
-%%DATADIR%%/themes/icons/default/reload2.png
-%%DATADIR%%/themes/icons/default/remind-pass.png
-%%DATADIR%%/themes/icons/default/saveuserlist.png
-%%DATADIR%%/themes/icons/default/scroll_lock.png
-%%DATADIR%%/themes/icons/default/selectpath.png
-%%DATADIR%%/themes/icons/default/share.png
-%%DATADIR%%/themes/icons/default/shortcuts.png
-%%DATADIR%%/themes/icons/default/sms.png
-%%DATADIR%%/themes/icons/default/sounds.png
-%%DATADIR%%/themes/icons/default/speech.png
-%%DATADIR%%/themes/icons/default/stop.png
-%%DATADIR%%/themes/icons/default/unmute.png
-%%DATADIR%%/themes/icons/default/unregisteraccount.png
-%%DATADIR%%/themes/icons/default/viewmag.png
-%%DATADIR%%/themes/icons/default/voice.png
-%%DATADIR%%/themes/icons/default/weather.png
-%%DATADIR%%/themes/icons/default/weather16.png
-%%DATADIR%%/themes/icons/default/wizard.png
-%%DATADIR%%/themes/icons/default/xmms.png
 %%DATADIR%%/themes/sounds/default/msg.wav
 %%DATADIR%%/themes/sounds/default/sound.conf
 %%DATADIR%%/translations/kadu_de.qm
@@ -1019,7 +1165,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%TABS_MOD%%include/kadu/modules/tabwidget.h
 %%TABS_MOD%%lib/kadu/modules/tabs.so
 %%TABS_MOD%%share/kadu/modules/translations/tabs_pl.qm
-%%TABS_MOD%%share/kadu/modules/data/tabs/attach.png
 %%TABS_MOD%%share/kadu/modules/tabs.desc
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
@@ -1041,6 +1186,10 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%/themes/sounds/default
 @dirrm %%DATADIR%%/themes/sounds
+@dirrm %%DATADIR%%/themes/icons/default/protocols/gg
+@dirrm %%DATADIR%%/themes/icons/default/protocols
+@dirrm %%DATADIR%%/themes/icons/default/kadu
+@dirrm %%DATADIR%%/themes/icons/default/external_modules
 @dirrm %%DATADIR%%/themes/icons/default
 @dirrm %%DATADIR%%/themes/icons
 @dirrm %%DATADIR%%/themes/emoticons/penguins
@@ -1050,14 +1199,18 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%GG_EMOTS%%@dirrm %%DATADIR%%/themes/emoticons/gg6_compatible
 @dirrm %%DATADIR%%/themes/emoticons
 @dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/syntax/infopanel
+@dirrm %%DATADIR%%/syntax/chat
+@dirrm %%DATADIR%%/syntax
 @dirrm %%DATADIR%%/modules/translations
 @dirrm %%DATADIR%%/modules/data/config_wizard/ronk2
 @dirrm %%DATADIR%%/modules/data/config_wizard/joi
 @dirrm %%DATADIR%%/modules/data/config_wizard
 %%ASPELL_MOD%%@dirrm %%DATADIR%%/modules/data/spellchecker
-%%TABS_MOD%%@dirrm %%DATADIR%%/modules/data/tabs
 @dirrm %%DATADIR%%/modules/data
+@dirrm %%DATADIR%%/modules/configuration
 @dirrm %%DATADIR%%/modules
+@dirrm %%DATADIR%%/configuration
 @dirrm %%DATADIR%%
 @dirrm lib/kadu/modules/bin
 @dirrm lib/kadu/modules