3 files changed, 114 insertions, 52 deletions

diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index 98e674d981c7..d6fd985cd052 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kadu
-PORTVERSION=	0.11.3
-PORTREVISION=	2
+PORTVERSION=	0.12.0
 PORTEPOCH=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \
diff --git a/polish/kadu/distinfo b/polish/kadu/distinfo
index 2c08c821c557..b46336528214 100644
--- a/polish/kadu/distinfo
+++ b/polish/kadu/distinfo
@@ -1,5 +1,5 @@
-SHA256 (kadu/kadu-0.11.3.tar.bz2) = 3170f9f620907bfc75a4f02ae598e69e68e7f137392a0c7c074fd41ca2eb267f
-SIZE (kadu/kadu-0.11.3.tar.bz2) = 5836503
+SHA256 (kadu/kadu-0.12.0.tar.bz2) = 7de16df61f7900a7e6569cf4a2eaf20d11177bde430c2db2b25f591714f4c27e
+SIZE (kadu/kadu-0.12.0.tar.bz2) = 5914017
 SHA256 (kadu/kompatybilne_z_GG6.tar.gz) = f8a84acd8512fd8fc38e394aa564e6b6d7ec2e9fe9864bdf0c5b8f2edb23da6f
 SIZE (kadu/kompatybilne_z_GG6.tar.gz) = 254637
 SHA256 (kadu/dodatkowe_emoty_GG7.tar.gz) = aebeb45b6ac9139620032436f7b565aa5729a0165d1c361a473c1195b8807450
diff --git a/polish/kadu/pkg-plist b/polish/kadu/pkg-plist
index 17448e57443c..2f8607d7bd24 100644
--- a/polish/kadu/pkg-plist
+++ b/polish/kadu/pkg-plist
@@ -21,7 +21,6 @@ include/kadu/kadu-core/aware-object.h
 include/kadu/kadu-core/buddies/buddy-additional-data-delete-handler-manager.h
 include/kadu/kadu-core/buddies/buddy-additional-data-delete-handler.h
 include/kadu/kadu-core/buddies/buddy-gender.h
-include/kadu/kadu-core/buddies/buddy-kadu-data.h
 include/kadu/kadu-core/buddies/buddy-list-mime-data-helper.h
 include/kadu/kadu-core/buddies/buddy-list.h
 include/kadu/kadu-core/buddies/buddy-manager.h
@@ -33,18 +32,17 @@ include/kadu/kadu-core/buddies/buddy.h
 include/kadu/kadu-core/buddies/group-manager.h
 include/kadu/kadu-core/buddies/group-shared.h
 include/kadu/kadu-core/buddies/group.h
-include/kadu/kadu-core/buddies/model/buddies-model-base.h
-include/kadu/kadu-core/buddies/model/buddies-model.h
 include/kadu/kadu-core/buddies/model/buddy-data-extractor.h
 include/kadu/kadu-core/buddies/model/buddy-list-model.h
+include/kadu/kadu-core/buddies/model/buddy-manager-adapter.h
 include/kadu/kadu-core/buddies/model/checkable-buddies-proxy-model.h
 include/kadu/kadu-core/buddies/model/groups-model.h
-include/kadu/kadu-core/chat/aggregate-chat-manager.h
-include/kadu/kadu-core/chat/chat-details-aggregate.h
-include/kadu/kadu-core/chat/chat-details-conference.h
-include/kadu/kadu-core/chat/chat-details-simple.h
+include/kadu/kadu-core/chat/buddy-chat-manager.h
+include/kadu/kadu-core/chat/chat-details-buddy.h
+include/kadu/kadu-core/chat/chat-details-contact-set.h
+include/kadu/kadu-core/chat/chat-details-contact.h
+include/kadu/kadu-core/chat/chat-details-room.h
 include/kadu/kadu-core/chat/chat-details.h
-include/kadu/kadu-core/chat/chat-geometry-data.h
 include/kadu/kadu-core/chat/chat-list-mime-data-helper.h
 include/kadu/kadu-core/chat/chat-manager.h
 include/kadu/kadu-core/chat/chat-shared.h
@@ -52,14 +50,16 @@ include/kadu/kadu-core/chat/chat-styles-manager.h
 include/kadu/kadu-core/chat/chat.h
 include/kadu/kadu-core/chat/html-messages-renderer.h
 include/kadu/kadu-core/chat/model/chat-data-extractor.h
-include/kadu/kadu-core/chat/model/chats-model.h
+include/kadu/kadu-core/chat/model/chat-list-model.h
+include/kadu/kadu-core/chat/model/chat-manager-adapter.h
 include/kadu/kadu-core/chat/recent-chat-manager.h
 include/kadu/kadu-core/chat/style-engines/chat-style-engine.h
-include/kadu/kadu-core/chat/type/chat-type-aggregate.h
 include/kadu/kadu-core/chat/type/chat-type-aware-object.h
-include/kadu/kadu-core/chat/type/chat-type-conference.h
+include/kadu/kadu-core/chat/type/chat-type-buddy.h
+include/kadu/kadu-core/chat/type/chat-type-contact-set.h
+include/kadu/kadu-core/chat/type/chat-type-contact.h
 include/kadu/kadu-core/chat/type/chat-type-manager.h
-include/kadu/kadu-core/chat/type/chat-type-simple.h
+include/kadu/kadu-core/chat/type/chat-type-room.h
 include/kadu/kadu-core/chat/type/chat-type.h
 include/kadu/kadu-core/configuration/chat-configuration-holder.h
 include/kadu/kadu-core/configuration/config-file-data-manager.h
@@ -80,8 +80,10 @@ include/kadu/kadu-core/contacts/contact-set.h
 include/kadu/kadu-core/contacts/contact-shared.h
 include/kadu/kadu-core/contacts/contact.h
 include/kadu/kadu-core/contacts/model/buddy-contact-model.h
+include/kadu/kadu-core/contacts/model/chat-adapter.h
 include/kadu/kadu-core/contacts/model/contact-data-extractor.h
 include/kadu/kadu-core/contacts/model/contact-list-model.h
+include/kadu/kadu-core/core/adapter.h
 include/kadu/kadu-core/core/core-actions.h
 include/kadu/kadu-core/core/core.h
 include/kadu/kadu-core/core/crash-aware-object.h
@@ -108,12 +110,14 @@ include/kadu/kadu-core/gui/actions/actions.h
 include/kadu/kadu-core/gui/actions/base-action-context.h
 include/kadu/kadu-core/gui/actions/change-status-action.h
 include/kadu/kadu-core/gui/actions/chat/add-conference-action.h
+include/kadu/kadu-core/gui/actions/chat/add-room-chat-action.h
 include/kadu/kadu-core/gui/actions/chat/leave-chat-action.h
 include/kadu/kadu-core/gui/actions/default-proxy-action.h
 include/kadu/kadu-core/gui/actions/delete-talkable-action.h
 include/kadu/kadu-core/gui/actions/edit-talkable-action.h
 include/kadu/kadu-core/gui/hot-key.h
 include/kadu/kadu-core/gui/status-icon.h
+include/kadu/kadu-core/gui/web-view-highlighter.h
 include/kadu/kadu-core/gui/widgets/abstract-tool-tip.h
 include/kadu/kadu-core/gui/widgets/account-add-widget.h
 include/kadu/kadu-core/gui/widgets/account-avatar-widget.h
@@ -132,9 +136,14 @@ include/kadu/kadu-core/gui/widgets/buddy-groups-configuration-widget.h
 include/kadu/kadu-core/gui/widgets/buddy-info-panel.h
 include/kadu/kadu-core/gui/widgets/buddy-options-configuration-widget.h
 include/kadu/kadu-core/gui/widgets/buddy-personal-info-configuration-widget.h
+include/kadu/kadu-core/gui/widgets/categorized-list-view-painter.h
+include/kadu/kadu-core/gui/widgets/categorized-list-view.h
+include/kadu/kadu-core/gui/widgets/categorized-view-painter.h
 include/kadu/kadu-core/gui/widgets/chat-edit-box-size-manager.h
 include/kadu/kadu-core/gui/widgets/chat-edit-box.h
+include/kadu/kadu-core/gui/widgets/chat-edit-widget.h
 include/kadu/kadu-core/gui/widgets/chat-messages-view.h
+include/kadu/kadu-core/gui/widgets/chat-room-edit-widget.h
 include/kadu/kadu-core/gui/widgets/chat-view-network-access-manager.h
 include/kadu/kadu-core/gui/widgets/chat-widget-actions.h
 include/kadu/kadu-core/gui/widgets/chat-widget-container.h
@@ -187,6 +196,7 @@ include/kadu/kadu-core/gui/widgets/group-list.h
 include/kadu/kadu-core/gui/widgets/group-tab-bar.h
 include/kadu/kadu-core/gui/widgets/groups-combo-box.h
 include/kadu/kadu-core/gui/widgets/identities-combo-box.h
+include/kadu/kadu-core/gui/widgets/kadu-text-edit.h
 include/kadu/kadu-core/gui/widgets/kadu-tree-view-delegate.h
 include/kadu/kadu-core/gui/widgets/kadu-tree-view.h
 include/kadu/kadu-core/gui/widgets/kadu-web-view.h
@@ -195,16 +205,22 @@ include/kadu/kadu-core/gui/widgets/line-edit-with-clear-button.h
 include/kadu/kadu-core/gui/widgets/modal-configuration-widget.h
 include/kadu/kadu-core/gui/widgets/path-edit.h
 include/kadu/kadu-core/gui/widgets/path-list-edit.h
+include/kadu/kadu-core/gui/widgets/plugin-list-widget-item-delegate.h
+include/kadu/kadu-core/gui/widgets/plugin-list-view-delegate-widgets.h
+include/kadu/kadu-core/gui/widgets/plugin-list-view-delegate.h
+include/kadu/kadu-core/gui/widgets/plugin-list-widget.h
+include/kadu/kadu-core/gui/widgets/plugin-selector.h
 include/kadu/kadu-core/gui/widgets/preview.h
 include/kadu/kadu-core/gui/widgets/progress-icon.h
 include/kadu/kadu-core/gui/widgets/progress-label.h
 include/kadu/kadu-core/gui/widgets/protocols-combo-box.h
 include/kadu/kadu-core/gui/widgets/proxy-combo-box.h
 include/kadu/kadu-core/gui/widgets/roster-widget.h
-include/kadu/kadu-core/gui/widgets/select-buddy-combo-box.h
-include/kadu/kadu-core/gui/widgets/select-buddy-popup.h
+include/kadu/kadu-core/gui/widgets/search-bar.h
 include/kadu/kadu-core/gui/widgets/select-file.h
 include/kadu/kadu-core/gui/widgets/select-font.h
+include/kadu/kadu-core/gui/widgets/select-talkable-combo-box.h
+include/kadu/kadu-core/gui/widgets/select-talkable-popup.h
 include/kadu/kadu-core/gui/widgets/status-button.h
 include/kadu/kadu-core/gui/widgets/status-buttons.h
 include/kadu/kadu-core/gui/widgets/status-menu.h
@@ -217,15 +233,18 @@ include/kadu/kadu-core/gui/widgets/talkable-painter.h
 include/kadu/kadu-core/gui/widgets/talkable-tree-view.h
 include/kadu/kadu-core/gui/widgets/tool-tip-class-manager.h
 include/kadu/kadu-core/gui/widgets/toolbar.h
+include/kadu/kadu-core/gui/widgets/wait-overlay.h
+include/kadu/kadu-core/gui/window-manager.h
 include/kadu/kadu-core/gui/windows/about.h
 include/kadu/kadu-core/gui/windows/add-buddy-window.h
 include/kadu/kadu-core/gui/windows/add-conference-window.h
+include/kadu/kadu-core/gui/windows/add-room-chat-window.h
 include/kadu/kadu-core/gui/windows/buddy-data-window-aware-object.h
 include/kadu/kadu-core/gui/windows/buddy-data-window.h
 include/kadu/kadu-core/gui/windows/buddy-delete-window.h
+include/kadu/kadu-core/gui/windows/chat-data-window-aware-object.h
 include/kadu/kadu-core/gui/windows/chat-data-window.h
 include/kadu/kadu-core/gui/windows/chat-window.h
-include/kadu/kadu-core/gui/windows/choose-description.h
 include/kadu/kadu-core/gui/windows/configuration-window.h
 include/kadu/kadu-core/gui/windows/file-transfer-window.h
 include/kadu/kadu-core/gui/windows/group-properties-window.h
@@ -235,7 +254,6 @@ include/kadu/kadu-core/gui/windows/main-configuration-window.h
 include/kadu/kadu-core/gui/windows/main-window.h
 include/kadu/kadu-core/gui/windows/merge-buddies-window.h
 include/kadu/kadu-core/gui/windows/message-dialog.h
-include/kadu/kadu-core/gui/windows/modules-window.h
 include/kadu/kadu-core/gui/windows/multilogon-window.h
 include/kadu/kadu-core/gui/windows/open-chat-with/open-chat-with-contact-list-runner.h
 include/kadu/kadu-core/gui/windows/open-chat-with/open-chat-with-runner-manager.h
@@ -243,14 +261,18 @@ include/kadu/kadu-core/gui/windows/open-chat-with/open-chat-with-runner.h
 include/kadu/kadu-core/gui/windows/open-chat-with/open-chat-with.h
 include/kadu/kadu-core/gui/windows/password-window.h
 include/kadu/kadu-core/gui/windows/plugin-error-dialog.h
+include/kadu/kadu-core/gui/windows/plugins-window.h
 include/kadu/kadu-core/gui/windows/progress-window.h
 include/kadu/kadu-core/gui/windows/progress-window2.h
 include/kadu/kadu-core/gui/windows/proxy-action-context.h
 include/kadu/kadu-core/gui/windows/proxy-edit-window.h
 include/kadu/kadu-core/gui/windows/search-window-actions.h
 include/kadu/kadu-core/gui/windows/search-window.h
+include/kadu/kadu-core/gui/windows/status-window-description-proxy-model.h
+include/kadu/kadu-core/gui/windows/status-window.h
 include/kadu/kadu-core/gui/windows/subscription-window.h
 include/kadu/kadu-core/gui/windows/syntax-editor-window.h
+include/kadu/kadu-core/gui/windows/token-window.h
 include/kadu/kadu-core/gui/windows/updates-dialog.h
 include/kadu/kadu-core/gui/windows/window-notifier-window.h
 include/kadu/kadu-core/gui/windows/your-accounts.h
@@ -271,20 +293,26 @@ include/kadu/kadu-core/message/message-manager.h
 include/kadu/kadu-core/message/message-render-info.h
 include/kadu/kadu-core/message/message-shared.h
 include/kadu/kadu-core/message/message.h
+include/kadu/kadu-core/misc/change-notifier.h
 include/kadu/kadu-core/misc/coding-conversion.h
 include/kadu/kadu-core/misc/date-time-parser-tags.h
 include/kadu/kadu-core/misc/date-time.h
+include/kadu/kadu-core/misc/kadu-paths.h
 include/kadu/kadu-core/misc/misc.h
-include/kadu/kadu-core/misc/path-conversion.h
+include/kadu/kadu-core/misc/string-utils.h
 include/kadu/kadu-core/misc/syntax-list.h
 include/kadu/kadu-core/misc/token-acceptor.h
 include/kadu/kadu-core/misc/token-reader.h
-include/kadu/kadu-core/model/actions-proxy-model.h
+include/kadu/kadu-core/model/action-filter-proxy-model.h
+include/kadu/kadu-core/model/action-list-model.h
+include/kadu/kadu-core/model/categorized-sort-filter-proxy-model.h
 include/kadu/kadu-core/model/kadu-abstract-model.h
+include/kadu/kadu-core/model/kadu-merged-proxy-model.h
 include/kadu/kadu-core/model/merged-proxy-model-factory.h
 include/kadu/kadu-core/model/merged-proxy-model.h
 include/kadu/kadu-core/model/model-chain.h
 include/kadu/kadu-core/model/model-index-list-converter.h
+include/kadu/kadu-core/model/model-watcher.h
 include/kadu/kadu-core/model/roles.h
 include/kadu/kadu-core/multilogon/model/multilogon-model.h
 include/kadu/kadu-core/multilogon/multilogon-session.h
@@ -300,7 +328,6 @@ include/kadu/kadu-core/network/proxy/network-proxy-manager.h
 include/kadu/kadu-core/network/proxy/network-proxy-shared.h
 include/kadu/kadu-core/network/proxy/network-proxy.h
 include/kadu/kadu-core/notify/account-notification.h
-include/kadu/kadu-core/notify/buddy-notify-data.h
 include/kadu/kadu-core/notify/chat-notification.h
 include/kadu/kadu-core/notify/multilogon-notification.h
 include/kadu/kadu-core/notify/new-message-notification.h
@@ -336,8 +363,8 @@ include/kadu/kadu-core/protocols/protocol-factory.h
 include/kadu/kadu-core/protocols/protocol-menu-manager.h
 include/kadu/kadu-core/protocols/protocol-state-machine.h
 include/kadu/kadu-core/protocols/protocol.h
-include/kadu/kadu-core/protocols/protocols-aware-object.h
 include/kadu/kadu-core/protocols/protocols-manager.h
+include/kadu/kadu-core/protocols/roster.h
 include/kadu/kadu-core/protocols/services/avatar-service.h
 include/kadu/kadu-core/protocols/services/chat-image-service.h
 include/kadu/kadu-core/protocols/services/chat-service.h
@@ -347,13 +374,20 @@ include/kadu/kadu-core/protocols/services/contact-personal-info-service.h
 include/kadu/kadu-core/protocols/services/file-transfer-service.h
 include/kadu/kadu-core/protocols/services/multilogon-service.h
 include/kadu/kadu-core/protocols/services/personal-info-service.h
+include/kadu/kadu-core/protocols/services/protocol-service.h
 include/kadu/kadu-core/protocols/services/roster-service.h
 include/kadu/kadu-core/protocols/services/search-service.h
+include/kadu/kadu-core/protocols/services/subscription-service.h
+include/kadu/kadu-core/provider/default-provider.h
+include/kadu/kadu-core/provider/provider.h
+include/kadu/kadu-core/provider/simple-provider.h
 include/kadu/kadu-core/qt/long-validator.h
 include/kadu/kadu-core/status/all-accounts-status-container.h
 include/kadu/kadu-core/status/description-manager.h
 include/kadu/kadu-core/status/description-model.h
 include/kadu/kadu-core/status/status-actions.h
+include/kadu/kadu-core/status/status-adapter.h
+include/kadu/kadu-core/status/status-change-source.h
 include/kadu/kadu-core/status/status-changer-manager.h
 include/kadu/kadu-core/status/status-changer.h
 include/kadu/kadu-core/status/status-container-aware-object.h
@@ -366,10 +400,10 @@ include/kadu/kadu-core/status/status-type-manager.h
 include/kadu/kadu-core/status/status-type.h
 include/kadu/kadu-core/status/status.h
 include/kadu/kadu-core/status/storable-status-container.h
+include/kadu/kadu-core/storage/custom-properties.h
 include/kadu/kadu-core/storage/details.h
 include/kadu/kadu-core/storage/manager-common.h
 include/kadu/kadu-core/storage/manager.h
-include/kadu/kadu-core/storage/module-data.h
 include/kadu/kadu-core/storage/named-storable-object.h
 include/kadu/kadu-core/storage/shared-base.h
 include/kadu/kadu-core/storage/shared.h
@@ -383,9 +417,10 @@ include/kadu/kadu-core/talkable/filter/blocked-talkable-filter.h
 include/kadu/kadu-core/talkable/filter/exclude-buddy-talkable-filter.h
 include/kadu/kadu-core/talkable/filter/group-talkable-filter.h
 include/kadu/kadu-core/talkable/filter/hide-anonymous-talkable-filter.h
+include/kadu/kadu-core/talkable/filter/hide-contact-chats-talkable-filter.h
 include/kadu/kadu-core/talkable/filter/hide-offline-talkable-filter.h
 include/kadu/kadu-core/talkable/filter/hide-offline-without-description-talkable-filter.h
-include/kadu/kadu-core/talkable/filter/hide-simple-chats-talkable-filter.h
+include/kadu/kadu-core/talkable/filter/hide-temporary-talkable-filter.h
 include/kadu/kadu-core/talkable/filter/hide-without-description-talkable-filter.h
 include/kadu/kadu-core/talkable/filter/mobile-talkable-filter.h
 include/kadu/kadu-core/talkable/filter/name-talkable-filter.h
@@ -437,6 +472,7 @@ include/kadu/plugins/gadu_protocol/gadu-protocol-plugin.h
 include/kadu/plugins/gadu_protocol/gadu-protocol.h
 include/kadu/plugins/gadu_protocol/gadu-search-record.h
 include/kadu/plugins/gadu_protocol/gadu-search-result.h
+include/kadu/plugins/gadu_protocol/gadu-status-adapter.h
 include/kadu/plugins/gadu_protocol/gadu-url-handler.h
 include/kadu/plugins/gadu_protocol/gui/widgets/gadu-add-account-widget.h
 include/kadu/plugins/gadu_protocol/gui/widgets/gadu-contact-personal-info-widget.h
@@ -465,7 +501,6 @@ include/kadu/plugins/gadu_protocol/open-chat-with/gadu-open-chat-with-runner.h
 include/kadu/plugins/gadu_protocol/server/gadu-avatar-data-parser.h
 include/kadu/plugins/gadu_protocol/server/gadu-avatar-fetcher.h
 include/kadu/plugins/gadu_protocol/server/gadu-avatar-uploader.h
-include/kadu/plugins/gadu_protocol/server/gadu-contact-list-handler.h
 include/kadu/plugins/gadu_protocol/server/gadu-server-change-password.h
 include/kadu/plugins/gadu_protocol/server/gadu-server-register-account.h
 include/kadu/plugins/gadu_protocol/server/gadu-server-remind-password.h
@@ -482,6 +517,7 @@ include/kadu/plugins/gadu_protocol/services/gadu-contact-personal-info-service.h
 include/kadu/plugins/gadu_protocol/services/gadu-file-transfer-service.h
 include/kadu/plugins/gadu_protocol/services/gadu-multilogon-service.h
 include/kadu/plugins/gadu_protocol/services/gadu-personal-info-service.h
+include/kadu/plugins/gadu_protocol/services/gadu-roster-service.h
 include/kadu/plugins/gadu_protocol/services/gadu-search-service.h
 include/kadu/plugins/gadu_protocol/services/multilogon/gadu-multilogon-session.h
 include/kadu/plugins/gadu_protocol/socket-notifiers/gadu-protocol-socket-notifiers.h
@@ -490,26 +526,30 @@ include/kadu/plugins/gadu_protocol/socket-notifiers/gadu-socket-notifiers.h
 include/kadu/plugins/gadu_protocol/socket-notifiers/gadu-token-socket-notifiers.h
 include/kadu/plugins/history/actions/show-history-action-description.h
 include/kadu/plugins/history/buddy-history-delete-handler.h
+include/kadu/plugins/history/chats-buddies-splitter.h
+include/kadu/plugins/history/gui/history-buddy-data-window-addons.h
+include/kadu/plugins/history/gui/history-chat-data-window-addons.h
+include/kadu/plugins/history/gui/widgets/chat-history-tab.h
+include/kadu/plugins/history/gui/widgets/history-messages-tab.h
+include/kadu/plugins/history/gui/widgets/history-tab.h
+include/kadu/plugins/history/gui/widgets/history-talkable-combo-box.h
+include/kadu/plugins/history/gui/widgets/search-tab.h
+include/kadu/plugins/history/gui/widgets/timeline-chat-messages-view.h
 include/kadu/plugins/history/gui/windows/history-window.h
 include/kadu/plugins/history/history-messages-prepender.h
 include/kadu/plugins/history/history-plugin.h
+include/kadu/plugins/history/history-query-result.h
+include/kadu/plugins/history/history-query.h
 include/kadu/plugins/history/history-save-thread.h
-include/kadu/plugins/history/history-tree-item.h
 include/kadu/plugins/history/history.h
 include/kadu/plugins/history/history_exports.h
-include/kadu/plugins/history/model/buddy-status-dates-model.h
-include/kadu/plugins/history/model/chat-dates-model.h
-include/kadu/plugins/history/model/dates-model-item.h
-include/kadu/plugins/history/model/history-chats-model-proxy.h
-include/kadu/plugins/history/model/history-chats-model.h
-include/kadu/plugins/history/model/history-type.h
-include/kadu/plugins/history/model/sms-dates-model.h
+include/kadu/plugins/history/model/history-query-results-model.h
+include/kadu/plugins/history/model/history-query-results-proxy-model.h
 include/kadu/plugins/history/search/history-search-parameters.h
+include/kadu/plugins/history/storage/history-messages-storage.h
 include/kadu/plugins/history/storage/history-storage.h
-include/kadu/plugins/history/timed-status.h
 include/kadu/plugins/history_migration/gui/windows/history-import-window.h
 include/kadu/plugins/history_migration/history-import-thread.h
-include/kadu/plugins/history_migration/history-importer-chat-data.h
 include/kadu/plugins/history_migration/history-importer-manager.h
 include/kadu/plugins/history_migration/history-importer.h
 include/kadu/plugins/history_migration/history-migration-actions.h
@@ -523,7 +563,6 @@ include/kadu/plugins/jabber_protocol/actions/jabber-actions.h
 include/kadu/plugins/jabber_protocol/actions/jabber-protocol-menu-manager.h
 include/kadu/plugins/jabber_protocol/actions/show-xml-console-action-description.h
 include/kadu/plugins/jabber_protocol/certificates/certificate-display-dialog.h
-include/kadu/plugins/jabber_protocol/certificates/certificate-error-dialog.h
 include/kadu/plugins/jabber_protocol/certificates/certificate-helpers.h
 include/kadu/plugins/jabber_protocol/certificates/trusted-certificates-manager.h
 include/kadu/plugins/jabber_protocol/client/jabber-client.h
@@ -538,6 +577,7 @@ include/kadu/plugins/jabber_protocol/gui/widgets/jabber-contact-personal-info-wi
 include/kadu/plugins/jabber_protocol/gui/widgets/jabber-create-account-widget.h
 include/kadu/plugins/jabber_protocol/gui/widgets/jabber-edit-account-widget.h
 include/kadu/plugins/jabber_protocol/gui/widgets/jabber-personal-info-widget.h
+include/kadu/plugins/jabber_protocol/gui/windows/certificate-error-window.h
 include/kadu/plugins/jabber_protocol/gui/windows/jabber-change-password-window.h
 include/kadu/plugins/jabber_protocol/gui/windows/jabber-wait-for-account-register-window.h
 include/kadu/plugins/jabber_protocol/gui/windows/xml-console.h
@@ -548,6 +588,7 @@ include/kadu/plugins/jabber_protocol/jabber-id-validator.h
 include/kadu/plugins/jabber_protocol/jabber-protocol-factory.h
 include/kadu/plugins/jabber_protocol/jabber-protocol-plugin.h
 include/kadu/plugins/jabber_protocol/jabber-protocol.h
+include/kadu/plugins/jabber_protocol/jabber-status-adapter.h
 include/kadu/plugins/jabber_protocol/jabber-url-handler.h
 include/kadu/plugins/jabber_protocol/open-chat-with/jabber-open-chat-with-runner.h
 include/kadu/plugins/jabber_protocol/resource/jabber-resource-pool.h
@@ -638,6 +679,9 @@ lib/kadu/plugins/libspellchecker.so
 lib/kadu/plugins/libsql_history.so
 lib/kadu/plugins/libtabs.so
 lib/kadu/plugins/libword_fix.so
+sdk/kadu-config.h
+sdk/translations/configuration-ui.xsl
+sdk/translations/plugintsupdate.sh
 share/applications/kadu.desktop
 share/cmake/Modules/FindKadu.cmake
 share/icons/hicolor/16x16/apps/kadu.png
@@ -705,10 +749,10 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%DATADIR%%/plugins/data/mediaplayer/mediaplayer.png
 %%DATADIR%%/plugins/data/mprisplayer_mediaplayer/mprisplayer-players.data
 %%DATADIR%%/plugins/data/sms/scripts/gateway-era.js
-%%DATADIR%%/plugins/data/sms/scripts/gateway-orange-multibox.js
 %%DATADIR%%/plugins/data/sms/scripts/gateway-orange.js
 %%DATADIR%%/plugins/data/sms/scripts/gateway-plus.js
 %%DATADIR%%/plugins/data/sms/scripts/gateway.js
+%%DATADIR%%/plugins/data/sql_history/scripts/history-database-recovery.sh
 %%DATADIR%%/plugins/data/word_fix/wf_default_list.data
 %%DATADIR%%/plugins/desktop_docking.desc
 %%DATADIR%%/plugins/docking.desc
@@ -738,8 +782,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%DATADIR%%/plugins/qt4_docking_notify.desc
 %%DATADIR%%/plugins/qt4_sound.desc
 %%DATADIR%%/plugins/screenshot.desc
-%%DATADIR%%/plugins/sdk/configuration-ui.xsl
-%%DATADIR%%/plugins/sdk/plugintsupdate.sh
 %%DATADIR%%/plugins/simpleview.desc
 %%DATADIR%%/plugins/single_window.desc
 %%DATADIR%%/plugins/sms.desc
@@ -1948,7 +1990,26 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%DATADIR%%/syntax/chat/renkooNaked/LICENSE.txt
 %%DATADIR%%/syntax/chat/skp_by_dam.syntax
 %%DATADIR%%/syntax/chat/skype_by_dorr.syntax
-%%DATADIR%%/syntax/chat/ultr.syntax
+%%DATADIR%%/syntax/chat/ultr/Contents/Info.plist
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Footer.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Header.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Incoming/Content.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Incoming/Context.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Incoming/NextContent.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Incoming/NextContext.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Outgoing/Content.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Outgoing/Context.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Outgoing/NextContent.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Outgoing/NextContext.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Status.html
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Variants/Default Left.css
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Variants/Default Right.css
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Variants/Inverted Centered.css
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Variants/Inverted Left.css
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Variants/Inverted Right.css
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/Variants/Traditional.css
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/common.css
+%%DATADIR%%/syntax/chat/ultr/Contents/Resources/main.css
 %%DATADIR%%/syntax/infopanel/Arvenil.syntax
 %%DATADIR%%/syntax/infopanel/Old Default.syntax
 %%DATADIR%%/syntax/infopanel/ultr.syntax
@@ -2628,7 +2689,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%DATADIR%%/themes/emoticons/penguins/zly.gif
 %%DATADIR%%/themes/emoticons/penguins/zmeczony.gif
 %%DATADIR%%/themes/emoticons/penguins/zniesmaczony.gif
-%%DATADIR%%/themes/emoticons/tango/TODO.txt
 %%DATADIR%%/themes/emoticons/tango/act-up.png
 %%DATADIR%%/themes/emoticons/tango/admonish.png
 %%DATADIR%%/themes/emoticons/tango/amorous.png
@@ -2693,7 +2753,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%DATADIR%%/themes/emoticons/tango/kissing.png
 %%DATADIR%%/themes/emoticons/tango/laugh.png
 %%DATADIR%%/themes/emoticons/tango/learning.png
-%%DATADIR%%/themes/emoticons/tango/license.txt
 %%DATADIR%%/themes/emoticons/tango/loser.png
 %%DATADIR%%/themes/emoticons/tango/love.png
 %%DATADIR%%/themes/emoticons/tango/mad-tongue.png
@@ -2897,7 +2956,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%DATADIR%%/themes/icons/default/kadu_icons/96x96/buddy0.png
 %%DATADIR%%/themes/icons/default/kadu_icons/96x96/buddy1.png
 %%DATADIR%%/themes/icons/default/kadu_icons/96x96/buddy2.png
-%%DATADIR%%/themes/icons/default/kadu_icons/DESCRIPTION kadu own icons.txt
 %%DATADIR%%/themes/icons/default/kadu_icons/svg/0.svg
 %%DATADIR%%/themes/icons/default/kadu_icons/svg/composing.svg
 %%DATADIR%%/themes/icons/default/protocols/common/128x128/message.png
@@ -2908,7 +2966,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%DATADIR%%/themes/icons/default/protocols/common/32x32/message.png
 %%DATADIR%%/themes/icons/default/protocols/common/48x48/message.png
 %%DATADIR%%/themes/icons/default/protocols/common/64x64/message.png
-%%DATADIR%%/themes/icons/default/protocols/gadu-gadu/16x16/.directory
 %%DATADIR%%/themes/icons/default/protocols/gadu-gadu/32x32/gadu-gadu.png
 %%DATADIR%%/themes/icons/default/protocols/gadu-gadu/svg/away.svg
 %%DATADIR%%/themes/icons/default/protocols/gadu-gadu/svg/away_d.svg
@@ -3757,9 +3814,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 %%DATADIR%%/themes/icons/oxygen/protocols/xmpp/64x64/online_m.png
 %%DATADIR%%/themes/icons/oxygen/protocols/xmpp/brand_name/16x16/GmailGoogleTalk.png
 %%DATADIR%%/themes/icons/oxygen/protocols/xmpp/brand_name/16x16/facebook.png
-%%DATADIR%%/themes/icons/oxygen/src/rebuild-statuses.sh
-%%DATADIR%%/themes/icons/oxygen/src/rebuild-statuses.sh.bak
-%%DATADIR%%/themes/icons/oxygen/src/statuses.xcf
 %%DATADIR%%/themes/icons/oxygen/svg/application-exit.svg
 %%DATADIR%%/themes/icons/oxygen/svg/audio-input-microphone.svg
 %%DATADIR%%/themes/icons/oxygen/svg/audio-volume-high.svg
@@ -3827,7 +3881,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrm %%DATADIR%%/themes/sounds/default
 @dirrm %%DATADIR%%/themes/sounds
 @dirrm %%DATADIR%%/themes/icons/oxygen/svg
-@dirrm %%DATADIR%%/themes/icons/oxygen/src
 @dirrm %%DATADIR%%/themes/icons/oxygen/protocols/xmpp/brand_name/16x16
 @dirrm %%DATADIR%%/themes/icons/oxygen/protocols/xmpp/brand_name
 @dirrm %%DATADIR%%/themes/icons/oxygen/protocols/xmpp/64x64
@@ -3903,7 +3956,6 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrm %%DATADIR%%/themes/icons/default/protocols/xmpp
 @dirrm %%DATADIR%%/themes/icons/default/protocols/gadu-gadu/svg
 @dirrm %%DATADIR%%/themes/icons/default/protocols/gadu-gadu/32x32
-@dirrm %%DATADIR%%/themes/icons/default/protocols/gadu-gadu/16x16
 @dirrm %%DATADIR%%/themes/icons/default/protocols/gadu-gadu
 @dirrm %%DATADIR%%/themes/icons/default/protocols/common/64x64
 @dirrm %%DATADIR%%/themes/icons/default/protocols/common/48x48
@@ -3937,6 +3989,12 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrm %%DATADIR%%/themes/emoticons
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/syntax/infopanel
+@dirrm %%DATADIR%%/syntax/chat/ultr/Contents/Resources/Variants
+@dirrm %%DATADIR%%/syntax/chat/ultr/Contents/Resources/Outgoing
+@dirrm %%DATADIR%%/syntax/chat/ultr/Contents/Resources/Incoming
+@dirrm %%DATADIR%%/syntax/chat/ultr/Contents/Resources
+@dirrm %%DATADIR%%/syntax/chat/ultr/Contents
+@dirrm %%DATADIR%%/syntax/chat/ultr
 @dirrm %%DATADIR%%/syntax/chat/renkooNaked/Contents/Resources/images
 @dirrm %%DATADIR%%/syntax/chat/renkooNaked/Contents/Resources/Variants
 @dirrm %%DATADIR%%/syntax/chat/renkooNaked/Contents/Resources/Outgoing
@@ -4017,8 +4075,9 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrm %%DATADIR%%/syntax
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/plugins/translations
-@dirrm %%DATADIR%%/plugins/sdk
 @dirrm %%DATADIR%%/plugins/data/word_fix
+@dirrm %%DATADIR%%/plugins/data/sql_history/scripts
+@dirrm %%DATADIR%%/plugins/data/sql_history
 @dirrm %%DATADIR%%/plugins/data/sms/scripts
 @dirrm %%DATADIR%%/plugins/data/sms
 @dirrm %%DATADIR%%/plugins/data/mprisplayer_mediaplayer
@@ -4050,6 +4109,8 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrmtry share/cmake/Modules
 @dirrmtry share/cmake
 @dirrmtry share/applications
+@dirrm sdk/translations
+@dirrm sdk
 @dirrm lib/kadu/plugins
 @dirrm lib/kadu
 @dirrm include/kadu/plugins/sound/configuration/gui
@@ -4079,6 +4140,7 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrm include/kadu/plugins/history/search
 @dirrm include/kadu/plugins/history/model
 @dirrm include/kadu/plugins/history/gui/windows
+@dirrm include/kadu/plugins/history/gui/widgets
 @dirrm include/kadu/plugins/history/gui
 @dirrm include/kadu/plugins/history/actions
 @dirrm include/kadu/plugins/history
@@ -4108,6 +4170,7 @@ share/icons/hicolor/128x128/apps/kadu.png
 @dirrm include/kadu/kadu-core/storage
 @dirrm include/kadu/kadu-core/status
 @dirrm include/kadu/kadu-core/qt
+@dirrm include/kadu/kadu-core/provider
 @dirrm include/kadu/kadu-core/protocols/services
 @dirrm include/kadu/kadu-core/protocols/model
 @dirrm include/kadu/kadu-core/protocols/filter