Request 2701 (accepted)

Overview

Request 2701 (accepted)

update to 20160408

Created by jirislaby almost 10 years ago
In state accepted
Package maintainer: jirislaby

Submit psi+-iconsets

Submit package home:jirisla...s:Essentials / psi+-iconsets to package Essentials / psi+-iconsets

psi+-iconsets.changes Changed

psi+-iconsets.spec Changed

@@ -16,14 +16,17 @@
 #
 
 
+%define version_unconverted 20160408
+
 Name:           psi+-iconsets
 Url:            http://code.google.com/p/psi-dev/
-Version:        20160309
+Version:        20160408
 Release:        0
 Summary:        Icons for Psi
 License:        GPL-2.0 and CC-BY-ND-3.0
 Group:          Productivity/Networking/Talk/Clients
-Requires:       psi+
+# only for psi+ with icons from upstream (otherwise some will be missing)
+Requires:       psi+ >= 20160408
 Source0:        psi-plus-main-%{version}.tar.xz
 Source1:        psi-plus-resources-1.tar.xz
 BuildArch:      noarch
@@ -40,7 +43,7 @@
 %install
 install -d -m 0755 %{buildroot}/%{iconspath}
 
-for DIR in activities/default affiliations/default clients/default moods/default; do
+for DIR in clients/default; do
 	DEST="%{buildroot}/%{iconspath}/$DIR/"
 	install -d -m 0755 "$DEST"
 	install -m 0644 -t "$DEST" iconsets/"$DIR"/icondef.xml
@@ -65,14 +68,11 @@
 %dir %{_datadir}/psi-plus
 %dir %{iconspath}
 %dir %{iconspath}/activities
-%dir %{iconspath}/activities/default
 %dir %{iconspath}/affiliations
-%dir %{iconspath}/affiliations/default
 %dir %{iconspath}/clients
 %dir %{iconspath}/clients/default
 %dir %{iconspath}/emoticons
 %dir %{iconspath}/moods
-%dir %{iconspath}/moods/default
 %dir %{iconspath}/roster
 %dir %{iconspath}/system
 %{iconspath}/activities/*.jisp
@@ -82,14 +82,8 @@
 %{iconspath}/moods/*.jisp
 %{iconspath}/roster/*.jisp
 %{iconspath}/system/*.jisp
-%{iconspath}/activities/default/icondef.xml
-%{iconspath}/affiliations/default/icondef.xml
 %{iconspath}/clients/default/icondef.xml
-%{iconspath}/moods/default/icondef.xml
 %{iconspath}/clients/default/FP_Freeware?License.txt
-%{iconspath}/activities/default/*.png
-%{iconspath}/affiliations/default/*.png
 %{iconspath}/clients/default/*.png
-%{iconspath}/moods/default/*.png
 
 %changelog

_service Changed

psi-plus-main-20160309.tar.xz/README Deleted

psi-plus-main-20160309.tar.xz/app.ico Deleted

psi-plus-main-20160309.tar.xz/changelog.txt Deleted

@@ -1,6767 +0,0 @@
-2014-05-02  zet
-v0.16.361
-  ! коммит в upstream psi: разрешено автозаполнение поля с паролем в форме присоединения
-    к конференции
-  ! коммит в upstream psi: исправлено некорректное поведение при перетаскивании объектов
-    в ростере конференции
-  ! коммит в upstream psi: исправлена работа поиска в ростере (задача 107,
-    https://github.com/psi-im/psi/issues/107)
-  ! коммит в upstream psi: сворачивание/разворачивание групп ростера при одиночном клике на
-    иконке группы
-  ! коммит в upstream psi: более эффективная работа с опциями
-  ! коммит в upstream psi: некоторые улучшения при перерисовке элементов ростера
-  ! коммит в upstream psi: небольшие исправления для диалоговых окон с историей переписки
-    (задача 109, https://github.com/psi-im/psi/issues/109 и другие)
-  ! коммит в upstream psi: решена задача 108, https://github.com/psi-im/psi/issues/108
-  ! коммит в upstream psi: 2014 год в окне "О программе"
-  ! коммит в upstream psi: попытка исправить некорректное отображение иконки в трее
-  ! коммит в upstream psi: решена задача 102, https://github.com/psi-im/psi/issues/102
-  ! коммит в upstream psi: всегда отображать в ростере контакт с непрочитанным сообщением/событием
-    (https://github.com/psi-im/psi/issues/42)
-  ! коммит в upstream psi: исправлена ошибка при смене ника после кика в конференции
-  ! коммит в upstream psi: сглаживание шрифтов в WebKit-версии
-  ! коммит в upstream psi: фикс получения имени клиента в случае когда в капсах содержится 'https'
-  ! коммит в upstream psi: теперь используется внешний qjdns
-  ! коммит в upstream psi: возможность сделать масштабируемую область видеоокна для видеозвонков
-  ! коммит в upstream psi: показывать продолжительность вызова в строке состояния
-  ! коммит в upstream iris: добавлен qcm-модуль для проверки наличия внешнего qjdns. если внешний
-    qjdns не найден, то будет использоваться встроенная версия. также встроенная версии qjdns будет
-    использоваться в Windows и в Mac OS X без проверки наличия внешнего qjdns
-  + добавлен новый патч для решения задачи 524, https://code.google.com/p/psi-dev/issues/detail?id=524
-    (psi-fix-selection-behavior-groupchat-dlg.diff)
-  + добавлен новый патч для решения задачи 574, https://code.google.com/p/psi-dev/issues/detail?id=574
-    (fix-muc-roster-drag-and-drop.diff)
-  - убран патч fix-muc-roster-drag-and-drop.diff -> принят в upstream
-  + добавлен новый патч для поддержки проверки правописания при использовании нескольких словарей
-    в случае когда Psi+ скомпилирован с enchant (psi-enchant-multidicts.diff)
-  + добавлен новый патч для решения задачи 575, https://code.google.com/p/psi-dev/issues/detail?id=575
-    для работы фичи необходимо опцию "options.ui.muc.allow-highlight-events" установить в положение
-    "true" (psi-muc-highlight-events.diff)
-  * исправлена утечка памяти при очистке очереди событий. память текла при удалении контакта, если у
-    него были непрочитанные сообщения или другие необработанные события (psi-fix-memory-leaks.diff)
-  * исправлена ошибка, в результате которой отображалось событие composing для конференций
-    (если какой нибудь клиент его отправлял), также теперь используется одинаковая иконка
-    для события и для чатов (psi-muc-highlight-events.diff)
-  * решена проблема с повреждением открытых вкладок, содержащих приватные чаты конференций,
-    при появлении нового события для конференции. ник и заголовок вкладки приватного чата менялись
-    на название конференции (psi-muc-highlight-events.diff)
-  * теперь события конференции подгружаются при запуске Psi+ (если таковые существуют)
-    psi-muc-highlight-events.diff
-  - убраны патчи psi-more-effective-work-with-options.diff и
-    some-improvments-for-contactlist-repaiting.diff -> приняты в upstream
-  * попытка исправить патч psi-improve-tray-tooltip.diff
-  * обновлён патч psi-hide-any-group.diff
-  * решена задача 578, https://code.google.com/p/psi-dev/issues/detail?id=578
-    (psi-reasons-for-roles-affiliations.diff)
-  + добавлен новый патч psi-disable-messages-correct-behavior.diff: патч меняет поведение опции
-    "options.message.enabled". теперь при включённой опции входящие сообщения и другие события
-    отображаются в диалоге, события не "зависают". исходящие сообщения запрещены и отключены в меню.
-    также решена задача 560, https://code.google.com/p/psi-dev/issues/detail?id=560
-  + добавлен новый патч psi-transfer-dlg-improvement.diff: доработка диалогового окна передачи файлов,
-    подробнее https://github.com/psi-plus/main/commit/1d5659b572e5a5dae39a245a66b5c71553adfa67#commitcomment-5454136
-  + добавлены новые патчи для ОС Haiku (спасибо Diger) fix-psiplus-build-in-haiku.patch,
-    fix-iconselect-buttons-in-haiku.patch, fix-screenshotplugin-build-in-haiku.patch
-  * добавлены новые капсы и ресурсы для Jabber-клиентов из списка отсюда:
-    https://code.google.com/p/psi-dev/issues/detail?id=3#c157 (спасибо aon17@mail.ru)
-    psi-client-icons.diff
-  * обновлены наборы иконок Jabber-клиентов "fingerprint.jisp" и "fingerprint-22.jisp"
-    (спасибо aon17@mail.ru)
-  * добавлена поддержка действия detach при клике средней кнопкой мыши по табу. для неизвестных
-    значений настройки теперь используется действие по умолчанию "none" (спасибо Hamper)
-    psi-tab-action-on-mouse-click.diff
-  * исправлена недоработка, в результате которой в консоль выводились предупреждения
-    об отсутствующей опции (задача 563, пункт 0) psi-tunable-chattoolbar.diff
-  * исправлено поведение при выделении элементов в обычных чатах. теперь это происходит таким же
-    способом, как и в MUC (https://code.google.com/p/psi-dev/issues/detail?id=524)
-    psi-fix-selection-behavior-chat-dlg.diff
-  * убраны ненужные переменные в патчах psi-modern-roster.diff и psi-options-reset-button.diff
-  * добавлена проверка на пустые аватары в патче psi-roster-avatar-frame.diff
-  * чистка лишних отладочных сообщений в коде для решения задачи 563,
-    https://code.google.com/p/psi-dev/issues/detail?id=563 (psi-extend-plugins-interface.diff)
-  * теперь центральная панель инструментов в чатах включена по умолчанию
-    (psi-default-application-settings.diff, psi-tunable-chattoolbar.diff)
-  * решена проблема, описанная здесь: http://code.google.com/p/psi-dev/issues/detail?id=106#c35.
-    теперь в диалоге чата, запущенном по команде из контекстного меню, будет выбран правильный
-    ресурс. если ресурс у контакта только один, то режим autojid останется включённым. если
-    несколько ресурсов - то даже, если был выбран ресурс с максимальным приоритетом, этот режим
-    будет отключён (psi-one-chat-for-many-resources.diff)
-  * исправлен двойной вызов vcard из контекстного меню при клике на jid в ростере
-    (psi-muc-nickclick-chat.diff)
-  * исправлен регистр в названиях ресурсов, т.к. для данного патча в переменной name не может быть
-    символов верхнего регистра (psi-client-icons.diff)
-  * обновлена ссылка для скачивания свежего инсталлятора Psi+, а также обновлены прямые ссылки на
-    changelog и version в патче на автоматическое обнаружение новых версий Psi+
-    (psi-dirty-check.diff)
-  * обновлён OTR plugin до версии 1.0.2,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/otrplugin/changelog.txt
-  * обновлён extended menu plugin до версии 0.1.3,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedmenuplugin/changelog.txt
-  * обновлён video status plugin до версии 0.2.5,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/videostatusplugin/changelog.txt
-  * обновлён extended options plugin до версии 0.4.0,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedoptionsplugin/changelog.txt
-  * обновлён content downloader plugin до версии 0.2.5,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/contentdownloaderplugin/changelog.txt
-  ! обновлены библиотеки шифрования OpenSSL до версии 1.0.1g,
-    http://www.openssl.org/news/changelog.html
-  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.352)
-    https://github.com/psi-plus/psi-plus-l10n
-  --
-  ! upstream commit psi: allowed autofill password for muc join dialog
-  ! upstream commit psi: fixed drag and drop action in the muc roster
-  ! upstream commit psi: fix search in roster (https://github.com/psi-im/psi/issues/107)
-  ! upstream commit psi: expand/collapse roster groups on group icon singleclick
-  ! upstream commit psi: more effenctive work with options
-  ! upstream commit psi: some improvements for contactlist repainting
-  ! upstream commit psi: some fixes for history
-    (https://github.com/psi-im/psi/issues/109 and other)
-  ! upstream commit psi: fixed https://github.com/psi-im/psi/issues/108
-  ! upstream commit psi: 2014 at aboutdlg
-  ! upstream commit psi: try to fix wrong tray icon
-  ! upstream commit psi: fix handling + at url (https://github.com/psi-im/psi/issues/102)
-  ! upstream commit psi: always show contacts with events
-    (https://github.com/psi-im/psi/issues/42)
-  ! upstream commit psi: fix nick changing after kick from muc
-  ! upstream commit psi: round pixel font size in WebKit
-  ! upstream commit psi: fixed to obtain the client's name, if the caps node contains https
-  ! upstream commit psi: use external qjdns
-  ! upstream commit psi: make scalable video area for video calls
-  ! upstream commit psi: show call duration in status string
-  ! upstream commit iris: added qcm module to check for external qjdns. if external qjdns not
-    found will be used bundled version. also bundled qjdns will be used on Windows and Mac OS X
-    without checking for external qjdns
-  + added new psi-fix-selection-behavior-groupchat-dlg.diff patch
-  + added new patch for fix issue 574, https://code.google.com/p/psi-dev/issues/detail?id=574
-    (fix-muc-roster-drag-and-drop.diff)
-  - removed fix-muc-roster-drag-and-drop.diff patch -> went to upstream
-  + added new patch for support check spelling with multiple dictionaries when Psi+ compiled with
-    enchant (psi-enchant-multidicts.diff)
-  + added new patch for fix issue 575, https://code.google.com/p/psi-dev/issues/detail?id=575. for
-    enable this feature you need 'options.ui.muc.allow-highlight-events' option switch to 'true'
-    position (psi-muc-highlight-events.diff)
-  * fixed a memory leak (psi-fix-memory-leaks.diff)
-  * updated psi-muc-highlight-events.diff patch
-  - removed psi-more-effective-work-with-options.diff and
-    some-improvments-for-contactlist-repaiting.diff patches -> went to upstream
-  * try to fix psi-improve-tray-tooltip.diff patch
-  * updated psi-hide-any-group.diff patch
-  * fixed issue 578, https://code.google.com/p/psi-dev/issues/detail?id=578
-    (psi-reasons-for-roles-affiliations.diff)
-  + added new psi-disable-messages-correct-behavior.diff patch
-  + added new psi-transfer-dlg-improvement.diff patch
-  + added patches for Haiku (thanks to Diger) fix-psiplus-build-in-haiku.patch,
-    fix-iconselect-buttons-in-haiku.patch, fix-screenshotplugin-build-in-haiku.patch
-  * added new client caps and resources to src/userlist.cpp from
-    https://code.google.com/p/psi-dev/issues/detail?id=3#c157 (thanks to aon17@mail.ru)
-    psi-client-icons.diff
-  * updated client iconsets 'fingerprint.jisp' and 'fingerprint-22.jisp' (thanks to aon17@mail.ru)
-  * added some actions on the mouse middle button (thanks to Hamper)
-    psi-tab-action-on-mouse-click.diff
-  * updated psi-tunable-chattoolbar.diff patch
-  * fixed a selection behavior in the psichatdlg (psi-fix-selection-behavior-chat-dlg.diff)
-  * removed unused variables in psi-modern-roster.diff and psi-options-reset-button.diff patches
-  * updated psi-roster-avatar-frame.diff patch
-  * updated psi-extend-plugins-interface.diff patch for fix issue 563,
-    https://code.google.com/p/psi-dev/issues/detail?id=563
-  * enable central toolbar by default
-    (psi-default-application-settings.diff, psi-tunable-chattoolbar.diff)
-  * updated psi-one-chat-for-many-resources.diff patch
-  * fixed double vcards from context menu on jid (psi-muc-nickclick-chat.diff)
-  * fixed capital letters in comparisions in psi-client-icons.diff patch
-  * updated downloads location and changelog/version raw files locations for auto updater
-    (psi-dirty-check.diff)
-  * updated OTR plugin to v1.0.2,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/otrplugin/changelog.txt
-  * updated extended menu plugin to v0.1.3,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedmenuplugin/changelog.txt
-  * updated video status plugin to v0.2.5,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/videostatusplugin/changelog.txt
-  * updated extended options plugin to v0.4.0,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedoptionsplugin/changelog.txt
-  * updated content downloader plugin to v0.2.5,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/contentdownloaderplugin/changelog.txt
-  ! updated OpenSSL win32 binary files to v1.0.1g, http://www.openssl.org/news/changelog.html
-  ! updated translations to v0.16.355 (https://github.com/psi-plus/psi-plus-l10n)
-
-
-2013-11-24  zet
-v0.16.261
-  ! коммит в upstream psi: dbus отключён в MS Windows по умолчанию
-  ! коммит в upstream psi: теперь не показывается лишняя история сообщений при перезаходе в
-    конференцию (спасибо Dmitriy Deshevoy)
-  ! коммит в upstream psi: исправлен порядок расположения панелей инструментов в настройках
-    приложения. Теперь новые панели появляются всегда в конце списка (снизу)
-  ! коммит в upstream psi: улучшена раскраска ников в чатлоге конференции. Патч от команды Psi+
-  ! коммит в upstream psi: исправлено падение приложения при вызове AlertManager
-  ! коммит в upstream psi: улучшено определение версии ОС семейства MS Windows в SystemInfo
-  + добавлен новый патч psi-tunable-chattoolbar.diff
-  * теперь используется слово "Groupchat" вместо "MUC"  или "Conference"
-    (psi-muc-and-user-topic-context-menu.diff)
-  * убрана ненужная опция "disable-paste-and-send". Теперь настройка тулбара осуществляется через
-    соответствующую вкладку в настройках приложения (psi-send-button-context-menu.diff,
-    psi-muc-minimize-to-roster.diff, psi-tunable-chattoolbar.diff)
-  * исправлено падение приложения при вызове findOnlineAccountForContact когда *account = 0
-    (psi-extend-plugins-interface.diff)
-  * фиксы для локализации в патче psi-tunable-chattoolbar.diff
-  + добавлен новый патч для коррекции dpi в webkit-версии (psi-webkit-dpi.diff)
-  + добавлен новый патч для корректной сортировки панелей инструментов в настройках приложения
-    (psi-toolbars-sorted.diff)
-  + добавлен новый патч psi-x11-class-name.diff
-  - убран патч psi-x11-class-name.diff -> принят в upstream
-  * улучшена раскраска ников в чатлоге конференции (psi-muc-nick-hash-color.diff)
-  - убран патч psi-muc-nick-hash-color.diff -> принят в upstream
-  - убран патч psi-webkit-dpi.diff -> принят в upstream
-  * правильная установка цветовой палитры для всплывающих подсказок (psi-coloring-tooltip.diff)
-  + добавлен новый патч psi-unity-menubar.diff
-  + добавлен новый плагин для Psi+ -- Off-The-Record-Messaging plugin, подробнее по ссылке:
-    https://github.com/psi-plus/plugins/tree/master/generic/otrplugin
-  * обновлены некоторые плагины: теперь используется слово "Groupchat" вместо "MUC" или "Conference"
-    (client switcher plugin, conference logger plugin, extended options plugin, gomoku game plugin,
-    stop spam plugin)
-  * обновлён extended options plugin: убраны опции, которые отображают тулбар чата и кнопку
-    "Вставить и отправить"
-  * обновлён juick plugin: добавлена обработка изображений в формате *.png
-  * обновлён watcher plugin: убрана опция "Отображать на панели чата". Теперь это настраивается в
-    настройках приложения (вкладка "Панель инструментов")
-  * обновлён GnuPG plugin: уменьшен размер иконки плагина, убрана опция "Отображать на панели чата"
-  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.257)
-    https://github.com/psi-plus/psi-plus-l10n
-  --
-  ! upstream commit psi: disable dbus on MS Windows by default
-  ! upstream commit psi: MUC history since (thx:Dmitriy Deshevoy)
-  ! upstream commit psi: fixed toolbars order in Toolbar Options. New toolbars added to the
-    bottom. After reopen options a new toolbar was on the top. Now new toolbars always in the bottom
-  ! upstream commit psi: improve palette for nicknames coloring in group chats. Patch from Psi+
-  ! upstream commit psi: fixed crash in AlertManager (double free)
-  ! upstream commit psi: allow no text in html message content. for example if it's image
-  ! upstream commit psi: update checks of MS Windows versions in SystemInfo
-  ! upstream commit iris: ignore /\r\n+/ in vcard base64 photo
-  + added new psi-tunable-chattoolbar.diff patch
-  * 'Groupchat' instead of 'MUC' or 'Conference' (psi-muc-and-user-topic-context-menu.diff)
-  * no disable-paste-and-send option (psi-send-button-context-menu.diff,
-    psi-muc-minimize-to-roster.diff, psi-tunable-chattoolbar.diff)
-  * don't crash in findOnlineAccountForContact when *account = 0 (psi-extend-plugins-interface.diff)
-  * split Toolbar from Chat Toolbar
-    (psi-tunable-chattoolbar.diff, psi-extend-plugins-interface.diff)
-  * fix with translations of Chat Toolbar (psi-tunable-chattoolbar.diff)
-  * fix text strings in psi-tunable-chattoolbar.diff patch
-  + added new patch for fix webkit's dpi (psi-webkit-dpi.diff)
-  + added new patch for fix Toolbar Options. Options internally uses QHash so they has no order.
-    Before putting toolbars in combobox they must be sorted (psi-toolbars-sorted.diff)
-  + added new patch for fix bug with changing of X11 window class name. Such class name is used for
-    grouping windows and for some WM (psi-x11-class-name.diff)
-  - removed psi-x11-class-name.diff patch -> went to upstream
-  * updated psi-muc-nick-hash-color.diff patch. Now nicknames should look much better in group chats
-  * fixed color palette in psi-muc-nick-hash-color.diff patch
-  * improved psi-muc-nick-hash-color.diff patch
-  - removed psi-muc-nick-hash-color.diff patch -> went to upstream
-  - removed psi-webkit-dpi.diff patch -> went to upstream
-  * set palette colors for tooltips proper way (psi-coloring-tooltip.diff)
-  + added new psi-unity-menubar.diff patch. This workaround. Need to fix Unity bug with Status Menu
-    in indicator. When a menu is used on the application menu bar it can no be shown anywhere else.
-    Need to use clone of the menu on the menu bar
-  + added new plugin - Off-The-Record-Messaging plugin for Psi+, see the link for details
-    https://github.com/psi-plus/plugins/tree/master/generic/otrplugin
-  * updated some plugins: use Groupchat word instead of MUC or Conference (client switcher plugin,
-    conference logger plugin, extended options plugin, gomoku game plugin, stop spam plugin)
-  * updated extended options plugin: dropped two chat options
-  * updated juick plugin: handle *.png photos
-  * updated watcher plugin: dropped show no chat toolbar option. Now there is a way to setup chat
-    toolbar. That option has no any sense anymore
-  * updated GnuPG plugin: shrinked plugin icon; dropped show no chat toolbar option
-  ! updated translations to v0.16.257 (https://github.com/psi-plus/psi-plus-l10n)
-
-
-2013-09-01  zet
-v0.16.204
-  ! коммит в upstream psi: добавлена поддержка Webkit от команды Psi+
-    (со встроенной поддержкой adium)
-  * коммит в upstream psi: улучшенное окно для ввода текста при установке топика конференции
-  + коммит в upstream psi: добавлено отображение уведомлений о доставке сообщений
-  * коммит в upstream psi: добавлена иконка для отображения уведомлений о доставке сообщений
-  * коммит в upstream psi: фикс для работы через proxy-сервер
-  + коммит в upstream psi: добавлена иконка для отображения уведомления о написании сообщения
-  * коммит в upstream psi: фикс для growlnotifier
-  * коммит в upstream psi: чтение файлов тем adium вне зависимости от регистра файла
-  + коммит в upstream psi: добавлена поддержка мониторов Retina
-  + коммит в upstream psi: начальная поддержка adium messageClasses
-  + коммит в upstream psi: добавлена тема new_classic psi (с аватарами)
-  * коммит в upstream iris: не показывать способность в передаче файлов в обзоре сервисов, если
-    поддержка передачи файлов отключена
-  * коммит в upstream iris: исправлена ошибка в механизме передачи файлов методом s5b
-  * добавлено опеределение клиента Xabber (psi-client-icons.diff, fingerprint.jisp)
-  + добавлен новый патч для улучшения перерисовки ростера
-    (some-improvments-for-contactlist-repaiting.diff)
-  - убраны патчи psi-webkit.diff, psi-muc-topic.diff and psi-receipts.diff -> приняты в upstream
-  * фикс в патче psi-fix-pep-retraction.diff
-  * небольшие улучшения в патче psi-extend-plugins-interface.diff
-  * иконка для уведомления о написании сообщения принята в upstream (psi-iconsets.diff)
-  * улучшенные иконки для клиентов jTalk и Xabber (спасибо vados)
-    fingerprint.jisp, fingerprint-22.jisp
-  * иконка 'theme_title_texture.png' принята в upstream (psi-iconsets.diff)
-  * обновлён патч psi-extend-plugins-interface.diff: добавлена поддержка отображения иконки для
-    каждого плагина в выпадающем списке выбора плагина (настройки приложения -> вкладка Плагины)
-  + добавлен новый патч для исправления отображения аватарки во всплывающей подсказке на приватных
-    чатах конференции в основном ростере (psi-fix-tooltip-avatar-on-privates-in-main-roster.diff)
-  * серая (бледная) иконка для отключенных плагинов в выпадающем списке плагинов на странице
-    настроек (psi-extend-plugins-interface.diff)
-  * добавлена поддержка плагинного интерфейса в табах чатов и конференций, также объединены
-    ChatTabAccessor и GCTabAccessor (psi-extend-plugins-interface.diff)
-  * juick plugin: попытка исправить заползание длинной ссылки за пределы видимой области экрана
-  + content downloader plugin: добавлен набор смайлов 'Nimbuzz' (Nimbuzz22.jisp)
-  + content downloader plugin: добавлен набор смайлов 'Android 4 blue' (Android4blue.jisp)
-  * content downloader plugin (v0.2.3): кликабельные ссылки на странице описания набора иконок
-  * watcher plugin (v0.4.2): исправлен выбор Jid'а для удаления из списка наблюдения
-  * watcher plugin (v0.4.3):
-    + добавлена кнопка в панель инструментов чата для добавления контакта в список слежения
-    * изменена иконка в контекстном меню контакта
-    * теперь в настройках 1-ая колонка используется для включения правила
-    + добавлена настройка для отображения кнопок "Следить за JID'ом"
-  + к каждому плагину Psi+ добавлена его иконка (для отображения в выпадающем списке плагинов в
-    настройках приложения)
-  - убран yandex narod plugin, т.к. Яндекс закрыл свой сервис "Яндекс.Народ"
-  * gnupg plugin (v0.3.4): теперь используется основная иконка плагина размером 16x16
-  * translate plugin: теперь используется новый плагинный интерфейс ChatTabAccessor
-  * juick plugin (v0.11.4): изменения в интерфейсе плагинов
-  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.179)
-    https://github.com/psi-plus/psi-plus-l10n
-  --
-  ! upstream commit psi: added Webkit support from Psi+ (support for adium themes inside)
-  * upstream commit psi: improved dialog for setting MUC topic
-  + upstream commit psi: added receipts support to ui
-  * upstream commit psi: updated iconset to support message icons
-  * upstream commit psi: fix for proxy
-  + upstream commit psi: add typing icon
-  * upstream commit psi: fix for growlnotifier
-  * upstream commit psi: case insensitive read of adium theme files
-  + upstream commit psi: retina displays support
-  + upstream commit psi: basic support for adium messageClasses
-  + upstream commit psi: added new_classic psi theme (with avatars). slotted scrollUp/Down
-  * upstream commit iris: don't show filetransfer features in disco if filetransfer disabled
-  * upstream commit iris: make all ByteStream based classes. fixes bug in s5b file transfer
-  * added Xabber detection (psi-client-icons.diff, fingerprint.jisp)
-  + added new patch for some improvments for contactlist repaiting
-    (some-improvments-for-contactlist-repaiting.diff)
-  - removed psi-webkit.diff, psi-muc-topic.diff and psi-receipts.diff patches -> went to upstream
-  * fixed psi-fix-pep-retraction.diff patch
-  * small improvement for psi-extend-plugins-interface.diff patch
-  * typing icon went to upstream (psi-iconsets.diff)
-  * better jTalk and Xabber client icons (from vados)
-    iconsets/clients/fingerprint.jisp, fingerprint-22.jisp
-  * moved 'theme_title_texture.png' icon to upstream (psi-iconsets.diff)
-  * updated psi-extend-plugins-interface.diff patch: added plugin icon. added new function icon to
-    PsiPlugin. also added that icon to plugins combobox
-  + added new patch for fix tooltip avatar on privates in main roster
-    (psi-fix-tooltip-avatar-on-privates-in-main-roster.diff)
-  * grayscale icons for disabled plugins in plugins combobox (psi-extend-plugins-interface.diff)
-  * added plugin interfaces for chat tabs and groupchat tabs, merged ChatTabAccessor and
-    GCTabAccessor (psi-extend-plugins-interface.diff)
-  * juick plugin: try to fix out of screen long links
-  + content downloader plugin: added 'Nimbuzz' emoticons (Nimbuzz22.jisp)
-  + content downloader plugin: added 'Android 4 blue' emoticons (Android4blue.jisp)
-  * content downloader plugin (v0.2.3): clickable links in iconpack description
-  * watcher plugin (v0.4.2): fix with jid checking for deleting from watcher list
-  * watcher plugin (v0.4.3):
-    + added Watch for JID button on chat toolbar
-    * new icon for Watch for JID button
-    * first column in settings now uses for enable/disable rule
-    + added setting to show/hide Watch for JID buttons
-  + added plugin icon for all Psi+ Plugins
-  - removed yandex narod plugin
-  * gnupg plugin (v0.3.4): use 16x16 image for plugin icon
-  * translate plugin: use new plugin interface ChatTabAccessor, tabify sources
-  * juick plugin (v0.11.4): changes in plugin interface
-  ! updated translations to v0.16.179 (https://github.com/psi-plus/psi-plus-l10n)
-
-
-2013-07-28  zet
-v0.16.150
-  * коммит в upstream psi: оптимизация кода в HistoryDlg::displayResult
-  * коммит в upstream psi: исправлено описание OS в system info. актуально только для *nix-систем,
-    в которых не установлен lsb_release
-  * коммит в upstream psi: добавлено определение OS RFRemix в методе unixHeuristicDetect().
-    актуально только для *nix-систем, в которых не установлен lsb_release
-  * коммит в upstream psi: обновлён psi.desktop
-  * коммит в upstream psi: добавлено несколько патчей от команды Kopete
-  * коммит в upstream psi: PongServer перемещён в iris
-  * коммит в upstream psi: добавлена поддержка XEP-0264: File Transfer Thumbnails
-  * коммит в upstream psi: исправлено поведение при двойном щелчке на элементе ростера для KDE.
-    оригинальный патч от Petr Gregor
-  * коммит в upstream psi: новые всплывающие окна (патч от команды Psi+): добавлена поддержка
-    dbus-popups, в настройках приложения добавлена новая вкладка с настройками всплывающих окон,
-    добавлена поддержка аватаров во всплывающих окнах и много других улучшений и исправлений
-  * коммит в upstream iris: добавлена поддержка XEP-0184 v1.2 (спасибо команде Kopete)
-  * коммит в upstream iris: добавлена поддержка XEP-0199 (urn:xmpp:ping)
-  ! коммит в upstream iris: теперь в комплекте нет libidn
-  * коммит в upstream iris: много фиксов от команд Kadu и Kopete
-  * коммит в upstream iris: добавлена поддержка XEP-0264: File Transfer Thumbnails
-  * коммит в upstream iris: возвращена поддержка уведомлений о доставке сообщений старого образца
-  * небольшие исправления в патче small fix for psi-presets-in-status-menu.diff
-  - убран патч psi-rfremix-sysinfo.diff -> принят в upstream
-  * обновлён патч psiplus-application-info.diff: небольшой фикс для psi.desktop
-  * плагинная система: стабилизация про поиске контактов в аккаунтах
-    (psi-presets-in-status-menu.diff, psi-extend-plugins-interface.diff)
-  * реализован метод findOnlieAccountForContact (требуется тестирование)
-    psi-extend-plugins-interface.diff
-  * исправлен патч psi-chatview-quote-feature.diff
-  * добавлено определение клиента Google Hangouts (psi-client-icons.diff)
-  * обновлён патч psi-receipts.diff для поддержки нового API
-  * небольшие фиксы для классической темы webkit (psi-webkit.diff, psi-receipts.diff)
-  * исправления в способах соединения для Mac OS X (psi-webkit.diff)
-  * webkit: убраны лишние пробелы и переносы строк при копирование текста (psi-webkit.diff)
-  * webkit: исправлен копипаст отдельных иконок (psi-webkit.diff)
-  * webkit: убрана излишняя высота строки для классической темы. не работает с крупными шрифтами
-    (psi-webkit.diff)
-  - убран патч psi-KDEfix-doubleclick-on-roster.diff -> принят в upstream
-  - убран патч psi-extend-popups.diff -> убран в upstream
-  * gnupg plugin (v0.3.1): добавлен диалог подтверждения при удалении ключа/ключей
-  * gnupg plugin (v0.3.2): косметические фиксы в окне диалога создания ключевой пары
-  * gnupg plugin (v0.3.3): улучшен алгоритм поиска gpg бинарника, иконка критической ошибки в окне
-    информации в случае ошибки
-  ! в состав дистрибутива включён новый необходимый компонент - библиотеки LibIDN, v1.28
-    (взяты отсюда http://ftp.gnu.org/gnu/libidn/libidn-1.28-win32.zip)
-  ! обновлена системная библиотека Zlib, v1.2.8 (скомпилировано в MinGW из исходников, взятых
-    отсюда http://zlib.net/zlib-1.2.8.tar.gz)
-  ! пропатчены и скомпилированы заново библиотеки QCA (патч взят отсюда
-    http://websvn.kde.org/?view=revision&revision=1357590)
-  ! обновлены системные библиотеки Qt, v4.8.5 (включая QtWebKit4.dll),
-    подробнее - http://blog.qt.digia.com/blog/2013/07/02/qt-4-8-5-released/
-  --
-  * upstream commit psi: code optimization in HistoryDlg::displayResult
-  * upstream commit psi: fixed OS description in system info. affects only *nix systems where
-    lsb_release is not installed
-  * upstream commit psi: added detection of RFRemix into unixHeuristicDetect(). affects only *nix
-    systems where lsb_release is not installed
-  * upstream commit psi: updated psi.desktop
-  * upstream commit psi: added few patches from kopete
-  * upstream commit psi: PongServer moved to iris
-  * upstream commit psi: added XEP-0264: File Transfer Thumbnails support
-  * upstream commit psi: fixed doubleclick roster items activation for KDE. original patch by
-    Petr Gregor
-  * upstream commit psi: new popups. add dbus popups, add new tab at settings, add avatars at
-    popups, many other changes
-  * upstream commit iris: XEP-0184 v1.2 implementation (thanks to kopete team)
-  * upstream commit iris: don't hide Qt's virtual reset functions (thanks to kopete team)
-  * upstream commit iris: added abstract socket access function (thanks to kopete team)
-  * upstream commit iris: added XEP-0199 (urn:xmpp:ping) implementation
-  * upstream commit iris: handle jabber:x:signed tin message stanzas as well
-    (thanks to kopete team)
-  ! upstream commit iris: removed bundled libidn
-  * upstream commit iris: more fixes from kadu and kopete
-  * upstream commit iris: added XEP-0264: File Transfer Thumbnails support
-  * upstream commit iris: now understands a received receipts of the old format
-  * small fix for psi-presets-in-status-menu.diff patch
-  - removed psi-rfremix-sysinfo.diff patch -> went to upstream
-  * updated psiplus-application-info.diff patch. small fix for psi.desktop
-  * plugins: stub for search for contact in accounts
-    (psi-presets-in-status-menu.diff, psi-extend-plugins-interface.diff)
-  * implemented findOnlieAccountForContact. probably buggy a bit (psi-extend-plugins-interface.diff)
-  * fixed psi-chatview-quote-feature.diff patch
-  * updated psi-client-icons.diff patch ("android.com" res)
-  * updated receipts patch to follow new API (psi-receipts.diff)
-  * small fixes to webkit cassic theme (psi-webkit.diff, psi-receipts.diff)
-  * selectionChanged connection commented out on mac (psi-webkit.diff)
-  * webkit: fixed spaces collapse while copying (psi-webkit.diff)
-  * webkit: fixed copypaste of single icon (psi-webkit.diff)
-  * removed line-height from classic theme. doesn't work with big fonts (psi-webkit.diff)
-  - removed psi-KDEfix-doubleclick-on-roster.diff patch -> went to upstream
-  - removed psi-extend-popups.diff -> went to upstream
-  * gnupg plugin: added a confirmation dialog for keys deleting
-  * gnupg plugin: cosmetics in 'A new key pair' dialog
-  * updated gnupg plugin to v0.3.3: improved gpg binary search. error icon in "Info" dialog
-    when error
-  ! added new required Psi+ component - LibIDN binary libs v1.28
-    (based on http://ftp.gnu.org/gnu/libidn/libidn-1.28-win32.zip)
-  ! updated Zlib Libs to v1.2.8 (compiled by MinGW from sources at http://zlib.net/zlib-1.2.8.tar.gz)
-  ! patched Psi+ Crypto Libs (QCA + patch http://websvn.kde.org/?view=revision&revision=1357590)
-  ! updated Qt libs to v4.8.5 (QtWebKit4.dll included)
-
-
-2013-05-01  zet
-v0.16.116
-  * коммит в upstream psi: работать с хэшем паролей, если сервер поддерживает аутентификацию SCRAM
-  * коммит в upstream psi: найден обходной путь для решения проблемы QTBUG-26351 в диалоге с
-    историей переписки (спасибо taurus)
-  * коммит в upstream psi: небольшие исправления в форме редактора аккаунта: улучшения для
-    отображения текста и элементов
-  * коммит в upstream iris: установить состояние ReadOnly для SockClient при дисконнекте
-    tcp-соединения (разрешить чтение из буфера)
-  * коммит в upstream iris: исправлен сломанный ранее механизм передачи файлов (IBB) после
-    портирования на QIODevice
-  * коммит в upstream iris: исправлены ошибки в работе DIGEST-MD5 аутентификации
-  * коммит в upstream iris: исправлен текст лицензии в некоторых файлах
-  * обновлена иконка jabber-клиента digsby
-  * обновлены иконки для клиента leechcraft-azoth
-  * обновлён патч psi-client-icons.diff для поддержки свежих иконок клиентов
-  * обновлены наборы иконок для отображения jabber-клиентов в ростере Psi+
-    (fingerprint.jisp, fingerprint-22.jisp)
-  * исправлена ошибка при открытии чата по правой кнопке мыши на контакте в случае использования
-    открытия чата по одиночному клику (psi-KDEfix-doubleclick-on-roster.diff)
-  - убран патч qca_qt5.patch -> принят в upstream
-    http://websvn.kde.org/?view=revision&revision=1347515
-  * исправлен показ версии для Mac OS X 10.8 (patches/mac/3060-psi-update-mac-versions.diff)
-  * новый механизм определения версии для Mac OS (patches/mac/3060-psi-update-mac-versions.diff)
-  - убран патч psi-history-dlg-fix-keyboard.diff -> принят в upstream
-  * обновлён gnupg plugin до версии 0.3.0: добавлена функция автоимпорта ключа из тела сообщения, в
-    панель инструментов чата добавлена кнопка отправки публичного ключа, в диалоге генерации
-    ключевой пары по умолчанию срок действия ключа 1 год. подробнее -
-    https://raw.github.com/psi-plus/plugins/master/generic/gnupgplugin/changelog.txt
-  + добавлена персидская локализация Psi+ (translations/psi_fa.qm)
-  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.115)
-    https://github.com/psi-plus/psi-plus-l10n
-  --
-  * upstream commit psi: salted hash passwords when scram is available
-  * upstream commit psi: get rid of couple compilation warnings
-  * upstream commit psi: disabled 822 encoding/decoding since jids are already passed stringprep
-    and double encoding/decoding breaks jids. probably bad solution
-  * upstream commit psi: workaround for QTBUG-26351 in history dialog (thx: taurus)
-  * upstream commit psi: small fixes in Account Properties Dialog: improved text and layouts of
-    elements
-  * upstream commit iris: set ReadOnly state for SockClient on tcp disconnect (allow read from
-    buffer)
-  * upstream commit iris: fixed IBB regression after portig to QIODevice
-  * upstream commit iris: no qca-static anymore
-  * upstream commit iris: fixed regression in DIGEST-MD5 auth
-  * upstream commit iris: fix license descriptions
-  * updated digsby client icon
-  * updated leechcraft-azoth clients icon
-  * updated psi-client-icons.diff patch
-  * updated 'fingerprint.jisp' and 'fingerprint-22.jisp' clients iconsets
-  * fix opening chat on rightclick on contact when use singlclick option is enabled
-    (psi-KDEfix-doubleclick-on-roster.diff)
-  - removed qca_qt5.patch -> went to upstream http://websvn.kde.org/?view=revision&revision=1347515
-  * corrected OS X 10.8 version (patches/mac/3060-psi-update-mac-versions.diff)
-  * a new approach to get Mac OS VERSION (patches/mac/3060-psi-update-mac-versions.diff)
-  - removed psi-history-dlg-fix-keyboard.diff patch -> went to upstream
-  * updated gnupg plugin auto import function: button to send publik key on chat toolbar, expiration
-    data in an year by default
-  * updated gnupg plugin: do not handle incoming stanza if plugin is disabled
-  + added persian translation (translations/psi_fa.qm)
-  ! updated translations to version 0.16.115 (https://github.com/psi-plus/psi-plus-l10n)
-
-
-2013-03-17  zet
-v0.16.105
-  * коммит в upstream psi: небольшой фикс для filetunecontroller
-  * коммит в upstream psi: фикс xhtml-im formatting
-  * коммит в upstream psi: фиксы для совместимости с Qt5
-  * коммит в upstream psi: частичная поддержка mediaelement + фиксы совместимости с Qt4
-  * коммит в upstream psi: обновлён год в диалоге Меню -> Справка -> О программе
-  * коммит в upstream psi: добавлено корректное определение MS Windows 8
-  * коммит в upstream psi: исправления багов при переименовании профиля
-  * коммит в upstream iris: фиксы для совместимости с Qt5
-  * коммит в upstream iris: исправлены ошибки для поддержки socks proxy
-  * коммит в upstream iris: некоторые фиксы в s5b
-  * коммит в upstream libpsi: фиксы для совместимости с Qt5
-  * коммит в upstream libpsi: исправлена сломанная ранее совместимость с Qt4
-  * изменён алгоритм раскраски ников в конференциях (psi-muc-nick-hash-color.diff)
-  - убран патч psi-filetunecontroller-fix.diff -> принят в upstream
-  * возврат к прежнему алгоритму winamptunecontroller (из upstream) psi-fix-tunes.diff
-  + добавлен новый патч psi-fix-display-status-icon.diff
-  + добавлен новый патч psi-fix-showing-xml-chars-in-contacts-popup.diff
-  * исправлен патч psi-small-tooltip-fix.diff
-  + добавлен новый патч psi-fix-transports-group.diff
-  * фиксы в патче psi-modern-roster.diff
-  - убран патч fix-showing-xml-chars-in-contacts-popup.diff -> принят в upstream
-  * часть патча psi-send-xhtml-im.diff принята в upstream
-  - убран патч psi-data-forms-media-element.diff -> принят в upstream
-  * обновлён состав команды Psi+ (Меню -> Справка -> О программе -> О Psi+) psiplus-aboutdlg.diff
-  * решена задача 532 (http://code.google.com/p/psi-dev/issues/detail?id=532)
-    psi-autostart-pgp.diff
-  * обновлён патч psi-one-chat-for-many-resources.diff: исправлено отображение xml-символов в SysMsg
-  * исправлена ошибочная опция в options/macosx.xml (psi-extend-popups.diff)
-  * обновлён патч psi-muc-and-user-topic-context-menu.diff: добавлена команда Copy user JID для меню
-    на списке ресурсов в окне чата
-  + добавлен новый патч для вызова выпадающего списка с известными stun-серверами в редакторе
-    аккаунта (psi-stun-hosts-combobox.diff)
-  * показывать команду Copy user JID только для пользователей с реальными JID
-    (psi-muc-and-user-topic-context-menu.diff)
-  + добавлен новый патч fix-showing-xml-chars-in-group-popup.diff
-  * исправления в патче psi-fix-transports-group.diff
-  + добавлен новый патч для устранения утечки памяти (psi-fix-memory-leaks.diff)
-  * небольшие фиксы в патчах psi-always-visible-contacts.diff и psi-presets-in-status-menu.diff
-  + добавлен новый патч для исправления вызова элементов ростера по двойному клику в KDE. автор
-    патча - Petr Gregor (psi-KDEfix-doubleclick-on-roster.diff)
-  + добавлен новый патч для поддержки нового дистрибутива семейства Linux в systeminfo
-    (psi-rfremix-sysinfo.diff)
-  + добавлен новый патч psi-switch-tab-on-new-message.diff
-  * корректная работа с изменяемыми полями в редакторе закладок
-    (psi-muc-bookmark-toolbar-button.diff)
-  * корректировка в написании команды в меню цитирования в окне чата
-    (psi-chatview-quote-feature.diff)
-  * обновлён client switcher plugin (v0.0.16)
-  * обновлён screenshot plugin (v0.6.4)
-  + добавлен новый плагин -- GnuPG Key Manager (v0.2.1), подробнее -
-    https://raw.github.com/psi-plus/plugins/master/generic/gnupgplugin/changelog.txt
-  * фикс в коде icq die plugin (v0.1.5)
-  ! обновлены системные библиотеки Qt до версии 4.8.4
-    (http://qt.digia.com/Release-Notes/Release-Notes-Qt-484/)
-  ! обновлены библиотеки OpenSSL до версии 1.0.1e (http://www.openssl.org/news/changelog.html)
-  ! перекомпилирована библиотека Zlib (v1.2.7)
-  ! добавлены новые и обновлены существующие файлы локализации для поддержки различных языков в Psi+
-    (версия локализации 0.16.103.1) https://github.com/psi-plus/psi-plus-l10n
-  --
-  * upstream commit psi: small fix for filetunecontroller
-  * upstream commit psi: some escaping at contacts tooltip
-  * upstream commit psi: fix xhtml-im formatting
-  * upstream commit psi: Qt5 compatibility fixes
-  * upstream commit psi: incomplete support for mediaelement + Qt4 compat fixes
-  * upstream commit psi: update years in dialog about program
-  * upstream commit psi: add correct checks of MS Windows 8 in SystemInfo
-  * upstream commit psi: fix profile renaming
-  * upstream commit iris: Qt5 compatibility fixes
-  * upstream commit iris: use QIODevice as base class for ByteStream. started some work on
-    NetworkAccessManager. added partial support for mediaelement
-  * upstream commit iris: NAM in progress. dropped idea with socket factory
-  * upstream commit iris: fixed socks proxy support
-  * upstream commit iris: fixed double memory free in StunTransactionPool destructor
-  * upstream commit iris: the previous fix for double free was wrong. so here is another fix
-  * upstream commit iris: fixed regression in http proxy handling code
-  * upstream commit iris: a try to fix socks regression after porting to qiodevice
-  * upstream commit iris: more s5b fixes
-  * upstream commit libpsi: Qt5 compatibility fixes
-  * upstream commit libpsi: fixed broken Qt4 compatibility
-  * upstream commit libpsi: use PWD for x11info in *.pri
-  * upstream commit libpsi: added forgotten license to x11info.* files
-  * upstream commit libpsi: partial rollback of x11 global shortcut manager code
-  * changed nick hashing algo (psi-muc-nick-hash-color.diff)
-  - removed psi-filetunecontroller-fix.diff patch -> went to upstream
-  * new winamptunecontroller moved to dev. reverted winamptunecontroller from upstream
-    (psi-fix-tunes.diff)
-  + added new psi-fix-display-status-icon.diff patch
-  + added new psi-fix-showing-xml-chars-in-contacts-popup.diff patch
-  * fixed psi-small-tooltip-fix.diff patch
-  + added new psi-fix-transports-group.diff patch
-  * removed extra comma from psi-modern-roster.diff patch
-  - removed psi-fix-showing-xml-chars-in-contacts-popup.diff patch -> went to upstream
-  * part of psi-send-xhtml-im.diff patch went to upstream
-  - removed psi-data-forms-media-element.diff patch -> went to upstream
-  * updated Psi+ about dialog (psiplus-aboutdlg.diff)
-  * fixed issue 532 (http://code.google.com/p/psi-dev/issues/detail?id=532) psi-autostart-pgp.diff
-  * updated psi-one-chat-for-many-resources.diff patch. fixed showing xml chars in SysMsg
-  * fixed invalid options/macosx.xml (psi-extend-popups.diff)
-  * updated psi-muc-and-user-topic-context-menu.diff patch: added Copy user JID from user JID
-    context menu
-  + added new psi-stun-hosts-combobox.diff patch
-  * show copy user JID only for normal users (psi-muc-and-user-topic-context-menu.diff)
-  + added new fix-showing-xml-chars-in-group-popup.diff patch
-  * fixed psi-fix-transports-group.diff patch
-  + added new psi-fix-memory-leaks.diff patch
-  * small fix for psi-always-visible-contacts.diff patch
-  * small fix for psi-presets-in-status-menu.diff patch
-  + added new patch for fix activation roster items by doubleclick on KDE. patch by Petr Gregor
-    (psi-KDEfix-doubleclick-on-roster.diff)
-  + added new patch for support new Linux distro in systeminfo (psi-rfremix-sysinfo.diff)
-  + added new psi-switch-tab-on-new-message.diff patch
-  * must be Edit Bookmark (psi-muc-bookmark-toolbar-button.diff)
-  * corrected English grammitcs (psi-chatview-quote-feature.diff)
-  * updated client switcher plugin (v0.0.16)
-  * updated screenshot plugin (v0.6.4)
-  + added new plugin -- GnuPG Key Manager (v0.2.1),
-    https://raw.github.com/psi-plus/plugins/master/generic/gnupgplugin/changelog.txt
-  * fixed icq die plugin (v0.1.5)
-  ! updated Qt libs to version 4.8.4 (http://qt.digia.com/Release-Notes/Release-Notes-Qt-484/)
-  ! updated OpenSSL libs to version 1.0.1e (http://www.openssl.org/news/changelog.html)
-  ! recompiled windows zlib (v1.2.7)
-  ! updated translations to version 0.16.103.1 (https://github.com/psi-plus/psi-plus-l10n)
-
-
-2012-10-28  zet
-v0.16.25
-  * улучшения в патче psi-autostart-pgp.diff: запрет автоматического включения PGP для чата, если
-    PGP был включён/отключён вручную
-  * обновлена информация об активных участниках проекта Psi+ (psiplus-aboutdlg.diff)
-  * попытка наладить корректную сборку Psi+ под Ms Windows x64 (psi-fix-tunes.diff)
-  * обновлены файлы переводов Psi+ на различные языки (поддержка более 30 языков), от 27.10.2012
-    (спасибо команде переводчиков https://github.com/psi-plus/psi-plus-l10n )
-  ! установщик windows: восстановлена работа механизма проверки орфографии (были изменены пути
-    расположения словарей aspell в официальной версии Psi)
-  --
-  * fixed fuzess; improve psi-autostart-pgp.diff patch: disable autopgp for chat if pgp
-    enabled/disabled manually (psi-receipts.diff, psi-hide-muc-auto-join.diff,
-    psi-autostart-pgp.diff)
-  * updated Psi+ about info (psiplus-aboutdlg.diff)
-  * try to fix build of win64 binary (psi-fix-tunes.diff)
-  * updated Psi+ translations (2012-10-27) by https://github.com/psi-plus/psi-plus-l10n
-  ! windows installer: fixed aspell path
-
-
-2012-10-21  zet
-v0.16.19
-  ! состоялся долгожданный релиз Psi 0.15!
-    http://lists.affinix.com/pipermail/psi-devel-affinix.com/2012-October/009348.html
-  * upstream commit psi: небольшой фикс для корректного отображения истории переписки
-    (отображение ников со спецсимволами)
-  * upstream commit psi: некоторые фиксы при переименовании групп и контактов ростера
-    (спасибо liuch)
-  * upstream commit psi: фикс обработки первого сообщения в новом чате (для некоторых случаев)
-  * upstream commit psi: деактивация некоторых элементов в редакторе аккаунта и во всплывающем
-    меню на контакте ростера
-  * upstream commit psi: спрятана ненужная опция "use-singleclick"
-  * upstream commit psi: спрятана опция "hide show-away action"
-  * upstream commit psi: запрет скрытия команды меню "Выполнить команду" для оффлайн-контактов
-    (требуется для xmpp-транспорта Mrim)
-  * upstream commit psi: создание xml-консоли только если это необходимо
-  * upstream commit psi: запрет на удаление аккаунтов, содержащих непрочитанные события
-  * upstream commit psi: исправлена возможная утечка памяти при удалении событий
-  * upstream commit psi: исправлено падение приложения при удалении аккаунта
-  * upstream commit psi: действие по умолчанию для средней кнопки мыши при клике на контакте
-  * upstream commit psi: фикс при отрисовке статусного сообщения в режиме отображения контактов
-    ростера в виде одной строки
-  * upstream commit psi: фикс отрисовки ростера конференции при включенной опции "slim-groups"
-  ! upstream commit psi: новая ветка версий Psi 0.16-dev (после состоявшегося релиза Psi 0.15)
-  * upstream commit psi: фикс таймера в eventdlg (никогда не сбрасывался)
-  * upstream commit psi: некоторые фиксы для winamp tune controller (by KukuRuzo)
-  * upstream commit psi: настраиваемые цвета текста в окне истории переписки. патч для задачи #21
-  * upstream commit psi: попытка использовать по умолчанию ник аккаунта при подсоединении к
-    конференции (вместо полного jid-а)
-  * upstream commit psi: исправлен двойной запрос features при вызове окна service discovery
-  * upstream commit psi: небольшой фикс для редактора настроек
-  * upstream commit psi: фикс заголовка окна с рисовальной доской
-  * upstream commit iris: добавлено временное решение проблем с ipv6 в режиме http-poll
-  * upstream commit iris: отключен tls для режима http-poll в AdvancedConnector, так как
-    http-poll имеет свой собственный обработчик tls
-  * upstream commit iris: фикс заголовка grepshortcutdlg
-  * обновлён патч psi-one-chat-for-many-resources.diff: исправлена ошибка, в результате которой при
-    активации вкладки с непрочитанными сообщениями счётчик непрочитанных сообщений не обновлялся в
-    случае если контакт ушёл в оффлайн и на этой вкладке включён режим autojid
-  * исправления в обработке станзы для Entity Time (задача #512) psi-entity-time.diff
-  * обновлён патч psi-safe-storage-fix.diff (задача #515): исправлена ошибка, в результате которой
-    терялись файлы конфигурации (точнее, один из вариантов потери файлов конфигурации). при
-    неудачной записи файла или его недозаписи в результате сбоя в следующем запуске Psi+ использует
-    .backup копию того же файла. но при двух последовательных сбоях получалось так, что backup копия
-    затиралась битым файлом от первого сбоя. таким образом можно получить битую конфигурацию и битую
-    резервную копию одновременно. эта же функция записи и чтения используется не только для
-    accounts.xml и options.xml, но и для events*.xml, т.е. могли теряться также и события
-  + добавлен новый патч psi-fix-historydlg.diff: исправлено отображение ника в окне отображения
-    истории переписки. ошибка связана с тем, что в нике не экранируются спецсимволы html. пример:
-    переименовываем контакт в ник вида:
-    "nic
-    k"
-    открываем историю переписки, смотрим результат. после применения патча ник будет отображаться
-    правильно
-  * исправлен патч psiplus-application-info.diff - qcm/certstore.qcm убран из Psi+
-  - убран патч psi-fix-historydlg.diff -> принят в upstream
-  * модифицирован патч psi-send-xhtml-im.diff: формат блока для нового сообщения копировался из
-    предыдущего (а в нашем случае - с последнего сообщения), т.е. если входящее сообщение было
-    форматировано с использованием параграфов (pidgin, например), то все последующие сообщения
-    отображались с отступами. данный баг актуален для конференции и для обычных чатов в НЕвебкит
-    версии. в вебкит версии патч не проверялся.
-  - убраны некоторые патчи -> приняты в upstream (psi-fix-rename-contact-in-roster.diff,
-    psi-fix-rename-groups.diff, psi-fix-proccess-first-message.diff)
-  - убран патч psi-fix-crash-when-going-offline.diff (перемещён в dev), т.к. не актуален
-  - убраны некоторые патчи -> приняты в upstream (psi-tmp-hide-useless-roster-options.diff,
-    psi-hide-show-away-action.diff)
-  - убрано ещё больше патчей -> приняты в upstream
-    (psi-do-not-disable-execute-command-menu-item.diff, psi-create-xmlconsole-when-need-it.diff,
-    psi-dont-remove-accounts-with-events.diff, psi-fix-event-removing.diff)
-  * исправлен патч psiplus-new-popups.diff
-  - убраны ненужные патчи (psi-disable-alt-n-switch-tabs.diff,
-    psi-fix-reconnecting-when-account-changed.diff)
-  * исправлен патч psi-mac-sparkle.diff
-  * патч psi-fix-tunes.diff разделён на два отдельных патча psi-fix-winampcontroller.diff и
-    psi-fix-tunes.diff
-  * фиксы патча psi-mac-sparkle.diff
-  * поддержка всплывающих окон в ОС Lion и выше (psiplus-new-popups.diff)
-  - убран патч psi-fix-encoding-of-command-line-arguments.diff (перемещён в dev)
-  * небольшой фикс в патче psi-muc-nick-hash-color.diff
-  - убран патч psi-fix-timer-in-eventdlg.diff -> принят в upstream
-  * объединены патчи на всплывающие окна в один патч psi-extend-popups.diff
-  * патч psi-dont-send-composing-events.diff выделен в отдельный патч. некоторые изменения в патче
-    psi-extend-popups.diff
-  * исправлен патч psi-extend-popups.diff patch под MAC OSX
-  - убраны патчи psi-fix-winampcontroller.diff и psi-fix-sending-disco-items-request-twice.diff ->
-    приняты в upstream
-  + добавлен новый патч на корректное поведение для события приглашения порисовать на рисовальной
-    доске (psi-whiteboard-invitation-event.diff)
-  ! обновлены капсы (caps) до версии 0.16 (psiplus-application-info.diff)
-  * исправлено деление на ноль в juick plugin (v0.11.2)
-  * обновлён client switcher plugin: добавлена возможность игнора запроса версии, обновлён список ОС
-    (v0.0.13)
-  * принят патч для плагинов от https://github.com/FlorianFieber/plugins (client switcher plugin,
-    juick plugin)
-  * исправлен watcher plugin (v0.4.1)
-  * обновлён extended options plugin до версии 0.3.7
-  * принят патч для плагинов от (pull request #3) fk0/master (extended options plugin,
-    client switcher plugin, watcher plugin)
-  + добавлены иконки аффиляций (lamps-affiliations.jisp и futurama-robots-affiliations.jisp)
-  ! обновлены системные библиотеки qt до версии 4.8.2
-    http://qt.digia.com/Product/changes/Changes-482/
-  ! обновлены библиотеки openssl до версии 1.0.1c http://www.openssl.org/news/changelog.html
-  ! обновлена библиотека windows zlib до версии 1.2.7
-  ! добавлены новые и обновлены существующие файлы переводов для Psi+ от команды переводчиков
-    (от 19.10.2012) https://github.com/psi-plus/psi-plus-l10n
-  --
-  ! Psi 0.15 released!
-    http://lists.affinix.com/pipermail/psi-devel-affinix.com/2012-October/009348.html
-  * upstream commit psi: small fix for historydlg (displaying nicks with special symbols)
-  * upstream commit psi: some fixes for contacts and group renaming (tnx liuch)
-  * upstream commit psi: fix processing first chat message for some cases
-  * upstream commit psi: deactivation of some items at account and contact popup menu
-  * upstream commit psi: hide useless use-singleclick option
-  * upstream commit psi: hide show-away action
-  * upstream commit psi: don't disable execute-command menu item for offline contacts (needed
-    for mrim transport)
-  * upstream commit psi: create xml console only if it needed
-  * upstream commit psi: don't remove accounts with events
-  * upstream commit psi: fix possible memory leaks when removing events
-  * upstream commit psi: fixed crash on account remove
-  * upstream commit psi: default action on middleclick on contact
-  * upstream commit psi: fix drawing status messages in single line
-  * upstream commit psi: fix muc roster painting when slim-groups option is enabled
-  ! upstream commit psi: bump version number to 0.16-dev
-  * upstream commit psi: fix whois timer at eventdlg never stops
-  * upstream commit psi: some fixes for winamp tune controller (by KukuRuzo)
-  * upstream commit psi: configurable text colors in history dialog. patch for issue #21
-  * upstream commit psi: try use accounts nick when join muc
-  * upstream commit psi: fix disco items request sent twice when diskodlg opens
-  * upstream commit psi: small fix for options editor
-  * upstream commit psi: fix wbdlg title
-  * upstream commit iris: added stupid hack to workaround ipv6 problem in http-poll
-  * upstream commit iris: disable tls for http-poll in AdvancedConnector since http-poll has its
-    own tls handler
-  * upstream commit iris: fix grepshortcutdlg title
-  * updated psi-one-chat-for-many-resources.diff patch. fix unread messages
-  * fixed Entity Time stanza (issue #512) psi-entity-time.diff
-  * updated psi-safe-storage-fix.diff patch (issue #515)
-  + added psi-fix-historydlg.diff patch. fixed display of nick
-  * fixed patch - qcm/certstore.qcm removed from psi (psiplus-application-info.diff)
-  - removed psi-fix-historydlg.diff patch -> went to upstream
-  * modified psi-send-xhtml-im.diff patch. reset margin properties for new text blocks
-  - removed some patches -> went to upstream (psi-fix-rename-contact-in-roster.diff,
-    psi-fix-rename-groups.diff, psi-fix-proccess-first-message.diff)
-  - move psi-fix-crash-when-going-offline.diff patch to dev because of useless
-  - removed some patches -> went to upstream (psi-tmp-hide-useless-roster-options.diff,
-    psi-hide-show-away-action.diff)
-  - removed more patches -> went to upstream (psi-do-not-disable-execute-command-menu-item.diff,
-    psi-create-xmlconsole-when-need-it.diff, psi-dont-remove-accounts-with-events.diff,
-    psi-fix-event-removing.diff)
-  * fixed psiplus-new-popups.diff patch
-  - removed some patches because of useless (psi-disable-alt-n-switch-tabs.diff,
-    psi-fix-reconnecting-when-account-changed.diff)
-  * fixed psi-mac-sparkle.diff patch
-  * psi-fix-tunes.diff patch has been splitted on two separate patches psi-fix-winampcontroller.diff
-    and psi-fix-tunes.diff
-  * fixes for psi-mac-sparkle.diff patch
-  * enabled growl popups on Lion and higher (psiplus-new-popups.diff)
-  - moved psi-fix-encoding-of-command-line-arguments.diff patch to dev
-  * small fix in work with constants in psi-muc-nick-hash-color.diff patch
-  - removed psi-fix-timer-in-eventdlg.diff patch -> went to upstream
-  * merged popup patches and move it top. fix other patches (psi-extend-popups.diff)
-  * splited psi-dont-send-composing-events.diff patch into separated patch. some work with popups
-    patch (psi-extend-popups.diff)
-  * fixed psi-extend-popups.diff patch for mac
-  - removed psi-fix-winampcontroller.diff patch -> went to upstream
-  - removed psi-fix-sending-disco-items-request-twice.diff patch -> went to upstream
-  + added new patch for whiteboard invitation events (psi-whiteboard-invitation-event.diff)
-  ! caps version to 0.16 (psiplus-application-info.diff)
-  * fixed division by 0 in juick plugin (v0.11.2)
-  * updated client switcher plugin: added feature for ignoring a request version, updated the OS
-    template (v0.0.13)
-  * merged https://github.com/FlorianFieber/plugins (client switcher plugin, juick plugin)
-  * fixed watcher plugin (v0.4.1)
-  * updated extended options plugin: more clear description for "hiding on auto-join conferences"
-    option (v0.3.7)
-  * merged pull request #3 from fk0/master (extended options plugin, client switcher plugin,
-    watcher plugin)
-  + added lamps affiliations icons (iconsets/affiliations/lamps-affiliations.jisp)
-  + added futurama affiliation icons (iconsets/affiliations/futurama-robots-affiliations.jisp)
-  ! updated qt libs to version 4.8.2, http://qt.digia.com/Product/changes/Changes-482/
-  ! updated openssl libs to version 1.0.1c, http://www.openssl.org/news/changelog.html
-  ! updated windows zlib to version 1.2.7
-  ! added new Psi+ translations and updated existing translations (2012-10-19) by
-    https://github.com/psi-plus/psi-plus-l10n
-
-
-2012-05-22  zet
-v0.15.5337
-  * некоторые исправления и улучшения для juick plugin (v0.11.1)
-  + в пакет дистрибутива под windows добавлена необходимая системная библиотека "QtWebKit4.dll"
-  ! обновлены файлы переводов от команды https://github.com/tehnick/psi-plus-i18n
-  --
-  * some fixes for juick plugin (v0.11.1)
-  + win32 installer: added required system lib 'QtWebKit4.dll'
-  ! updated some Psi+ translations from https://github.com/tehnick/psi-plus-i18n
-
-
-2012-05-20  zet
-v0.15.5335
-  + коммит в upstream psi: добавлены временные метки в дебаг-лог
-  * коммит в upstream psi: исправлено неоткрывание основного окна в билдах под MAC и Qt Cocoa
-  * коммит в upstream psi: исправлено отображение сообщения "no version available" в групчатах
-  + коммит в upstream psi: вложенный каталог "translations" теперь используется для хранения
-    файлов переводов (локализаций). старые пути расположения файлов переводов также поддерживаются
-    (для обеспечения обратной совместимости)
-  - коммит в upstream psi: убран ненужный флаг dynamic_cast в psicon
-  + коммит в upstream psi: теперь используется shared zlib в сборках под MS Windows
-  * коммит в upstream iris: более подробные сообщения в дебаг-логе для bsocket и connector
-  * коммит в upstream iris: исправлено поведение при SSL handshake после интеграции newdns
-  + коммит в upstream libpsi: теперь используется shared zlib в сборках под MS Windows
-  * исправления для хидеров в плагинном интерфейсе (спасибо Hugin) psi-extend-plugins-interface.diff
-  - убран патч psi-mac-dock-click.diff -> принят в upstream
-  + добавлен новый патч для удаления некоторых событий (исправлены возможные утечки памяти)
-    psi-fix-event-removing.diff
-  + добавлен новый патч для обеспечения совместимости с XEP-0172
-    (psi-remove-nick-entry-from-muc-stanzas.diff)
-  * поправлен патч rename-contact-in-roster. теперь допустимо указывать пустое имя контакта
-    (psi-fix-rename-contact-in-roster.diff)
-  * убран ненужный код из third-party в файлах wa_ipc.h и AIMPSDKRemote.h (psi-fix-tunes.diff)
-  + добавлен новый патч для использования absoluteFilePath в PsiRiachText
-    (psi-use-absolutefilepath-in-psireachtext.diff)
-  * улучшения в патче psi-improve-tray-tooltip.diff
-  * фикс при обновлении состояния плагинов (psi-extend-plugins-interface.diff)
-  + добавлен новый патч для решения задачи 508
-    ( http://code.google.com/p/psi-dev/issues/detail?id=508 )
-    psi-fix-reconnecting-when-account-changed.diff
-  + добавлены отсутствующие инклюды для некоторых плагинов (спасибо Florian Fieber)
-  * обновлён birthday reminder plugin до версии 0.4.0
-  * небольшой фикс для extended menu plugin (v0.1.1)
-  ! начата работа над новой реализацией juick plugin (v0.11.0)
-  ! обновлены системные библиотеки qt до версии 4.8.1,
-    http://qt.nokia.com/products/changes/changes-4.8.1
-  ! теперь инсталлятор Psi+ под MS Windows содержит 30+ переводов (локализаций) интерфейса
-    приложения на различные языки (спасибо tehnick), https://github.com/tehnick/psi-plus-i18n
-  --
-  + upstream commit psi: added timestamps into debug log
-  * upstream commit psi: fix main window not reopening on MAC and Qt Cocoa builds
-  * upstream commit psi: fix 'no version available' message in groupchatdlg
-  + upstream commit psi: subdirectory 'translations' is now used for translation files. old paths
-    are also checked for back compatibility
-  - upstream commit psi: remove useless dynamic_cast in psicon
-  + upstream commit psi: use shared zlib on windows
-  * upstream commit iris: better debug messaging in bsocket and connector
-  * upstream commit iris: fixed regression with SSL handshake after merging newdns
-  + upstream commit libpsi: use shared zlib on windows
-  * fixed plugin interface headers (tnx to Hugin) psi-extend-plugins-interface.diff
-  - removed psi-mac-dock-click.diff patch -> went to upstream
-  + added new patch for remove some events (fixed possible memory leaks)
-    psi-fix-event-removing.diff
-  + added new patch for accordance with XEP-0172 revoved the "nick" entry from muc stanzas
-    (psi-remove-nick-entry-from-muc-stanzas.diff)
-  * fixed rename-contact-in-roster patch. allowed blank contact name
-    (psi-fix-rename-contact-in-roster.diff)
-  * removed unused code from third-party wa_ipc.h and AIMPSDKRemote.h files (psi-fix-tunes.diff)
-  + added new patch for use absoluteFilePath in PsiRiachText
-    (psi-use-absolutefilepath-in-psireachtext.diff)
-  * improved psi-improve-tray-tooltip.diff patch
-  * fixed plugins updating (psi-extend-plugins-interface.diff)
-  + added new patch to solve issue 508 ( http://code.google.com/p/psi-dev/issues/detail?id=508 )
-    psi-fix-reconnecting-when-account-changed.diff
-  + added missing includes for some plugins (thx to Florian Fieber)
-  * updated birthday reminder plugin to v0.4.0
-  * small fix for extended menu plugin (v0.1.1)
-  ! start works on new juick plugin implementation (v0.11.0)
-  ! updated qt libs to version 4.8.1, http://qt.nokia.com/products/changes/changes-4.8.1
-  ! win32 installer: added 30+ translations for Psi+ (thx to tehnick),
-    https://github.com/tehnick/psi-plus-i18n
-
-
-2012-04-08  zet
-v0.15.5320
-  * коммит в upstream psi: исправлен некорректный адрес fsf
-  * коммит в upstream psi: фиксы для сервера Idle: теперь PsiCon контроллирует автостатус для
-    аккаунтов; улучшена работа с опциями; счётчик Idle останавливается если автостатусы
-    не используются
-  * коммит в upstream psi: исправлена утечка памяти в диалоге истории переписки (патч от команды
-    Psi+, спасибо liuch)
-  * коммит в upstream psi: исправлена работа опций "contact-sort-style",
-    "contactlist.use-single-click", "contactlist.use-outlined-group-headings" и
-    "contactlist.use-slim-group-headings"
-  * коммит в upstream psi: адаптирован патч от команды Psi+ на работу с директориями freedekstop
-  * коммит в upstream psi: изменены некоторые строки при работе мастера импорта профиля Psi
-  * коммит в upstream psi: фикс миграции профиля Psi в ОС Windows
-  * коммит в upstream psi: исправлено определение местоположения файлов конфига в профиле Psi в
-    ОС Windows
-  * коммит в upstream psi: ещё один фикс определения местоположения файлов профиля Psi+ в ОС Windows
-  * коммит в upstream psi: исправлена работа опции "animate online contacts"
-  * коммит в upstream psi: исправлена работа всплывающего окна при использовании поиска по ростеру
-  * коммит в upstream psi: исправлена работа опции "roster autoresize"
-  * коммит в upstream psi: исправлена работа по передаче файлов при перетаскивании файла на контакт
-    ростера
-  * коммит в upstream psi: исправлена работа действий по переименованию и удалению в меню контакта
-    ростера
-  * коммит в upstream psi: некоторые исправления в отрисовке ростера
-  * коммит в upstream psi: исправлен drag-n-drop в ростере конференции
-  * коммит в upstream libpsi: исправлен некорректный адрес fsf
-  * коммит в upstream libpsi: небольшой фикс для grepshotcuddlg
-  * коммит в upstream libpsi: обновлён GrowlNotifier для использования нового фреймворка growl
-  - убраны некоторые патчи -> приняты в upstream (psi-improve-idle.diff, psi-fix-memory-leak.diff,
-    psi-fix-grepshotcutkeydlg.diff)
-  * перемещены патчи для Mac OC X из репозитория maintenance в репозиторий main (brushed-metal.diff,
-    psi-psiwindowheader-left-button.diff, psi-mac-Makefile.diff, psi-mac-sparkle.diff,
-    psi-chat-theme-mac_native.diff, psi-mac-dock-click.diff, psi-new-growl-interface.diff)
-  * исправлен баг в plopt_plugins (psi-extend-plugins-interface.diff)
-  - убраны некоторые патчи -> приняты в upstream (psi-fix-roster-accounts-and-groups-drawing.diff,
-    psi-fix-contact-sorting-style-option.diff, psi-fix-use-single-click.diff)
-  + добавлен новый патч для исправления поведения при переименовании контакта в ростере
-    (psi-fix-rename-contact-in-roster.diff)
-  * исправлен патч fixed psi-extend-plugins-interface.diff
-  * фикс патча psiplus-binary.diff. далее необходимо разделить данный патч и переместить некоторые
-    его части в другие патчи
-  * отделена часть патча psiplus-binary.diff и перемещена в патч psi-extend-plugins-interface.diff
-  * продолжение работ по разделению патча psiplus-binary.diff (psi-options-language-select.diff,
-    psi-autostart.diff)
-  * исправлен патч fixed psi-bookmark-skip.diff
-  * завершено разделение патча psiplus-binary.diff (psi-webkit.diff, psiplus-application-info.diff)
-  - убран ненужный патч psiplus-binary.diff
-  * подготовка некоторых патчей к отправке в upstream (psi-modern-roster.diff,
-    psi-muc-minimize-to-roster.diff, psi-block-contact-from-menu.diff,
-    psi-fix-pgp-icon-in-roster.diff)
-  - убраны некоторые патчи -> приняты в upstream (psi-fix-online-contacts-animation.diff,
-    psi-fix-tooltip-when-searching-in-roster.diff)
-  * доработка патча psi-multilang-spelling-for-aspell.diff - теперь существует проверка на наличие
-    переменной LANG
-  - убраны некоторые патчи -> приняты в upstream (psi-fix-roster-autoresize.diff,
-    psi-send-file-when-drop-to-roster.diff, psi-fix-remove-action.diff)
-  * обновлён патч psi-fix-rename-contact-in-roster.diff
-  + добавлен новый патч для исправления поведения при переименовании групп ростера
-    (psi-fix-rename-groups.diff)
-  * исправлен патч psi-modern-roster.diff после коммитов в upstream
-  - убраны некоторые патчи -> приняты в upstream (mac/psi-new-growl-interface.diff,
-    psi-fix-drag-contacts-in-muc-roster.diff)
-  * небольшие исправления в init при нажатии кнопки мыши в верхней области поля окна
-    (psiplus-decorate-windows.diff)
-  * PsiWindowHeader теперь поддерживает и Mac OS X. некоторые оптимизации кода в PsiWindowHeader
-    (psiplus-decorate-windows.diff)
-  * убрана ненужная часть патча mac/psi-psiwindowheader-left-button.diff
-  * завершено разделение патча mac/psi-psiwindowheader-left-button.diff
-    (psi-default-application-settings.diff)
-  - убран ненужный патч mac/psi-psiwindowheader-left-button.diff patch
-  * исправлен регресс в патче psi-fix-rename-groups.diff - ошибка при удалении контакта
-  * обновлён список активных участников проекта Psi+ (psiplus-aboutdlg.diff)
-  * обновлён extended options plugin до версии 0.3.7
-  --
-  * upstream commit psi: fixed incorrect fsf address
-  * upstream commit psi: fixed Idle: now PsiCon controls auto-away status for accounts; improved
-    work with options; Idle stops if auto-statuses does not use
-  * upstream commit psi: fixed memory leaks in history (patch from Psi+, thx liuch)
-  * upstream commit psi: fixed 'contact-sort-style', 'contactlist.use-single-click',
-    'contactlist.use-outlined-group-headings' and 'contactlist.use-slim-group-headings' options
-  * upstream commit psi: backported Psi+ patch for freedekstop dirs
-  * upstream commit psi: changed some strings in import wizard
-  * upstream commit psi: fixed migration on windows
-  * upstream commit psi: fixed detection of config data dirs on windows
-  * upstream commit psi: one yet fix for windows profile dir
-  * upstream commit psi: fixed animate online contacts option
-  * upstream commit psi: fixed tooltip on contacts when search in roster
-  * upstream commit psi: fixed roster autoresize option
-  * upstream commit psi: fixed send files when drop to roster
-  * upstream commit psi: fixed rename and remove actions at contacts menu
-  * upstream commit psi: some fixes for roster painting
-  * upstream commit psi: fixed drag-n-drop in muc roster
-  * upstream commit iris: relink psi when iris sources changes. use qDebug instead of printf to
-    make messages visible in debug view of qtreator
-  * upstream commit libpsi: fixed incorrect fsf address
-  * upstream commit libpsi: small fix for grepshotcuddlg
-  * upstream commit libpsi: update GrowlNotifier for using new growl framework
-  - removed some patches -> went to upstream (psi-improve-idle.diff, psi-fix-memory-leak.diff,
-    psi-fix-grepshotcutkeydlg.diff)
-  * moved mac patches from maintenance to main (brushed-metal.diff,
-    psi-psiwindowheader-left-button.diff, psi-mac-Makefile.diff, psi-mac-sparkle.diff,
-    psi-chat-theme-mac_native.diff, psi-mac-dock-click.diff, psi-new-growl-interface.diff)
-  * fixed bug in plopt_plugins (psi-extend-plugins-interface.diff)
-  - removed some patches -> went to upstream (psi-fix-roster-accounts-and-groups-drawing.diff,
-    psi-fix-contact-sorting-style-option.diff, psi-fix-use-single-click.diff)
-  + added new patch for fix rename contact in roster (psi-fix-rename-contact-in-roster.diff)
-  * fixed psi-extend-plugins-interface.diff patch
-  * fixed brending patch. still needs to move its parts into other patches (psiplus-binary.diff)
-  * moved some part of psiplus-binary.diff patch into psi-extend-plugins-interface.diff patch
-  * more split of psiplus-binary.diff patch (psi-options-language-select.diff, psi-autostart.diff)
-  * fixed psi-bookmark-skip.diff patch
-  * spliting psiplus-binary.diff patch is completed (psi-webkit.diff, psiplus-application-info.diff)
-  - removed useless psiplus-binary.diff patch
-  * prepared some patches for upstream (psi-modern-roster.diff, psi-muc-minimize-to-roster.diff,
-    psi-block-contact-from-menu.diff, psi-fix-pgp-icon-in-roster.diff)
-  - removed some patches -> went to upstream (psi-fix-online-contacts-animation.diff,
-    psi-fix-tooltip-when-searching-in-roster.diff)
-  * improved psi-multilang-spelling-for-aspell.diff patch - check LANG variable
-  - removed some patches -> went to upstream (psi-fix-roster-autoresize.diff,
-    psi-send-file-when-drop-to-roster.diff, psi-fix-remove-action.diff)
-  * updated psi-fix-rename-contact-in-roster.diff patch
-  + added new patch for fix rename groups (psi-fix-rename-groups.diff)
-  * fixed psi-modern-roster.diff patch after upstream commit
-  - removed some patches -> went to upstream (mac/psi-new-growl-interface.diff,
-    psi-fix-drag-contacts-in-muc-roster.diff)
-  * small fix in mouse press init at the top region of the borderless window
-    (psiplus-decorate-windows.diff)
-  * PsiWindowHeader now supports Mac OS X. some code optimizations in PsiWindowHeader
-    (psiplus-decorate-windows.diff)
-  * removed a part of mac/psi-psiwindowheader-left-button.diff patch
-  * spliting psi-psiwindowheader-left-button.diff patch is complited
-    (psi-default-application-settings.diff)
-  - removed useless mac/psi-psiwindowheader-left-button.diff patch
-  * fixed regression in psi-fix-rename-groups.diff patch. error when deleting a contact
-  * updated psiplus-aboutdlg.diff patch
-  * updated extended options plugin to v0.3.7
-
-
-2012-04-01  zet
-v0.15.5284
-  * коммит в upstream psi: убрана ненужная анимация из меню на нике в чатлоге
-  + коммит в upstream psi: добавлена поддержка распознавания ссылок типа "magnet:" в чатлогах
-  + коммит в upstream psi: поддержка распознавания ссылок типа "xmpp:" в freedesktop
-  * коммит в upstream iris: фикс передачи файлов большого размера, подробнее -
-    http://code.google.com/p/psi-dev/issues/detail?id=499
-  * коммит в upstream iris: исправлено возможное падение приложения при закрытии приложения в момент
-    получения входящей станзы
-  * возвращена ежесекундная проверка состояния idle (psi-improve-idle.diff)
-  + добавлен новый патч для запрета мгновенного обновления счётчика онлайн-контактов в ростере -
-    небольшое увеличение скорости запуска приложения (psi-fix-online-contacts-count-update.diff)
-  * улучшения в плагинной системе - не используются отладочные символы в релизных сборках;
-    исправлено включение/отключение плагинов из настроек приложения; автоматическая установка
-    автозагрузки плагина после первого использования (psi-extend-plugins-interface.diff)
-  + добавлен новый патч, убирающий ненужную анимацию из некоторых меню приложения
-    (psi-remove-anim-from-urlmenu.diff)
-  * переименован патч psi-remove-anim-from-urlmenu.diff, а также убрана ненужная анимация из меню
-    iconactions (psi-remove-animation-from-iconactions.diff)
-  - убран патч psi-remove-animation-from-iconactions.diff -> принят в upstream
-  + добавлен новый патч append_sys_message от Hugin (объединён с патчем
-    psi-extend-plugins-interface.diff)
-  * улучшения в dbus-попапах: проверка возможностей сервера (psiplus-new-popups.diff)
-  * переписан idle патч и перемещён в начало очереди применения патчей - подготовка к передаче
-    в upstream (psi-improve-idle.diff)
-  * исправлены некоторые патчи (psi-presets-in-status-menu.diff, psiplus-new-popups.diff)
-  * исправления для сервера idle (psi-idle-server.diff)
-  * исправлены прочие патчи (psi-ignoring-global-statuses.diff,
-    psi-fix-online-contacts-count-update.diff, psi-extend-plugins-interface.diff,
-    psi-more-effective-work-with-options.diff, psiplus-binary.diff)
-  * фикс патча psiplus-binary.diff после коммита в upstream
-  * обновлён image plugin до версии 0.1.2
-  * обновлён gnome3 support plugin (только для *nix-систем)
-  * psimedia+ исправлен некорректный адрес FSF
-  * psimedia+ фиксы сборки с glib >= 2.32
-  ! обновлены системные библиотеки openssl до версии 1.0.1,
-    http://www.openssl.org/news/changelog.html
-  --
-  * upstream commit psi: remove crazy animation from iconactions
-  + upstream commit psi: added stupid magnet links support
-  + upstream commit psi: added some freedesktop magic into desktop file
-  * upstream commit iris: fixed int overflow in filetransfer when ranged transfer used
-    (Psi+ Issue 499, http://code.google.com/p/psi-dev/issues/detail?id=499 )
-  * upstream commit iris: fixed possible crash when Client::close called during incoming stanza
-    processing
-  * reverted every second idle checking (psi-improve-idle.diff)
-  + added new patch for deny update online contacts count instantly - a bit faster application start
-    (psi-fix-online-contacts-count-update.diff)
-  * improved plugins patch - dont use qdebug in release builds; fix loading-unloading plugins from
-    options; automatically set auto-load option at first accessing
-    (psi-extend-plugins-interface.diff)
-  + added new patch for fix animation never stops (psi-remove-anim-from-urlmenu.diff)
-  * renamed psi-remove-anim-from-urlmenu.diff patch and removed animation from iconactions
-    (psi-remove-animation-from-iconactions.diff)
-  - removed psi-remove-animation-from-iconactions.diff patch -> went to upstream
-  + added append_sys_message patch by Hugin (merged with psi-extend-plugins-interface.diff patch)
-  * improved dbus popups: check server capabilities (psiplus-new-popups.diff)
-  * rewritten idle patch and moved to top of patches - prepared for moving to upstream
-    (psi-improve-idle.diff)
-  * fixed some patches (psi-presets-in-status-menu.diff, psiplus-new-popups.diff)
-  * fixed idle server (psi-idle-server.diff)
-  * fixed other patches (psi-ignoring-global-statuses.diff,
-    psi-fix-online-contacts-count-update.diff, psi-extend-plugins-interface.diff,
-    psi-more-effective-work-with-options.diff, psiplus-binary.diff)
-  * fixed psiplus-binary.diff patch after upstream commit
-  * updated image plugin to v0.
-  * updated gnome3 support plugin (*nix only)
-  * psimedia+ fixed incorrect FSF address
-  * psimedia+ fixed build with glib >= 2.32
-  ! updated openssl libs to version 1.0.1, http://www.openssl.org/news/changelog.html
-
-
-2012-03-25  zet
-v0.15.5268
-  * коммит в upstream psi: теперь используется static_cast вместо dynamic_cast в
-    contactlistproxymodel
-  * теперь используется (jid) вместо <jid> в dbus-попапах (psiplus-new-popups.diff)
-  + добавлен новый патч для проверки орфографии для нескольких языков одновременно. основан на
-    патче отсюда http://forum.psi-plus.com/viewtopic.php?f=8&t=94 . взят только базовый функционал.
-    для проверки используются все доступные в системе языки. необходимые языки указываются через
-    пробел в advanced-опции "options.ui.spell-check.langs" (psi-multilang-spelling-for-aspell.diff)
-  + добавлен новый патч для исправления бага, из-за которого при поиске в списке контактов
-    использовался ресурс контакта. вследствие этого контакт дублировался в группе "Not in list".
-    например, актуально для плагинов, использующих ссылки (psi-chat-not-in-list-fix.diff)
-  * исправлен патч psiplus-new-popups.diff
-  + добавлен новый патч, запрещающий проверку орфографии при наборе цифр
-    ( http://code.google.com/p/psi-dev/issues/detail?id=396 ) psi-dont-spellcheck-digits.diff
-  + добавлен новый патч для grepshorcutkeydlg. исправлена утечка памяти. теперь работает в Mac OS X
-    psi-fix-grepshotcutkeydlg.diff
-  + улучшения в патче psi-fix-eventnotifier.diff - панель уведомлений не будет скрываться, если
-    этого не требуется. ранее панель с количеством пропущенных сообщений в ростере всегда пряталась
-    после прочтения сообщения, независимо от настроек тулбаров в опциях
-  * переименована опция в меню ростера (Blocked -> Ignore global actions)
-    psi-ignoring-global-statuses.diff
-  + добавлена новая иконка "ignore_global_actions.png" в системный иконпак
-    (psi-iconsets.diff, psi-one-chat-for-many-resources.diff)
-  * обновлён патч psi-ignoring-global-statuses.diff - используется новая иконка и пункт меню
-    перенесён на уровень глубже, в меню статусов
-  + добавлен новый патч для уменьшения количества вызовов при работе с настройками приложения
-    (psi-improve-idle.diff)
-  * небольшая оптимизация в некоторых патчах. userAccount() -> accountOptions()
-    psi-presets-in-status-menu.diff, psi-ignoring-global-statuses.diff,
-    psi-extend-plugins-interface.diff
-  + добавлен новый патч для более эффективной работы с настройками - исключение вызова в одном и
-    том же месте по 2-3-4 раза одной и той же опции. также добавлено кэширование некоторых настроек
-    в делегате ростера (должна возрасти скорость отрисовки)
-    psi-more-effective-work-with-options.diff
-  * idle - опрашивать каждую минуту вместо каждой секунды (psi-improve-idle.diff)
-  * некоторые фиксы в некоторых патчах (psi-improve-idle.diff, psi-extend-plugins-interface.diff,
-    psi-more-effective-work-with-options.diff)
-  * переписан патч psi-more-effective-work-with-options.diff
-  * улучшения в патче psi-hide-muc-auto-join.diff
-  * исправлен патч psi-always-visible-contacts.diff после коммита в upstream
-  * фикс компиляции в Mac OS X (psi-more-effective-work-with-options.diff)
-  + добавлен новый патч для growl-интерфейса
-    (scripts/macosx/patches/3060-psi-new-growl-interface.diff)
-  * обновлён storage notes plugin до версии 0.1.8
-  * обновлён translate plugin до версии 0.4.3
-  * обновлён gmail service plugin до версии 0.7.4
-  * обновлён video status changer plugin до версии 0.2.3
-  * обновлён screenshot plugin до версии 0.6.4
-  * исправлен content downloader plugin (убран ненужный редирект), v0.2.2
-  --
-  * upstream commit psi: use static_cast instead of dynamic_cast in contactlistproxymodel
-  * use (jid) instead of <jid> in dbus popups (psiplus-new-popups.diff)
-  + added new patch for spell checking for multiple languages at once. based on patch from here
-    http://forum.psi-plus.com/viewtopic.php?f=8&t=94 . only basic functionality. for check uses all
-    available languages in the system. use 'options.ui.spell-check.langs' to specify langs
-    (no commas, just through space) psi-multilang-spelling-for-aspell.diff
-  + added new patch for fix a bug due to which the search in the roster used by the contact
-    resource. contact is duplicated in group 'Not in list'. for example, in the relevant plugins
-    that use the urls (psi-chat-not-in-list-fix.diff)
-  * fixed psiplus-new-popups.diff patch
-  + added new patch for deny spellcheck of digits
-    ( http://code.google.com/p/psi-dev/issues/detail?id=396 ) psi-dont-spellcheck-digits.diff
-  + added new patch for fix grepshorcutkeydlg. fixed memory leak. now works on Mac OS X
-    psi-fix-grepshotcutkeydlg.diff
-  + improved psi-fix-eventnotifier.diff patch - eventnotifier will not hiding if it shouldnt. the
-    panel with the number of missed messages in the roster is always hiding after reading the
-    message. this occurred regardless of the settings in the options toolbar
-  * renamed menu item (Blocked -> Ignore global actions) psi-ignoring-global-statuses.diff
-  + added 'ignore_global_actions.png' icon into iconsets
-    (psi-iconsets.diff, psi-one-chat-for-many-resources.diff)
-  * updated psi-ignoring-global-statuses.diff patch - the menu item is moved to a level deeper in
-    the status menu
-  + added new patch for less options calling every second in secondsIdle() psi-improve-idle.diff
-  * small optimization for some patches. userAccount() -> accountOptions()
-    psi-presets-in-status-menu.diff, psi-ignoring-global-statuses.diff,
-    psi-extend-plugins-interface.diff
-  + added new patch for more effective work with options - exception to the call in the same place
-    at 2-3-4 times the same option. also added some caching settings on the delegate roster
-    (should increase rendering speed) psi-more-effective-work-with-options.diff
-  * idle - poll every minute instead of every seccond (psi-improve-idle.diff)
-  * some fixes for some patches (psi-improve-idle.diff, psi-extend-plugins-interface.diff,
-    psi-more-effective-work-with-options.diff)
-  * improved psi-more-effective-work-with-options.diff patch
-  * improved psi-hide-muc-auto-join.diff patch
-  * fixed psi-always-visible-contacts.diff patch after upstream commit
-  * fixed compilations on mac (psi-more-effective-work-with-options.diff)
-  + added new growl interface patch (scripts/macosx/patches/3060-psi-new-growl-interface.diff)
-  * updated storage notes plugin to v0.1.8
-  * updated translate plugin to v0.4.3
-  * updated gmail service plugin to v0.7.4
-  * updated video status changer plugin to v0.2.3
-  * updated screenshot plugin to v0.6.4
-  * fixed content downloader plugin (removed unnecessary redirect), v0.2.2
-
-
-2012-03-09  zet
-v0.15.5242
-  * коммит в upstream psi: исправлено падение приложения при использовании service discovery
-  + добавлен новый патч, исправляющий несколько утечек памяти в истории сообщений (поиск,
-    навигация, экспорт) psi-fix-memory-leak.diff
-  + добавлен новый патч, запрещающий удаление аккаунта, содержащего непрочитанные сообщения/события
-    (решена задача 492, http://code.google.com/p/psi-dev/issues/detail?id=492)
-    psi-dont-remove-accounts-with-events.diff
-  + добавлен новый патч, который позволяет указывать аккаунты, для которых будут игнорироваться
-    глобальные установки статуса. а именно: автостатус, настроения, занятия, геолокация, статус из
-    главного окна, в том числе, текст статуса. исключение сделано для глобального offline - при этом
-    отключатся все аккаунты (как обычно) psi-ignoring-global-statuses.diff
-  + добавлен новый патч - попытка исправить баг, в результате которого иногда самопроизвольно
-    обнуляются accounts.xml и options.xml. при открытии файла явно указано о его обнулении.
-    необходимо в случае если предыдущая запись в файл не была корректно завершена. после применения
-    патча QTextStream и QFile закрываются явно. в случае QFile теперь проверяется не только наличие
-    ошибок записи, но и ошибки при сбросе буферов перед закрытием файла (psi-safe-storage-fix.diff)
-  * обновлён патч psi-ignoring-global-statuses.diff. опция перенесена из диалога настроек аккаунта
-    в меню аккаунта
-  * некоторые фиксы в отрисовке основного ростера и ростера конференции (psi-modern-roster.diff,
-    psi-custom-icons-size.diff, psi-modern-muc-roster.diff)
-  * небольшие исправления для growl-уведомлений (psiplus-new-popups.diff)
-  * исправлена ошибка, приводившая к пустому потоку в tune-контроллере AIMP (psi-fix-tunes.diff)
-  * исправлена работа с именами файлов в tune-контроллере AIMP (psi-fix-tunes.diff)
-  * контроллер Winamp теперь генерирует правильный tune (psi-fix-tunes.diff)
-  * исправлено определение времени в tune-контроллере AIMP (psi-fix-tunes.diff)
-  + добавлен новый патч для исправления переоткрытия ростера в MAC OS X (решена задача 403,
-    http://code.google.com/p/psi-dev/issues/detail?id=403)
-    scripts/macosx/patches/3050-psi-mac-dock-click.diff
-  * исправлена опечатка в тексте предупреждение при закрытии несохранённого скриншота (screenshot
-    plugin, v0.6.2)
-  * исправлен translate plugin (v0.4.2)
-  * обновлён storage notes plugin до версии 0.1.8
-  --
-  * upstream commit psi: fixed random crash when closing discodlg
-  + added new patch for fix several memory leaks in history of messages (search, navigation,
-    exports) psi-fix-memory-leak.diff
-  + added new patch for deny to remove accounts with unread events (closed issue 492,
-    http://code.google.com/p/psi-dev/issues/detail?id=492)
-    psi-dont-remove-accounts-with-events.diff
-  + added mew patch for allows you to specify which accounts for the global settings will be
-    ignored status. namely avtostatus, moods, activities, geolocation, the status of the main
-    window, including the status text. an exception is made for the global offline - shut off all
-    the accounts as usual (psi-ignoring-global-statuses.diff)
-  + added new patch for try to fix a bug in which sometimes spontaneously reset accounts.xml and
-    options.xml. when you open the file explicitly reset it. necessary if the previous record in
-    the file has not been properly completed. after patch QTextStream and QFile closed explicitly.
-    in the case of QFile is now checked for errors, not only writing, but when you reset the error
-    buffer before you close the file (psi-safe-storage-fix.diff)
-  * updated psi-ignoring-global-statuses.diff patch. option moved from the account settings dialog
-    menu to the account context menu
-  * some fixes for painting roster and muc roster (psi-modern-roster.diff,
-    psi-custom-icons-size.diff, psi-modern-muc-roster.diff)
-  * small fix for growl notifications (psiplus-new-popups.diff)
-  * fixed empty tunes flood in AIMP controller (psi-fix-tunes.diff)
-  * fixed work with filenames in AIMP tunecontroller (psi-fix-tunes.diff)
-  * Winamp tunecontroller now can generate correct tune (psi-fix-tunes.diff)
-  * fixed time detection in AIMP tunecontroller (psi-fix-tunes.diff)
-  + added new patch for fix reopen roster when dock clicked on cocoa in MAC OS X (closed issue 403,
-    http://code.google.com/p/psi-dev/issues/detail?id=403)
-    scripts/macosx/patches/3050-psi-mac-dock-click.diff
-  * fixed typo in screenshot plugin (v0.6.2)
-  * fixed translate plugin (v0.4.2)
-  * updated storage notes plugin to v0.1.8
-
-
-2012-02-25  zet
-v0.15.5225
-  * коммит в upstream psi: теперь ошибка "Unable to retrieve your account information."
-    не отображается для собственного вкарда при логине если опция
-    "options.vcard.query-own-vcard-on-login" выключена
-  * коммит в upstream psi: исправлен метод soundPlay(const QString &s) - при пустой строке в
-    настройках звука теперь используется тишина (вместо проигрывания звука по умолчанию из системы)
-  * коммит в upstream psi: добавлена возможность установить отдельный звук для подсвеченных
-    сообщений из конференций (патч от команды Psi+)
-  * исправлен патч psi-typeahead-find.diff
-  * исправлен патч psi-chatview-quote-feature.diff
-  ! рефакторинг всплывающих окон (попапов) - добавлена поддержка freedesktop.Notifications
-    (только для *NIX), фиксы Growl-нотификаций (MAC OS X), прочие исправления и улучшения
-    psiplus-new-popups.diff, psi-extend-plugins-interface.diff
-  + добавлен новый патч на установку отдельного звука для подсвеченных сообщений из конференций
-    (psi-sound-for-muc-messages.diff) by smartly
-  * улучшения в dbus-попапах: теперь при закрытии попапов пользователем будет вызываться действие
-    по умолчанию (psiplus-new-popups.diff)
-  * некоторые исправления в стиле кода для новых попапов Psi+, исправлена возможная утечка памяти
-    в попапах Psi+, добавлены новые advanced-опции
-    "options.ui.notifications.passive-popups.suppress-while-dnd" и
-    "options.ui.notifications.passive-popups.suppress-while-away" (psiplus-new-popups.diff)
-  * добавлены подсказки для dbus-попапов (psiplus-new-popups.diff)
-  * проверка статуса при показе попапов для всех типов попапов (psiplus-new-popups.diff,
-    psi-extend-plugins-interface.diff)
-  - убран патч psi-sound-for-muc-messages.diff -> принят в upstream
-  * объединены патчи psi-muc-notify-highlight.diff и psiplus-new-popups.diff
-  * улучшения в работе попапов для плагинного интерфейса (psiplus-new-popups.diff,
-    psi-extend-plugins-interface.diff)
-  * попытка исправить падение приложения при работе dbus-попапов (psiplus-new-popups.diff)
-  * фиксы описаний в dbus-попапах, исправлена утечка памяти при работе попапов из конференций,
-    теперь попапы из конференций кликабельны (psiplus-new-popups.diff)
-  * убрана команда Block из меню на контакте конференции в ростере (решена задача 481,
-    http://code.google.com/p/psi-dev/issues/detail?id=481) psi-block-contact-from-menu.diff
-  * исправлен патч fixed psi-send-custom-status.diff (решена задача 489,
-    http://code.google.com/p/psi-dev/issues/detail?id=489)
-  * исправлена последовательность переключения между полями на странице настройки шаблонов статусов
-    (решена задача 483, http://code.google.com/p/psi-dev/issues/detail?id=483)
-    psi-presets-in-status-menu.diff
-  + добавлен новый патч для поддержки отображения аватаров в попапах из конференций
-    (psi-muc-avatars-at-popups.diff)
-  * оптимизация плагинной системы. при отключении плагина его опция удаляется из попапов
-    (имеется ввиду настройка интервала отображения)
-  * больше переводимых строк в extended options plugin
-  * обновлены updated attention plugin, birthday reminder plugin, client switcher plugin,
-    extended menu plugin, gmail service plugin, pep change notify plugin, stop spam plugin,
-    storage notes plugin
-  * обновлён watcher plugin, некоторые фиксы для attention plugin и pep change notify plugin
-  * исправлен client switcher plugin
-  * исправлен и обновлён yandex narod plugin
-  * исправлен regexp для omploader в screenshot plugin
-  * обновлён video status plugin
-  * исправлен патч scripts/macosx/patches/3030-psi-mac-sparkle.diff
-  --
-  * upstream commit psi: don't show 'Unable to retrieve your account information.' error for
-    own vcard on login if 'options.vcard.query-own-vcard-on-login' was disabled
-  * upstream commit psi: fix void soundPlay(const QString &s) method if s is empty string
-  * upstream commit psi: add ability to set sound for muc highlightes (from Psi+ patch)
-  * fixed psi-typeahead-find.diff patch
-  * fixed psi-chatview-quote-feature.diff patch
-  ! more works with popups - added freedesktop.Notifications (*NIX only), fixes for Growl
-    notifications (MAC OS X), other fixes
-    (psiplus-new-popups.diff, psi-extend-plugins-interface.diff)
-  + added a new patch to be able to set a separate sound for messages from the conference
-    (psi-sound-for-muc-messages.diff) by smartly
-  * improved dbus popups: now when popup closes by user - default action will invoke
-    (psiplus-new-popups.diff)
-  * some fixes for codestyle of Psi+ popups, fixed possible memory leak in Psi+ popups, added
-    options 'options.ui.notifications.passive-popups.suppress-while-dnd' and
-    'options.ui.notifications.passive-popups.suppress-while-away' (psiplus-new-popups.diff)
-  * added transient hint for dbus popups (psiplus-new-popups.diff)
-  * do status check when show popups for all popup types
-    (psiplus-new-popups.diff, psi-extend-plugins-interface.diff)
-  - removed psi-sound-for-muc-messages.diff patch -> went to upstream
-  * merged psi-muc-notify-highlight.diff and psiplus-new-popups.diff patches
-  * improved popup plugin interface (psiplus-new-popups.diff, psi-extend-plugins-interface.diff)
-  * try to fix crash on awesome with new dbus popups (psiplus-new-popups.diff)
-  * fixed descriptions in dbus popups, fixed memory leak for groupchat popups, groupchat popups
-    now can be clicked (psiplus-new-popups.diff)
-  * dont block mucs (closed issue 481, http://code.google.com/p/psi-dev/issues/detail?id=481)
-    psi-block-contact-from-menu.diff
-  * fixed psi-send-custom-status.diff patch (closed issue 489,
-    http://code.google.com/p/psi-dev/issues/detail?id=489)
-  * fixed tabstop at opt_statusauto (closed issue 483,
-    http://code.google.com/p/psi-dev/issues/detail?id=483) psi-presets-in-status-menu.diff
-  + added avatars for muc popups (psi-muc-avatars-at-popups.diff)
-  * optimization for the plugin system. if you disable the plugin, it removes the option of the
-    popups (meaning set the display interval)
-  * more translatable strings in extended options plugin
-  * updated attention plugin, birthday reminder plugin, client switcher plugin,
-    extended menu plugin, gmail service plugin, pep change notify plugin, stop spam plugin,
-    storage notes plugin
-  * updated watcher plugin, some fixes for attention plugin, pep change notify plugin
-  * fixed client switcher plugin
-  * fixed yandex narod plugin
-  * fixed regexp for omploader in screenshot plugin
-  * updated video status plugin
-  * fixed scripts/macosx/patches/3030-psi-mac-sparkle.diff patch
-
-
-2012-02-12  zet
-v0.15.5195
-  * коммит в upstream psi: исправлены лицензионные заголовки в файлах
-  * коммит в upstream iris: исправлен адрес fsf
-  - коммит в upstream psi: убраны пустые и ненужные файлы tune-контроллера
-  * коммит в upstream psi: исправлен баг в ContactListView::rename()
-  * changelog.txt теперь кодируется в UTF-8 with BOM
-  - убран ненужный changelog_cp1251.txt
-  * фиксы в патче fixed psi-send-xhtml-im.diff: убраны отступы, возникающие вследствии применения
-    html-форматирования сообщений. не всегда удаётся разместить форматированное сообщение не с
-    новой строки. например, если его вставить в строку ввода посредством Ctrl+ArrowUp. в этом
-    случае формируется несколько \<p\> тегов
-  * исправлен год в копирайте диалога "О программе"  (psiplus-aboutdlg.diff)
-  * объединены некоторые патчи на всплывающие окошки (psiplus-new-popups.diff)
-  * фиксы сдвига в патче psi-geolocation.diff
-  * обновлён yandex narod plugin to v0.1.1
-  * исправлен адрес fsf в файлах некоторых плагинов (client switcher plugin, gomoku game plugin)
-  * исправлен stop spam plugin (v0.5.4)
-  * обновлён video status plugin to v0.1.8
-  * обновлён content downloader plugin to v0.2.2
-  ! обновлены библиотеки qt до версии 4.8.0, http://labs.qt.nokia.com/2011/12/15/qt-4-8-0-released/
-  ! обновлены библиотеки openssl до версии 1.0.0g, http://www.openssl.org/news/changelog.html
-  ! обновлена русская локализация от ivan101, https://github.com/ivan101/psi-plus-ru (2011-12-26)
-  --
-  * upstream commit psi: fixed lincense headers
-  * upstream commit iris: fixed fsf address
-  - upstream commit psi: removed empty tune controller files
-  * upstream commit psi: fix bug in ContactListView::rename()
-  * changelog.txt now encoded in UTF-8 with BOM
-  - removed useless changelog_cp1251.txt
-  * fixed psi-send-xhtml-im.diff patch: unindented arise as a consequence of html formatted messages.
-    it's not always possible to place the formatted message with a new line. for example, if you
-    insert it into the input line by trl + ArrowUp. in this case, a few \<p\> tags
-  * updated year in aboutdlg (psiplus-aboutdlg.diff)
-  * merged some popup patches (psiplus-new-popups.diff)
-  * fixed fuzz in psi-geolocation.diff patch
-  * updated yandex narod plugin to v0.1.1
-  * corrected fsf address for some Psi+ plugins (client switcher plugin, gomoku game plugin)
-  * fixed stop spam plugin (v0.5.4)
-  * updated video status plugin to v0.1.8
-  * updated content downloader plugin to v0.2.2
-  ! updated qt libs to version 4.8.0, http://labs.qt.nokia.com/2011/12/15/qt-4-8-0-released/
-  ! updated openssl libs to version 1.0.0g, http://www.openssl.org/news/changelog.html
-  ! updated russian localization by ivan101, https://github.com/ivan101/psi-plus-ru (2011-12-26)
-
-
-2012-01-22  zet
-v0.15.5185
-  ! коммит в upstream обновление для iris
-  ! коммит в upstream добавлен флаг OTHER_FILES в файл проекта psi.pro для удобства
-  ! коммит в upstream исправлена работа dbus при старте приложения. устранено падение приложения
-    при открытии приватного сообщения из конференции
-  ! коммит в upstream улучшен механизм загрузки иконсетов при работе с ними в настройках
-    приложения
-  - убран патч psi-gcc-4.6-compatibility.diff -> принят в upstream
-  * исправлен патч psi-muc-minimize-to-roster.diff - отображение разделителя неактивных сессий при
-    сворачивании конференции в ростер
-  * исправлен вылет Psi+ в случае когда список пользователей для чата был пуст. например, при
-    попытке открытия чата с конференцией psi-dev, если сама конференция уже активна
-    (psi-one-chat-for-many-resources.diff)
-  * устранено падение приложения при деактивации в настройках приложения флажка выбора цвета
-    дополнительного текста в чатах/конференциях (psi-webkit.diff)
-  + добавлен новый смайлпак Android12x12.jisp
-  * обновлён системный иконпак oxygen_sys.jisp (iconsets/system/oxygen_sys.jisp)
-  * обновлены скины для Mac OSX
-    (skins/mac/native_mac/NativeMac_tt.skn, skins/mac/native_mac/images/qcombobox.png)
-  * обновлены системные иконпаки blacksys.jisp, whitesys.jisp
-    (iconsets/system/blacksys.jisp, iconsets/system/whitesys.jisp)
-  + добавлен новый ростерный иконпак mrim2012.jisp (iconsets/roster/mrim2012.jisp)
-  * обновлён ростерный иконпак icq.jisp (iconsets/roster/icq.jisp)
-  - убраны устаревшие ростерные иконпаки для mrim-транспорта
-    (iconsets/roster/mrim2006.jisp, iconsets/roster/mrim2008.jisp)
-  * win32 installer: экспериментально добавлена проверка на запущенный процесс "psi-plus.exe" при
-    инсталляции/деинсталляции приложения (KillProc)
-  --
-  ! upstream commit iris: prefer null strings to empty
-  ! upstream commit added OTHER_FILES to psi.pro for convenience
-  ! upstream commit fixed dbus warning on start. fixed crash on opening muc private chat
-  ! upstream commit improved loading of iconsets in options
-  - removed psi-gcc-4.6-compatibility.diff patch -> went to upstream
-  * fixed psi-muc-minimize-to-roster.diff patch - do trackbar when muc hidden to roster
-  * fixed a bug that caused the crash, in some cases (psi-one-chat-for-many-resources.diff)
-  * fixed crash on deactivating color checkbox of additional text (psi-webkit.diff)
-  + added Android12x12.jisp emoticons iconset
-  * updated oxygen_sys.jisp (iconsets/system/oxygen_sys.jisp)
-  * updated mac skins
-    (skins/mac/native_mac/NativeMac_tt.skn, skins/mac/native_mac/images/qcombobox.png)
-  * updated blacksys.jisp, whitesys.jisp
-    (iconsets/system/blacksys.jisp, iconsets/system/whitesys.jisp)
-  + added mrim2012.jisp (iconsets/roster/mrim2012.jisp)
-  * updated icq.jisp (iconsets/roster/icq.jisp)
-  - removed ugly mrim iconsets (iconsets/roster/mrim2006.jisp, iconsets/roster/mrim2008.jisp)
-  * win32 installer: added 'KillProcDLL::KillProc'
-
-
-2011-12-25  zet
-v0.15.5160
-  ! коммит в upstream теперь по умолчанию всегда выключен горизонтальный скролл-бар
-    в ростере конференции
-  ! коммит в upstream исправлена регрессия в zlib.qcm
-  - убран патч psi-fix-filetransfer.diff -> патч принят в upstream
-  + добавлен новый патч для решения задачи 466, http://code.google.com/p/psi-dev/issues/detail?id=466
-    (psi-send-file-when-drop-to-roster.diff)
-  * обновлён патч psi-send-file-when-drop-to-roster.diff
-  - убран патч psi-muc-roster-disable-horizontal-scrollbar.diff -> патч принят в upstream
-  + добавлен новый патч, исправляющий работу таймера в eventdlg (psi-fix-timer-in-eventdlg.diff)
-  * включение плагина на этапе старта приложения (если плагин был включен в настройках приложения)
-    psi-extend-plugins-interface.diff
-  * запрет блокировки самого себя в контекстном меню self-contact (psi-block-contact-from-menu.diff)
-  + добавлен новый патч, исключающий возможность удаления собственного контакта (self-contact)
-    psi-fix-remove-action.diff
-  * больше строк для локализации (psi-one-chat-for-many-resources.diff)
-  * исправлена отрисовка иконок в чатах webkit-версии (psi-webkit.diff)
-  * исправлено падение приложения при попытке изменить роль/афиляцию вышедшему участнику
-    конференции (psi-reasons-for-roles-affiliations.diff). решена задача 476,
-    http://code.google.com/p/psi-dev/issues/detail?id=476
-  * обновлён video status changer plugin (v0.1.7): добавлена поддержка определения полноэкранного
-    режима для MS Windows, http://psi-plus.com/wiki/plugins#video_status_changer_plugin
-  * обновлён extended options plugin до версии 0.3.6
-  * обновлён gmail service plugin до версии 0.7.2
-  ! в win32-инсталлятор добавлен video status changer plugin
-  ! обновлена русская локализация от ivan101, https://github.com/ivan101/psi-plus-ru (2011-12-25)
-  --
-  ! upstream commit always off for muc roster's horizontal scrollbar
-  ! upstream commit fixed regression in zlib.qcm
-  - removed psi-fix-filetransfer.diff patch -> went to upstream
-  + added a new patch to solve the issue 466, http://code.google.com/p/psi-dev/issues/detail?id=466
-    (psi-send-file-when-drop-to-roster.diff)
-  * updated psi-send-file-when-drop-to-roster.diff patch
-  - removed psi-muc-roster-disable-horizontal-scrollbar.diff patch -> went to upstream
-  + added new patch for fix timer in eventdlg (psi-fix-timer-in-eventdlg.diff)
-  * enable new plugin if it enabled in options (psi-extend-plugins-interface.diff)
-  * don't block yourself in self-contact context menu (psi-block-contact-from-menu.diff)
-  + added a new patch for fix remove action in contacts menu (psi-fix-remove-action.diff)
-  * updated messages for translate (psi-one-chat-for-many-resources.diff)
-  * fixed icons drawing in webkit chat (psi-webkit.diff)
-  * fixed psi-reasons-for-roles-affiliations.diff patch (solved the issue 476,
-    http://code.google.com/p/psi-dev/issues/detail?id=476)
-  * updated video status changer plugin (v0.1.7): added support for determining fullscreen mode
-    for MS Windows, http://psi-plus.com/wiki/plugins#video_status_changer_plugin
-  * updated extended options plugin to v0.3.6
-  * updated gmail service plugin to v0.7.2
-  ! win32 installer: added video status changer plugin
-  ! updated russian localization by ivan101, https://github.com/ivan101/psi-plus-ru (2011-12-25)
-
-
-2011-11-13  zet
-v0.15.5145
-  ! коммит в upstream исправлена работа при выборе способа передачи файлов (по приоритету)
-  * некоторые исправления в контроллере MPRIS (psi-fix-tunes.diff)
-  + добавлен детект клиента qip 2012 (psi-client-icons.diff)
-  + добавлен новый патч на автостарт pgp-соединений. теперь будет автоматически стартовать в том
-    случае, если контакту присвоен pgp-ключ. т.е. будет автостарт даже для оффлайн-контактов.
-    используйте advanced-опцию "options.pgp.auto-start" для включения данной функции. также должна
-    быть включена опция автовыбора ресурса при переписке с pgp-контактом (psi-autostart-pgp.diff)
-  * ещё один фикс в контроллере MPRIS (psi-fix-tunes.diff)
-  + добавлен новый патч для исправления механизма работы передачи файлов,
-    http://code.google.com/p/psi-dev/issues/detail?id=464 (psi-fix-filetransfer.diff)
-  * некоторые исправления в патче psi-autostart-pgp.diff
-  * фикс патча psi-fix-filetransfer.diff
-  - убраны некоторые патчи -> приняты в upstream:
-     psi-selectable-application-version-in-aboutdlg.diff
-     psi-fix-online-contacts-count.diff
-     psi-disable-rename-of-general-group.diff
-     psi-reset-not-complete-connection-on-status-change.diff
-     psi-reset-selection-in-muc-roster.diff
-     psi-sort-by-jid-at-discodlg.diff
-     psi-fix-privates-group-in-roster.diff
-  * обновлён video status plugin (v0.1.1): новый механизм работы с видеоплеерами (только для *nix)
-  * обновлён captcha forms plugin до версии 0.1.0
-  * обновлён yandex narod plugin до версии 0.1.0,
-    http://psi-plus.com/wiki/plugins#yandex_narod_plugin
-  * обновлён screenshot plugin до версии 0.6.2
-  --
-  ! upstream commit fixed choose filetransfer transport by priority
-  * some fixes in MPRIS controller (psi-fix-tunes.diff)
-  + added detection of qip 2012 client (psi-client-icons.diff)
-  + added new patch for autostart pgp. use 'options.pgp.auto-start' for enable this feature. also
-    you should start chat for some contact's resource or enable autojid option
-    (psi-autostart-pgp.diff)
-  * one more fix in MPRIS controller (psi-fix-tunes.diff)
-  + added new patch for fix filetransfer, http://code.google.com/p/psi-dev/issues/detail?id=464
-    (psi-fix-filetransfer.diff)
-  * some fixes for psi-autostart-pgp.diff patch
-  * fixed psi-fix-filetransfer.diff patch
-  - removed some patches -> went to upstream (psi-selectable-application-version-in-aboutdlg.diff,
-    psi-fix-online-contacts-count.diff, psi-disable-rename-of-general-group.diff)
-  - removed more patches -> went to upstream
-    (psi-reset-not-complete-connection-on-status-change.diff,
-    psi-reset-selection-in-muc-roster.diff, psi-sort-by-jid-at-discodlg.diff)
-  * removed psi-fix-privates-group-in-roster.diff patch -> went to upstream
-  * updated video status plugin (v0.1.1): new mechanism of work with video players (*nix only)
-  * updated captcha forms plugin to v0.1.0
-  * updated yandex narod plugin to v0.1.0, http://psi-plus.com/wiki/plugins#yandex_narod_plugin
-  * updated screenshot plugin to v0.6.2
-
-
-2011-10-29  zet
-v0.15.5130
-  ! коммит в upstream исправлен возможное падение приложения в диалоге истории переписки
-  ! коммит в upstream исправлено поведение при перезаходе в защищённую паролем конференцию после
-    реконнекта ( http://code.google.com/p/psi-dev/issues/detail?id=461 )
-  ! коммит в upstream исправлена некорректная работа меню настроек цвета (решена задача 
-    http://code.google.com/p/psi-dev/issues/detail?id=436 )
-  + добавлен новый патч для запрета на переименование основной группы ростера General
-    (psi-disable-rename-of-general-group.diff)
-  * исправлены некоторые патчи после комитта в upstream
-    (psi-muc-minimize-to-roster.diff, psi-hide-muc-auto-join.diff)
-  * некоторые улучшения в патче psi-always-visible-contacts.diff. теперь если контакту поставили
-    метку "всегда виден", а потом этот контакт удалили, то метка "всегда виден" будет удаляться из
-    опций
-  * улучшения в патче psi-icon-actions-shortcuts.diff
-    (psi-pep-toolbar-buttons.diff, psi-presets-in-status-menu.diff)
-  * наведение порядка с горячими клавишами в приложении, 
-    http://code.google.com/p/psi-dev/issues/detail?id=437 (psi-typeahead-find.diff,
-    psi-pep-toolbar-buttons.diff, psi-presets-in-status-menu.diff,
-    psi-active-contacts-tool-button.diff)
-  * наведение порядка с горячими клавишами, часть 2 (psi-icon-actions-shortcuts.diff,
-    psi-presets-in-status-menu.diff, psi-active-contacts-tool-button.diff)
-  * обновлён client switcher plugin: скроллирование в диалоге настроек плагина (v0.0.11)
-  + добавлен новый плагин -- Yandex Narod Plugin (портирован из qutIm plugin), подробнее -- 
-    https://raw.github.com/psi-plus/plugins/master/generic/yandexnarodplugin/changelog.txt (v0.0.9)
-  * обновлён history keeper plugin до версии 0.0.6
-  * обновлён watcher plugin до версии 0.4.0
-  * обновлён cleaner plugin до версии 0.3.1 (не забывайте делать резервные копии файлов профиля
-    перед использованием чистильщика)
-  --
-  ! upstream commit fixed possible crash in historydlg
-  ! upstream commit fixed rejoining to the password protected groupchat when reconnecting
-    ( http://code.google.com/p/psi-dev/issues/detail?id=461 )
-  ! upstream commit fixed color button in opt_appearance
-    ( http://code.google.com/p/psi-dev/issues/detail?id=436 )
-  ! upstream commit fixed QLabel CVE
-  ! upstream commit fixed ui tab-stop compile warning
-  + added new patch for disable renaming of general group (psi-disable-rename-of-general-group.diff)
-  * fixed some patches after upstream commit
-    (psi-muc-minimize-to-roster.diff, psi-hide-muc-auto-join.diff)
-  * some improvements for psi-always-visible-contacts.diff patch
-  * improved psi-icon-actions-shortcuts.diff patch
-    (psi-pep-toolbar-buttons.diff, psi-presets-in-status-menu.diff)
-  * improved some patches (add comments for shortcuts), 
-    http://code.google.com/p/psi-dev/issues/detail?id=437 psi-typeahead-find.diff,
-    psi-pep-toolbar-buttons.diff, psi-presets-in-status-menu.diff,
-    psi-active-contacts-tool-button.diff
-  * improved some patches (add comments for shortcuts), part 2 psi-icon-actions-shortcuts.diff,
-    psi-presets-in-status-menu.diff, psi-active-contacts-tool-button.diff
-  * updated client switcher plugin: added scrolling area (v0.0.11)
-  + added new Psi+ Plugin -- Yandex Narod Plugin (ported from qutIm plugin), see at 
-    https://raw.github.com/psi-plus/plugins/master/generic/yandexnarodplugin/changelog.txt (v0.0.9)
-  * get rid of QTextCodec::setCodecForLocale() in plugins birthdayreminderplugin, chessplugin,
-    cleanerplugin, clientswitcherplugin, conferenceloggerplugin, extendedoptionsplugin,
-    gomokugameplugin, skinsplugin, stopspamplugin
-  * updated history keeper plugin to v0.0.6
-  * updated watcher plugin to v0.4.0
-  * updated cleaner plugin to v0.3.1 (make backup of profile files before use the cleaner)
-
-
-2011-10-02  zet
-v0.15.5122
-  * исправлено поведение патча psi-one-chat-for-many-resources.diff при наличии offline ресурса
-    в списке: исправлено отображение статуса при переключении, удалено дублирование иконки клиента
-    одного из активных ресурсов на неактивный (psi-one-chat-for-many-resources.diff)
-  * исправлено исчезнование области уведомлений в ростере при использовании темы oxygen,
-    http://api.kde.org/4.6-api/kdebase-workspace-apidocs/kstyles/html/classOxygen_1_1TransitionWidget.html theme
-    (psi-fix-eventnotifier.diff)
-  * некоторые исправления в патче на сохранение геометрии окон приложения
-    (psi-save-windows-size.diff, psi-xmpp-uri-in-chat-mode.diff,
-    psi-customize-dialogs-title-hint.diff, psi-muc-minimize-to-roster.diff,
-    psiplus-decorate-windows.diff, psi-always-visible-contacts.diff)
-  - убран патч psi-save-windows-size.diff -> принят в upstream
-  ! обновлены библиотеки шифрования win32 openssl до версии 1.0.0e, подробнее --
-    http://openssl.org/news/changelog.html
-  ! обновлена русская локализация от ivan101, https://github.com/ivan101/psi-plus-ru (2011-09-24)
-  --
-    * fixed psi-one-chat-for-many-resources patch for offline resources
-    (psi-one-chat-for-many-resources.diff)
-  * fixed hiding event notifier for the oxygen theme (psi-fix-eventnotifier.diff)
-  * some fixes for save-sizes patch (psi-save-windows-size.diff, psi-xmpp-uri-in-chat-mode.diff,
-    psi-customize-dialogs-title-hint.diff, psi-muc-minimize-to-roster.diff,
-    psiplus-decorate-windows.diff, psi-always-visible-contacts.diff)
-  - removed psi-save-windows-size.diff patch -> went to upstream
-  ! updated win32 openssl libs to v1.0.0e, http://openssl.org/news/changelog.html
-  ! updated russian localization by ivan101, https://github.com/ivan101/psi-plus-ru (2011-09-24)
-
-
-2011-09-11  zet
-v0.15.5116
-  - убран патч psi-proxy-settings-in-opt.diff -> принят в upstream
-  * улучшения в патче на сохранение геометрии окон с чатами/табами приложения
-    (psi-muc-minimize-to-roster.diff, psi-save-windows-size.diff)
-  + запоминание размеров окна с историей переписки (psi-save-windows-size.diff)
-  * фиксы в патче psi-one-chat-for-many-resources.diff -- исправлен показ пустого поля джида в
-    привате конференции при открытии окна чата с сообщением в тот момент, когда отправитель уже
-    вышел из конференции
-  * исправлен патч для работы с менеджером прокси-сервера после коммитов в upstream
-    (psi-extend-plugins-interface.diff)
-  * подготовка патча на запоминание размеров окон с чатами/табами для отправки в upstream
-    (psi-save-windows-size.diff)
-  * исправлен патч psi-muc-roster-size-and-location.diff
-  * исправлен патч psi-webkit.diff
-  * исправлен патч на поведение окон с чатами/табами после предыдущего коммита
-    (psiplus-decorate-windows.diff)
-  ! обновлены системные библиотеки Qt до версии 4.7.4, подробнее --
-    http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4
-  --
-  - removed psi-proxy-settings-in-opt.diff patch -> went to upstream
-  * improved windows size saving (psi-muc-minimize-to-roster.diff, psi-save-windows-size.diff)
-  + saved historydlg size in the same way as used for other widgets (psi-save-windows-size.diff)
-  * small fix for psi-one-chat-for-many-resources.diff patch
-  * fixed proxy manager after upstream commits (psi-extend-plugins-interface.diff)
-  * prepare save-sizes patch for moving to upstream (psi-save-windows-size.diff)
-  * fixed psi-muc-roster-size-and-location.diff patch
-  * fixed psi-webkit.diff patch
-  * fixed works with tabdlg after previous commit (psiplus-decorate-windows.diff)
-  ! updated Qt libs to v4.7.4,
-    http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4
-
-
-2011-08-28  zet
-v0.15.5106
-  * изменена ссылка на файл version.txt для проверки наличия новых версий Psi+
-    (psi-dirty-check.diff)
-  + добавлен новый патч для исправления поведения области событий в ростере -- теперь можно скрывать
-    тулбар, который содержит область уведомления, если кроме этой самой области нет других кнопок
-    (psi-fix-eventnotifier.diff)
-  * исправлено запоминание позиции ширины основного ростера и ростера конференции для режима
-    "всё-в-одном-окне" (psi-all-in-one-window.diff, psi-improve-tray-tooltip.diff,
-    psi-add-view-groups-to-tray-menu.diff, psiplus-more-compatibility-with-skinsplugin.diff,
-    psi-pep-toolbar-buttons.diff, psi-roster-autohide.diff, psi-presets-in-status-menu.diff,
-    psiplus-decorate-windows.diff, psi-one-chat-for-many-resources.diff,
-    psi-active-contacts-tool-button.diff)
-  * улучшения в патче psi-muc-roster-size-and-location.diff
-  * исправлен патч psi-all-in-one-window.diff после предыдущего коммита, также исправлены некоторые
-    другие патчи (psi-muc-roster-size-and-location.diff, psi-improve-tray-tooltip.diff,
-    psi-minimize-chat-hotkey.diff, psiplus-decorate-windows.diff, psi-vert-splitter-position.diff,
-    psi-modern-muc-roster.diff)
-  * исправлено поведение при закрытии активного таба для режима "всё-в-одном-окне" (ранее по хоткею
-    "Close the current window/tab" не закрывался таб, если он остался один)
-    psi-all-in-one-window.diff, psi-muc-minimize-to-roster.diff
-  * небольшой фикс в патче psi-hide-muc-auto-join.diff
-  * небольшой фикс в патче psi-muc-roster-size-and-location.diff
-  + добавлен новый патч для решения задачи 456,
-    http://code.google.com/p/psi-dev/issues/detail?id=456
-    (psi-selectable-application-version-in-aboutdlg.diff)
-  * переписан патч на правильный подсчёт онлайн-контактов в ростере,
-    http://code.google.com/p/psi-dev/issues/detail?id=455 (psi-fix-online-contacts-count.diff)
-  * обновлён extended options plugin до версии 0.3.5
-  --
-  * changed urls for update checker (psi-dirty-check.diff)
-  + added new patch for fix event notifier (psi-fix-eventnotifier.diff)
-  * fixed splitter size saving and position when all-in-one (psi-all-in-one-window.diff,
-    psi-improve-tray-tooltip.diff, psi-add-view-groups-to-tray-menu.diff,
-    psiplus-more-compatibility-with-skinsplugin.diff, psi-pep-toolbar-buttons.diff,
-    psi-roster-autohide.diff, psi-presets-in-status-menu.diff, psiplus-decorate-windows.diff,
-    psi-one-chat-for-many-resources.diff, psi-active-contacts-tool-button.diff)
-  * improved psi-muc-roster-size-and-location.diff patch
-  * fixed psi-all-in-one-window.diff patch after last commit, fixed some patches
-    (psi-muc-roster-size-and-location.diff, psi-improve-tray-tooltip.diff,
-    psi-minimize-chat-hotkey.diff, psiplus-decorate-windows.diff, psi-vert-splitter-position.diff,
-    psi-modern-muc-roster.diff)
-  * fixed close action for current tab when all-in-one (psi-all-in-one-window.diff,
-    psi-muc-minimize-to-roster.diff)
-  * small fix for psi-hide-muc-auto-join.diff patch
-  * small fix for psi-muc-roster-size-and-location.diff patch
-  + added new patch for fix issue 456, http://code.google.com/p/psi-dev/issues/detail?id=456
-    (psi-selectable-application-version-in-aboutdlg.diff)
-  * fixed online-contacts-count patch and move in to work,
-    http://code.google.com/p/psi-dev/issues/detail?id=455 (psi-fix-online-contacts-count.diff)
-  * updated extended options plugin to v0.3.5
-
-
-2011-08-21  zet
-v0.15.5091
-  + добавлен новый патч, добавляющий пункт "Выполнить команду" в контекстное меню на контакте
-    в ростере конференции (psi-execute-command-in-muc-roster-menu.diff)
-  + добавлен новый патч, добавляющий кнопку "Активные контакты" на панель кнопок ростера приложения.
-    активные контакты -- это контакты, с которыми ведётся переписка в открытых или свёрнутых
-    табах/чатах (при условии, что при сворачивании история текущего чата не уничтожается)
-    psi-active-contacts-tool-button.diff
-  + добавлен новый патч для отображения в чате специальной иконки при включенном pgp/gpg-шифровании
-    (psi-pgp-chat-icons.diff)
-  * теперь в списке активных контактов отображаются ники контактов (вместо jid)
-    psi-active-contacts-tool-button.diff
-  * исправлено отображение в чатах иконок уведомлений о доставке сообщений при включенном
-    pgp/gpg-шифровании (psi-receipts.diff, psi-pgp-chat-icons.diff)
-  * сохранение размеров окон приложения: полностью переписан патч psi-save-windows-size.diff
-  * сохранение размеров окон приложения: убрана ненужная опция "remember-window-sizes"; некоторые
-    улучшения и исправление в коде патча (psi-save-windows-size.diff)
-  * улучшения в патче на активные контакты: добавлена соответствующая кнопка на панель инструментов
-    в чатах; статусная иконка в списке активных контактов отображает текущий статус каждого из
-    активных контактов (psi-active-contacts-tool-button.diff)
-  + добавлен новый патч для решения задачи 450,
-    http://code.google.com/p/psi-dev/issues/detail?id=450 (psi-fix-groupchat-options.diff)
-  * исправления в патче psi-one-chat-for-many-resources.diff:
-     * теперь иконки отображаются и для контактов-транспортов
-     * теперь корректно отображаются статусные сообщения в чатах
-     * если имеется только один jid в списке и нет иконки клиента (например, у неопределившегося
-       клиента в привате конференции или если открыт чат с клиентом из оффлайна), то пустого места
-       вместо иконки теперь не будет
-     * если отключён autojid для чата, то сообщения о переключении ресурса не отображаются
-    (psi-one-chat-for-many-resources.diff, psi-active-contacts-tool-button.diff)
-  --
-  + added new patch for adds ability execute command from popup menu on contact in muc roster
-    (psi-execute-command-in-muc-roster-menu.diff)
-  + added new patch for adds active contacts tool button in roster toolbar
-    (psi-active-contacts-tool-button.diff)
-  + added new patch for adds pgp/gpg notifications chat icons (psi-pgp-chat-icons.diff)
-  * show nicks in active contacts menu (psi-active-contacts-tool-button.diff)
-  * fixed receipts when pgp/gpg is enabled (psi-receipts.diff, psi-pgp-chat-icons.diff)
-  * fixed saving windows sizes: rewritten psi-save-windows-size.diff patch
-  * fixed saving windows sizes: removed useless stupid 'remember-window-sizes' option; some
-    improvements and code cleanup (psi-save-windows-size.diff)
-  * improved active-contacts patch: added action to chat toolbar; icons in popup menu now shows of
-    current contacts status (psi-active-contacts-tool-button.diff)
-  + added new patch for fix issue 450, http://code.google.com/p/psi-dev/issues/detail?id=450
-    (psi-fix-groupchat-options.diff)
-  * improved one-chat-for-many-resources patch: fixed display of icons clients show status messages
-    and text on switching
-    (psi-one-chat-for-many-resources.diff, psi-active-contacts-tool-button.diff)
-
-
-2011-08-07  zet
-v0.15.5074
-  + добавлен новый патч для отображения причин изменения ролей/рангов в списках участников
-    конференции (настройки комнаты) psi-reasons-in-muc-config-dlg.diff
-  * обновлён автоджид-патч: добавлены более строгие правила для переключения между ресурсами при
-    исходящих сообщениях, исправлено отображение джида в приватных чатах конференции
-    (psi-one-chat-for-many-resources.diff)
-  + добавлен новый патч для отображения аватарки собеседника в чатах с контактами ростера
-    (psi-chat-avatar.diff)
-  + добавлен новый патч с фиксами для информационных полей в vCard (fix-contact-info-dialog.diff)
-  - убран патч fix-contact-info-dialog.diff -> патч принят в upstream
-  + добавлен новый патч для решения задачи 446,
-    http://code.google.com/p/psi-dev/issues/detail?id=446 (psi-fix-editing-roster-element.diff)
-  - убран патч psi-fix-editing-roster-element.diff -> патч принят в upstream
-  * оптимизация кода в патче psi-chat-avatar.diff
-  * исправлено отображение аватарок во всплывающих подсказках на контактах конференции, имеющих
-    спецсимволы в никах (psi-modern-muc-roster.diff)
-  * решена задача 445, http://code.google.com/p/psi-dev/issues/detail?id=445
-    (psi-muc-minimize-to-roster.diff)
-  + добавлен новый патч, добавляющий возможность переименования списка приватности в
-    редакторе списков приватности (psi-rename-privacy-list.diff)
-  * обновлён extended options plugin до версии 0.3.4
-  * обновлён client switcher plugin до версии 0.0.10
-  * фиксы для translate plugin (v0.4.0)
-  --
-  + added new patch for show reasons in muc config dialog (psi-reasons-in-muc-config-dlg.diff)
-  * changed autojid patch: added stricter rules on switching output messages, fixed display
-    jid in private conference (psi-one-chat-for-many-resources.diff)
-  + added new patch for show avatar in chatdlg (psi-chat-avatar.diff)
-  + added new patch for several fixes to the infodlg (fix-contact-info-dialog.diff)
-  - removed fix-contact-info-dialog.diff patch -> went to upstream
-  + added new patch for fix error described in the issue 446,
-    http://code.google.com/p/psi-dev/issues/detail?id=446 (psi-fix-editing-roster-element.diff)
-  - removed psi-fix-editing-roster-element.diff patch -> went to upstream
-  * code optimization for psi-chat-avatar.diff patch
-  * fixed showing avatars in tooltips for muc contacts with special symbols in the nick
-    (psi-modern-muc-roster.diff)
-  * fixed issue 445, http://code.google.com/p/psi-dev/issues/detail?id=445
-    (psi-muc-minimize-to-roster.diff)
-  + added new patch for adds ability for rename privacy lists (psi-rename-privacy-list.diff)
-  * updated extended options plugin to v0.3.4
-  * updated client switcher plugin to v0.0.10
-  * fixes for translate plugin (v0.4.0)
-
-
-2011-07-17  zet
-v0.15.5062
-  + добавлен новый патч, добавляющий команду Unregister в меню на транспорте в service discovery
-    (psi-action-unregister-in-discodlg.diff)
-  + добавлен новый патч, позволяющий сортировать по алфавиту элементы в столбце jid в
-    service discovery (psi-sort-by-jid-at-discodlg.diff)
-  * обновлён патч psi-entity-time.diff: добавлена регистрация entity time в капсах
-  + добавлен новый патч для поддержки XEP-0012: Last Activity. используйте advanced-опцию
-    "options.service-discovery.last-activity" для включения/отключения данной функции. требуется
-    рестарт приложения (psi-idle-server.diff)
-  * фиксы сдвигов в некоторых патчах (psi-muc-topic-context-menu.diff, psi-idle-server.diff,
-    psi-extend-plugins-interface.diff)
-  * исправлен поиск и обнаружение тем в домашнем каталоге (psiplus-binary.diff)
-  + добавлен новый патч для корректной отрисовки окна редактора правила в списках приватности при
-    изменении размеров окна по вертикали и горизонтали (psi-privacy-rule-editor-dialog.diff)
-  - убран патч psi-privacy-rule-editor-dialog.diff -> принят в upstream
-  * обновлён gmail service plugin до версии 0.7.1
-  * обновлён client switcher plugin до версии 0.0.9 -- изменён цвет подсвеченных слов при поиске
-  * обновлён conference logger plugin до версии 0.2.0 -- изменён цвет подсвеченных слов при поиске
-  * обновлён gomoku game plugin до версии 0.1.0
-  --
-  + added new patch to adds 'unregister' command in discodlg (psi-action-unregister-in-discodlg.diff)
-  + added new patch to sort by jid in discodlg (psi-sort-by-jid-at-discodlg.diff)
-  * updated psi-entity-time.diff patch: added entity time caps registration
-  + added new patch to support of XEP-0012: Last Activity. use option
-    'options.service-discovery.last-activity' for enabling or disabling. needs application restart
-    (psi-idle-server.diff)
-  * fix fuzzes for some patches (psi-muc-topic-context-menu.diff, psi-idle-server.diff,
-    psi-extend-plugins-interface.diff)
-  * fixed themes search at home folder (psiplus-binary.diff)
-  + added new patch to correct privacy rule editor dialog resizing
-    (psi-privacy-rule-editor-dialog.diff)
-  - removed psi-privacy-rule-editor-dialog.diff patch -> went to upstream
-  * updated gmail service plugin to v0.7.1
-  * updated client switcher plugin to v0.0.9 -- changed highlighting color of the found text
-  * updated conference logger plugin to v0.2.0 -- changed highlighting color of the found text
-  * updated gomoku game plugin to v0.1.0
-
-
-2011-07-10  zet
-v0.15.5050
-  * поправлен патч psi-fix-entity-time-in-vcard-for-muc-users.diff и объединён с патчем
-    psi-entity-time.diff (deleted psi-fix-entity-time-in-vcard-for-muc-users.diff,
-    modified psi-entity-time.diff)
-  * исправлена ошибка с неудаляемым muc-контактом из основного ростера приложения после запроса
-    vCard muc-контакта (psiplus-decorate-windows.diff, psi-hide-muc-auto-join.diff)
-  + добавлен новый патч, автоматически добавляющий символ "_" к нику если выбранный ник уже занят
-    на сервере для режима автовхода в конференции-закладки (psi-bookmark-nick-auto-comlition.diff)
-  + добавлен новый патч для реализации импорта/экспорта списка конференций-закладок
-    (psi-import-export-bookmarks.diff)
-  + добавлен новый патч, исправляющий поведение всплывающих подсказок при поиске в ростере
-    (http://code.google.com/p/psi-dev/issues/detail?id=432)
-    psi-fix-tooltip-when-searching-in-roster.diff
-  * фиксы в патче psi-muc-minimize-to-roster.diff: в некоторых ситуациях не работали уведомления
-    для спрятанных табов (psi-muc-minimize-to-roster.diff)
-  * разделён и модифицирован патч psi-action-line-edit-context-menu.diff
-    (добавлен psi-action-line-edit-context-menu.diff, удалён psi-action-line-edit-context-menu.diff,
-    добавлен psi-muc-topic-context-menu.diff)
-  + добавлен новый патч, улучшающий работу с мини-командами в конференции. добавлены команды kick,
-    ban, topic, leave, invite. для kick и ban выполняется автодополнение по табу как для списка
-    ников, так и для ризонов. для topic - автодополняется до текущего топика. повторное нажатие
-    хоткея (Ctrl+Space) закрывает режим мини-команд
-    (http://code.google.com/p/psi-dev/issues/detail?id=22) psi-improve-mini-comands.diff
-  * оптимизация в патче psi-action-line-edit-context-menu.diff
-  - убран патч psi-action-line-edit-context-menu.diff -> принят в upstream
-  * обновлён screenshot plugin до версии 0.6.0
-  * обновлён gmail service plugin до версии 0.7.0
-  --
-  * fixed psi-fix-entity-time-in-vcard-for-muc-users.diff patch and merged with
-    psi-entity-time.diff patch (deleted psi-fix-entity-time-in-vcard-for-muc-users.diff,
-    modified psi-entity-time.diff)
-  * fixed psi-hide-muc-auto-join.diff patch, fix fuzz (psiplus-decorate-windows.diff,
-    psi-hide-muc-auto-join.diff)
-  + added new patch to automatically append symbol '_' if nickname already used in groupchat
-    when autojoin to bookmark (psi-bookmark-nick-auto-comlition.diff)
-  + added new patch to adds ability import and export bookmarks (psi-import-export-bookmarks.diff)
-  + added new patch to fix tooltip in contactlist when searching for someone
-    (http://code.google.com/p/psi-dev/issues/detail?id=432)
-    psi-fix-tooltip-when-searching-in-roster.diff
-  * some fixes for psi-muc-minimize-to-roster.diff patch: alerting for hidden tabs was broken in
-    some cases (psi-muc-minimize-to-roster.diff)
-  * separated and modified psi-action-line-edit-context-menu.diff patch
-    (added psi-action-line-edit-context-menu.diff, deleted psi-action-line-edit-context-menu.diff,
-    added psi-muc-topic-context-menu.diff)
-  + added new patch to improve mini commands system
-    (http://code.google.com/p/psi-dev/issues/detail?id=22) psi-improve-mini-comands.diff
-  * optimization for psi-action-line-edit-context-menu.diff patch
-  - removed psi-action-line-edit-context-menu.diff patch -> went to upstream
-  * updated screenshot plugin to v0.6.0
-  * updated gmail service plugin to v0.7.0
-
-
-2011-07-03  zet
-v0.15.5031
-  * попытка решить задачу 424, http://code.google.com/p/psi-dev/issues/detail?id=424
-    (спасибо AvadoN) psi-improve-adhoc-forms.diff
-  * imageplugin: добавлена возможность отправки картинок в общий чат конференции
-  * исправлен патч psi-tab-status-icon.diff - баг со статусной иконкой в заголовке таба
-  * улучшения в пачте psi-modern-muc-roster.diff - добавлено отображение аватаров во всплывающих
-    подсказках на элементах ростера конференции
-  + добавлен новый патч для возможности копирования ника участника конференции перетаскиванием
-    в поле ввода (psi-fix-drag-contacts-in-muc-roster.diff)
-  * улучшения в патче psi-modern-muc-roster.diff - добавлено отображение аватаров в приватных чатах
-    конференции 
-  * изменён размер аватара по умолчанию (24 пкс) psi-modern-muc-roster.diff
-  * обновлён client switcher plugin до версии 0.0.8
-  + добавлен новый патч для поддержки функции всегда видимых контактов (always visible contacts)
-    в основном ростере приложения (psi-always-visible-contacts.diff)
-  * решена задача 380, http://code.google.com/p/psi-dev/issues/detail?id=380 и задача 163,
-    http://code.google.com/p/psi-dev/issues/detail?id=163 (psi-receipts.diff, psi-webkit.diff)
-  * очистка кода от qt3-зависимостей (psi-muc-nickclick-chat.diff, psi-muc-minimize-to-roster.diff,
-    psi-chatview-quote-feature.diff, psi-typed-history.diff, psi-send-button-context-menu.diff,
-    psi-implements-iq-version-stuff-in-discodlg.diff, psi-typeahead-find.diff,
-    psi-minimize-chat-hotkey.diff, psi-send-xhtml-im.diff)
-  + добавлен новый патч для корректной работы виртуальных групп ростера с открытыми приватными
-    чатами конференции (psi-fix-privates-group-in-roster.diff)
-  * windows-инсталлятор: исправлено создание ярлыков для текущего пользователя,
-    http://code.google.com/p/psi-dev/issues/detail?id=399#c7 (scripts/win32/psiplus-install.nsi)
-  + добавлен новый патч, дающий возможность скрыть любую группу ростера (psi-hide-any-group.diff)
-  + добавлен новый патч для более удобного выбора цветовых решений и раскраски различных элементов
-    приложения в дополнительных настройках (Advanced Options) psi-optionseditor-choose-color.diff
-  - убран патч psi-optionseditor-choose-color.diff -> принят в upstream
-  + добавлен новый патч для показа иконки приложения на различных окнах при настройке приложения
-    (psi-set-window-icons.diff)
-  + добавлен новый патч для сокращения многострочных параметров в редакторе настроек приложения
-    (psi-optionseditor-show-only-first-line.diff)
-  - убран патч psi-less-warnings.diff -> принят в upstream
-  * корректная прорисовка иконки приложения на отделённых окнах advanced-опций. также поправлено
-    имя в заголовке окна (psi-set-window-icons.diff)
-  + добавлен новый патч для решения задачи 155,
-    http://code.google.com/p/psi-dev/issues/detail?id=155 (psi-custom-chat-window-caption.diff)
-  + добавлен новый патч для надлежащего выделения элемента в ростере конференции
-    (psi-mucroster-highlighted-text.diff)
-  * патч psi-mucroster-highlighted-text.diff объединён с патчем psi-modern-muc-roster.diff
-  + добавлен новый патч для возможности копирования jid'а конференции по нажатию правой кнопки мыши
-    на поле с топиком конференции (psi-action-line-edit-context-menu.diff)
-  * переписан патч psi-action-line-edit-context-menu.diff patch
-  + добавлена возможность скрыть статусную иконку контакта в ростере конференции
-    (psi-modern-muc-roster.diff)
-  - убран патч psi-fix-contact-sorting-in-muc-roster.diff -> принят в upstream
-  * фиксы в обработке tunes-событий (psi-fix-tunes.diff)
-  * фиксы для PollingController (psi-fix-tunes.diff)
-  * раздельная опция для настройки варианта сортировки контактов в ростере конференции
-    (psi-modern-muc-roster.diff)
-  + добавлен новый патч, добавляющий возможность указать причину при смене аффиляции и/или роли
-    участника конференции. показ причины в общем чате конференции
-    (psi-reasons-for-roles-affiliations.diff)
-  + добавлен новый патч для поиска псимедии в любой директории с плагинами
-    (psi-search-for-psimedia-in-all-plugins-dirs.diff)
-  + добавлены иконки jabber-клиентов "smack-api" и "emess"
-    (iconsets/clients/fingerprint-22.jisp, fingerprint.jisp)
-  * добавлен детект новых jabber-клиентов (psi-client-icons.diff)
-  * фикс отображения иконки окна с конференцией и иконки закладок в режиме без табов
-    (psi-set-window-icons.diff)
-  + добавлен новый патч, добавляющий фильтр при поиске в диалоге "Обзор сервисов" (discodlg)
-    psi-filter-in-discodlg.diff
-  + добавлен новый патч для предупреждения двойной посылки запроса disco#items при открытии диалога
-    "Обзор сервисов" (psi-fix-sending-disco-items-request-twice.diff)
-  * попытка фикса ошибки при работе с tune-фильтрами (psi-fix-tunes.diff)
-  * теперь по умолчанию выключен автоматический запрос информации при открытии диалога
-    "Обзор сервисов" (psi-default-application-settings.diff)
-  + добавлен новый патч для фикса entity time при открытии vcard'ов участников конференции
-    (psi-fix-entity-time-in-vcard-for-muc-users.diff)
-  + добавлены иконки для поля со списком ресурсов контакта
-    (iconsets/system/default/psiplus/autojid.png, autojid_en.png)
-  * обновлён патч psi-one-chat-for-many-resources.diff
-  ! обновлена русская локализация (psi-ru svn, r205, 2011-06-21)
-  ! репозиторий проекта переехал из svn на git ( https://github.com/psi-plus )
-  --
-  * try to fix issue 424, http://code.google.com/p/psi-dev/issues/detail?id=424 (thanks to AvadoN)
-    psi-improve-adhoc-forms.diff
-  * imageplugin: added extremally useful muc button
-  * fixed  psi-tab-status-icon.diff patch - Qwest's bug with muc tab status icon
-  * improved psi-modern-muc-roster.diff patch - added avatars in tooltips and at main roster
-  + added new patch for fix drag contacts in muc roster (psi-fix-drag-contacts-in-muc-roster.diff)
-  * improved psi-modern-muc-roster.diff patch - added avatars for private chats dialogs
-  * changed muc avatar default size (set to 24) psi-modern-muc-roster.diff
-  * updated client switcher plugin to v0.0.8
-  + added new patch for support the always visible contacts (psi-always-visible-contacts.diff)
-  * fixed issue 380, http://code.google.com/p/psi-dev/issues/detail?id=380 and issue 163,
-    http://code.google.com/p/psi-dev/issues/detail?id=163 (psi-receipts.diff, psi-webkit.diff)
-  * more qt3 cleanup (psi-muc-nickclick-chat.diff, psi-muc-minimize-to-roster.diff,
-    psi-chatview-quote-feature.diff, psi-typed-history.diff, psi-send-button-context-menu.diff,
-    psi-implements-iq-version-stuff-in-discodlg.diff, psi-typeahead-find.diff,
-    psi-minimize-chat-hotkey.diff, psi-send-xhtml-im.diff)
-  + added new patch for fix roster group of private contacts (psi-fix-privates-group-in-roster.diff)
-  * windows installer: fixed create shortcuts for all users,
-    http://code.google.com/p/psi-dev/issues/detail?id=399#c7 (scripts/win32/psiplus-install.nsi)
-  + added new patch for support of hiding any roster group (psi-hide-any-group.diff)
-  + added new patch for provide a way for choosing color in Advanced Options
-    (psi-optionseditor-choose-color.diff)
-  - removed psi-optionseditor-choose-color.diff patch -> went to upstream
-  + added new patch for showing options icon (psi-set-window-icons.diff)
-  + added new patch for shorten multiline options in options editor
-    (psi-optionseditor-show-only-first-line.diff)
-  - removed psi-less-warnings.diff patch -> went to upstream
-  * setup icons for many windows (psi-set-window-icons.diff)
-  * set proper icon for detached Advanced. also corrected window name (psi-set-window-icons.diff)
-  + added new patch for fix issue 155, http://code.google.com/p/psi-dev/issues/detail?id=155
-    (psi-custom-chat-window-caption.diff)
-  * more windows in set-window-icons (thanks to Hugin) psi-set-window-icons.diff
-  + added new patch for proper highlighting text in muc roster (psi-mucroster-highlighted-text.diff)
-  * merged mucroster-highlighted-text patch with modern-muc-roster patch
-    (psi-modern-muc-roster.diff)
-  + added new patch for copying conference jid by right click on topic
-    (psi-action-line-edit-context-menu.diff)
-  * rewritten psi-action-line-edit-context-menu.diff patch
-  + added ability to hide status icons in muc roster (psi-modern-muc-roster.diff)
-  - removed psi-fix-contact-sorting-in-muc-roster.diff patch -> went to upstream
-  * some fixes in tunes processing (psi-fix-tunes.diff)
-  * PollingController code fixes (psi-fix-tunes.diff)
-  * use separated option for contact sort style in muc roster (psi-modern-muc-roster.diff)
-  + added new patch for adds ability to set reason for affiliations and roles changes; show reasons
-    in chatlog (psi-reasons-for-roles-affiliations.diff)
-  + added new patch for searching psimedia in all plugins dirs
-    (psi-search-for-psimedia-in-all-plugins-dirs.diff)
-  + added 'smack-api' and 'emess' client icons
-    (iconsets/clients/fingerprint-22.jisp, fingerprint.jisp)
-  * updated client icons patch (psi-client-icons.diff)
-  * start-chat icon for MUC window in no tabs mode. star icon for bookmark MUC window
-    (psi-set-window-icons.diff)
-  + added new patch for adds filter by jid in discodlg (psi-filter-in-discodlg.diff)
-  * availability of some fields to the connected resource (psi-temp-show-caps.diff)
-  + added new patch for preventing disco#items request sends twice when open discodlg
-    (psi-fix-sending-disco-items-request-twice.diff)
-  * try to fix bug in work with tune-filters (psi-fix-tunes.diff)
-  * disabled automatically get disco info by default (psi-default-application-settings.diff)
-  + added new patch for fix entity time on vcards for muc users
-    (psi-fix-entity-time-in-vcard-for-muc-users.diff)
-  + added autojid icons (iconsets/system/default/psiplus/autojid.png, autojid_en.png)
-  * updated psi-one-chat-for-many-resources.diff patch
-  ! updated russian localization (psi-ru svn, r205, 2011-06-21)
-  ! project repository has moved from svn to git ( https://github.com/psi-plus )
-
-
-2011-06-19  zet
-v0.15.4062
-  + добавлен детект некоторых jabber-клиентов: irssi-xmpp, weonlydo, kadu, ekg2, wtw
-    (psi-client-icons.diff)
-  * обновлены иконпаки с иконками клиентов (iconsets/clients/fingerprint-22.jisp, fingerprint.jisp)
-  * фикс обработки css в редакторе шаблонов (psi-send-button-context-menu.diff)
-  * psiplus-install.nsi: исправлена домашняя папка для ярлыков (scripts/win32/psiplus-install.nsi)
-  * фиксы для патча psi-one-chat-for-many-resources.diff
-  * исправлен шрифт в редакторе топика конференции (psi-muc-topic.diff)
-  + добавлена возможность сортировки по статусу списка участников в ростере конференции
-    (psi-fix-contact-sorting-in-muc-roster.diff)
-  + добавлен новый патч для снижения количества предупреждений при компиляции Psi+
-    (psi-less-warnings.diff)
-  * меньше предупредений при компиляции Psi+ (psi-proxy-settings-in-opt.diff,
-    psi-data-forms-media-element.diff, psi-webkit.diff, psi-receipts.diff, psi-entity-time.diff,
-    psi-xmpp-uri-in-chat-mode.diff, psi-adhoc-leave-muc.diff, psi-typeahead-find.diff,
-    psi-modern-roster.diff, psi-contact-manager.diff, psi-presets-in-status-menu.diff,
-    psi-add-contact-from-chat-dialog.diff, psi-one-chat-for-many-resources.diff, psiplus-binary.diff)
-  - убраны лишние "tr" из POPUP_OPTION_NAME (attention plugin, birthday reminder plugin,
-    extended menu plugin, gmail service plugin, pep change notify plugin, stop spam plugin,
-    watcher plugin)
-  * меньше предупреждений при компиляции Psi+ (psi-muc-nickclick-chat.diff, psi-typed-history.diff,
-    psi-typeahead-find.diff, psi-muc-minimize-to-roster.diff, psi-tray-act-bring-to-front.diff,
-    psi-send-xhtml-im.diff, psi-workaround-adhoc-form-closes.diff, psi-auto-capitalizer.diff)
-  * переписан патч psi-change-password-dialog.diff
-  * исправлен патч psi-fix-contact-sorting-in-muc-roster.diff
-  * переписан патч psi-tab-highlight-color.diff
-  * поправлен стиль кода в патче psi-muc-nickclick-chat.diff (psi-muc-roster-size-and-location.diff,
-    psi-chatview-quote-feature.diff)
-  * объединены некоторые патчи для ростера конференции в один общий патч. добавлена поддержка
-    отображения аватарок в ростере конференции. настройки ростера конференции осуществляются
-    группой advanced-опций "options.ui.muc.userlist..." (psi-modern-muc-roster.diff,
-    psi-presets-in-status-menu.diff, psi-extend-plugins-interface.diff)
-  * некоторые фиксы в патче psi-modern-roster.diff (psi-muc-minimize-to-roster.diff,
-    psi-modern-muc-roster.diff)
-  * домашний каталог Psi+: поправлен стиль кода в HomeDirMigration. корректное копирование
-    директорий с кэшем в Mac OSX и Linux (psiplus-binary.diff)
-  * libpsibuild: force --libdir param (scripts/posix/libpsibuild.sh)
-  + добавлен новый патч на создание и использование специального хранилища для аватарок
-    (psi-filecache-for-avatars.diff)
-  * libpsibuild: added PLUGINS_PREFIXES var, which is space separated list of prefixes like generic
-    unix dev. by default its generic and updated later according to platform
-    (scripts/posix/libpsibuild.sh)
-  * исправлен патч psi-filecache-for-avatars.diff
-  * обновлён патч psi-one-chat-for-many-resources.diff:
-    добавлена advanced-опция "options.ui.chat.default-jid-mode-ignorelist", предназначенная
-    для перечисления исключений в виде JID-ов, к которым не будет применяться новый режим работы
-    убрана функция Qt::NoFocus из поля jid в виджете
-  * поправлен скрипт compileallplugins.py (scripts/posix/compileallplugins.py)
-  * обновлён extended options plugin до версии 0.3.3
-  * content downloader plugin: поправлен стиль кода
-  ! возвращена поддержка PsiMedia в версии для Mac OSX 10.6 (scripts/macosx/psibuild.command)
-  * кнопка закладок в конференции: изменён метод activated -> triggered
-    (psi-muc-bookmark-toolbar-button.diff)
-  * фиксы в патче psi-modern-muc-roster.diff
-  * небольшие изменения в редакторе геолокации (psi-geolocation.diff)
-  * исправлен патч psi-fix-contact-sorting-style-option.diff
-  + добавлен win32-скрипт make-psi-ru-lang-files.cmd (scripts/win32/make-psi-ru-lang-files.cmd)
-  ! обновлена русская локализация (psi-ru svn, r201, 2011-06-18)
-  --
-  + added detection of some clients: irssi-xmpp, weonlydo, kadu, ekg2, wtw (psi-client-icons.diff)
-  * updated fingerprint iconsets (iconsets/clients/fingerprint-22.jisp, fingerprint.jisp)
-  * fixed css in template's editor dialog (psi-send-button-context-menu.diff)
-  * psiplus-install.nsi: corrected home directory for shortcuts (scripts/win32/psiplus-install.nsi)
-  * small fix to one-chat-for-many-resources patch (psi-one-chat-for-many-resources.diff)
-  * fixed font setting in groupchat topic dialog (psi-muc-topic.diff)
-  + add ability for sorting contacts in muc roster by status
-    (psi-fix-contact-sorting-in-muc-roster.diff)
-  + added new patch for less warnings (psi-less-warnings.diff)
-  * less warnings (psi-proxy-settings-in-opt.diff, psi-data-forms-media-element.diff,
-    psi-webkit.diff, psi-receipts.diff, psi-entity-time.diff, psi-xmpp-uri-in-chat-mode.diff,
-    psi-adhoc-leave-muc.diff, psi-typeahead-find.diff, psi-modern-roster.diff,
-    psi-contact-manager.diff, psi-presets-in-status-menu.diff, psi-add-contact-from-chat-dialog.diff,
-    psi-one-chat-for-many-resources.diff, psiplus-binary.diff)
-  - dropped useless tr from POPUP_OPTION_NAME (attention plugin, birthday reminder plugin,
-    extended menu plugin, gmail service plugin, pep change notify plugin, stop spam plugin,
-    watcher plugin)
-  * less warnings (psi-muc-nickclick-chat.diff, psi-typed-history.diff, psi-typeahead-find.diff,
-    psi-muc-minimize-to-roster.diff, psi-tray-act-bring-to-front.diff, psi-send-xhtml-im.diff,
-    psi-workaround-adhoc-form-closes.diff, psi-auto-capitalizer.diff)
-  * rewritten psi-change-password-dialog.diff patch
-  * fixed psi-fix-contact-sorting-in-muc-roster.diff patch
-  * rewritten psi-tab-highlight-color.diff patch
-  * fixed codestyle for psi-muc-nickclick-chat.diff patch (psi-muc-roster-size-and-location.diff,
-    psi-chatview-quote-feature.diff)
-  * merged some muc roster patches into one new patch. added avatars in muc roster. use options
-    'options.ui.muc.userlist...' for more muc-roster configure (psi-modern-muc-roster.diff,
-    psi-presets-in-status-menu.diff, psi-extend-plugins-interface.diff)
-  * some fixes for psi-modern-roster.diff patch (psi-muc-minimize-to-roster.diff,
-    psi-modern-muc-roster.diff)
-  * psiplus-binary patch. corrected codestyle of HomeDirMigration. copying cache for Mac OSX
-    and Linux (psiplus-binary.diff)
-  * libpsibuild: force --libdir param (scripts/posix/libpsibuild.sh)
-  + added new patch for using filecache for cached avatars (psi-filecache-for-avatars.diff)
-  * libpsibuild: added PLUGINS_PREFIXES var, which is space separated list of prefixes like generic
-    unix dev. by default its generic and updated later according to platform
-    (scripts/posix/libpsibuild.sh)
-  * fixed psi-filecache-for-avatars.diff patch
-  * updated psi-one-chat-for-many-resources patch:
-    added 'options.ui.chat.default-jid-mode-ignorelist' option,
-    removed Qt::NoFocus from jid address widget (psi-one-chat-for-many-resources.diff)
-  * fixed compileallplugins.py (scripts/posix/compileallplugins.py)
-  * updated extended options plugin to v0.3.3
-  * content downloader plugin: corrected codestyle
-  ! return PsiMedia on Mac OSX 10.6 (scripts/macosx/psibuild.command)
-  * bookmark button: activated -> triggered (psi-muc-bookmark-toolbar-button.diff)
-  * fixed regression in psi-modern-muc-roster.diff patch
-  * modified geolocation dialog (psi-geolocation.diff)
-  * fixed psi-fix-contact-sorting-style-option.diff patch
-  + added make-psi-ru-lang-files.cmd win32 script (scripts/win32/make-psi-ru-lang-files.cmd)
-  ! updated russian localization (psi-ru svn, r201, 2011-06-18)
-
-
-2011-06-12  zet
-v0.15.4018
-  * локализация мастера импорта профиля (psiplus-binary.diff)
-  ! исправлен скрипт psibuild.sh (для *nix-систем). настоятельно рекомендуется обновить
-    данный скрипт вручную из svn, http://psi-dev.googlecode.com/svn/trunk/scripts/posix/psibuild.sh
-  - убран патч psi-muc-leave-status.diff -> принят в upstream
-  + добавлена лицензионная информация для менеджера контактов (psi-contact-manager.diff)
-  * домашний каталог Psi+: корректное удаление пустых каталогов в хранилище старого профиля после
-    завершения процесса импорта данных (psiplus-binary.diff)
-  + добавлен новый патч для избавления кода Psi (в части ростера конференции) от qt3-зависимостей
-    (psi-remove-qt3-from-muc-roster.patch)
-  - убран патч psi-remove-qt3-from-muc-roster.patch -> принят в upstream
-  * обновлён патч psi-avcalls-addons.diff: setProperty -> setData
-  - убран патч psi-insert-nick-on-shift-plus-leftclick.diff -> принят в upstream
-  * очистка кода от qt3-зависимостей (psi-roster-disable-scrollbar.diff,
-    psi-muc-roster-disable-horizontal-scrollbar.diff)
-  - убран патч psi-historydlg.diff -> принят в upstream
-  + добавлен новый патч для исправления отображения названий групп в ростере конференции
-    (psi-fix-group-header-drawing-in-muc-roster.diff)
-  - windows-инсталлятор: из состава дистрибутива убрана ненужная библиотека Qt3Support4.dll
-    (trunk/scripts/win32/psiplus-install.nsi)
-  + добавлен новый патч для сброса фокуса курсора с контакта в ростере конференции после клика
-    на пустой области ростера (psi-reset-selection-in-muc-roster.diff)
-  + добавлен новый патч, сдвигающий вправо название группы в ростере конференции
-    (psi-move-group-text-in-muc-roster-to-right.diff)
-  * исправлен патч psi-mac-makefile.diff и скрипт psibuild.command для Mac OSX
-    (trunk/scripts/macosx/patches/3020-psi-mac-Makefile.diff, trunk/scripts/macosx/psibuild.command)
-  + добавлен новый патч, который добавляет кнопку "Save" в редактор причин для кика/бана
-    (psi-save-button-for-muc-kickban-reasons.diff)
-  * некоторые исправления поведения ростера Psi+ при включенной опции "автоматически изменять
-    высоту ростера" (psi-fix-roster-autoresize.diff)
-  + добавлен новый патч, позволяющий вести чат с контактом в одном окне/табе независимо от
-    имени ресурса. поведение управляется advanced-опцией "options.ui.chat.default-jid-mode",
-    которая может принимать значения " barejid" и "auto". подробнее --
-    http://forum.psi-plus.com/viewtopic.php?f=8&t=40 (psi-one-chat-for-many-resources.diff)
-  * решена задача 431, http://code.google.com/p/psi-dev/issues/detail?id=431
-    (psi-muc-minimize-to-roster.diff)
-  + добавлен новый патч, исправляющий сортировку контактов в ростере конференции
-    (psi-fix-contact-sorting-in-muc-roster.diff)
-  * домашний каталог Psi+:  фикс для HomedirMigration::exec (psiplus-binary.diff)
-  * исправлена ссылка на форум Psi+ в меню Help -> Psi+ Forum (psiplus-join-to-support-muc.diff)
-  * обновлён skins plugin до версии 0.3.2
-  * массированное обновление скина/темы LunnaCat (v1.1)
-  * попытка детекта jabber-клииента LeechCraft (psi-client-icons.diff)
-  * исправлен детект клиента SIP Communicator (Jitsi). спасибо Qwеst (psi-client-icons.diff)
-  ! обновлена русская локализация от ivan101 (psi-ru svn, r198, 2011-06-10)
-  --
-  * translate migration manager (psiplus-binary.diff)
-  ! fixed psibuild.sh. its highly recommended to update this script manually
-    (trunk/scripts/posix/psibuild.sh)
-  - removed psi-muc-leave-status.diff patch -> went to upstream
-  + added license to contact manager (psi-contact-manager.diff)
-  * psiplus-binary patch. proper removing of empty folders (psiplus-binary.diff)
-  + added new patch for get rid of qt3 dependence in muc roster
-    (psi-remove-qt3-from-muc-roster.patch)
-  - removed psi-remove-qt3-from-muc-roster.patch -> went to upstream
-  * updated psi-avcalls-addons.diff patch: setProperty -> setData
-  - removed psi-insert-nick-on-shift-plus-leftclick.diff patch -> went to upstream
-  * more qt3 cleanup (psi-roster-disable-scrollbar.diff,
-    psi-muc-roster-disable-horizontal-scrollbar.diff)
-  - removed psi-historydlg.diff patch -> went to upstream
-  + added new patch for fix of groups drawing in muc roster
-    (psi-fix-group-header-drawing-in-muc-roster.diff)
-  - windows installer: removed useless Qt3Support4.dll (trunk/scripts/win32/psiplus-install.nsi)
-  + added new patch for reset selection in muc roster when clicking at free space
-    (psi-reset-selection-in-muc-roster.diff)
-  + added new patch for move groups text in muc roster to the right
-    (psi-move-group-text-in-muc-roster-to-right.diff)
-  * fixed psi-mac-makefile.diff patch and psibuild.command
-    (trunk/scripts/macosx/patches/3020-psi-mac-Makefile.diff, trunk/scripts/macosx/psibuild.command)
-  + added new patch for adds save button for muc kick and ban reasons
-    (psi-save-button-for-muc-kickban-reasons.diff)
-  * some fixes for roster autoresize feature (psi-fix-roster-autoresize.diff)
-  + added new patch that allows to chat with contact in one window/tab regardless of
-    resource name. behavior is controlled by advanced option 'options.ui.chat.default-jid-mode'
-    which can take values 'barejid' and 'auto'. more information at
-    http://forum.psi-plus.com/viewtopic.php?f=8&t=40 (psi-one-chat-for-many-resources.diff)
-  * fixed issue 431, http://code.google.com/p/psi-dev/issues/detail?id=431
-    (psi-muc-minimize-to-roster.diff)
-  + added new patch for fix contact sorting in muc roster
-    (psi-fix-contact-sorting-in-muc-roster.diff)
-  * psiplus-binary patch. fixed returning from HomedirMigration::exec (psiplus-binary.diff)
-  * updated Psi+ Forum url (psiplus-join-to-support-muc.diff)
-  * updated skins plugin to v0.3.2
-  * massive update of LunnaCat Skin/Theme (v1.1)
-  * update for LeechCraft detection (psi-client-icons.diff)
-  * SIP Communicator was renamed to Jitsi and we detect it. thanks to Qwеst (psi-client-icons.diff)
-  ! updated russian localization by ivan101 (psi-ru svn, r198, 2011-06-10)
-
-
-2011-06-05  zet
-v0.15.3969
-  ! переписан патч psiplus-binary.diff. теперь все данные профиля Psi+ (настройки,
-    история переписки, логи, аватары и пр.) хранятся в домашнем каталоге пользователя (в Mac OSX
-    для хранения настроек и данных используется каталог "~/Library/Application Support/Psi+", для
-    хранения кэша используется каталог "~/Library/Caches/Psi+"; в Windows для хранения любых файлов
-    используется папка "%appdata%\Psi+"). также была изменена системная переменная -- вместо
-    "PSIDATADIR" теперь используется переменная "PSIPLUSDATADIR"). будьте бдительны при запуске и
-    работе мастера импорта данных и внимательно читайте всплывающие подсказки мастера импорта
-    psiplus-binary.diff
-  * обновлён патч psiplus-nix-application-icon-and-name.diff. теперь используется иконка Psi+
-    вместо устаревшей иконки Psi Plus
-  * инсталлятор Psi+: попытка решить проблему первого запуска Psi+ от имени пользователя
-    без прав администратора в ОС Windows 7 (psiplus-install.nsi)
-    trunk/scripts/win32/psiplus-install.nsi
-  * wiki: добавлена информация о форуме Psi+, http://forum.psi-plus.com/
-  * обновлён video status plugin (актуально только для *nix-систем)
-  + добавлена новая опция "options.muc.leave-status-message" для установки статусного сообщения
-    при выходе из конференции (psi-presets-in-status-menu.diff)
-  * обновлены некоторые плагины для совместимости с новым домашним каталогом Psi+ (juick plugin,
-    stop spam plugin, cleaner plugin, skins plugin, client switcher plugin, content downloader plugin)
-  * домашний каталог Psi+: возможность копирования и удаления скрытых файлов и папок
-    (psiplus-binary.diff)
-  * домашний каталог Psi+: создание папки для данных (если не существует) psiplus-binary.diff
-  * домашний каталог Psi+: в Linux вместо каталога "~/.local/share/data" используется каталог
-    "~/.local/share" (psiplus-binary.diff)
-  * домашний каталог Psi+: фикс пути для установки плагинов (вместо каталога
-    "~/.local/share/data/Psi+/plugins" используется каталог "~/.local/share/Psi+/plugins")
-    psiplus-binary.diff
-  * исправлено цитирование в диалоговых окнах juick plugin (psi-chatview-quote-feature.diff)
-  + добавлена новая команда "Paste As Quotation" для контекстного меню в поле ввода сообщения
-    (psi-chatview-quote-feature.diff, psi-auto-capitalizer.diff)
-  * домашний каталог Psi+: небольшие исправления для всплывающих подсказок в мастере импорта
-    (psiplus-binary.diff)
-  * обновлён screenshot plugin до версии 0.5.9 (настройки авторизации на некоторых хостингах можно
-    найти здесь: http://code.google.com/p/qscreenshot/wiki/Authorization)
-  * домашний каталог Psi+: фикс отображения пути в диалоге при удалении профиля Psi+ в Windows
-    (psiplus-binary.diff)
-  * домашний каталог Psi+: копируются только те файлы, которые доступны для копирования и удаляются
-    только те файлы, которые разрешено удалять (psiplus-binary.diff)
-  * попытка исправить поведение ростера при включенной опции "автоматически изменять высоту ростера"
-    в Windows (psi-fix-roster-autoresize.diff)
-  * домашний каталог Psi+: корректная работа с каталогом данных в Mac OSX (psiplus-binary.diff)
-  * gomoku game plugin: добавлена информация о лицензиях
-  * gomoku game plugin: исправлена опечатка в меню (issue #429,
-    http://code.google.com/p/psi-dev/issues/detail?id=429)
-  ! в дистрибутив инсталлятора под Windows добавлена русская локализация от taurus
-    (основана на локализации от ivan101)
-  --
-  ! rewritten psiplus-binary.diff patch. at now all profile data of Psi+ (settings, history, logs,
-    avatars, etc.) are stored in the user's home directory (on Mac OSX for store the settings and
-    data using '~/Library/Application Support/Psi+' directory, for cache storage using
-    '~/Library/Caches/Psi+' directory; on Windows for store of any files types using
-    '%appdata%\Psi+' folder). also changed a system variable for Psi+. at now used 'PSIPLUSDATADIR'
-    instead of 'PSIDATADIR'). be careful when you run the Import Wizard and carefully read the
-    tooltips of the Import Wizard psiplus-binary.diff.
-  * updated psiplus-nix-application-icon-and-name.diff patch. use Psi+ icon name instead ugly
-    Psi Plus
-  * psiplus-install.nsi: workaround for first start under win7
-    (trunk/scripts/win32/psiplus-install.nsi)
-  * wiki: added information about Psi+ Forum, http://forum.psi-plus.com/
-  * updated video status plugin (*nix only). added status setting timer to plugin
-  * updated psi-presets-in-status-menu.diff patch. added 'options.muc.leave-status-message' option
-  * rewritten psiplus-binary patch. added new appHomeDir (psiplus-binary.diff)
-  * updated juick plugin, stop spam plugin, cleaner plugin, skins plugin, client switcher plugin
-    and content downloader plugin to compile with new appHomeDir
-  * psiplus-binary patch. copy and remove hidden files and folders (psiplus-binary.diff)
-  * psiplus-binary patch. preventing from all profile dirs (psiplus-binary.diff)
-  * psiplus-binary patch. creating data dir if not exist (psiplus-binary.diff)
-  * psiplus-binary patch. use ~/.local/share insted ~/.local/share/data on Linux
-    (psiplus-binary.diff)
-  * psiplus-binary. fixed plugins install path. ~/.local/share/data/Psi+/plugins =>
-    ~/.local/share/Psi+/plugins (psiplus-binary.diff)
-  + added new psimedia patch (psimedia-drop-v4lsrc-gst-plugin.diff)
-  * trying to fix quoting for juick plugin (psi-chatview-quote-feature.diff)
-  + added new 'Paste As Quotation' option in context menu of ChatEdit
-    (psi-chatview-quote-feature.diff, psi-auto-capitalizer.diff)
-  * psiplus-binary patch. corrected tooltips (psiplus-binary.diff)
-  * updated screenshot plugin to v0.5.9 (authorization settings for some hosting services can be
-    found here: http://code.google.com/p/qscreenshot/wiki/Authorization)
-  * psiplus-binary patch. fixed showing paths when delete profile on Windows (psiplus-binary.diff)
-  * corrected FSF address for homedirmigration (psiplus-binary.diff)
-  * psiplus-binary patch. fixed copying and removing of hidden files and folders
-    (psiplus-binary.diff)
-  * psiplus-binary patch. copying only for readable file and removing only for writable files
-    (psiplus-binary.diff)
-  * fixed roster autoresize for OS Windows (psi-fix-roster-autoresize.diff)
-  * psiplus-binary patch. corrected dataDir for Mac OSX (psiplus-binary.diff)
-  * gomoku game plugin: added license block
-  * gomoku game plugin: fix typing error in window menu (issue #429,
-    http://code.google.com/p/psi-dev/issues/detail?id=429)
-  ! Psi+ Windows Installer: added russian localization by taurus (based on localization by ivan101)
-
-
-2011-05-22  zet
-v0.15.3910
-  + добавлен новый патч, исправляющий поведение анимации вновь подключившихся контактов в ростере
-    (psi-fix-online-contacts-animation.diff)
-  * исправлен screenshot plugin (v0.5.6)
-  + добавлен новый патч, исправляющий работу авторесайза размера ростера по высоте (при включении
-    соответствующей опции в настройках приложения) psi-fix-roster-autoresize.diff
-  * обновлён storage notes plugin до версии 0.1.6
-  * обновлён патч psi-fix-tunes.diff. добавлена поддержка работы контроллера PsiFile с QCA::FileWatch
-  * исправлена работа gomoku game plugin (v0.0.8)
-  * обновлены регулярные выражения для правильного детекта иконок конференций/комнат
-    (psi-add-standard-transports.diff)
-  * исправлена утечка памяти в парсере сообщений (psi-receipts.diff)
-  * некоторые исправления и фикс утечки памяти в патче psi-muc-minimize-to-roster.diff
-  + добавлен новый патч, исправляющий поведение всплывающих окон (psi-fix-popups.diff)
-  * обновлён патч psi-fix-tunes.diff. убран ненужный плагин xmms и мусор в файлах psifilecontroller
-  + добавлен новый патч, исправляющий отображение иконки зашифрованного соединения в ростере
-    (psi-fix-pgp-icon-in-roster.diff)
-  * обновлён extended menu plugin до версии 0.1.0
-  * меньше предупреждений при при компиляции Psi+ (psi-fix-online-contacts-animation.diff)
-  + добавлен новый патч для запоминания ключа pgp-шифрования при рестарте приложения. примечание:
-    не для параноиков! :) psi-remember-pgp-key.diff
-  * рефакторинг в патче psi-muc-minimize-to-roster.diff. возможна регрессия, требуется много тестов
-    psi-muc-minimize-to-roster.diff
-  * некоторые фиксы в патче psi-hide-muc-auto-join.diff
-  * временный фикс в патче psi-save-maximized-window-state.diff
-  + добавлен новый патч для отключения функции переключения между табами по комбинации "alt+n"
-    (psi-disable-alt-n-switch-tabs.diff)
-  ! запущен форум Psi+, http://forum.psi-plus.com/ (спасибо diSabler). добро пожаловать! :)
-  --
-  + added new patch for fix animation of roster contacts (psi-fix-online-contacts-animation.diff)
-  * fixed screenshot plugin (v0.5.6)
-  + added new patch for fix roster autoresize (psi-fix-roster-autoresize.diff)
-  * updated storage notes plugin to v0.1.6
-  * updated psi-fix-tunes.diff patch. added PsiFile controller work with QCA::FileWatch
-  * fixed gomoku game plugin (v0.0.8)
-  * updated regexp for groupchats (psi-add-standard-transports.diff)
-  * fixed memory leak in message receipts (psi-receipts.diff)
-  * some fixes for psi-muc-minimize-to-roster.diff patch
-  + added new patch for fix popups (psi-fix-popups.diff)
-  * updated psi-fix-tunes.diff patch. removed useless xmms plugin and psifilecontroller files
-  + added new patch for fix pgp incrypted connection icon in roster (psi-fix-pgp-icon-in-roster.diff)
-  * updated extended menu plugin to v0.1.0
-  * less warnings for psi-fix-online-contacts-animation.diff patch
-  + added new patch for remember pgp key. not for paranoids :) psi-remember-pgp-key.diff
-  * refactoring for psi-muc-minimize-to-roster.diff patch. regressions are possible, needed
-    many tests :) psi-muc-minimize-to-roster.diff
-  * some fixes for psi-hide-muc-auto-join.diff patch
-  * fixed pgp icon in roster (psi-fix-pgp-icon-in-roster.diff)
-  * temporary fix for psi-save-maximized-window-state.diff patch
-  + added new patch for disable alt+n switching tabs (psi-disable-alt-n-switch-tabs.diff)
-  ! launched Psi+ Forum, http://forum.psi-plus.com/ (thanks to diSabler). welcome! :)
-
-
-2011-05-09  zet
-v0.15.3861
-  * исправлена работа gmail service plugin (v0.6.9)
-  + добавлен новый tune-контроллер. теперь оба tune-контроллера (старый и новый) могут работать
-    вместе. модуль "psifilecontroller" более не нужен (psi-fix-tunes.diff)
-  * скрипт сборки psibuild теперь полностью совместим с FreeBSD
-    (trunk/scripts/posix/libpsibuild.sh, psibuild.sh)
-  + добавлен новый патч для возможности компиляции Psi+ в системах без поддержки sslv2
-    (psi-qca-no-ossl2.diff)
-  - убрана метка "Beta" из полного номера версии Psi+ (psiplus-application-info.diff)
-  - убран патч psi-qca-no-ossl2.diff -> принят в upstream
-  + добавлен новый патч для поддержки новой advanced-опции "options.ui.chat.auto-scroll-to-bottom",
-    которая позволяет отключить автоматическое скроллирование (автофокус) чатлога к самому свежему
-    (нижнему) отправленному сообщению (psi-disable-auto-scroll-to-bottom.diff)
-  * обновления безопасности в некоторых плагинах (attention plugin, autoreply plugin,
-    captcha forms plugin, chess plugin, extended menu plugin, storage notes plugin)
-  * обновлён screenshot plugin до версии 0.5.5
-  ! обновлена русская локализация от ivan101 (psi-ru svn, r195, 2011-05-08)
-  --
-  * fixed gmail service plugin (v0.6.9)
-  + added new psifiletunecontroller. at now works new and old controllers together.
-    psifilecontroller module is no longer needed (psi-fix-tunes.diff)
-  * psibuild is now fully compatible with FreeBSD (trunk/scripts/posix/libpsibuild.sh, psibuild.sh)
-  + added new patch psi-qca-no-ossl2.diff (openssl 1.0 not support ssl2)
-  - removed 'Beta' from version name (psiplus-application-info.diff)
-  - removed psi-qca-no-ossl2.diff patch -> went to upstream
-  + added new patch for adds option options.ui.chat.auto-scroll-to-bottom
-    (psi-disable-auto-scroll-to-bottom.diff)
-  * security updates for some plugins (attention plugin, autoreply plugin, captcha forms plugin,
-    chess plugin, extended menu plugin, storage notes plugin)
-  * updated screenshot plugin to v0.5.5
-  * psibuild is now fully compatible with FreeBSD (scripts/posix/libpsibuild.sh, psibuild.sh)
-  ! updated russian localization by ivan101 (psi-ru svn, r195, 2011-05-08)
-
-
-2011-04-21  zet
-v0.15.3800 Beta
-  * обновлён gmail service plugin до версии 0.6.8
-  * обновления для шаблонов - добавлены подменю и разделители (psi-send-button-context-menu.diff)
-  + добавлена новая иконка Print (Печать) в патч psi-iconsets.diff, теперь screenshot plugin
-    использует данную иконку для команды вывода скриншота на печать
-  + добавлен новый патч для деактивации вызова рисовальной доски из тулбара и из меню в приватах
-    конференций (не работает в текущей реализации) psi-remove-whiteboard-action-from-groupchat.diff
-  * исправлена обработка pep-событий (спасибо Hugin) psi-fix-pep-retraction.diff
-  * поправлен патч psi-extend-plugins-interface.diff
-  * исправлен chess plugin (v0.2.5)
-  * исправлен патч psi-muc-notify-highlight.diff. теперь хайлайт в конференциях не будет работать
-    для пользователей со статусом "dnd" ("занят")
-  * обновлён gomoku game plugin до версии 0.0.7
-  * переписан и значительно расширен функционал screenshot plugin (v0.5.3)
-  * решена задача 422, http://code.google.com/p/psi-dev/issues/detail?id=422
-    (psi-roster-avatar-frame.diff)
-  --
-  * updated gmail service plugin to v0.6.8
-  * updated for templates - the submenu and separators are added (psi-send-button-context-menu.diff)
-  + added print icon to psi-iconsets.diff patch, fix screenshotplugin for use this icon
-  + added new patch for remove whiteboard action from toolbar and menu in groupchat cos
-    it doesnt work (psi-remove-whiteboard-action-from-groupchat.diff)
-  * fixed pep retraction by Hugin (psi-fix-pep-retraction.diff)
-  * small fix for psi-extend-plugins-interface.diff patch
-  * fixed chess plugin (v0.2.5)
-  * fixed psi-muc-notify-highlight.diff patch. now highlights from mucs are disabled when
-    status is dnd
-  * updated gomoku game plugin to v0.0.7
-  * rewritten screenshot plugin (v0.5.3)
-  * workaround to fix issue 422, http://code.google.com/p/psi-dev/issues/detail?id=422
-    (psi-roster-avatar-frame.diff)
-
-
-2011-03-08  zet
-v0.15.3755 Beta
-  + добавлен новый плагин - jabber disk plugin (v0.0.3), подробнее -
-    http://psi-plus.com/wiki/plugins#jabber_disk_plugin
-  * обновлён client switcher plugin до версии 0.0.6
-  * улучшен патч для рисовальной доски и перемещён в рабочий каталог с патчами. добавлен ключ
-    "--enable-whiteboarding" для конфигурирования проекта перед сборкой, другие графические
-    улучшения в интерфейсе (psi-wb.diff)
-  - убран патч для рисовальной доски -> принят в upstream (psi-wb.diff)
-  - убран патч для псимедии asterisk-hack-skip-connection-negotiation-check.diff - данный патч
-    больше не нужен, т.к. он, по мнению автора патчей для псимедии Z_God, приводит к аварийной
-    ситуации с падением приложения "ASSERT: "!iceA_status.channelsReadyindex" in file
-    avcall/jinglertp.cpp, line 1368" в билдах PPA в Ubuntu (у Z_God не воспроизводится данная
-    ошибка на его собственной сборке). процедура установления соединения может стать немного
-    медленее, чем это было до этого
-  * фикс устаревшего метода использования Jid::setResource в патче
-    psi-add-bookmarks-to-join-conference-dlg.diff
-  * фикс устаревшего метода использования Jid::userHost в патче psi-block-contact-from-menu.diff
-  * фикс устаревшего метода использования Jid::setDomain в патче psi-muc-notify-highlight.diff
-  + добавлен новый патч для очистки кода диалога передачи файлов от устаревших методов qt3
-    (psi-filetransdlg-to-qt4.diff)
-  * объединены патчи psi-improve-filetransfer-dialog.diff и psi-filetransdlg-to-qt4.diff
-  * небольшие исправления в патче psi-improve-filetransfer-dialog.diff
-  * исправлена возможная утечка памяти в патче psi-extend-plugins-interface.diff
-  - убран патч psi-improve-filetransfer-dialog.diff -> принят в upstream
-  ! обновлены системные библиотеки Qt до версии 4.7.2, подробнее -
-    http://qt.nokia.com/developer/changes/changes-4.7.2
-  ! обновлены библиотеки win32 openssl до версии 0.9.8r, подробнее -
-    http://cvs.openssl.org/getfile?f=openssl/CHANGES&v=OpenSSL_0_9_8r
-  --
-  + added new plugin - jabber disk plugin (v0.0.3),
-    http://psi-plus.com/wiki/plugins#jabber_disk_plugin
-  * updated client switcher plugin to v0.0.6
-  * improved whiteboarding patch and move it to work dir. added '--enable-whiteboarding'
-    configure key, some ui fixes (psi-wb.diff)
-  - removed whiteboarding patch -> went to upstream (psi-wb.diff)
-  - removed asterisk-hack-skip-connection-negotiation-check.diff patch - this patch should not be
-    needed anymore and i think it causes a crash with 'ASSERT: "!iceA_status.channelsReadyindex"
-    in file avcall/jinglertp.cpp, line 1368' in the PPA build (i cannot reproduce it with my own
-    build). connection negotiation may be a bit slower now though commented by Z_God
-  * libpsibuild: enable whiteboarding by default (scripts/posix/libpsibuild.sh)
-  * updated some win32 scripts - enable whiteboarding by default
-    (scripts/win32/make-psiplus-webkit.cmd, scripts/win32/make-psiplus.cmd)
-  * fixed deprecated usage of Jid::setResource in psi-add-bookmarks-to-join-conference-dlg.diff
-    patch
-  * fixed deprecated usage of Jid::userHost in psi-block-contact-from-menu.diff patch
-  * fixed deprecated usage of Jid::setDomain in psi-muc-notify-highlight.diff patch
-  + added new patch for cleaning qt3 from filetransdialog (psi-filetransdlg-to-qt4.diff)
-  * merged psi-improve-filetransfer-dialog.diff and psi-filetransdlg-to-qt4.diff patches
-  * small fix for psi-improve-filetransfer-dialog.diff patch
-  * fixed possible memory leak (psi-extend-plugins-interface.diff)
-  - removed psi-improve-filetransfer-dialog.diff patch -> went to upstream
-  ! updated Qt libs to v4.7.2, http://qt.nokia.com/developer/changes/changes-4.7.2
-  ! updated win32 openssl libs to v0.9.8r,
-    http://cvs.openssl.org/getfile?f=openssl/CHANGES&v=OpenSSL_0_9_8r
-
-
-2011-02-27  zet
-v0.15.3730 Beta
-  * инсталлятор Psi+: убраны неиспользуемые крипто-библиотеки
-    (qca2.dll, qca-gnupg2.dll, qca-ossl2.dll)
-  * исправлен патч psi-add-options-color-highliting.diff
-  + добавлен новый патч - рабочая реализация IBB в приложении (psi-fix-ibb.diff)
-  * убрана отладочная информация из патчей (psi-fix-ibb.diff, psi-extend-plugins-interface.diff)
-  * обновлён патч на ibb: теперь клиент заявляет в disco о поддержке ibb. начата работа по
-    исправлению работоспособности функции передачи файлов в конференциях (psi-fix-ibb.diff)
-  + добавлен новый плагин - Gomoku game plugin (v0.0.4), подробнее -
-    http://psi-plus.com/wiki/plugins#gomoku_game_plugin
-  * обновлён chess plugin до версии 0.2.4
-  - убран патч psi-fix-ibb.diff -> принят в upstream
-  + добавлен новый патч, добавляющий новую опцию "ibb only" в редактор настроек аккаунта
-    (psi-ibb-only-option.diff)
-  * обновлён gmail service plugin до версии 0.6.6
-  * исправлен порядок обработки входящих станз в менеджере плагинной системы
-    (psi-extend-plugins-interface.diff)
-  * исправлен stop spam plugin (v0.5.2)
-  - убран патч psi-ibb-only-option.diff -> принят в upstream
-  * 2011 год в меню Help->About (psiplus-aboutdlg.diff)
-  --
-  * psiplus-install.nsi: removed useless crypto libs (qca2.dll, qca-gnupg2.dll, qca-ossl2.dll)
-  * fixed psi-add-options-color-highliting.diff patch
-  + added new patch - started IBB rewrite (psi-fix-ibb.diff)
-  * removed debug info (1930-psi-fix-ibb.diff, psi-extend-plugins-interface.diff)
-  * updated ibb patch: ibb added to disco. start fixing filetransfer in mucs (psi-fix-ibb.diff)
-  + added new plugin - Gomoku game plugin (v0.0.4), http://psi-plus.com/wiki/plugins#gomoku_game_plugin
-  * updated chess plugin to v0.2.4
-  - removed psi-fix-ibb.diff patch -> went to upstream
-  + added new patch for adds 'ibb only' option in account manager (psi-ibb-only-option.diff)
-  * updated gmail service plugin to v0.6.6
-  * fixed order of processing incoming stanzas by plugin manager (psi-extend-plugins-interface.diff)
-  * fixed stop spam plugin (v0.5.2)
-  - removed psi-ibb-only-option.diff patch -> went to upstream
-  * updated copyright year in Help->About menu (psiplus-aboutdlg.diff)
-
-
-2011-02-13  zet
-v0.15.3690 Beta
-  * исправлены роли некоторых активных участников проекта (psiplus-aboutdlg.diff)
-  + добавлен новый патч, создающий решение по исправлению падения приложения при переходе в оффлайн
-    при наличии непрочитанных сообщений (psi-fix-crash-when-going-offline.diff)
-  * обновлены некоторые плагины (attention plugin, chess plugin, pep change notify plugin)
-  * обновлён watcher plugin до версии 0.3.9
-  * обновлён birthday reminder plugin до версии 0.3.3
-  * обновления в патче psi-popups-options-tab.diff
-  * фиксы смещения в патчах psi-contact-manager.diff и
-    psi-add-join-groupchat-item-to-account-menu.diff
-  * обновлён gmail service plugin до версии 0.6.2
-  + добавлен файл звукового сопровождения при получении новых/непрочитанных писем в gmail service
-    plugin (sound/email.wav)
-  * обновлён extended menu plugin до версии 0.0.7
-  * исправлен патч psi-movable-tabs-qt45-and-custom-style.diff
-  * улучшения в патче psi-xmpp-uri-in-chat-mode.diff и исправления в связанных с ним патчах
-    (psi-tab-status-icon.diff, psi-movable-tabs-qt45-and-custom-style.diff,
-    psi-muc-minimize-to-roster.diff, psi-presets-in-status-menu.diff, psiplus-decorate-windows.diff,
-    psi-save-maximized-window-state.diff, psi-extend-plugins-interface.diff)
-  * обновлён extended options plugin до версии 0.3.2
-  --
-  * fixed active project members list (psiplus-aboutdlg.diff)
-  * small fix for psiplus-install.nsi
-  + added new patch for сreate a workaround to fix crash when going to offline with some unread
-    messages (psi-fix-crash-when-going-offline.diff)
-  * updated some plugins (attention plugin, chess plugin, pep change notify plugin)
-  * updated watcher plugin to v0.3.9
-  * updated birthday reminder plugin to v0.3.3
-  * updated psi-popups-options-tab.diff patch
-  * fixed fuzzes (psi-contact-manager.diff, psi-add-join-groupchat-item-to-account-menu.diff)
-  * update gmail service plugin to v0.6.2
-  + added sound for gmail service plugin (sound/email.wav)
-  * updated extended menu plugin to v0.0.7
-  * fixed psi-movable-tabs-qt45-and-custom-style.diff patch
-  * improved psi-xmpp-uri-in-chat-mode.diff patch and fix other patches after changes
-    (psi-tab-status-icon.diff, psi-movable-tabs-qt45-and-custom-style.diff,
-    psi-muc-minimize-to-roster.diff, psi-presets-in-status-menu.diff, psiplus-decorate-windows.diff,
-    psi-save-maximized-window-state.diff, psi-extend-plugins-interface.diff)
-  * updated extended options plugin to v0.3.2
-
-
-2011-02-06  zet
-v0.15.3670 Beta
-  * обновлён список активных участников проекта (psiplus-aboutdlg.diff)
-  ! устранена утечка памяти в менеджере настройки прокси-сервера (psi-proxy-settings-in-opt.diff)
-  + добавлен новый патч для сохранения памяти путём сокращения количества ненужных вызовов
-    xml-консоли (psi-create-xmlconsole-when-need-it.diff)
-  - убраны некоторые патчи -> приняты в upstream (less-includes.diff, psi-boss-key.diff)
-  * обновлён chess plugin до версии 0.2.1
-  + добавлен новый патч для исправления поведения при отзыве mood-события
-    (psi-fix-mood-retract.diff)
-  * исправлена чрезмерная интенсивность отправки tune-событий в контроллере MPRIS
-    (psi-fix-tunes.diff)
-  + добавлена поддержка css в контекстном меню для url-объектов (psi-css-style-sheet.diff)
-  + добавлена новая advanced-опция "options.ui.look.css" (psi-css-style-sheet.diff)
-  + добавлен новый патч для устранения утечек памяти в variant tree (psi-fix-variant-tree-diff)
-  - убран патч psi-fix-variant-tree-diff -> принят в upstream
-  + добавлен новый патч, создающий новую отдельную вкладку в настройках приложения для регулировки
-    параметров работы всплывающих окон (psi-popups-options-tab.diff)
-  * улучшения в патче psi-popups-options-tab.diff: добавлен класс для контроля длительности
-    показа всплывающих окон
-  * расширение функциональности метода PopupAccessor (psi-extend-plugins-interface.diff)
-  * обновлён stop spam plugin до версии 0.5.1
-  * патч на цитирование: теперь команда цитирования отключается при открытии нового чата
-    (psi-chatview-quote-feature.diff)
-  * фиксы в работе контроллера MPRIS (psi-fix-tunes.diff)
-  * исправлен gmail service plugin (v0.6.1)
-  * улучшения в патче psi-popups-options-tab.diff
-  * обновлён attention plugin до версии 0.1.6
-  * обновлён интерфейс плагинной системы: добавлены методы appOsName(), appCurrentProfileDir()
-    psi-extend-plugins-interface.diff
-  * улучшения в патче на цитирование для невебкит-версии (psi-chatview-quote-feature.diff)
-  * обновлён client switcher plugin до версии 0.0.5
-  * улучшения в патче psi-extend-plugins-interface.diff
-  * улучшения в патче psi-popup-avatar.diff
-  * улучшения в патче psi-popups-options-tab.diff
-  * патч на цитирование: исправлено зависание приложения при клике по url-объекту
-    (psi-chatview-quote-feature.diff)
-  * улучшения в скрипте инсталлятора под win32: работа с ярлыками (psiplus-install.nsi)
-  --
-  * updated project members list (psiplus-aboutdlg.diff)
-  ! fixed memory leak in proxy manager (psi-proxy-settings-in-opt.diff)
-  + added new patch for save some memory with useless xml-consoles
-    (psi-create-xmlconsole-when-need-it.diff)
-  - removed some patches -> went to upstream (less-includes.diff, psi-boss-key.diff)
-  * updated chess plugin to v0.2.1
-  + added new patch for fix mood retract (psi-fix-mood-retract.diff)
-  * fixed excessive tune sending in MPRIS controller (psi-fix-tunes.diff)
-  + added css for url object context menu (psi-css-style-sheet.diff)
-  + added empty option 'options.ui.look.css' (psi-css-style-sheet.diff)
-  + added new patch for fix memory leaks in variant tree (psi-fix-variant-tree-diff)
-  - removed psi-fix-variant-tree-diff patch -> went to upstream
-  + added new patch for create popups options tab (psi-popups-options-tab.diff)
-  * improved psi-popups-options-tab.diff patch: added class to control popups durations
-  * updated PopupAccessor (psi-extend-plugins-interface.diff)
-  * updated stop spam plugin to v0.5.1
-  * corrected quote feature. now quote menu is disabled after opening chatview
-    (psi-chatview-quote-feature.diff)
-  * fixed MPRIS controller (psi-fix-tunes.diff)
-  * fixed gmail service plugin (v0.6.1)
-  * improved psi-popups-options-tab.diff patch
-  * updated attention plugin to v0.1.6
-  * updated plugins interface: added appOsName(), appCurrentProfileDir()
-    psi-extend-plugins-interface.diff
-  * improved quote patch for non-webkit version (psi-chatview-quote-feature.diff)
-  * updated client switcher plugin to v0.0.5
-  * improved psi-extend-plugins-interface.diff patch
-  * improved psi-popup-avatar.diff patch
-  * improved psi-popups-options-tab.diff patch
-  * quote patch: fixed hangup (psi-chatview-quote-feature.diff)
-  * improved win32 install script: working with shortcuts (psiplus-install.nsi)
-
-
-2011-01-30  zet
-v0.15.3630 Beta
-  * исправлена обработка css для меню со смайлами. теперь изменения вступают в силу без перезапуска
-    Psi+ (psi-css-style-sheet.diff)
-  * improved Bits Of Binary (XEP-0231) support (psi-bits-of-binary.diff)
-  + добавлена возможность скрывать и восстанавливать показ нескольких табов
-    (psi-muc-minimize-to-roster.diff)
-  - теперь удаляется неиспользуемый иконсет при выгрузке плагина (psi-extend-plugins-interface.diff)
-  * улучшена работа методов active tab accessor (psi-extend-plugins-interface.diff)
-  * небольшие улучшение и исправления для патча psi-extend-plugins-interface.diff
-  * некоторые фиксы стиля кода и меньше предупреждений при компиляции Psi+
-    (psi-mood-icons-and-description.diff, psi-activity-icons-and-description.diff,
-    psi-muc-roster-icons.diff)
-  + добавлен новый патч на фиксы стиля кода и снижение количества предупреждений при компиляции Psi+
-    (psi-fix-opt-iconset-codestyle-and-warnings.diff)
-  - убран патч psi-bits-of-binary.diff -> принят в upstream
-  * улучшения в шаблонах сообщений: фикс обновления меню с шаблонами и команды paste&send. добавлены
-    команды для редактирования и перемещения шаблонов в списке, возможность перетаскивания шаблонов
-    по списку мышкой, а также запрос при выходе из редактора шаблонов без сохранения
-    (psi-send-button-context-menu.diff)
-  * патч psi-fix-opt-iconset-codestyle-and-warnings.diff объединён с патчем psi-client-icons.diff
-  * меньше предупреждений при компиляции Psi+ (psi-send-button-context-menu.diff)
-  * меньше предупреждений при компиляции Psi+ (psi-roster-avatar-frame.diff)
-  * обновлён watcher plugin до версии 0.3.8
-  * некоторые фиксы стиля кода и меньше предупреждений при компиляции Psi+ (psi-popup-avatar.diff,
-    psi-xmpp-uri-in-chat-mode.diff, psi-highlighted-color.diff,
-    psi-tab-status-icon.diff, psi-typed-history.diff, psi-roster-settings.diff,
-    psi-all-in-one-window.diff, psi-movable-tabs-qt45-and-custom-style.diff, psi-typeahead-find.diff,
-    psi-improve-tray-tooltip.diff, psi-css-style-sheet.diff, psi-muc-minimize-to-roster.diff,
-    psi-pep-toolbar-buttons.diff, psi-presets-in-status-menu.diff, psi-minimize-chat-hotkey.diff,
-    psi-send-xhtml-im.diff, psi-add-contact-from-chat-dialog.diff, psi-typing-notify-popups.diff,
-    psi-internal-changes-tabbablewidget.diff, psi-auto-capitalizer.diff,
-    psi-extend-plugins-interface.diff)
-  * исправлено возможное падение приложения в менеджере плагинов при удалении аккаунта
-    (psi-extend-plugins-interface.diff)
-  * попытка исправить падение приложения в менеджере плагинов при инициализации попапа
-    (psi-extend-plugins-interface.diff)
-  * обновлён pep change notify plugin до версии 0.0.7
-  + добавлен новый патч, исправляющий поведение PsiTooltipHandler (psi-fix-psitooltiphandler.diff)
-  * решена задача 328, http://code.google.com/p/psi-dev/issues/detail?id=328
-    (psi-contact-manager.diff)
-  + добавлен новый патч для быстрого скрытия окон и иконки приложения с рабочего стола, из трея и
-    из панели задач по нажатию горячей кнопки (анти-босс режим). по умолчанию назначена
-    комбинация Ctrl+Alt+B (psi-boss-key.diff)
-  --
-  * fixed css for smiles menu. now there is no necessity of restarting Psi+
-    (psi-css-style-sheet.diff)
-  * improved Bits Of Binary (XEP-0231) support (psi-bits-of-binary.diff)
-  + added ability to hide and restore several tabs (psi-muc-minimize-to-roster.diff)
-  - removed iconset when unload plugin (psi-extend-plugins-interface.diff)
-  * improved active tab accessor methods (psi-extend-plugins-interface.diff)
-  * small improvement, less wornings for psi-extend-plugins-interface.diff
-  * some code style fixes (psi-mood-icons-and-description.diff,
-    psi-activity-icons-and-description.diff, psi-muc-roster-icons.diff)
-  + added new patch for fix codestyle and less warnings
-    (psi-fix-opt-iconset-codestyle-and-warnings.diff)
-  - removed patch psi-bits-of-binary.diff -> went to upstream
-  * improved templates: fix update templates menu, paste&send action. added actions for editing,
-    relocation of the context menu into edit dialog (psi-send-button-context-menu.diff)
-  * merged psi-fix-opt-iconset-codestyle-and-warnings.diff and psi-client-icons.diff patches
-  * less warnings for psi-send-button-context-menu.diff
-  * less warnings for psi-roster-avatar-frame.diff
-  * updated watcher plugin to v0.3.8
-  * some codestyle and warnings fixes (psi-popup-avatar.diff, psi-xmpp-uri-in-chat-mode.diff,
-    psi-highlighted-color.diff, psi-tab-status-icon.diff, psi-typed-history.diff,
-    psi-roster-settings.diff, psi-all-in-one-window.diff,
-    psi-movable-tabs-qt45-and-custom-style.diff, psi-typeahead-find.diff,
-    psi-improve-tray-tooltip.diff, psi-css-style-sheet.diff, psi-muc-minimize-to-roster.diff,
-    psi-pep-toolbar-buttons.diff, psi-presets-in-status-menu.diff, psi-minimize-chat-hotkey.diff,
-    psi-send-xhtml-im.diff, psi-add-contact-from-chat-dialog.diff, psi-typing-notify-popups.diff,
-    psi-internal-changes-tabbablewidget.diff, psi-auto-capitalizer.diff,
-    psi-extend-plugins-interface.diff)
-  * fixed possible crash in plugin manager when psi account was deleted
-    (psi-extend-plugins-interface.diff)
-  * try to fix possible crash in plugin manager when init popup (psi-extend-plugins-interface.diff)
-  * updated pep change notify plugin to v0.0.7
-  + added new patch for fix to PsiTooltipHandler (psi-fix-psitooltiphandler.diff)
-  * fixed issue 328, http://code.google.com/p/psi-dev/issues/detail?id=328
-    (psi-contact-manager.diff)
-  + added new patch that adds a boss key. ctrl+alt+b is default hotkey (psi-boss-key.diff)
-
-
-2011-01-23  zet
-v0.15.3600 Beta
-  * обновлена иконка ping.png для extended menu plugin
-  * улучшения в патче на цветность фона тултипов/попапов (psi-coloring-tooltip.diff)
-  * переписан патч psi-send-button-context-menu.diff (автор - liuch)
-  + добавлен новый патч, выводящий новую кнопку Reset на панель управления advanced-опциями
-    приложения (psi-options-reset-button.diff)
-  * обновлён pep change notify plugin до версии 0.0.5
-  * добавлен новый патч, исправляющий утечки памяти в диалоге добавления нового пользователя
-    (psi-fix-adduserdlg.diff)
-  - убран патч psi-fix-adduserdlg.diff -> принят в upstream
-  + добавлен новый патч, исправляющий утечки памяти в data_widget (psi-fix-xdata-widget.diff)
-  - убран патч psi-fix-xdata-widget.diff -> принят в upstream
-  * чистка мусора в патче psi-options-reset-button.diff
-  + добавлен новый патч, исправляющий утечку памяти в edb (psi-fix-leak-in-edb.diff)
-  * исправлены возможные утечки памяти в патче на новую историю переписки (psi-historydlg.diff)
-  * изменён алгоритм работы с tunes-контроллерами. улучшена очистка тюнсов (psi-fix-tunes.diff)
-  * исправлена поддержка css в меню с шаблонами сообщений (psi-send-button-context-menu.diff)
-  + добавлен новый патч, исправляющий утечки памяти в главном меню
-    (psi-fix-memory-leak-in-main-menu.diff)
-  * исправлен экспорт и убраны magic numbers в патче новой истории (psi-historydlg.diff)
-  + добавлен новый патч, исправляющий утечки памяти в optionseditor
-    (psi-fix-memory-leaks-in-psioptionseditor.diff)
-  - убран патч psi-fix-leak-in-edb.diff -> принят в upstream
-  * изменены разделители в списке исключений tunes-контроллеров. вместо запятых теперь используются
-    пробелы (psi-fix-tunes.diff)
-  * исправлена перерисовка меню с шаблонами сообщений (psi-send-button-context-menu.diff)
-  * возвращена кнопка Delete в панель управления advanced-опциями (psi-options-reset-button.diff)
-  * исправлена работа опции автостарта приложения в ОС семейства Linux (psi-autostart.diff)
-  * исправлена обработка пустых элементов в списке исключений tunes-контроллеров
-    (psi-fix-tunes.diff)
-  * исправлен патч psi-fix-memory-leak-in-main-menu.diff
-  * обновлён chess plugin до версии 0.2.0
-  * обновлён gmail service plugin до версии 0.5.9
-  * исправлена привязка положения меню с шаблонами сообщений (psi-send-button-context-menu.diff)
-  + добавлен новый патч, исправляющий утечки памяти в виджетах табов
-    (psi-fix-leaks-in-tab-menus.diff)
-  * исправлен патч psi-movable-tabs-qt45-and-custom-style.diff
-  * переименована advanced-опция "can_close_inactive_tab" в "can-close-inactive-tab"
-    (psi-movable-tabs-qt45-and-custom-style.diff)
-  - убраны некоторые патчи -> приняты в upstream (psi-fix-leaks-in-tab-menus.diff,
-    psi-fix-memory-leak-in-main-menu.diff, psi-fix-memory-leaks-in-psioptionseditor.diff)
-  * исправлен патч psi-fix-possible-memory-leaks.diff
-  - убран патч psi-fix-possible-memory-leaks.diff -> принят в upstream
-  * некоторые исправления в стиле кода в патче psi-muc-minimize-to-roster.diff
-  * мелкий фикс для меню с шаблонами сообщений (psi-send-button-context-menu.diff)
-  * обновлён системный иконпак qipinfium_sys.jisp (спасибо Yuri Gural). оптимизированы все
-    системные иконпаки (iconsets/system/blacksys.jisp, lunnacat.jisp, nuvola-system.jisp,
-    oxygen_sys.jisp, oxygen_sys_22.jisp, qipinfium_sys.jisp, summer-system.jisp,
-    tango_system.jisp, whitesys.jisp)
-  * больше строк для локализации в cleaner plugin
-  * запрет локализации строк в html для content downloader plugin
-  + добавлена поддержка css для формы со смайлами (psi-css-style-sheet.diff)
-  * больше строк для локализации менеджера контактов (psi-contact-manager.diff)
-  * исправлено запоминание размера максимизированного окна конференции в режиме табов
-    (psi-save-maximized-window-state.diff)
-  ! обновлена русская локализация от ivan101 (psi-ru svn, r185, 2011-01-23)
-  --
-  * updated ping.png icon for extended menu plugin
-  * improved psi-coloring-tooltip.diff
-  * rewritten psi-send-button-context-menu.diff (by liuch)
-  + added new patch for add reset button to advanced options control panel
-    (psi-options-reset-button.diff)
-  * updated pep change notify plugin to v0.0.5
-  * added new patch for fix memory leaks (psi-fix-adduserdlg.diff)
-  - removed psi-fix-adduserdlg.diff -> went to upstream
-  + added new patch for fix leaks in data_widget (psi-fix-xdata-widget.diff)
-  - removed psi-fix-xdata-widget.diff -> went to upstream
-  * cleaned garbage from psi-options-reset-button.diff
-  + added new patch for fix memory leak in edb (psi-fix-leak-in-edb.diff)
-  * fixed possible memory leaks in psi-historydlg.diff
-  * changed operation with controllers. better tune cleaning (psi-fix-tunes.diff)
-  * fixed css for templates menu (psi-send-button-context-menu.diff)
-  + added new patch for fix memory leaks in main menu (psi-fix-memory-leak-in-main-menu.diff)
-  * fixed export, removed magic numbers in psi-historydlg.diff
-  + added new patch for fix leaks in optionseditor (psi-fix-memory-leaks-in-psioptionseditor.diff)
-  - removed psi-fix-leak-in-edb.diff -> went to upstream
-  * changed exstensions separator from comma to space (psi-fix-tunes.diff)
-  * fixed template's menu redraw (psi-send-button-context-menu.diff)
-  * returned delete button to advanced options control panel (psi-options-reset-button.diff)
-  * fixed psi-autostart.diff on linux
-  * fixed empty items in controller-blacklist (psi-fix-tunes.diff)
-  * fixed psi-fix-memory-leak-in-main-menu.diff
-  * removeSubmenus -> clearMenu (psi-fix-memory-leak-in-main-menu.diff)
-  * updated chess plugin to v0.2.0
-  * updated gmail service plugin to v0.5.9
-  * fixed temptate's menu show position (psi-send-button-context-menu.diff)
-  + added new patch for fix some memory leaks in tab widget menus (psi-fix-leaks-in-tab-menus.diff)
-  * fixed psi-movable-tabs-qt45-and-custom-style.diff
-  * 'can_close_inactive_tab' -> 'can-close-inactive-tab' (psi-movable-tabs-qt45-and-custom-style.diff)
-  - removed some patches -> went to upstream (psi-fix-leaks-in-tab-menus.diff,
-    psi-fix-memory-leak-in-main-menu.diff, psi-fix-memory-leaks-in-psioptionseditor.diff)
-  * fixed psi-fix-possible-memory-leaks.diff
-  - removed psi-fix-possible-memory-leaks.diff -> went to upstream
-  * some codestyle fixes for psi-muc-minimize-to-roster.diff
-  * small fix for template menu (psi-send-button-context-menu.diff)
-  * updated qipinfium_sys.jisp (thanks to Yuri Gural). optimized all systems jisps
-    (iconsets/system/blacksys.jisp, lunnacat.jisp, nuvola-system.jisp, oxygen_sys.jisp,
-    oxygen_sys_22.jisp, qipinfium_sys.jisp, summer-system.jisp, tango_system.jisp, whitesys.jisp)
-  * more translatable for cleaner plugin
-  * not translatable html for content downloader plugin
-  + added css for smiles menu (psi-css-style-sheet.diff)
-  * more translatable for contact manager (psi-contact-manager.diff)
-  * save maximized groupchat window state in tabmode fix (psi-save-maximized-window-state.diff)
-  ! updated russian localization by ivan101 (psi-ru svn, r185, 2011-01-23)
-
-
-2011-01-16  zet
-v0.15.3522 Beta
-  + добавлен новый патч, добавляющий опцию в настройки приложения "автостарт Psi+ при запуске
-    операционной системы" (psi-autostart.diff)
-  + добавлена поддержка автостарта Psi+ в ОС семейства Linux (psi-autostart.diff)
-  * снижено количество запоминаемых историй ввода сообщений до 50 (psi-typed-history.diff)
-  + добавлен новый патч для исправления возможной утечки памяти (psi-fix-possible-memory-leaks.diff)
-  * некоторые фиксы translate plugin (v0.3.2)
-  + добавлен новый патч, исправляющий поведение анимированной иконки с fancylabel и устраняющий
-    возможную утечку памяти (psi-fix-fancylabel.diff)
-  - убран патч psi-fix-fancylabel.diff. патч принят в upstream
-  * попытка исправить ошибочный детект клиента Talkonaut (google.com 1.0.0.84)
-    psi-client-icons.diff
-  * небольшие фиксы conference logger plugin (v0.1.9). спасибо liuch
-  ! начат рефакторинг патчей плагинной системы, часть 1: все плагинные патчи объединены в один
-    общий патч + фиксы кодестайлинга (psi-extend-plugins-interface.diff)
-  ! рефакторинг патчей плагинной системы, часть 2: улучшения и исправления общего плагинного патча
-    (psi-extend-plugins-interface.diff)
-  ! рефакторинг патчей плагинной системы, часть 3: исправлена работа плагинной системы, требуется
-    перекомпилировать все плагины Psi+
-  * исправлен pep plugin (v0.0.4)
-  * обновлён attention plugin до версии 0.1.5
-  + добавлен новый плагин - extended menu plugin, подробнее -
-    http://psi-plus.com/wiki/plugins#extended_menu_plugin
-  * фикс утечки памяти в патче psi-send-button-context-menu.diff (автор - liuch)
-  * фиксы некоторых патчей (psi-avcalls-addons.diff, psi-muc-bookmark-toolbar-button.diff,
-    psi-typeahead-find.diff, psi-muc-minimize-to-roster.diff,
-    psi-add-join-groupchat-item-to-account-menu.diff, psi-send-xhtml-im.diff, psi-fix-tunes.diff)
-  + добавлена возможность отключать определённые контроллеры трансляции музыки
-    (трансляция через tune-файл и/или через Winamp-контроллер). комбинированный контроллер
-    трансляции музыки больше не используется (psi-fix-tunes.diff)
-  * некоторые улучшения в патче psi-extend-plugins-interface.diff
-  * обновлён патч psi-extend-plugins-interface.diff. теперь кнопка "plugin info" доступна даже
-    при отключенном плагине
-  + добавлен новый патч для переименования бинарного исполняемого файла
-    из psi.exe (psi) в psi-plus.exe (psi-plus) и разрешения конфликтов с пакетами оригинального Psi
-    в некоторых ОС семейства Linux (psiplus-binary.diff) -- экспериментально!
-  * обновлены списки ресурсов для content downloader plugin
-  * исправлен watcher plugin (v.0.3.7)
-  * исправлена утечка памяти в патче psi-send-xhtml-im.diff
-  * исправлена ещё одна утечка памяти в патче psi-send-xhtml-im.diff
-  * исправлен патч psiplus-binary.diff
-  + добавлен детект некоторых jabber-клиентов. спасибо Qwеst (psi-client-icons.diff)
-  * обновлён extended menu plugin до версии 0.0.5
-  * обновлён birthday reminder plugin до версии 0.3.2
-  * исправлен детект клиента sim communicator (psi-client-icons.diff)
-  * обновлены иконпаки с иконками jabber-клиентов
-    (iconsets/clients/fingerprint.jisp, fingerprint-22.jisp)
-  --
-  + added new patch for adds autostart application option 'automatically launch application when OS
-    starts' (psi-autostart.diff)
-  + added support for linux (psi-autostart.diff)
-  * decreased typed history size to 50 messages (psi-typed-history.diff)
-  + added new patch for fix possible memory leaks (psi-fix-possible-memory-leaks.diff)
-  * some fixes for translate plugin (v0.3.2)
-  + added new patch for fix fancylabel (psi-fix-fancylabel.diff)
-  - removed psi-fix-fancylabel.diff. patch moved to upstream
-  * try to fix for Talkonaut detection (google.com 1.0.0.84) psi-client-icons.diff
-  * small fixes for conference logger plugin (v0.1.9). tnx to liuch
-  ! begining of refactoring plugins patches, part 1: merge all plugins patches into new one,
-    some fixes to codestyle (psi-extend-plugins-interface.diff)
-  ! refactoring, part2: improvement for main plugins patch. all the plugins are broken,
-    wait for fixes (psi-extend-plugins-interface.diff)
-  ! refactoring, part3: fixes for plugins. note: you must recompile all the plugins
-  * fixed pep plugin (v0.0.4)
-  * updated attention plugin (v0.1.5)
-  + added new plugin - extended menu plugin, http://psi-plus.com/wiki/plugins#extended_menu_plugin
-  * fixes for psi-send-button-context-menu.diff (by liuch)
-  * fixed some patches (psi-avcalls-addons.diff, psi-muc-bookmark-toolbar-button.diff,
-    psi-typeahead-find.diff, psi-muc-minimize-to-roster.diff,
-    psi-add-join-groupchat-item-to-account-menu.diff, psi-send-xhtml-im.diff, psi-fix-tunes.diff)
-  + added ability to disable tune controllers. combined controller is no longer used
-    (psi-fix-tunes.diff)
-  * some progress with psi-extend-plugins-interface.diff
-  * updated psi-extend-plugins-interface.diff. for now 'plugin info' button available even when
-    plugin is disabled
-  + added new patch for rename binary executable file from psi.exe (psi) to psi-plus.exe (psi-plus)
-    and avoid conflicts with original psi package on a Linux (psiplus-binary.diff) -- experimental!
-  * updated resource lists for content downloader plugin
-  * fixed watcher plugin (v.0.3.7)
-  * fixed memory leak in psi-send-xhtml-im.diff
-  * one more fix memory leak in psi-send-xhtml-im.diff
-  * fixed psiplus-binary.diff
-  + added some clients detection. thanks to Qwеst (psi-client-icons.diff)
-  * updated extended menu plugin (v0.0.5)
-  * updated birthday reminder plugin
-  * fixed sim communicator detection (psi-client-icons.diff)
-  * updated fingerprint jisps (iconsets/clients/fingerprint.jisp, fingerprint-22.jisp)
-
-
-2011-01-09  zet
-v0.15.3465 Beta
-  * обновлён client switcher plugin до версии 0.0.4 (автор - liuch)
-  * фикс метода currentTune, незначительные фиксы для mpris (psi-fix-tunes.diff)
-  * улучшен метод changeCase() в механизме автокапитализации (psi-auto-capitalizer.diff)
-  + добавлен новый патч, создающий новую advanced-опцию options.ui.chat.show-status-changes для
-    управления отображением статусных сообщений в ростерном чате
-    (psi-disable-show-status-changes-in-chat.diff)
-  * временно отключена обработка капчи в ядре приложения. для прохождения капчи используйте
-    captcha forms plugin (psi-data-forms-media-element.diff)
-  + добавлен новый универсальный скин LunnaCat от majik (skins/universal/LunnaCat)
-  + добавлен новый системный иконпак lunnacat.jisp (iconsets/system/lunnacat.jisp)
-  * обновлён список ресурсов для content downloader plugin (добавлен lunnacat.jisp)
-  * пересортировка списков ресурсов в алфавитном порядке (для content downloader plugin)
-  * обновлён attention plugin до версии 0.1.4
-  * убран мусор в коде группчатов. решена задача is369,
-    http://code.google.com/p/psi-dev/issues/detail?id=369 (psi-save-maximized-window-state.diff)
-  + добавлен фильтр транслируемых источников (psi-fix-tunes.diff)
-  * поправлен патч psi-muc-nick-hash-color: исключена возможность отображения чёрных ников на
-    чёрном фоне в чатлоге конференции (psi-muc-nick-hash-color.diff)
-  --
-  * updated client switcher plugin to v0.0.4, by liuch
-  * currentTune method fix, minor mpris fix (psi-fix-tunes.diff)
-  * improve changeCase() method in auto-capitalizer (psi-auto-capitalizer.diff)
-  + added new patch for create new option options.ui.chat.show-status-changes
-    (psi-disable-show-status-changes-in-chat.diff)
-  * temporary disable captcha in messages. use captcha forms plugin
-    (psi-data-forms-media-element.diff)
-  + added new universal skin LunnaCat (skins/universal/LunnaCat)
-  + added new system iconset lunnacat.jisp (iconsets/system/lunnacat.jisp)
-  * updated resources list for content downloader plugin (lunnacat.jisp)
-  * reordered content.list (alphabetical)
-  * updated attention plugin to v0.1.4
-  * removed garbage in groupchat dlg. fixed is369,
-    http://code.google.com/p/psi-dev/issues/detail?id=369 (psi-save-maximized-window-state.diff)
-  + added tune-content filters (psi-fix-tunes.diff)
-  * fixed psi-muc-nick-hash-color patch for no more black for snowgirl and dead moroz. also
-    corrected codestyle (psi-muc-nick-hash-color.diff)
-
-
-2010-12-26  zet
-v0.15.3450 Beta
-  * некоторые исправления в патче автосмены регистра psi-auto-capitalizer.diff
-  * обновлён gmail service plugin до версии 0.5.7
-  + добавлено определение некоторых jabber-клиентов: Dictbot, SoFServer, Spectrum, ICQ Mobile
-    (psi-client-icons.diff)
-  * обновлены иконпаки с иконками клиентов (iconsets/clients/fingerprint.jisp, fingerprint-22.jisp)
-  + добавлен новый плагин -- pep change notify plugin, подробнее --
-    http://psi-plus.com/wiki/plugins#pep_change_notify_plugin
-  * изменения в процедуре getPluginOption
-    (psi-plugins-options-and-fix-plugins-loading-and-unloading.diff,
-    psi-fix-optionChanged-method-in-plugins.diff)
-  * мелкие фиксы в патче psi-send-button-context-menu.diff
-  * pep change notify plugin: добавлена поддержка mingw
-  * мелкие фиксы в патче psi-typed-history.diff
-  * исправлена функция getJid() для плагинной системы (psi-get-account-info-from-plugins.diff)
-  * content downloader plugin: добавлена кнопка ручного запроса списка доступных ресурсов
-  * content downloader plugin: теперь по умолчанию плагин автоматически не проверяет список
-    доступных ресурсов (v0.1.10)
-  * расширена функциональность accountinfoaccessor. спасибо liuch
-    (psi-get-account-info-from-plugins.diff, psi-add-toolbar-button-from-plugins.diff,
-    psi-access-to-menus-from-plugins.diff, psi-change-contacts-status-from-plugins.diff)
-  + добавлен новый плагин -- client switcher plugin (by liuch), подробнее --
-    http://psi-plus.com/wiki/plugins#client_switcher_plugin
-  * обновлён pep change notify plugin до версии 0.0.3
-  * обновлён патч на цитирование -- добавлен локальный хоткей Ctrl+S для цитирования выделенного
-    фрагмента текста (psi-chatview-quote-feature.diff)
-  * улучшена точность срабатывания механизма автосмены регистра (psi-auto-capitalizer.diff)
-  --
-  * some updates for psi-auto-capitalizer.diff
-  * updated gmail service plugin, v0.5.7
-  + added detection of Dictbot, SoFServer, Spectrum, ICQ Mobile. updated both fingerprint.jisp
-    (psi-client-icons.diff, iconsets/clients/fingerprint.jisp, iconsets/clients/fingerprint-22.jisp)
-  + added new plugin -- pep change notify plugin,
-    http://psi-plus.com/wiki/plugins#pep_change_notify_plugin
-  * changed getPluginOption procedure
-    (psi-plugins-options-and-fix-plugins-loading-and-unloading.diff,
-    psi-fix-optionChanged-method-in-plugins.diff)
-  * less warnings (psi-send-button-context-menu.diff)
-  * make pep change notify plugin compile with mingw
-  * less warnings (psi-typed-history.diff)
-  * updated downloads.wiki (pep change notify plugin)
-  * fixed getJid() function for plugins (psi-get-account-info-from-plugins.diff)
-  * content downloader plugin: added download content list button
-  * content downloader plugin: download content list is now disabling when i click it (v0.1.10)
-  * extend accountinfoaccessor. thx to liuch (psi-get-account-info-from-plugins.diff,
-    psi-add-toolbar-button-from-plugins.diff, psi-access-to-menus-from-plugins.diff,
-    psi-change-contacts-status-from-plugins.diff)
-  + added new plugin -- client switcher plugin (by liuch),
-    http://psi-plus.com/wiki/plugins#client_switcher_plugin
-  * updated pep change notify plugin, v0.0.3
-  * improved quote feature. added Ctrl+S shortcut (psi-chatview-quote-feature.diff)
-  * improved auto-capitalize accurracy (psi-auto-capitalizer.diff)
-
-
-2010-12-19  zet
-v0.15.3414 Beta
-  * обновлён патч для истории сообщений (psi-historydlg.diff)
-  * исправлено возможное падение приложения при удалении аккаунтов (psi-roster-avatar-frame.diff)
-  * небольшие исправления в conference logger plugin
-  * обновлён extended options plugin (добавлена обработка options.ui.muc.hide-on-autojoin,
-    options.ui.look.colors.chat.unread-message-color, options.ui.look.colors.chat.composing-color)
-  * решена задача 383, http://code.google.com/p/psi-dev/issues/detail?id=383
-    (psi-activity-icons-and-description.diff)
-  - патч psi-fix-online-contact-count.diff убран из рабочего каталога и не применяется вместе с
-    остальными, подробнее -- задача 384, http://code.google.com/p/psi-dev/issues/detail?id=384
-  + добавлен новый патч для фикса qWarning сообщений (psi-fix-qWarning-message.diff)
-  * теперь билды Psi+ выпускаются только под MacOS 10.6
-    (trunk/scripts/macosx/patches/3020-psi-mac-Makefile.diff, trunk/scripts/macosx/psibuild.command)
-  - убран патч psi-fix-qWarning-message.diff, т.к. принят в upstream
-  + добавлен новый ЭКСПЕРИМЕНТАЛЬНЫЙ патч для автоматического переключения регистра при составлении
-    сообщения. автосмена регистра выключена по умолчанию. автосмена включается advanced-опцией
-    options.ui.chat.auto-capitalize, ручное переключение регистра - Ctrl+Alt+X
-    (psi-auto-capitalizer.diff)
-  * обновлён stop spam plugin
-  * исправлены возможные утечки памяти в juick plugin
-  * исправлены возможные утечки памяти в некоторых плагинах (birthday reminder plugin,
-    captcha forms plugin, image plugin)
-  * исправлены возможные утечки памяти в некоторых плагинах, часть 2 (chess plugin, cleaner plugin,
-    skins plugin)
-  + в инсталлятор psiplus-install.nsi добавлена опция для старта Psi+ при запуске windows
-  * обновлена ссылка для скачивания свежей версии инсталлятора Psi+ (psi-dirty-check.diff)
-  ! обновлены библиотеки win32 openssl до версии 0.9.8q
-  --
-  * updated history patch (psi-historydlg.diff)
-  * fixed possible crash when removing accounts (psi-roster-avatar-frame.diff)
-  * small fixes to conference logger plugin
-  * updated extended options plugin (added options.ui.muc.hide-on-autojoin,
-    options.ui.look.colors.chat.unread-message-color, options.ui.look.colors.chat.composing-color)
-  * fixed issue 383, http://code.google.com/p/psi-dev/issues/detail?id=383
-    (psi-activity-icons-and-description.diff)
-  - moved psi-fix-online-contact-count.diff patch to dev cos of issue 384,
-    http://code.google.com/p/psi-dev/issues/detail?id=384
-  + added new patch to fix qWarning message (psi-fix-qWarning-message.diff)
-  * back to MacOS 10.6 support only (trunk/scripts/macosx/patches/3020-psi-mac-Makefile.diff,
-    trunk/scripts/macosx/psibuild.command)
-  - removed psi-fix-qWarning-message.diff. patch moved to upstream
-  + added new auto-capitalizer EXPERIMENTAL patch. disabled by default. enable -
-    options.ui.chat.auto-capitalize, manual change case - Ctrl+Alt+X (psi-auto-capitalizer.diff)
-  * updated stop spam plugin
-  * fixed possible memory leaks in juick plugin
-  * fixed possible memory leaks in some plugins (birthday reminder plugin, captcha forms plugin,
-    image plugin)
-  * fixed possible memory leaks in some plugins, part2 (chess plugin, cleaner plugin, skins plugin)
-  + psiplus-install.nsi: added optional running Psi+ on windows start
-  * updated url for windows installer (psi-dirty-check.diff)
-  ! updated win32 openssl libs to v0.9.8q
-
-
-2010-12-12  zet
-v0.15.3385 Beta
-  * патч для истории сообщений синхронизирован с git и внесены некоторые фиксы,
-    подробнее -- http://code.google.com/p/psi-dev/issues/detail?id=353 (psi-historydlg.diff)
-  + добавлен новый патч для исправления поведения контакта ростера при его удалении из пустой группы
-    (psi-tmp-fix-removing-contacts-with-empty-group.diff)
-  * более корректная работа с MPRIS (psi-nix-mpris.diff)
-  * icq must die plugin - добавлена лицензия для debian
-  * content downloader plugin. теперь плагин умеет проверять наличие ресурсов в папке установки Psi+
-  * обновлён патч для истории сообщений - добавлен календарь (psi-historydlg.diff)
-  * попытка решить задачу 337, http://code.google.com/p/psi-dev/issues/detail?id=337
-    (psi-change-password-dialog.diff)
-  * в патче на цитирование теперь используется символ "»" вместо ">>"
-    (psi-chatview-quote-feature.diff)
-  * патч на цитирование: вставка цитаты на позицию курсора (psi-chatview-quote-feature.diff)
-  + добавлена поддержка множественных подключений (psi-nix-mpris.diff)
-  + добавлена поддержка множественных подключений на старте Psi+ (psi-nix-mpris.diff)
-  - убран патч psi-nix-mpris.diff, т.к. он принят в upstream
-  + добавлен новый патч для решения задачи 377, http://code.google.com/p/psi-dev/issues/detail?id=377
-    (psi-fix-closing-inactive-tabs-when-apply-button-pressed.diff)
-  * объединены патчи merged psi-muc-minimize-to-roster.diff и
-    psi-fix-closing-inactive-tabs-when-apply-button-pressed.diff
-  - убран патч psi-tmp-fix-removing-contacts-with-empty-group.diff, т.к. он принят в upstream
-  - убраны некоторые патчи, т.к. они приняты в upstream (psi-unnamed-xmpp-uri-param.diff,
-    psi-fix-avatar-transparency.diff, psi-vcard-open-homepage.diff)
-  * обновлён патч для истории сообщений - добавлена команда для удаления истории переписки с
-    выбранным контактом (вызывается через контекстное меню) psi-historydlg.diff
-  * поправлена ссылка на багтрекер проекта в меню Help (psiplus-join-to-support-muc.diff)
-  - убран патч psi-img-src-file-and-data-protos.diff. патч переписан и принят в upstream
-  - убран патч psi-add-detection-some-os.diff, т.к. он принят в upstream
-  * исправлен патч psi-entity-time.diff
-  * исправлено падение приложения в Linux при попытке поиска с пустой поисковой строкой
-    (psi-historydlg.diff)
-  + добавлено определение клиента QIP Mobile, обновлены иконпаки с иконками клиентов
-    (psi-client-icons.diff, iconsets/clients/fingerprint.jisp, fingerprint-22.jisp)
-  * обновлён патч для истории сообщений - восстановлена команда экспорта истории переписки в
-    текстовый файл (вызывается через контекстное меню) psi-historydlg.diff
-  * исправлено расположение скриншотов Psi+ на главной странице проекта после смены её дизайна
-    (http://psi-dev.googlecode.com/)
-  * исправлена возможность блокировки исходящих сообщений из плагинов
-    (0570-psi-extend-eventfilter.diff)
-  * восстановлено отображение иконок доставки сообщений в чатлогах (psi-receipts.diff)
-  * обновлён патч для истории сообщений - добавлены иконки для команд контекстного меню
-    (psi-historydlg.diff)
-  * processOutgoingStanza event filter method (psi-extend-eventfilter.diff)
-  * исправлены опечатки в интерфейсе cleaner plugin (спасибо tehnick.alive)
-  * исправлены опечатки в патче psi-implements-iq-version-stuff-in-discodlg.diff
-    (спасибо tehnick.alive)
-  * processOutgoingStanza переименован в outgoingStanza и перемещён в StanzaFilter
-    (psi-extend-eventfilter.diff)
-  * исправлена работа некоторых плагинов (gmail service plugin, juick plugin и stopspam plugin)
-    после изменений в StazaFilter
-  * фиксы для psi-add-options-color-highlighting.diff
-  * исправлена работа остальных плагинов после изменений в StazaFilter (attention plugin,
-    autoreply plugin, birthday reminder plugin, captcha forms plugin, chess plugin,
-    conference logger plugin, icq must die plugin, qip x-statuses plugin, storage notes plugin,
-    watcher plugin)
-  * обновлён watcher plugin: оптимизация определения плеера для воспроизведения звуковых событий
-  + добавлено определение некоторых клиентов (bombusng-md, emess, movamessenger и libpurple),
-    обновлены иконпаки с иконками клиентов (psi-client-icons.diff,
-    iconsets/clients/fingerprint.jisp, fingerprint-22.jisp)
-  --
-  * psi-historydlg.diff sync with git and some fixes,
-    http://code.google.com/p/psi-dev/issues/detail?id=353
-  + added new patch to fix removing contacts with empty group
-    (psi-tmp-fix-removing-contacts-with-empty-group.diff)
-  * updated new history patch (psi-historydlg.diff)
-  * more correct work with MPRIS (psi-nix-mpris.diff)
-  * icq must die plugin - licence for debian
-  * content downloader plugin. now also looking resources in resources dir
-  * updated history patch - added calendar (psi-historydlg.diff)
-  * try to fix is337, http://code.google.com/p/psi-dev/issues/detail?id=337
-    (psi-change-password-dialog.diff)
-  * using '»' instead '>>' for quote feature (psi-chatview-quote-feature.diff)
-  * quote feature: insert quote in the cursor position (psi-chatview-quote-feature.diff)
-  * quote feature: corrected quoute symbol (psi-chatview-quote-feature.diff)
-  + added multiply connections support (psi-nix-mpris.diff)
-  + added support of multiply mpris connections on psi+ start (psi-nix-mpris.diff)
-  * fixed excessive addition to list (psi-nix-mpris.diff)
-  - removed psi-nix-mpris.diff. patch applyed by upstream
-  + added new patch to fix is377, http://code.google.com/p/psi-dev/issues/detail?id=377
-    (psi-fix-closing-inactive-tabs-when-apply-button-pressed.diff)
-  * merged psi-muc-minimize-to-roster.diff and
-    psi-fix-closing-inactive-tabs-when-apply-button-pressed.diff patches
-  - removed psi-tmp-fix-removing-contacts-with-empty-group.diff. patch applyed by upstream
-  - removed some patches. patches applyed by upstream (psi-unnamed-xmpp-uri-param.diff,
-    psi-fix-avatar-transparency.diff, psi-vcard-open-homepage.diff)
-  * updated history patch - added delete history button, some other fixes (psi-historydlg.diff)
-  * updated link to psi+ bugtracker in Help menu (psiplus-join-to-support-muc.diff)
-  - removed psi-img-src-file-and-data-protos.diff. patch reworked and moved to upstream
-  - removed psi-add-detection-some-os.diff. patch moved to upstream
-  * fixed psi-entity-time.diff
-  * fixed crash history search (psi-historydlg.diff)
-  + added detection of QIP Mobile, updated jisps with clients icons (psi-client-icons.diff,
-    iconsets/clients/fingerprint.jisp, fingerprint-22.jisp)
-  * updated history patch - restore history export (use context menu) psi-historydlg.diff
-  * fixed typo in psi-historydlg.diff
-  * fixed pictures resolution for new googlecode site desigh
-  * fixed ability block outgoing messages from plugins (0570-psi-extend-eventfilter.diff)
-  * fixed receipt icons (psi-receipts.diff)
-  * updated history patch - icons at popup menu (psi-historydlg.diff)
-  * fixed psi-muc-nickclick-chat.diff
-  * processOutgoingStanza event filter method (psi-extend-eventfilter.diff)
-  * fixed typos in cleaner plugin (thx to tehnick.alive)
-  * fixed typos in psi-implements-iq-version-stuff-in-discodlg.diff (thx to tehnick.alive)
-  * processOutgoingStanza renamed to outgoingStanza and moved to StanzaFilter
-    (psi-extend-eventfilter.diff)
-  * fixed gmail service plugin, juick plugin and stopspam plugin after StazaFilter changes
-  * fixed psi-add-options-color-highlighting.diff
-  * fixed other plugins after StazaFilter changes (attention plugin, autoreply plugin,
-    birthday reminder plugin, captcha forms plugin, chess plugin, conference logger plugin,
-    icq must die plugin, qip x-statuses plugin, storage notes plugin, watcher plugin)
-  * updated watcher plugin: sound player detect optimization
-  + added detection of bombusng-md, emess, movamessenger and libpurple clients, updated fingeprint
-    jisps (psi-client-icons.diff, iconsets/clients/fingerprint.jisp, fingerprint-22.jisp)
-
-
-2010-12-05  zet
-v0.15.3318 Beta
-  - убраны патчи psi-fix-grepshortcutkeydialog.diff, psi-fix-adhoc-set-status.diff,
-    psi-fix-empty-name-for-bookmark.diff, psi-fix-submenu-hide.diff и
-    psi-fix-iconsets-when-changing-profiles.diff. патчи приняты в upstream
-  * продолжена работа над медиа-элементами (psi-data-forms-media-element.diff)
-  * значительно переработан gmail notification plugin. теперь он называется gmail service plugin
-    (v0.5.6)
-  * фиксы для psi-hide-muc-auto-join.diff
-  + добавлен новый патч, исправляющий подсчёт количества онлайн-контактов в заголовке аккаунта
-    в ростере при уходе одного из контактов в оффлайн (psi-fix-online-contact-count.diff)
-  + добавлены приоритеты для плагинной системы
-    (psi-plugins-options-and-fix-plugins-loading-and-unloading.diff,
-    psi-access-to-iconfactory-from-plugins.diff, psi-access-to-activetab-from-plugins.diff,
-    psi-add-toolbar-button-from-plugins.diff, psi-access-to-menus-from-plugins.diff,
-    psi-change-contacts-status-from-plugins.diff, psi-set-account-status-from-plugins.diff)
-  * stop spam plugin: имя бинарного файла плагина изменено с
-    "aaastopspamplugin.dll" на "stopspamplugin.dll"
-  * теперь stop spam plugin имеет наивысший приоритет среди плагинов
-  + добавлен новый патч для решения задачи 368,
-    http://code.google.com/p/psi-dev/issues/detail?id=368 (psi-fix-is368.diff)
-  - убран патч psi-fix-is368.diff. патч принят в upstream
-  + добавлен новый патч на улучшение поведения элементов ростера при их перетаскивании. теперь
-    возможно скопировать контакт ростера в несколько групп (с нажатым Ctrl)
-    psi-fix-drag-n-drop.diff
-  - убран патч psi-fix-drag-n-drop.diff. патч принят в upstream
-  - убран ненужный патч psiplus-fix-application-info-defines.diff
-  + добавлены ростерные иконпаки (crystal-aim.jisp, crystal-gadu.jisp, crystal-icq.jisp,
-    crystal-msn.jisp, crystal-roster.jisp, crystal-service.jisp, crystal-sms.jisp,
-    crystal-yahoo.jisp, stellar-1.jisp, GreenWeb.jisp, thomas.jisp, wpkontakt2.jisp, wpkontakt3.jisp)
-  + добавлен новый патч для поддержки MPRIS. актуален ТОЛЬКО для *nix-систем (psi-nix-mpris.diff)
-  * обновлён screenshot plugin до версии 0.4.4. плагин теперь использует настройки прокси
-    со страницы настроек приложения
-  * обновлён состав участников проекта Psi+ (psiplus-aboutdlg.diff)
-  * исправлена излишняя активность посылки событий tunes (psi-nix-mpris.diff)
-  + добавлена поддержка MPRIS v2 (psi-nix-mpris.diff)
-  - убран патч psi-openssl-1.0-defaults-compatibility.diff. патч принят в upstream
-  * обновлён content downloader plugin. исправлены проблемы с кодировками (v0.1.8)
-  * исправлен ростерный иконпак weatheraqua.jisp
-  * обновлён juick plugin до версии 0.10.4. добавлена возможность указать список джидов,
-    для которых будет происходить обработка сообщений (экспериментально)
-  --
-  - removed patches psi-fix-grepshortcutkeydialog.diff, psi-fix-adhoc-set-status.diff,
-    psi-fix-empty-name-for-bookmark.diff, psi-fix-submenu-hide.diff,
-    psi-fix-iconsets-when-changing-profiles.diff. patches applyed by upstream
-  * some progress on media element (psi-data-forms-media-element.diff)
-  * rewritten gmail notification plugin and renamed to gmail service plugin (v0.5.6)
-  * small fix to psi-hide-muc-auto-join.diff
-  + added new patch to fix online contact count in account header when one of contacts goes offline
-    (psi-fix-online-contact-count.diff)
-  * small fix to gmail service pluign
-  * stop spam plugin: the filename of binary file 'aaastopspamplugin.dll' renamed to
-    'stopspamplugin.dll'
-  + added priority to plugins (psi-plugins-options-and-fix-plugins-loading-and-unloading.diff,
-    psi-access-to-iconfactory-from-plugins.diff, psi-access-to-activetab-from-plugins.diff,
-    psi-add-toolbar-button-from-plugins.diff, psi-access-to-menus-from-plugins.diff,
-    psi-change-contacts-status-from-plugins.diff, psi-set-account-status-from-plugins.diff)
-  * make stop spam plugin highest priority plugins
-  * psiplus-install.nsi: aaastopspamplugin -> stopspamplugin
-  + added new patch to fix issue 368, http://code.google.com/p/psi-dev/issues/detail?id=368
-    (psi-fix-is368.diff)
-  - removed psi-fix-is368.diff. patch applyed by upstream
-  + added new patch to some fixes to drag-n-drop of contacts. for now is possible to copy contact
-    to several groups (psi-fix-drag-n-drop.diff)
-  - removed psi-fix-drag-n-drop.diff. patch applyed by upstream
-  - removed more unnecessary patch psiplus-fix-application-info-defines.diff
-  + added more roster iconsets for content downloader plugin (crystal-aim.jisp, crystal-gadu.jisp,
-    crystal-icq.jisp, crystal-msn.jisp, crystal-roster.jisp, crystal-service.jisp, crystal-sms.jisp,
-    crystal-yahoo.jisp, stellar-1.jisp, GreenWeb.jisp, thomas.jisp, wpkontakt2.jisp, wpkontakt3.jisp)
-  + added new patch to MPRIS support. for *nix systems only (psi-nix-mpris.diff)
-  * updated screenshot plugin to v0.4.4
-  * updated project members list (psiplus-aboutdlg.diff)
-  * fixed excessive tunes sending (psi-nix-mpris.diff)
-  + added MPRIS v2 support (psi-nix-mpris.diff)
-  - removed psi-openssl-1.0-defaults-compatibility.diff. patch applyed by upstream
-  * updated content downloader plugin. fixed encoding problems (v0.1.8)
-  * fixed roster iconset weatheraqua.jisp
-  * updated juick plugin to v0.10.4
-
-
-2010-11-28  zet
-v0.15.3275 Beta
-  + менеджер аккаунтов: добавлена возможность сортировки аккаунтов в списке аккаунтов
-    (psi-allow-accounts-reordering-in-manager.diff)
-  + добавлен новый патч для решения задачи 91, http://code.google.com/p/psi-dev/issues/detail?id=91,
-    используется advanced-опция options.ui.muc.hide-on-autojoin (psi-hide-muc-auto-join.diff)
-  * фиксы для патча psi-roster-avatar-frame.diff
-  * улучшена сортировка аккаунтов в списке аккаунтов (по алфавиту + перетаскивание)
-    psi-allow-accounts-reordering-in-manager.diff
-  * убраны ненужные вызовы после фиксов из предыдущего коммита
-    (psi-allow-accounts-reordering-in-manager.diff)
-  * фиксы для режима "окна без границ" (psiplus-decorate-windows.diff,
-    psi-save-maximized-window-state.diff, psi-vert-splitter-position.diff)
-  + добавлен новый патч для вызова из меню Help формы присоединения к конференции Psi+ вместо формы
-    присоединения к конференции официальной Psi (psiplus-join-to-support-muc.diff)
-  * gmail notification plugin переименован в gmail servic eplugin
-    (http://psi-plus.com/wiki/plugins#gmail_service_plugin)
-  * updated gmailserviceplugin. added support of Off The Record chats extension
-  * исправления для cleaner plugin (корректная работа при смене профиля)
-  + добавлен новый патч, добавляющий возможность перехода по ссылке, указанной в соответствующем
-    поле vCard (psi-vcard-open-homepage.diff)
-  * улучшения процесса открытия домашней странички из vCard. добавлена поддержка протокола omit
-    (psi-vcard-open-homepage.diff)
-  --
-  + allow account sorting in account manager (psi-allow-accounts-reordering-in-manager.diff)
-  + added new patch to fix issue 91, http://code.google.com/p/psi-dev/issues/detail?id=91 ,
-    use options.ui.muc.hide-on-autojoin (psi-hide-muc-auto-join.diff)
-  * fixed psi-roster-avatar-frame.diff
-  * a little of sorting magic in account manager (psi-allow-accounts-reordering-in-manager.diff)
-  * remove unnecessary calls from previous fixes (psi-allow-accounts-reordering-in-manager.diff)
-  * changed borderless mode (psiplus-decorate-windows.diff, psi-save-maximized-window-state.diff,
-    psi-vert-splitter-position.diff)
-  * no template error fix (psiplus-decorate-windows.diff)
-  + added new patch to change muc action from help menu to join to psi+ conference instead of
-    upstreams one (psiplus-join-to-support-muc.diff)
-  * updated gmail notify plugin (http://psi-plus.com/wiki/plugins#gmail_service_plugin)
-  * updated gmailplugin. add support of Off the record chats extension
-  * fixes for cleaner plugin
-  * gmailnotifyplugin -> gmailserviceplugin
-  + added new patch to open homepage from vcard (psi-vcard-open-homepage.diff)
-  * improved homepage opener from previous commit. allows to omit protocol
-    (psi-vcard-open-homepage.diff)
-
-
-2010-11-21  zet
-v0.15.3252 Beta
-  + добавлен новый патч для управления питанием, подробнее -- 
-    http://lists.affinix.com/pipermail/psi-devel-affinix.com/2010-November/009129.html
-    (psi-nix-systemwatch-over-upower-service.diff) актуален только для *nix-систем
-  * исправлен баг при вызове диалога с настройками приложения (psi-fix-bug-in-options.diff)
-  * исправлено падение приложения при смене профиля
-    (psi-plugins-options-and-fix-plugins-loading-and-unloading.diff)
-  * фикс патча psi-entity-time.diff
-  - убраны патчи psi-fix-removing-sorted-contacts.diff и psi-fix-bug-in-options.diff. данные патчи
-    приняты в upstream
-  + добавлен новый патч, рисующий разделитель неактивных сессий в чатлогах (не в конференциях)
-    psi-add-trackbar-to-chats.diff
-  - убран патч psi-tr-admin.diff. патч принят в upstream
-  * обновлён иконпак настроений silk.jisp, v1.2 (iconsets/moods/silk.jisp)
-  + добавлен новый патч, устраняющий проблемы работы иконпаков после смены профиля 
-    (psi-fix-iconsets-when-changing-profiles.diff), исправлен патч
-    psi-access-to-iconfactory-from-plugins.diff для работы с новым патчем
-  * опция "use-default-avatar" теперь включена по умолчанию для нового профиля
-    (psi-modern-roster.diff)
-  * фиксы отображения градиента в ростере (psi-muc-minimize-to-roster.diff)
-  * исправлено отображение события от "пустого" контакта. подробнее -- 
-    http://code.google.com/p/psi-dev/issues/detail?id=49#c11
-    (psi-muc-minimize-to-roster.diff)
-  + добавлен новый патч для запоминания положения разделителя области чатлога и поля ввода сообщения
-    (psi-vert-splitter-position.diff)
-  * решена задача 365, http://code.google.com/p/psi-dev/issues/detail?id=365
-    (psi-roster-autohide.diff)
-  * решена задача 354, http://code.google.com/p/psi-dev/issues/detail?id=354
-    (psi-roster-avatar-frame.diff, psi-presets-in-status-menu.diff)
-  * обновлён skins plugin до версии 0.2.9
-  + добавлен новый патч для корректного отображения прозрачности аватара
-    (psi-fix-avatar-transparency.diff)
-  - убраны неиспользумые скины для Mac OS X из скрипта сборки инсталлятора для win32
-    (psiplus-install.nsi)
-  - убраны неиспользуемые скины для Mac OS X из скрипта сборки билдов для *nix-систем
-    (trunk/scripts/posix/psibuild-deb.sh)
-  + добавлен новый патч, позволяющий сортировать аккаунты в списке менеджера аккаунтов. первый
-    аккаунт в списке является аккаунтом по умолчанию (psi-allow-accounts-reordering-in-manager.diff)
-  --
-  + added upower systemwatch patch from
-    http://lists.affinix.com/pipermail/psi-devel-affinix.com/2010-November/009129.html
-    (psi-nix-systemwatch-over-upower-service.diff) for *nix only
-  * split proxy-settings patch (psi-proxy-settings-in-opt.diff)
-  * fixed stupid bug in options (psi-fix-bug-in-options.diff)
-  * media element updated to current bob changes (psi-bits-of-binary.diff,
-    psi-data-forms-media-element.diff, psi-entity-time.diff,
-    psiplus-fix-application-info-defines.diff, psiplus-os-hide.diff, psi-improve-adhoc-forms.diff,
-    psi-change-password-dialog.diff)
-  * fixed crash when changing profiles
-    (psi-plugins-options-and-fix-plugins-loading-and-unloading.diff)
-  * fixed psi-entity-time.diff
-  - removed psi-fix-removing-sorted-contacts.diff and psi-fix-bug-in-options.diff. patches applyed
-    by upstream
-  + added new patch for adds trckbar to chats (not muc) psi-add-trackbar-to-chats.diff
-  - removed psi-tr-admin.diff. patch applyed by upstream
-  * updated silk.jisp, v1.2 (iconsets/moods/silk.jisp)
-  + added new patch to fix problems with iconsets when changing profiles
-    (psi-fix-iconsets-when-changing-profiles.diff), fix psi-access-to-iconfactory-from-plugins.diff
-    for working with new patch
-  * use-default-avatar=true for new profile (psi-modern-roster.diff)
-  * some fixes to painting gradient in roster (psi-muc-minimize-to-roster.diff)
-  * fixed opening event from empty contact (http://code.google.com/p/psi-dev/issues/detail?id=49#c11)
-    psi-muc-minimize-to-roster.diff
-  + added new patch to remember the vertical splitter position (psi-vert-splitter-position.diff)
-  * fixed http://code.google.com/p/psi-dev/issues/detail?id=365 (psi-roster-autohide.diff)
-  * fixed http://code.google.com/p/psi-dev/issues/detail?id=354 (psi-roster-avatar-frame.diff,
-    psi-presets-in-status-menu.diff)
-  * fix compillation failure with disabled dbus (psi-nix-systemwatch-over-upower-service.diff)
-  * updated skins plugin to v0.2.9
-  + added new patch to fix avatar transparency (psi-fix-avatar-transparency.diff)
-  - removed mac skin from psiplus-install.nsi for win32 installers
-  - killing unused mac skins (trunk/scripts/posix/psibuild-deb.sh)
-  + added new patch which allows to set order of accounts in account manager. first account is
-    usually default accounts, so its affected (psi-allow-accounts-reordering-in-manager.diff)
-
-
-2010-11-14  zet
-v0.15.3200 Beta
-  + добавлен новый патч psi-show-activity-and-mood-descriptions.diff
-  * разделён патч psi-show-activity-and-mood-descriptions и объединён с патчами psi-mood-icons и
-    psi-activity-icons (psi-mood-icons-and-description.diff,
-    psi-activity-icons-and-description.diff)
-  + добавлен новый патч psi-chatview-quote-feature.diff
-  * фикс TabDlg closeTab. фикс максимизации EventDlg (psi-save-maximized-window-state.diff)
-  * поправлен патч psi-chatview-quote-feature для поддержки копирования смайлов
-    (psi-chatview-quote-feature.diff)
-  + добавлен новый патч, решающий задачу http://code.google.com/p/psi-dev/issues/detail?id=147
-    (psi-resolve-nickname-by-N-for-adduserdlg.diff)
-  + добавлен новый патч, включающий по умолчанию фильтры при вызове xml-консоли
-    (psi-xmlconsole-filter-group-always-enable.diff)
-  + добавлен новый патч для поддержки капчи при регистрации аккаунта непосредственно из Psi+
-    (psi-captcha.diff)
-  + добавлен новый патч psi-internal-changes-tabbablewidget.diff (экспериментально)
-  - убран патч psi-fix-dont-parse-disco-register-form-twice.diff, т.к. он принят в upstream
-  + добавлен новый патч для возможности настройки прокси-сервера для разных сущностей. патч
-    добавляет настройки на вкладку Application (Приложение) в настройках приложения
-    (psi-proxy-settings-in-opt.diff)
-  * обновлён juick plugin. теперь можно настраивать использование прокси-сервера непосредственно в
-    настройках приложения на вкладке Application (Приложение)
-  * фикс для options.ui.look.colors.messages.highlighting (psi-add-options-color-highlighting.diff)
-  * обновлён juick plugin: исправлена обработка превью фотографий в сообщениях от бота juiсk
-  * обновлён birthday reminder plugin до версии 0.3.0
-  + добавлен новый патч для исправления поведения метода optionChanged() в плагинной системе
-    (psi-fix-optionChanged-method-in-plugins.diff)
-  * добавлены команды вызова некоторых плагинов из меню чата в компактном режиме когда скрыт
-    центральный тулбар (psi-add-toolbar-button-from-plugins.diff)
-  * поправлен патч psiplus-decorate-windows для улучшения работы окон/табов в ОС Haiku
-    (спасибо Diger) psiplus-decorate-windows.diff
-  * обновлён content downloader plugin до версии 0.1.7. теперь плагин не зависит от библиотеки
-    libproxy
-  * улучшения в патче psi-access-to-contact-info-from-plugins и небольшие обновления для
-    stop spam plugin (psi-access-to-contact-info-from-plugins.diff)
-  * обновлён watcher plugin до версии 0.3.5
-  * обновлён список активных участников проекта на вкладке Help -> About Psi+
-    (psiplus-aboutdlg.diff)
-  ! обновлены системные библиотеки Qt до версии 4.7.1, подробнее -- 
-    http://qt.nokia.com/developer/changes/changes-4.7.1
-  --
-  + added new patch psi-show-activity-and-mood-descriptions.diff
-  * splited psi-show-activity-and-mood-descriptions and merged with psi-mood-icons and
-    psi-activity-icons patches (psi-mood-icons-and-description.diff,
-    psi-activity-icons-and-description.diff)
-  + added new patch psi-chatview-quote-feature.diff
-  * TabDlg closeTab fix. EventDlg maximize fix (psi-save-maximized-window-state.diff)
-  * fixed psi-chatview-quote-feature patch to support smiles (psi-chatview-quote-feature.diff)
-  + added new patch to fix http://code.google.com/p/psi-dev/issues/detail?id=147
-    (psi-resolve-nickname-by-N-for-adduserdlg.diff)
-  + added new patch psi-xmlconsole-filter-group-always-enable.diff
-  + added new patch for support captcha registration (psi-captcha.diff)
-  + added new patch psi-internal-changes-tabbablewidget.diff (experimental)
-  - removed psi-fix-dont-parse-disco-register-form-twice.diff. patch applyed by upstream
-  + added new patch psi-proxy-settings-in-opt.diff
-  * updated juick plugin. now it uses proxy settings from application options tab
-  * fixed options.ui.look.colors.messages.highlighting (psi-add-options-color-highlighting.diff)
-  * updated juick plugin: fixed preview
-  * fixed psi-internal-changes-tabbablewidget.diff
-  * updated birthday reminder plugin to v0.3.0
-  + added new patch to fix optionChanged() method in plugins
-    (psi-fix-optionChanged-method-in-plugins.diff)
-  * copied plugins actions from central toolbar to the chat menu when toolbar is hidden
-    (psi-add-toolbar-button-from-plugins.diff)
-  * fixed psiplus-decorate-windows patch to working fine with Haiku, by Diger
-    (psiplus-decorate-windows.diff)
-  * updated content downloader plugin to v0.1.7. at now this plugin does not depend on the
-    libproxy library
-  * improved psi-access-to-contact-info-from-plugins patch and small update for stop spam plugin
-    (psi-access-to-contact-info-from-plugins.diff)
-  * updated watcher plugin to v0.3.5
-  * updated active Psi+ Project members (psiplus-aboutdlg.diff)
-  ! updated Qt libs to v4.7.1, http://qt.nokia.com/developer/changes/changes-4.7.1
-
-
-2010-10-31  zet
-v0.15.3135 Beta
-  * обновлён патч на отрисовку иконки статуса в заголовке таба. теперь события composing и иконка
-    сообщения корректно отображаются в заголовке таба (psi-tab-status-icon.diff,
-    psi-muc-roster-size-and-location.diff, psi-muc-minimize-to-roster.diff,
-    psiplus-decorate-windows.diff, psi-colors-for-tabs.diff)
-  - убран патч psi-fix-crash-in-muc-configurator.diff. принят в основную ветвь Psi
-  + добавлен новый патч для добавления в графический интерфейс настроек опции на включение
-    приёма/передачи видео при совершении голосовых вызовов. ранее этот параметр задавался в
-    переменных окружения (psi-video-option.diff)
-  * обновлены некоторые патчи (psi-iconsets.diff, psi-tab-status-icon.diff, psi-colors-for-tabs.diff)
-  + добавлен новый патч для корректировки поведения всплывающих уведомлений: добавлена возможность
-    настройки некоторых параметров всплывающих уведомлений через графический интерфейс CSS.
-    см. fancypopup.ui для подробностей (psiplus-new-popups.diff)
-  * больше опций для CSS: теперь возможно задать основной цвет для таба через TabDlg { color: ... ;}
-    psi-colors-for-tabs.diff
-  + добавлен репозиторий для хранения описаний существующих ресурсов приложения (trunk/resources)
-  * обновлён content downloader plugin: поправлена ссылка на хранилище описаний ресурсов (v0.1.6)
-  * больше отступов во всплывающих окнах (psiplus-new-popups.diff)
-  * RosterAvatarFrame теперь настраиваем через CSS (psi-roster-avatar-frame.diff)
-  * обновлён attention plugin до версии 0.1.3
-  * исправлена отрисовка CSS на табах после сворачивания/разворачивания
-    (psi-muc-minimize-to-roster.diff)
-  + добавлен новый патч для добавления функционала всплывающих уведомлений о написании сообщения
-    (psi-typing-notify-popups.diff)
-  + добавлена возможность включения только приёма событий composing (без отправки соответствующих
-    уведомлений) psi-typing-notify-popups.diff
-  --
-  * updated tab-status-icons patch. now composing and message icons are shown on tabs
-    (psi-tab-status-icon.diff, psi-muc-roster-size-and-location.diff,
-    psi-muc-minimize-to-roster.diff, psiplus-decorate-windows.diff, psi-colors-for-tabs.diff)
-  - removed patch psi-fix-crash-in-muc-configurator.diff. goes to upstream
-  + added new patch for enable video support in options - not in ENV (psi-video-option.diff)
-  * updated some patches (psi-iconsets.diff, psi-tab-status-icon.diff, psi-colors-for-tabs.diff)
-  + added new patch for some fixes to popups: add ui. now easy configuring via css. see
-    fancypopup.ui for details (psiplus-new-popups.diff)
-  * more options for CSS: now can set general color for tabs via TabDlg { color: ... ;}
-    psi-colors-for-tabs.diff
-  + added repository for descriptions of some resource files (trunk/resources)
-  * updated content downloader plugin: fixed link to file of resources (v0.1.6)
-  * more space in popups (psiplus-new-popups.diff)
-  * RosterAvatarFrame now more configurable via css (psi-roster-avatar-frame.diff)
-  * updated attention plugin to v0.1.3
-  * correct works of CSS on tab after hiding/showing (psi-muc-minimize-to-roster.diff)
-  + added new patch for adds typing notify popups to core (psi-typing-notify-popups.diff)
-  + added ability for composing events receive only (psi-typing-notify-popups.diff)
-
-
-2010-10-18  zet
-v0.15.3102 Beta
-  + добавлены лицензия и копирайт в файлы плагина content downloader plugin
-  + добавлены лицензия и копирайт в файлы плагина icq must die plugin
-  * некоторые фиксы патча psi-plugins-options-and-fix-plugins-loading-and-unloading.diff
-  * поправлен патч psi-plugin-info-button.diff
-  + добавлен новый вариант отображения диалогов с историей переписки
-    (автор - Piotrek Okonski <piotrek@okonski.org>) psi-historydlg.diff
-  + добавлен новый патч для совместимости с mingw-w64 (psi-mingw-w64-compatibility.diff)
-  * синхронизация патча совместимости с upstream-репозиторием (psi-gcc-4.6-compatibility.diff)
-  * обновлён content downloader plugin до версии 0.1.5. теперь кнопка "Download and Install"
-    неактивна при открытии окна с настройками плагина (не выбран ни один ресурс), подробнее --
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/contentdownloaderplugin/changelog.txt
-  + добавлен новый набор с иконками аффиляций stellar1-affiliations.jisp
-    (iconsets/affiliations/stellar1-affiliations.jisp)
-  * обновлён icq must die plugin до версии 0.1.5 (настраиваемое количество сообщений пользователю)
-  + добавлен новый патч для решения задачи 357,
-    http://code.google.com/p/psi-dev/issues/detail?id=357 (psi-workaround-adhoc-form-closes.diff)
-  * обновлён системный иконпак nuvola-system.jisp (iconsets/system/nuvola-system.jisp)
-  + добавлены лицензия и копирайт в файлы некоторых плагинов Psi+ (attention plugin,
-    auto reply plugin, birthday reminder plugin, captcha forms plugin, chess plugin, cleaner plugin,
-    conference logger plugin, extended options plugin, gmail notification plugin,
-    history keeper plugin, image plugin, juick plugin, qip x-statuses plugin, screenshot plugin,
-    skins plugin, stop spam plugin, storage notes plugin, translate plugin, video status plugin,
-    watcher plugin)
-  + добавлен новый патч для поддержки декоративного обрамления диалоговых окон в Psi+
-    ("режим окна без границ") psiplus-decorate-windows.diff, автор - KukuRuzo
-  * исправлено восстановление окна в режиме без границ (psiplus-decorate-windows.diff)
-  * обновлён skins plugin до версии 0.2.8
-  + добавлен новый патч для сохранения положения окна на рабочем столе при перезапуске Psi+
-    (psi-save-maximized-window-state.diff, авторы - Dealer_WeARE и KukuRuzo)
-  * обновлён night skin (v.0.4)
-  * обновлён stop spam plugin до версии 0.4.4
-  * исправлен патч psi-workaround-adhoc-form-closes (psi-workaround-adhoc-form-closes.diff)
-  - убран патч psi-fix-hidden-group. принят в upstream-репозиторий (psi-fix-hidden-group.diff)
-  * исправлен заголовок окна в режиме без границ (psiplus-decorate-windows.diff)
-  * решена задача 346 (падение приложения при вызове конфигуратора конференции,
-    http://code.google.com/p/psi-dev/issues/detail?id=346 (psi-fix-crash-in-muc-configurator.diff)
-  + добавлен новый патч, добавляющий две новые advanced-опции приложения:
-    options.ui.look.colors.chat.composing-color и options.ui.look.colors.chat.unread-message-color
-    (psi-colors-for-tabs.diff)
-  * обновлены некоторые ростерные иконпаки (iconsets/roster/blackroster.jisp, icq.jisp,
-    nuvola-roster.jisp, oxygen-roster-22.jisp, oxygen.jisp, qipinfium.jisp, white_theme.jisp)
-  ! обновлены системные библиотеки Qt до версии 4.7.0, подробнее --
-    http://qt.nokia.com/developer/changes/changes-4.7.0
-  --
-  + added license and copyright to content downloader plugin
-  + added license and copyright to icq must die plugin
-  * some fixes to psi-plugins-options-and-fix-plugins-loading-and-unloading.diff
-  * get rid of fuzzes (psi-plugin-info-button.diff)
-  * updated content downloader plugin to v0.1.5,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/contentdownloaderplugin/changelog.txt
-  + added new history from Piotrek Okonski <piotrek@okonski.org> (psi-historydlg.diff)
-  + added mingw-w64 compatibility patch (psi-mingw-w64-compatibility.diff)
-  * sync with upstream (psi-gcc-4.6-compatibility.diff)
-  * updated content downloader plugin. "Download and Install" button now disabled on open plugin
-  + added stellar1-affiliations.jisp (iconsets/affiliations/stellar1-affiliations.jisp)
-  * updated icq must die plugin to v0.1.5 (message count)
-  + added new patch to fix issue 357, http://code.google.com/p/psi-dev/issues/detail?id=357
-    (psi-workaround-adhoc-form-closes.diff)
-  * updated nuvola-system.jisp (iconsets/system/nuvola-system.jisp)
-  + added license and copyright for some Psi+ plugins (attention plugin, auto reply plugin,
-    birthday reminder plugin, captcha forms plugin, chess plugin, cleaner plugin,
-    conference logger plugin, extended options plugin, gmail notification plugin,
-    history keeper plugin, image plugin, juick plugin, qip x-statuses plugin, screenshot plugin,
-    skins plugin, stop spam plugin, storage notes plugin, translate plugin, video status plugin,
-    watcher plugin)
-  + added new patch psiplus-decorate-windows.diff by KukuRuzo
-  * fixed restore window in borderless mode (psiplus-decorate-windows.diff)
-  * updated skins plugin to v0.2.8
-  + added new patch psi-save-maximized-window-state.diff by Dealer_WeARE and KukuRuzo
-  * updated night skin (v.0.4)
-  * updated stop spam plugin to v0.4.4
-  * fixed psi-workaround-adhoc-form-closes patch (psi-workaround-adhoc-form-closes.diff)
-  - removed psi-fix-hidden-group patch. applyed by upstream (psi-fix-hidden-group.diff)
-  * fixed chat window header in borderless mode (psiplus-decorate-windows.diff)
-  * fixed issue 346 (crash in groupchat configurator),
-    http://code.google.com/p/psi-dev/issues/detail?id=346 (psi-fix-crash-in-muc-configurator.diff)
-  + added new patch to add 2 new options 'options.ui.look.colors.chat.composing-color' and
-    'options.ui.look.colors.chat.unread-message-color' (psi-colors-for-tabs.diff)
-  * updated some roster iconsets (iconsets/roster/blackroster.jisp, icq.jisp, nuvola-roster.jisp,
-    oxygen-roster-22.jisp, oxygen.jisp, qipinfium.jisp, white_theme.jisp)
-  ! updated Qt libs to v4.7.0, http://qt.nokia.com/developer/changes/changes-4.7.0
-
-
-2010-09-19  zet
-v0.15.3026 Beta
-  * исправлена ошибка отображения аватар при использовании прокси-сервера в настройках juick plugin
-  + команда Block работает теперь и для транспортов в ростере (psi-block-contact-from-menu.diff)
-  + добавлен новый патч для корректной выгрузки виджета перед выгрузкой плагина при завершении
-    работы приложения (psi-remove-widget-before-removing-plugin.diff)
-  * attention plugin - фикс текста сообщения в алерте
-  + добавлен новый патч для корректного отображения размера виджета с настройками плагина
-    (psi-correct-plugin-widget-size.diff)
-  * обновлён the_orange.png (skins/universal/orange)
-  * attention plugin: корректное отображение размера виджета с настройками плагина
-  * qip x-statuses plugin: корректное отображение размера виджета с настройками плагина
-  * stop spam plugin: корректное отображение размера виджета с настройками плагина
-  * обновлена ссылка на wiki для всех плагинов Psi+ (в окне с настройками плагинов)
-  + добавлен новый патч для совместимости с openssl v1.0
-    (psi-openssl-1.0-defaults-compatibility.diff)
-  * storage notes plugin: корректное отображение размера виджета с настройками плагина
-  * image plugin: корректное отображение размера виджета с настройками плагина
-  * объединены патчи psi-plugins-options-and-fix-plugins-loading-and-unloading.diff,
-    psi-remove-widget-before-removing-plugin.diff и psi-correct-plugin-widget-size.diff
-    в один общий патч psi-plugins-options-and-fix-plugins-loading-and-unloading.diff
-  + добавлен новый патч для исправления падения приложения при выборе смайлпака. подробнее --
-    http://code.google.com/p/psi-dev/issues/detail?id=348 (psi-fixed-kde-crash.diff)
-  - патч psi-fixed-kde-crash.diff принят в официальную ветвь Psi (upstream)
-  + добавлен новый патч для psimedia: этот приём упрощает инициализацию камеры, также работает
-    с uvcvideo-камерами. проверено на uvcvideo, gspca-камерах (spca561 и sq905)
-    (trunk/patches/psimedia/0030-psimedia-uvcvideo-fix.diff)
-  * captcha forms plugin: фикс при использовании прокси-сервера
-  + добавлен новый плагин -- content downloader plugin (v0.1.4), подробнее --
-    http://psi-plus.com/wiki/plugins#content_downloader_plugin
-  ! Psi+ wiki: подготовка к переезду на http://psi-plus.com/wiki/
-  --
-  * corrected info in juickplugin.cpp, small fix to juick plugin
-  + add block menu item for agents (psi-block-contact-from-menu.diff)
-  + added new patch psi-remove-widget-before-removing-plugin.diff
-  * updated attention plugin - fix translation
-  + added new patch which make to correct plugin widget size (psi-correct-plugin-widget-size.diff)
-  * updated the_orange.png (skins/universal/orange)
-  * updated attention plugin: correct layout on options widget
-  * updated qip x-statuses plugin: correct layout on options widget
-  * updated stop spam plugin: optimized size of options widget
-  * updated wiki url for Psi+ plugins options window
-  + added patch for openssl-1.0 compatibility (psi-openssl-1.0-defaults-compatibility.diff)
-  * updated storage notes plugin: correct stretch on options widget
-  * updated image plugin: correct stretch on options widget
-  * merged psi-plugins-options-and-fix-plugins-loading-and-unloading.diff,
-    psi-remove-widget-before-removing-plugin.diff and psi-correct-plugin-widget-size.diff to
-    psi-plugins-options-and-fix-plugins-loading-and-unloading.diff
-  + added patch for fix crash Psi+ on select and apply iconsets. look at issue 348
-    (psi-fixed-kde-crush.diff)
-  - psi-fixed-kde-crush.diff went to upstream
-  + added new patch for psimedia: this hack simplifies the camera initialization to something that
-    also works with uvcvideo cameras. verified with uvcvideo, gspca (spca561 and sq905) cameras
-    (trunk/patches/psimedia/0030-psimedia-uvcvideo-fix.diff)
-  * fixed captcha forms plugin
-  + added new plugin -- content downloader plugin (v0.1.4), see at
-    http://psi-plus.com/wiki/plugins#content_downloader_plugin
-  ! Psi+ wiki: preparation for migration to http://psi-plus.com/wiki/
-
-
-2010-09-05  zet
-v0.15.2911 Beta
-  + добавлен детект jabber-бота из семейства Talisman (psi-client-icons.diff)
-  + добавлен детект jabber-бота JabRSS и vkontakte j2j-транспорта (psi-client-icons.diff)
-  + добавлен новый набор иконок аффиляций "Kingdom" (iconsets/affiliations/kingdom-affiliations.jisp)
-  * попытка фикса проверяльщика обновлений под win32. требуется тестирование на win32 при
-    подключении через прокси-сервер (psi-dirty-check.diff)
-  * обновлён juick plugin до версии 0.9.16
-  + добавлен новый патч для возможности блокировки контактов непосредственно из контекстного меню
-    ростера. бОльшая часть кода взята из Япси. требуется тестирование
-    (psi-block-contact-from-menu.diff)
-  * обновлён патч для быстрой блокировки контактов: команда "Block" неактивна если сервер
-    не поддерживает "XEP-0016: Privacy Lists", команда "Block" спрятана для контактов-приватов
-    конференций и транспортов, команда "Block" доступна в контекстном меню на контакте
-    с конференцией в основном ростере (psi-block-contact-from-menu.diff)
-  * обновлён логотип Psi+ в наборах системных иконок (iconsets/system/blacksys.jisp,
-    nuvola-system.jisp, oxygen_sys.jisp, oxygen_sys_22.jisp, qipinfium_sys.jisp,
-    summer-system.jisp, tango_system.jisp, whitesys.jisp)
-  + добавлено 2 новых набора иконок аффиляций
-    (iconsets/affiliations/award-affiliations.jisp, people_of_color-affiliations.jisp)
-  * обновлён stop spam plugin до версии 0.4.2
-  ! обновлены библиотеки win32 openssl до версии 0.9.8o
-    (скомпилировано в mingw gcc из исходников http://www.openssl.org/source/openssl-0.9.8o.tar.gz)
-  --
-  + added bot detection from Talisman's family (psi-client-icons.diff)
-  + added detection of JabRSS bot, vkontakte j2j transport (psi-client-icons.diff)
-  + added "Kingdom" affiliations iconset (iconsets/affiliations/kingdom-affiliations.jisp)
-  * try to fix dirty check patch. test it on Windows with network connection through proxy
-    (psi-dirty-check.diff)
-  * updated juick plugin to v0.9.16
-  + added new patch for the possibility of blocking contacts from the roster contact menu. most of
-    the code is taken from Yapsi. needs to test (psi-block-contact-from-menu.diff)
-  * updated blocking patch: inactive block item if 'XEP-0016: Privacy Lists' not supported
-    by server; hide block item for privates and agents; add block item for conferences
-    (psi-block-contact-from-menu.diff)
-  * updated Psi+ logo (iconsets/system/blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp,
-    oxygen_sys_22.jisp, qipinfium_sys.jisp, summer-system.jisp, tango_system.jisp, whitesys.jisp)
-  + added new affiliations iconsets
-    (iconsets/affiliations/award-affiliations.jisp, people_of_color-affiliations.jisp)
-  * updated stop spam plugin to v0.4.2
-  ! updated win32 openssl libs to v0.9.8o
-    (compiled by mingw gcc compiler from source http://www.openssl.org/source/openssl-0.9.8o.tar.gz)
-
-
-2010-08-29  zet
-v0.15.2862 Beta
-  + добавлены 3 новых ростерных иконпака (iconsets/roster/Lamps_green.jisp,
-    iconsets/roster/Lamps_blue.jisp, iconsets/roster/Lamps_red.jisp)
-  * решена задача 330, http://code.google.com/p/psi-dev/issues/detail?id=330
-    (psi-add-contact-from-chat-dialog.diff)
-  + добавлен новый ростерный иконпак (iconsets/roster/Hearts-for-iSida-bot.jisp)
-  * исправлено падение приложения при попытке просмотра информации об иконпаке VKontakte.ru.jisp
-    (iconsets/roster/VKontakte.ru.jisp)
-  * теперь кнопка "add contact" отображается динамически (psi-add-contact-from-chat-dialog.diff)
-  * фиксы некоторых иконпаков (Hearts-for-iSida-bot.jisp, VKontakte.ru.jisp)
-  * обновлён storage notes plugin до версии 0.1.3
-  + добавлен новый патч, добавляющиий опцию "options.ui.tabs.mouse-doubleclick-action".
-    опция поддерживает три значения: "hide", "close" и "detach"
-    psi-hide-or-close-tab-on-doubleclick.diff
-  + добавлен новый патч, решающий задачу 214, http://code.google.com/p/psi-dev/issues/detail?id=214
-    (psi-do-not-disable-execute-command-menu-item.diff)
-  * пункт меню 'execute command' теперь доступен и для транспорта в оффлайн-состоянии
-    (psi-do-not-disable-execute-command-menu-item.diff)
-  + добавлен новый патч, добавляющий возможность вставки в поле ввода ника участника конференции
-    по нажатию комбинации "leftclick+shift" на элементе в ростере конференции (спасибо taurus)
-    psi-insert-nick-on-shift-plus-leftclick.diff
-  + добавлены 2 новых ростерных иконпака
-    (iconsets/roster/Facebook.jisp, iconsets/roster/VKontakte.jisp)
-  * обновлён состав участников проекта Psi+ (psiplus-aboutdlg.diff)
-  + добавлен детект jabber-клиента Imov im-client (psi-client-icons.diff)
-  * css-стиль для меню xhtml-im (psi-send-xhtml-im.diff)
-  + добавлен новый патч для плагинной системы (psi-extend-eventfilter.diff)
-  * начата работа над расширением функционала плагинной системы для взаимодействия с OTR-плагином
-    (psi-add-toolbar-button-from-plugins.diff, psi-access-to-menus-from-plugins.diff,
-    psi-change-contacts-status-from-plugins.diff)
-  * обновлены некоторые плагины (gmail notify plugin, juickp lugin, attention plugin, chess plugin,
-    conference logger plugin, image plugin)
-  + добавлен новый патч для решения задачи 32, http://code.google.com/p/psi-dev/issues/detail?id=32
-    (psi-remove-event-when-popup-rightclicked.diff)
-  + добавлен новый патч для решения задачи 339, http://code.google.com/p/psi-dev/issues/detail?id=339
-    (psi-fix-encoding-of-command-line-arguments.diff)
-  + добавлен новый патч для решения задачи 338, http://code.google.com/p/psi-dev/issues/detail?id=338
-    (psi-fix-removing-sorted-contacts.diff)
-  * фиксы для psi-get-account-info-from-plugins.diff
-  + добавлен новый патч, расширяющий возможности доступа к различной информации о контакте
-    непосредственно из плагина (psi-access-to-contact-info-from-plugins.diff)
-  * обновлён stop spam plugin до версии 0.4.0
-  * попытка детекта jabber-бота Talisman (psi-client-icons.diff)
-  * обновлён orange skin, v.0.7 (skins/universal/orange/the_orange.skn)
-  --
-  + added 3 new roster iconsets (iconsets/roster/Lamps_green.jisp, iconsets/roster/Lamps_blue.jisp,
-    iconsets/roster/Lamps_red.jisp)
-  * fixed issue 330, http://code.google.com/p/psi-dev/issues/detail?id=330
-    (psi-add-contact-from-chat-dialog.diff)
-  + added new roster iconset (iconsets/roster/Hearts-for-iSida-bot.jisp)
-  * fixed crash at view about info for VKontakte.ru.jisp under windows
-    (iconsets/roster/VKontakte.ru.jisp)
-  * make chatdlg's 'add contact' button visibility dynamic (psi-add-contact-from-chat-dialog.diff)
-  * fixed some roster iconsets (Hearts-for-iSida-bot.jisp, VKontakte.ru.jisp)
-  * updated storage notes plugin to v0.1.3
-  + added new patch for add option 'options.ui.tabs.mouse-doubleclick-action'. supported values are
-    'hide', 'close' and 'detach' (psi-hide-or-close-tab-on-doubleclick.diff)
-  + added new patch for fix issue 214, http://code.google.com/p/psi-dev/issues/detail?id=214
-    (psi-do-not-disable-execute-command-menu-item.diff)
-  * 'blank' resource for offline transports at 'execute command' menu
-    (psi-do-not-disable-execute-command-menu-item.diff)
-  + added new patch for insert nick to muc chatlog by leftclick+shift (thanks to taurus)
-    psi-insert-nick-on-shift-plus-leftclick.diff
-  + added 2 new roster iconsets (iconsets/roster/Facebook.jisp, iconsets/roster/VKontakte.jisp)
-  * updated list of participants of the Psi+ project (psiplus-aboutdlg.diff)
-  + added detection of Imov im-client (psi-client-icons.diff)
-  * css style for xhtml-im menu (psi-send-xhtml-im.diff)
-  + added new patch for extend plugin system (psi-extend-eventfilter.diff)
-  * extend plugin interface for work with OTR plugin (psi-add-toolbar-button-from-plugins.diff,
-    psi-access-to-menus-from-plugins.diff, psi-change-contacts-status-from-plugins.diff)
-  * updated some plugins (gmail notify plugin, juick plugin, attention plugin, chess plugin,
-    conference logger plugin, image plugin)
-  + added new patch for fix issue 32, http://code.google.com/p/psi-dev/issues/detail?id=32
-    (psi-remove-event-when-popup-rightclicked.diff)
-  + added new patch for fix issue 339, http://code.google.com/p/psi-dev/issues/detail?id=339
-    (psi-fix-encoding-of-command-line-arguments.diff)
-  + added new patch for fix issue 338, http://code.google.com/p/psi-dev/issues/detail?id=338
-    (psi-fix-removing-sorted-contacts.diff)
-  * some fixes for psi-get-account-info-from-plugins.diff
-  + added new patch for access to different info about contact from plugins
-    (psi-access-to-contact-info-from-plugins.diff)
-  * updated stop spam plugin to v0.4.0
-  * try to detect Talisman bot (psi-client-icons.diff)
-  * updated orange skin, v.0.7 (skins/universal/orange/the_orange.skn)
-
-
-2010-08-15  zet
-v0.15.2822 Beta
-  * мелкое исправление для psi-small-tooltip-fix.diff (спасибо Hugin)
-  * возможный фикс для сборки Psi+ под Haiku OS (psi-tray-act-bring-to-front.diff)
-  * сохранение статуса при работе с формой "Set status" (psi-presets-in-status-menu.diff)
-  + добавлена возможность опциональной перезаписи последнего выбранного статуса простым статусом
-    и шаблоном (psi-presets-in-status-menu.diff)
-  + добавлена команда Reconnect в статусные меню (psi-presets-in-status-menu.diff)
-  + добавлена возможность опционального отображение приоритета jabber-клиента собеседника
-    в информационном сообщении в чате (psi-presets-in-status-menu.diff)
-  * теперь сообщение "Logged out" может быть локализовано (psi-presets-in-status-menu.diff)
-  + добавлен новый патч для поддержки xmpp uri (psi-unnamed-xmpp-uri-param.diff)
-  * исправлен баг с отображением приоритета для оффлайн-статуса в чате
-    (psi-presets-in-status-menu.diff)
-  + добавлена возможность отображения статусного сообщения и приоритета для вновь присоединившихся
-    пользователей в общем чате конференции (psi-presets-in-status-menu.diff)
-  * корректное отображение ширины полей ввода значений приоритетов для различных статусов
-    (psi-presets-in-status-menu.diff)
-  + добавлена опция "Restore last status" в менеджер аккаунта (psi-presets-in-status-menu.diff)
-  + добавлена опция "options.ui.muc.show-initial-joins" для вкл/выкл отображения информационных
-    сообщений в общем чате при входе в конференцию (psi-presets-in-status-menu.diff)
-  * фикс для приоритета по умолчанию (psi-presets-in-status-menu.diff)
-  * обновлена иконка для кнопки выбора формата текста в центральном тулбаре
-    (iconsets/system/default/psiplus/text.png)
-  * обновлён watcher plugin до версии 0.3.3,
-    http://psi-plus.com/wiki/plugins#watcher_plugin
-  + добавлен патч для добавления нового контакта непосредственно из окна чата или приватного окна
-    конференции (psi-add-contact-from-chat-dialog.diff)
-  * кнопка добавления нового контакта смещена в крайнее правое положение на центральном тулбаре
-    (psi-add-contact-from-chat-dialog.diff)
-  * наведён порядок с иконпаками смайлов:
-     + добавлен iconsets/emoticons/kolobok_pidgin.jisp
-     + добавлен iconsets/emoticons/kolobok_qip_dark.jisp
-     + добавлен iconsets/emoticons/tasha_bombus.jisp
-     * обновлён iconsets/emoticons/bombus2psi.jisp
-     * обновлён iconsets/emoticons/GTalk-smiles.jisp
-     * обновлён iconsets/emoticons/yaemomidget.jisp
-     - удалён iconsets/emoticons/kolobok.jisp
-     - удалён iconsets/emoticons/kolobok_dark.jisp
-     - удалён iconsets/emoticons/kolobok_light.jisp
-     - удалён iconsets/emoticons/lk_35x35x138_tasha.jisp
-     - удалён iconsets/emoticons/puzazBox.jisp
-     - удалён iconsets/emoticons/qip_bigpack.jisp
-     - удалён iconsets/emoticons/quip.jisp
-     - удалён iconsets/emoticons/tasha_18x18x93.jisp
-  * обновлён ростерный иконпак bctango_roster.jisp (iconsets/roster/bctango_roster.jisp)
-  + добавлен детект jabber-клиента Jappix (psi-client-icons.diff)
-  * обновлены иконпаки fingerprint с иконками jabber-клиентов
-    (iconsets/clients/fingerprint.jisp, iconsets/clients/fingerprint-22.jisp)
-  * хотфикс для fingerprint-22.jisp (iconsets/clients/fingerprint-22.jisp)
-  * небольшой фикс для кнопки добавления нового контакта из приватного окна конференции
-    (psi-add-contact-from-chat-dialog.diff)
-  ! обновлена русская локализация от ivan101 (psi-ru svn, r181, 2010-08-09)
-  --
-  * updated psi-small-tooltip-fix.diff (thx to Hugin)
-  * possible fix for building on Haiku OS (psi-tray-act-bring-to-front.diff)
-  * also save status on "Set status" dialog accept (psi-presets-in-status-menu.diff)
-  + added optional last status overwriting by simple status and template
-    (psi-presets-in-status-menu.diff)
-  + added Reconnect action (psi-presets-in-status-menu.diff)
-  + optional display priority in chat log (psi-presets-in-status-menu.diff)
-  * translatable "Logged out" status message (psi-presets-in-status-menu.diff)
-  + added patch to handle xmpp uri commandline param w/o param name
-    (psi-unnamed-xmpp-uri-param.diff)
-  * fixed bug with offline status priority in chat log (psi-presets-in-status-menu.diff)
-  + also show status and priority in chat log when someone joins MUC
-    (psi-presets-in-status-menu.diff)
-  * fixed wrong default priority options width (psi-presets-in-status-menu.diff)
-  + added account option "Restore last status" (psi-presets-in-status-menu.diff)
-  + added hidden option "options.ui.muc.show-initial-joins" (psi-presets-in-status-menu.diff)
-  * fixed regression with default priority (psi-presets-in-status-menu.diff)
-  * updated format text icon (iconsets/system/default/psiplus/text.png)
-  * updated watcher plugin to v0.3.3, http://psi-plus.com/wiki/plugins#watcher_plugin
-  + added patch to add contacts from chat dialog (psi-add-contact-from-chat-dialog.diff)
-  * moved add contact icon to the right (psi-add-contact-from-chat-dialog.diff)
-  * ordering for emoticons iconsets:
-    + added iconsets/emoticons/kolobok_pidgin.jisp
-    + added iconsets/emoticons/kolobok_qip_dark.jisp
-    + added iconsets/emoticons/tasha_bombus.jisp
-    * modified iconsets/emoticons/bombus2psi.jisp
-    * modified iconsets/emoticons/GTalk-smiles.jisp
-    * modified iconsets/emoticons/yaemomidget.jisp
-    - deleted iconsets/emoticons/kolobok.jisp
-    - deleted iconsets/emoticons/kolobok_dark.jisp
-    - deleted iconsets/emoticons/kolobok_light.jisp
-    - deleted iconsets/emoticons/lk_35x35x138_tasha.jisp
-    - deleted iconsets/emoticons/puzazBox.jisp
-    - deleted iconsets/emoticons/qip_bigpack.jisp
-    - deleted iconsets/emoticons/quip.jisp
-    - deleted iconsets/emoticons/tasha_18x18x93.jisp
-  * updated bctango_roster.jisp (iconsets/roster/bctango_roster.jisp)
-  + added detection of Jappix client (psi-client-icons.diff)
-  * updated fingeprint packs
-    (iconsets/clients/fingerprint.jisp, iconsets/clients/fingerprint-22.jisp)
-  * fixed fingerprint-22.jisp (iconsets/clients/fingerprint-22.jisp)
-  * small fix for add button for muc contacts (psi-add-contact-from-chat-dialog.diff)
-  ! updated russian localization by ivan101 (psi-ru svn, r181, 2010-08-09)
-
-
-2010-08-08  zet
-v0.15.2801 Beta
-  * обновлена краткая справка по некоторым плагинам
-    (captchaformsplugin, videostatusplugin, watcherplugin)
-  + добавлен новый патч для корректного отображения различных форм для команд удалённого управления,
-    управления транспортами, а также поисковых форм (psi-improve-adhoc-forms.diff)
-  + добавлен новый патч для вызова формы ввода нового (правильного) пароля аккаунта непосредственно
-    на этапе установления соединения psi-change-password-dialog.diff (thanks to Virnik)
-  * более корректное отображение поисковых форм (psi-improve-adhoc-forms.diff)
-  + добавлен новый патч для исправления отображения вертикального скролла в ростере конференции.
-    теперь скролл не закрывает иконки клиентов и аффиляций
-    psi-fix-muc-roster-sizing.diff (by taurus)
-  * изменена комбинация горячих клавиш по умолчанию для действия по вызову быстрых команд для
-    конференций и чатов. теперь по умолчанию используется сочетание "ctrl+space"
-    (ранее было "ctrl+7") psi-default-application-settings.diff
-  * более корректное отображение форм ad-hoc (psi-improve-adhoc-forms.diff)
-  + добавлен новый патч для быстрого вызова конференций из закладок в форме присоединения
-    к конференции (psi-add-bookmarks-to-join-conference-dlg.diff)
-  --
-  * updated plugins info (captchaformsplugin, videostatusplugin, watcherplugin)
-  + added new patch psi-improve-adhoc-forms.diff
-  + added new patch psi-change-password-dialog.diff (thanks to Virnik)
-  * updated search forms (psi-improve-adhoc-forms.diff)
-  + added new patch psi-fix-muc-roster-sizing.diff (by taurus)
-  * changed default shortcut for command mode to ctrl+space (psi-default-application-settings.diff)
-  * updated ad-hoc forms (psi-improve-adhoc-forms.diff)
-  + added new patch for bookmarks to join conference dialog
-    (psi-add-bookmarks-to-join-conference-dlg.diff)
-  * removed some garbage from psi-default-application-settings.diff
-  * updated psi-add-bookmarks-to-join-conference-dlg.diff
-
-
-2010-08-01  zet
-v0.15.2780 Beta
-  * очистка мусора в medals-affiliations.jisp (iconsets/affiliations/medals-affiliations.jisp)
-  * фикс форматирования текста во всплывающей подсказке над элементом ростера
-    (psi-small-tooltip-fix.diff)
-  * обновлён video status plugin до версии 0.0.4 (работает только в ОС семейства Linux)
-  * обновлены все официальные скины приложения (skins/default_skin.skn,
-    skins/universal/black_theme/black_theme.skn, skins/universal/night/night.skn,
-    skins/universal/orange/the_orange.skn, skins/universal/qip_infium/qip_infium.skn,
-    skins/universal/sky/sky.skn, skins/universal/tkabber/tkabber.skn)
-  * обновлён watcher plugin до версии 0.3.1
-  * updated screenshot plugin до версии 0.4.2
-  * фикс для psi-small-tooltip-fix.diff (спасибо Hugin)
-  + добавлен новый патч для поддержки отправки xhtml-im-сообщений (psi-send-xhtml-im.diff)
-  * фиксы рендеринга при использовании xhtml-im-сообщений, исправлено отображение команды "/me" в
-    xhtml-im-сообщениях (psi-send-xhtml-im.diff)
-  + добавлен новый смайлпак свежей версии Mail.Ru Agent (сконвертированы tux-den)
-    iconsets/emoticons/mra-emoticons-5.7.3639.jisp
-  ! обновлена русская локализация от ivan101 (psi-ru svn, r179, 2010-07-27)
-  --
-  ! Если Вы хотите поддержать развитие проекта Psi+, то можете внести небольшое пожертвование
-    на один из нижеприведённых счетов:
-    http://passport.webmoney.ru/asp/certview.asp?wmid=351281428776
-    WMZ: Z217989559723
-    WMR: R347278107127
-    WME: E196199593868
-    Яндекс.Деньги: 41001348342725
-  --
-  * cleanup for medals-affiliations.jisp (iconsets/affiliations/medals-affiliations.jisp)
-  * updated contact tooltip (psi-small-tooltip-fix.diff)
-  * updated video status plugin to v0.0.4 (works for Linux only)
-  * updated all skins (skins/default_skin.skn, skins/universal/black_theme/black_theme.skn,
-    skins/universal/night/night.skn, skins/universal/orange/the_orange.skn,
-    skins/universal/qip_infium/qip_infium.skn, skins/universal/sky/sky.skn,
-    skins/universal/tkabber/tkabber.skn)
-  * updated watcher plugin to v0.3.1
-  * updated screenshot plugin to v0.4.2
-  * fixed signed presence (thx to Hugin) psi-small-tooltip-fix.diff
-  + added new patch for ability to send xhtml-im messages (psi-send-xhtml-im.diff)
-  * fixed xhtml-im rendering, fixed /me command in xhtml-im messages (psi-send-xhtml-im.diff)
-  + added new mra-emoticons-5.7.3639.jisp (converted by tux-den)
-    iconsets/emoticons/mra-emoticons-5.7.3639.jisp
-  ! updated russian localization by ivan101 (psi-ru svn, r179, 2010-07-27)
-  --
-  ! If you want to support the development of the Psi+ Project, you can make a small donation
-    to one of the following accounts:
-    http://passport.webmoney.ru/asp/certview.asp?wmid=351281428776
-    WMZ: Z217989559723
-    WMR: R347278107127
-    WME: E196199593868
-    Yandex.Money: 41001348342725
-
-
-2010-07-25  zet
-v0.15.2750 Beta
-  * обновлены иконпаки активностей, v.0.3 (psiplus-activities-16.jisp, psiplus-activities-22.jisp)
-  * обновлён скрипт сборки psibuild.sh. теперь работает и для FreeBSD, спасибо Kibab
-    (scripts/posix/psibuild.sh)
-  * фикс для корректного детекта контактов сервера vk.com (psi-add-standard-transports.diff)
-  * обновлён extended options plugin до версии 0.2.9
-  + добавлен новый патч для корректного отображения всплывающей подсказки над контактами ростера
-    (small-tooltip-fix.diff)
-  + обновлён chess plugin до версии 0.1.6
-  + добавлен новый иконпак с иконками аффиляций (iconsets/affiliations/psiplus-affiliations.jisp)
-  * исправлен вывод информации о размере иконок (iconsets/clients/fingerprint.jisp)
-  * фикс для стиля контекстного меню (psi-css-style-sheet.diff)
-  + добавлен новый патч для возможности создания событий плагинами и передачи таких событий
-    в приложение (psi-create-events-from-plugins.diff)
-  * исправлен патч psi-fix-hidden-group.diff
-  * исправлено отображение информации о PGP во всплывающей подсказке над контактами ростера
-    (psi-small-tooltip-fix.diff)
-  * обновлён screenshot plugin до версии 0.4.0
-  + добавлен новый патч для скрытия неработающего show-away действия
-    (psi-hide-show-away-action.diff)
-  * обновлён патч psi-get-account-info-from-plugins.diff
-  * обновлён video status changer plugin to v0.0.3 (*nix only)
-  + добавлен новый плагин для обработки капчи captcha forms plugin (v0.0.4), подробнее --
-    http://psi-plus.com/wiki/plugins#captcha_forms_plugin
-  + добавлен скрипт для массовой сборки плагинов Psi+, спасибо KukuRuzo
-    (scripts/posix/compileallplugins.py)
-  + добавлена поддержка дефолтной локали системы (psi-options-language-select.diff)
-  * обновлён патч psi-presets-in-status-menu.diff
-  + добавлен новый патч для поддержки горячей кнопки на сворачивание активного таба/окна
-    (psi-minimize-chat-hotkey.diff)
-  * исправлен патч psi-tray-act-bring-to-front.diff
-  * актуализация информации об участниках проекта (psiplus-aboutdlg.diff)
-  --
-  * updated activities iconsets, v.0.3 (psiplus-activities-16.jisp, psiplus-activities-22.jisp)
-  * improved psibuild.sh, it now works for FreeBSD too, thx Kibab (scripts/posix/psibuild.sh)
-  * updated vkontakte regexp (psi-add-standard-transports.diff)
-  * updated extended options plugin to v0.2.9
-  + added new patch psi-small-tooltip-fix.diff
-  + updated chess plugin to v0.1.6
-  + added psi-plus affilations iconset (iconsets/affiliations/psiplus-affiliations.jisp)
-  * fixed fingerprint.jisp (iconsets/clients/fingerprint.jisp)
-  * fixed submenu style (psi-css-style-sheet.diff)
-  + added new patch for creating events from plugins (psi-create-events-from-plugins.diff)
-  * fixed psi-fix-hidden-group.diff
-  * fixed show PGP in tooltip (psi-small-tooltip-fix.diff)
-  * 0920 moved into 1420 (psi-small-tooltip-fix.diff)
-  * updated screenshot plugin to v0.4.0
-  + added new patch for hiding useless show-away action (psi-hide-show-away-action.diff)
-  * updated psi-get-account-info-from-plugins.diff
-  * updated video status changer plugin to v0.0.3
-  + added new plugin - captcha forms plugin (v0.0.4),
-    http://psi-plus.com/wiki/plugins#captcha_forms_plugin
-  + added compile_all_plugins script by KukuRuzo (scripts/posix/compileallplugins.py)
-  + added default lang, depends of locale os (psi-options-language-select.diff)
-  * updated psi-presets-in-status-menu.diff
-  + added new patch psi-minimize-chat-hotkey.diff
-  * fixed hotkey "show/hide the application" on windows (hiding was broken)
-    (psi-tray-act-bring-to-front.diff)
-  * updated project members info (psiplus-aboutdlg.diff)
-
-
-2010-07-18  zet
-v0.15.2690 Beta
-  + добавлен новый патч для корректного отображения заголовков и разделителей групп в ростере
-    (psi-fix-roster-accounts-and-groups-drawing.diff)
-  * обновлён screenshot plugin до версии 0.3.9
-  * обновлены системные иконпаки (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp,
-    oxygen_sys_22.jisp, whitesys.jisp)
-  + добавлен новый патч для скрытия неактивного элемента "доска для рисования" в меню контакта
-    (psi-fix-submenu-hide.diff)
-  * фикс для скрытия неактивных элементов в подменю контакта (psi-access-to-menus-from-plugins.diff,
-    psi-fix-submenu-hide.diff)
-  + добавлен новый иконпак с иконками jabber-клиентов размером 22x22
-    (iconsets/clients/fingerprint-22.jisp)
-  + добавлен новый патч для исправления сортировки контактов в ростере (по статусу/по алфавиту)
-    (psi-fix-contact-sorting-style-option.diff)
-  * обновлён extended options plugin до версии 0.2.8
-  * исправлен перенос неактивных окон контакт-менеджера и редактора списков приватности на передний
-    план при повторном их вызове (psi-account-menu-privacy-item.diff, psi-contact-manager.diff)
-  + добавлен новый патч для исправления работы с группой Hidden в ростере
-    (psi-fix-hidden-group.diff)
-  + добавлена утилита для восстановления пароля от аккаунта по информации из
-    %userprofile%\PsiData\accounts.xml. запускать утилиту можно непосредственно отсюда:
-    http://psi-dev.googlecode.com/svn/trunk/scripts/passwordrecovery.html
-  + добавлен новый патч для корректной работы с элементами ростера в режиме одиночного клика мышью
-    (psi-fix-use-single-click.diff)
-  * обновлены настройки приложения по умолчанию (psi-default-application-settings.diff,
-    psi-add-options-color-highlighting.diff, psi-add-standard-transports.diff)
-  + добавлен новый патч для скрытия неработающих опций ростера
-    (psi-tmp-hide-useless-roster-options.diff)
-  * исправлен regexp для корректного отображения иконок контактов сервиса vkontakte
-    (psi-add-standard-transports.diff)
-  + добавлено определение некоторых jabber-ботов: jame, pako bot, fatal-bot, storm, sulci,
-    sleekbot, neutrina, yamaneko, talisman (psi-client-icons.diff)
-  * обновлён иконпак с иконками jabber-клиентов (fingerprint.jisp, v0.2.10)
-  --
-  + added new patch for fix options outline headings and slim roster group headings
-    (psi-fix-roster-accounts-and-groups-drawing.diff)
-  * updated screenshot plugin to v0.3.9
-  * updated system iconsets (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp,
-    oxygen_sys_22.jisp, whitesys.jisp)
-  + added new patch for fix disabling whiteboard menu item at contact menu
-    (psi-fix-submenu-hide.diff)
-  * fixed submenu hide (psi-access-to-menus-from-plugins.diff, psi-fix-submenu-hide.diff)
-  * updated psi-client-icons.diff, fingerprint.jisp
-  + added icons clients size 22x22 (iconsets/clients/fingerprint-22.jisp)
-  + added new patch for fix roster contact sorting option
-    (psi-fix-contact-sorting-style-option.diff)
-  * updated extended options plugin to v0.2.8
-  * fixed bring to front for contact manager and privacy dlg
-    (psi-account-menu-privacy-item.diff, psi-contact-manager.diff)
-  + added new patch for fix roster hidden group (psi-fix-hidden-group.diff)
-  + added password recovery utility by rion,
-    http://psi-dev.googlecode.com/svn/trunk/scripts/passwordrecovery.html
-  * fixed psi-fix-contact-sorting-style-option.diff
-  + added new patch for fix activation roster items on single click (psi-fix-use-single-click.diff)
-  * updated default options (psi-default-application-settings.diff,
-    psi-add-options-color-highlighting.diff, psi-add-standard-transports.diff)
-  + added new patch for hide autoresize and left-button-menu options
-    (psi-tmp-hide-useless-roster-options.diff)
-  * fixed vkontakte regexp (psi-add-standard-transports.diff)
-  + added bots detection: jame, pako bot, fatal-bot, storm, sulci, sleekbot, neutrina, yamaneko,
-    talisman (psi-client-icons.diff)
-
-
-2010-07-11  zet
-v0.15.2664 Beta
-  --
- Известные проблемы (после r1784):
-  1. в ростере не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  * исправлено сворачивание окна конференции в режиме без табов (psi-muc-minimize-to-roster.diff)
-  + добавлена опция "сворачивать конференцию при нажатии на кнопку закрытия"
-    (psi-muc-minimize-to-roster.diff)
-  ! переписана бОльшая часть кода плагина screenshot plugin (v0.3.0), подробнее - 
-    http://psi-plus.com/wiki/plugins#screenshot_plugin
-  - убран ненужный более патч psi-save-last-priority-in-statusdlg.diff (данный код теперь
-    используется в патче psi-presets-in-status-menu.diff)
-  + добавлена wiki-страница по сборке Psi+ под Meego (en, ru)
-  * обновлён skins plugin до версии v0.2.6
-  * обновлён патч psi-presets-in-status-menu.diff (by Dmitriy.trt), подробнее - 
-    http://code.google.com/p/psi-dev/issues/detail?id=284
-  + добавлен новый патч psi-fix-adhoc-set-status.diff, решена задача is305
-    ( http://code.google.com/p/psi-dev/issues/detail?id=305 )
-  + добавлены новые иконки для screenshot plugin (psi-iconsets.diff)
-  * обновлены некоторые системные иконпаки (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp,
-    oxygen_sys_22.jisp, whitesys.jisp)
-  * обновлён screenshot plugin до версии 0.3.6
-  + добавлен новый патч psi-fix-empty-name-for-bookmark.diff, решена задача is45
-    ( http://code.google.com/p/psi-dev/issues/detail?id=45 )
-  --
- Known issues (after r1784):
-  1. hidden roster group does not work (upstream version bug)
-  --
- Changelog:
-  * fixed hiding muc for non tabbed mode (psi-muc-minimize-to-roster.diff)
-  + added hide when closing window options in ui (psi-muc-minimize-to-roster.diff)
-  ! rewritten screenshot plugin (v0.3.0),
-    http://psi-plus.com/wiki/plugins#screenshot_plugin
-  - removed useless patch psi-save-last-priority-in-statusdlg.diff
-    (used in psi-presets-in-status-menu.diff)
-  + wiki: added Meego's builds wiki page (en, ru)
-  * updated skins plugin to v0.2.6
-  * updated patch psi-presets-in-status-menu.diff (by Dmitriy.trt),
-    http://code.google.com/p/psi-dev/issues/detail?id=284
-  + added new patch psi-fix-adhoc-set-status.diff, fixed is305
-    ( http://code.google.com/p/psi-dev/issues/detail?id=305 )
-  + added some icons for screenshot plugin (psi-iconsets.diff)
-  * updated some system iconsets (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp,
-    oxygen_sys_22.jisp, whitesys.jisp)
-  * updated screenshot plugin to v0.3.6
-  + added new patch psi-fix-empty-name-for-bookmark.diff, fixed is45
-    ( http://code.google.com/p/psi-dev/issues/detail?id=45 )
-
-
-2010-06-27  zet
-v0.15.2600 Beta
-  --
- Известные проблемы (после r1784):
-  1. в ростере не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  + добавлена возможность вывести на панель инструментов ростера кнопки для установки глобальных
-    настроений, активностей и геолокаций (psi-pep-toolbar-buttons.diff)
-  * фикс для psi-reset-not-complete-connection-on-status-change.diff
-  * обновлён скрипт инсталлятора psiplus-install.nsi
-    (теперь не удаляются пользовательские ресурсы из папки Psi+)
-  * обновлён патч psi-tray-act-bring-to-front.diff (by Dmitriy.trt)
-  * фиксы для for psi-roster-avatar-frame.diff
-  * установлен отступ в 1 px для фрейма с аватаром в ростере (psi-roster-avatar-frame.diff)
-  * скорректирована информация в диалоге About Psi+ (psiplus-aboutdlg.diff)
-  * обновлён blue skin (skins/universal/blue_skin/blue_skin.skn)
-  * изменены расстояния и отступы для фрейма с аватаром в ростере (psi-roster-avatar-frame.diff)
-  * обновлён копирайт для иконпаков qip
-    (iconsets/roster/qipinfium.jisp, iconsets/system/qipinfium_sys.jisp)
-  * заданы умолчания в css для фрейма с аватаром в ростере (psi-css-style-sheet.diff)
-  * исправлен шрифт ника для фрейма с аватаром в ростере (psi-roster-avatar-frame.diff)
-  * исправлен шрифт статусного сообщения для фрейма с аватаром в ростере
-    (psi-roster-avatar-frame.diff)
-  + добавлена опция для возможности изменения размера собственного аватара в ростере
-    (psi-roster-avatar-frame.diff)
-  + добавлена опция для возможности сворачивания окна с конференцией в ростер при нажатии
-    на кнопку закрытия окна (psi-muc-minimize-to-roster.diff)
-  * исправлен дубль pep-диалога (psi-pep-toolbar-buttons.diff)
-  * обновлён orange skin, v0.6.2(skins/universal/orange/the_orange.skn)
-  * обновлены некоторые скины (skins/default_skin.skn, skins/universal/black_theme/black_theme.skn,
-    skins/universal/orange/the_orange.skn, skins/universal/qip_infium/qip_infium.skn,
-    skins/universal/sky/sky.skn, skins/universal/tkabber/tkabber.skn)
-  * попытка решить задачу is310, http://code.google.com/p/psi-dev/issues/detail?id=310
-    (psi-options-language-select.diff)
-  * фикс счётчика непрочитанных сообщений в заголовке окна/таба (psi-muc-minimize-to-roster.diff)
-  + добавлен опциональный размер отступа для фрейма с аватаром в ростере
-    (psi-roster-avatar-frame.diff)
-  * обновлён skins plugin до версии 0.2.5
-  * обновлён brushed metal skin (skins/mac/brushed_metal/brushed_metal.skn)
-  + добавлен новый скин Night, v0.2 (skins/universal/night/night.skn)
-  --
- Known issues (after r1784):
-  1. hidden roster group does not work (upstream version bug)
-  --
- Changelog:
-  + added new patch: ability to add toolbar buttons for set the roster of global
-    moods, activity and geolocation (psi-pep-toolbar-buttons.diff)
-  * fixed psi-reset-not-complete-connection-on-status-change.diff
-  * updated installer script psiplus-install.nsi (softer mode for psi+ resources)
-  * update tray bring to front patch by Dmitriy.trt (psi-tray-act-bring-to-front.diff)
-  * fix for psi-roster-avatar-frame.diff
-  * set margin to 1 for roster avatar frame (psi-roster-avatar-frame.diff)
-  * corrected about Psi+ info (psiplus-aboutdlg.diff)
-  * updated blue skin (skins/universal/blue_skin/blue_skin.skn)
-  * fix for mac (psi-tray-act-bring-to-front.diff)
-  * changed margin and spacing in avatar's frame (psi-roster-avatar-frame.diff)
-  * fixed copyright for qip icons
-    (iconsets/roster/qipinfium.jisp, iconsets/system/qipinfium_sys.jisp)
-  * set default css settings for avatar's frame (psi-css-style-sheet.diff)
-  * fixed nick font (psi-roster-avatar-frame.diff)
-  * fixed status message font (psi-roster-avatar-frame.diff)
-  + added options for change avatar size (psi-roster-avatar-frame.diff)
-  * small fix frame size policy (psi-roster-avatar-frame.diff)
-  + added options hide conference when closing tabs (psi-muc-minimize-to-roster.diff)
-  * fixed duplicate pep dialogs (psi-pep-toolbar-buttons.diff)
-  * fixed size for avatar label (psi-roster-avatar-frame.diff)
-  * updated orange skin, v0.6.2(skins/universal/orange/the_orange.skn)
-  * major update for skins (skins/default_skin.skn, skins/universal/black_theme/black_theme.skn,
-    skins/universal/orange/the_orange.skn, skins/universal/qip_infium/qip_infium.skn,
-    skins/universal/sky/sky.skn, skins/universal/tkabber/tkabber.skn)
-  * try to fix is310, http://code.google.com/p/psi-dev/issues/detail?id=310
-    (psi-options-language-select.diff)
-  * fixed counter unread messages in window title (psi-muc-minimize-to-roster.diff)
-  + added optional margin for avatar frame (psi-roster-avatar-frame.diff)
-  * updated skins plugin to v.0.2.5
-  * updated brushed metal skin (skins/mac/brushed_metal/brushed_metal.skn)
-  + added new skin Night, v0.2 (skins/universal/night/night.skn)
-
-
-2010-06-15  zet
-v0.15.2555 Beta
-  --
- Известные проблемы (после r1784):
-  1. в ростере не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  * обновлён ростерный иконпак stafex_psi_mod.jisp (iconsets/roster/stafex_psi_mod.jisp)
-  * изменены некоторые иконки в форме просмотра истории переписки (psi-improve-historydlg.diff)
-  * правый клик мыши на статусных меню и другие улучшения для статусных шаблонов
-    (автор - Dmitriy.trt) psi-presets-in-status-menu.diff
-  + добавлены новые ростерные иконпаки из коллекции majik (archlinux.jisp, boss.jisp, debian.jisp,
-    dictionary.jisp, email.jisp, gentoo.jisp, hearts.jisp, hoodats.jisp, linux.jisp, maj-mail3.jisp,
-    nuvola-smtp.jisp, oxygen-roster-22.jisp, rss-classic.jisp, slackware.jisp,
-    stellar-crystalized-roster.jisp, suse.jisp)
-  + добавлен новый системный иконпак tango_system.jisp (iconsets/system/tango_system.jisp)
-  * обновлены некоторые ростерные иконпаки
-    (iconsets/roster/stellar.jisp, iconsets/roster/tkabber.jisp)
-  - убраны ненужные ростерные иконпаки
-    (iconsets/roster/dictionary_es.jisp, iconsets/roster/lightbulb.jisp)
-  * фиксы и улучшения для формы просмотра истории переписки (psi-improve-historydlg.diff)
-  + добавлен новый патч для установки статуса непосредственно из плагина
-    (psi-set-account-status-from-plugins.diff)
-  * обновлён системный иконпак 'oxygen system size 22px' (iconsets/system/oxygen_sys_22.jisp)
-  + добавлены новые иконпаки настроений с иконками различных размеров
-  + добавлена новая опция в настройки приложения для выбора affiliations-иконпака
-    (psi-muc-roster-icons.diff)
-  + добавлены новые affiliations-иконпаки (adium-affiliations.jisp, black-affiliations.jisp,
-    oxygen-affiliations-22.jisp, oxygen-affiliations.jisp, qipinfium-affiliations.jisp,
-    white-affiliations.jisp)
-  + добавлены новые affiliations-иконпаки, часть 2 (balls-affiliations.jisp,
-    balls-medium-affiliations.jisp, balls-small-affiliations.jisp, medals-affiliations.jisp,
-    planets-affiliations.jisp, smileys-affiliations.jisp)
-  * обновлён orange skin, v.0.6.1 (skins/universal/orange/the_orange.skn)
-  * поправлены системные иконпаки (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp,
-    oxygen_sys_22.jisp, qipinfium_sys.jisp, summer-system.jisp, whitesys.jisp)
-  + добавлен новый патч для сохранения последнего выставленного приоритета в диалоге установки
-    статуса (psi-save-last-priority-in-statusdlg.diff)
-  + добавлен новый патч для корректного сброса неустановившегося соединения при ручной смене статуса
-    (psi-reset-not-complete-connection-on-status-change.diff)
-  + добавлены новые affiliations-иконпаки, часть 3 (bombus-nostalgic-affiliations.jisp,
-    tango-emotes-affiliations.jisp, vista-halloween-affiliations.jisp)
-  + добавлен новый ростерный иконпак graphite.jisp (iconsets/roster/graphite.jisp)
-  * улучшены параметры значений по умолчанию для macosx (psi-default-application-settings.diff)
-  ! начата работа над немецкой локализацией wiki-страниц (спасибо Torsten)
-  ! теперь для работы с инсталлятором Psi+ используется NSIS, http://nsis.sourceforge.net/
-  + добавлен скрипт для инсталлятора Psi+ (psiplus-install.nsi)
-  ! обновлены системные библиотеки Qt до версии 4.6.3,
-    http://qt.nokia.com/developer/changes/changes-4.6.3
-  ! обновлены библиотеки Psimedia до версии 1.0.3.737, http://delta.affinix.com/svn/trunk/psimedia/
-  ! обновлён GStreamer до версии 0.10.28
- --
- Known issues (after r1784):
-  1. hidden roster group does not work (upstream version bug)
-  --
- Changelog:
-  * updated stafex_psi_mod.jisp (iconsets/roster/stafex_psi_mod.jisp)
-  * changed some icons for psi-improve-historydlg.diff
-  * right click mouse on statuses menus and other improvements (by Dmitriy.trt)
-    psi-presets-in-status-menu.diff
-  + added some roster iconsets from majik collection (archlinux.jisp, boss.jisp, debian.jisp,
-    dictionary.jisp, email.jisp, gentoo.jisp, hearts.jisp, hoodats.jisp, linux.jisp, maj-mail3.jisp,
-    nuvola-smtp.jisp, oxygen-roster-22.jisp, rss-classic.jisp, slackware.jisp,
-    stellar-crystalized-roster.jisp, suse.jisp)
-  + added tango_system.jisp (iconsets/system/tango_system.jisp)
-  * updated some roster iconsets (iconsets/roster/stellar.jisp, iconsets/roster/tkabber.jisp)
-  - removed useless roster iconsets
-    (iconsets/roster/dictionary_es.jisp, iconsets/roster/lightbulb.jisp)
-  * some code cleanings and fixes for psi-improve-historydlg.diff
-  + added new patch for set account status from plugin (psi-set-account-status-from-plugins.diff)
-  * updated system iconset 'oxygen system size 22px' (iconsets/system/oxygen_sys_22.jisp)
-  + added some sized moods iconsets
-  + added options for change affiliations iconsets (psi-muc-roster-icons.diff)
-  + added affiliations iconsets (adium-affiliations.jisp, black-affiliations.jisp,
-    oxygen-affiliations-22.jisp, oxygen-affiliations.jisp, qipinfium-affiliations.jisp,
-    white-affiliations.jisp)
-  + added more affiliations iconsets (balls-affiliations.jisp, balls-medium-affiliations.jisp,
-    balls-small-affiliations.jisp, medals-affiliations.jisp, planets-affiliations.jisp,
-    smileys-affiliations.jisp)
-  * updated orange skin, v.0.6.1 (skins/universal/orange/the_orange.skn)
-  * fixed system iconsets (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp, oxygen_sys_22.jisp,
-    qipinfium_sys.jisp, summer-system.jisp, whitesys.jisp)
-  + added new patch: save last priority in status dialog (psi-save-last-priority-in-statusdlg.diff)
-  + added new patch: reset not complete connection on status change
-    (psi-reset-not-complete-connection-on-status-change.diff)
-  + added Bombus nostalgic and other affiliations iconsets (bombus-nostalgic-affiliations.jisp,
-    tango-emotes-affiliations.jisp, vista-halloween-affiliations.jisp)
-  + added new roster iconset graphite.jisp
-  * some changes for default options on macosx (psi-default-application-settings.diff)
-  ! started german localization (thanks to Torsten)
-  ! now we use NSIS for Psi+ installers, http://nsis.sourceforge.net/
-  + added installation script (psiplus-install.nsi)
-  ! updated Qt libs to v4.6.3, http://qt.nokia.com/developer/changes/changes-4.6.3
-  ! updated Psimedia libs to v1.0.3.737, http://delta.affinix.com/svn/trunk/psimedia/
-  ! updated GStreamer to v0.10.28
-
-
-2010-06-06  zet
-v0.15.2514 Beta
-  --
- Известные проблемы (после r1784):
-  1. не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  * обновлён brushed metal skin, v.0.2.1 (skins/mac/brushed_metal/brushed_metal.skn)
-  * обновлён chess plugin до версии 0.1.5
-  * обновлён icq must die plugin до версии 0.1.3
-  * фикс по задаче 301, http://code.google.com/p/psi-dev/issues/detail?id=301
-    (psi-typed-history.diff)
-  + добавлен детект jabber-клиента Swift-IM (psi-client-icons.diff)
-  + добавлен новый патч, добавляющий вызов шаблонов в статусном меню (патч от Dmitriy.trt,
-    http://code.google.com/p/psi-dev/issues/detail?id=284) psi-presets-in-status-menu.diff
-  * если расцветка ников в конференции выключена, то не используется и раскраска по hash
-    (psi-muc-nick-hash-color.diff)
-  + добавлен детект jabber-клиента Bombus Avalon (psi-client-icons.diff)
-  + добавлена новая опция options.ui.muc.roster-nick-coloring на включение/выключение раскраски
-    ников в ростере конференции psi-muc-roster-icons.diff
-  * обновлён extended options plugin до версии 0.2.7
-  + добавлен новый патч psi-tray-act-bring-to-front.diff (патч от Dmitriy.trt,
-    http://code.google.com/p/psi-dev/issues/detail?id=300)
-  * фиксы дефолтных цветов ников в ростере конференции (psi-muc-roster-icons.diff)
-  + добавлен новый ростерный иконпак stafex_psi_mod.jisp (авторы - Dragonizer и majik)
-    iconsets/roster/stafex_psi_mod.jisp
-  * величина радиуса углов собственного аватара в ростере теперь зависит от соответствующей опции
-    в настройках приложения (psi-roster-avatar-frame.diff)
-  + добавлена новая опция для включения/отключения отображения кнопки отправки сообщения
-    (psi-send-button-arrow.diff)
-  * небольшая оптимизация для патча psi-modern-roster.diff
-  + добвлен новый патч на поддержку ростерных/системных иконок различного размера (экспериментально)
-    (psi-custom-icons-size.diff)
-  + добавлен новый патч на добавление меню переключения языка приложения непосредственно из
-    настроек Psi+ (psi-options-language-select.diff)
-  * откат к предыдущей версии диалога с историей сообщений (psi-improve-historydlg.diff, r2290)
-  * обновлён skins plugin до версии 0.2.3
-  * исправления и оптимизация activities-иконпака (iconsets/activities/psiplus-activities-16.jisp)
-  + добавлен новый activities-иконпак (iconsets/activities/rederick-activities-16.jisp)
-  + добавлен новый иконпак настроений rederick-moods-16.jisp (новая версия иконпака gajim1108.jisp)
-  * обновлён watcher plugin до версии 0.2.7
-  * небольшое обновление русской локализации от ivan101 (psi-ru svn, r174, 2010-05-27)
-  --
- Known issues (after r1784):
-  1. hidden group does not work (upstream version bug)
-  --
- Changelog:
-  * updated brushed metal skin, v.0.2.1 (skins/mac/brushed_metal/brushed_metal.skn)
-  * updated chess plugin to v0.1.5
-  * updated icq must die plugin to v0.1.3
-  * try to fix issue 301, http://code.google.com/p/psi-dev/issues/detail?id=301
-    (psi-typed-history.diff)
-  + added detection Swift-IM jabber client (psi-client-icons.diff)
-  + added new patch: presets in status menu (patch from Dmitriy.trt,
-    http://code.google.com/p/psi-dev/issues/detail?id=284) psi-presets-in-status-menu.diff
-  * if nick coloring is disabled then not use hash coloring (psi-muc-nick-hash-color.diff)
-  + added detection Bombus Avalon jabber client (psi-client-icons.diff)
-  + added new options.ui.muc.roster-nick-coloring to psi-muc-roster-icons.diff
-  * updated extended options plugin to v0.2.7
-  + added new patch psi-tray-act-bring-to-front.diff (patch from Dmitriy.trt,
-    http://code.google.com/p/psi-dev/issues/detail?id=300)
-  * some fixes for default muc roster nick colors (psi-muc-roster-icons.diff)
-  + added roster iconset stafex_psi_mod.jisp by Dragonizer, majik
-    (iconsets/roster/stafex_psi_mod.jisp)
-  * improved psi-roster-avatar-frame.diff
-  + added options for disable send button (psi-send-button-arrow.diff)
-  * some optimizations for psi-modern-roster.diff
-  + added 2 new patches: custom icons size patch and language select patch
-    (psi-custom-icons-size.diff, psi-options-language-select.diff)
-  * reverted psi-improve-historydlg.diff to r2290
-  * updated skins plugin to v.0.2.3
-  * fixing and optimizing "Psi+ Activities" iconset (iconsets/activities/psiplus-activities-16.jisp)
-  + added rederick-activities-16.jisp iconset
-  + added rederick-moods-16.jisp iconset (renewed version of gajim1108.jisp)
-  * updated watcher plugin to v0.2.7
-  * small updates of russian localization by ivan101 (psi-ru svn, r174, 2010-05-27)
-
-
-2010-05-23  zet
-v0.15.2460 Beta
-  --
- Известные проблемы (после r1784):
-  1. не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  + добавлен новый патч для автоматического сворачивания по таймауту главного окна Psi+
-    (psi-roster-autohide.diff)
-  + добавлен вызов краткой справки по плагину непосредственно из окна с настройками плагина,
-    часть 1: attention plugin, autoreply plugin, chess plugin, cleaner plugin,
-    conference logger plugin, extended options plugin
-  + добавлен вызов краткой справки по плагину, часть 2: birthday reminder plugin,
-    gmail notification plugin, history keeper plugin, icq die plugin, image plugin, juick plugin,
-    qip x-statuses plugin
-  + добавлена возможность отключения вертикального скроллбара в ростере конференции
-    (psi-roster-disable-scrollbar.diff)
-  + добавлен вызов краткой справки по плагину, часть 3: screenshot plugin, skins plugin,
-    stop spam plugin, storage notes plugin, translate plugin, watcher plugin
-  + добавлена иконка для кнопки вызова краткой справки по плагину (psi-plugin-info-button.diff)
-  * улучшения для панели поиска по чатлогу (psi-typeahead-find.diff)
-  * улучшения в css для чатов. использование TabDlg {} (psi-css-style-sheet.diff)
-  + добавлен новый патч для исправления запоминания размеров и положения окна с
-    headline-сообщениями (psi-fix-eventdlg-resizing.diff)
-  + добавлен новый патч на опциональное расположение всплывающих окон. используются опции
-    options.ui.notifications.passive-popups.at-left-corner и
-    options.ui.notifications.passive-popups.top-to-bottom options
-  + добавлены англоязычные страницы wiki/en-US/alt_linux.wiki и wiki/en-US/arch_linux.wiki
-  + добавлен новый патч для изменения стандартной иконки приложения в unix на логотип Psi+
-    (psiplus-nix-application-icon-and-name.diff)
-  - убран патч psi-fix-eventdlg-resizing.diff. патч принят upstream-разработчиками
-  * изменён размер панели поиска по чатлогу и фикс нажатия кнопки поиска (psi-typeahead-find.diff)
-  + добавлен детект клиента BombusKlub, обновлён fingerprint.jisp (спасибо westsibe)
-  * поправлена иконка для клиента bombus-avalon (fingerprint.jisp, v0.2.9)
-  * обновлён birthday reminder plugin до версии 0.2.5
-  * обновлён icq must die plugin до версии 0.1.1
-  * настройки приложения по умолчанию: теперь используется сочетание кнопок "Shift+Del" в качестве
-    горячей кнопки для удаления выбранного контакта из ростера Psi+. ранее для этого использовалась
-    кнопка "Del" (psi-default-application-settings.diff)
-  * chess plugin: больше строк для локализации (v0.1.5)
-  * обновлён orange skin, v.0.5.2 (skins/universal/orange/the_orange.skn)
-  ! обновлена русская локализация от ivan101 (psi-ru svn, r173, 2010-05-23)
-  --
- Known issues (after r1784):
-  1. hidden group does not work (upstream version bug)
-  --
- Changelog:
-  + added new patch - roster autohide patch (psi-roster-autohide.diff)
-  + added plugins information, part 1  (attention plugin, autoreply plugin, chess plugin,
-    cleaner plugin, conference logger plugin, extended options plugin)
-  + added plugins information, part 2 (birthday reminder plugin, gmail notification plugin,
-    history keeper plugin, icq die plugin, image plugin, juick plugin, qip x-statuses plugin)
-  + disable scrollbar for muc roster (psi-roster-disable-scrollbar.diff)
-  + added plugins information, part 3 (screenshot plugin, skins plugin, stop spam plugin,
-    storage notes plugin, translate plugin, watcher plugin)
-  + added icons for psi-plugin-info-button.diff
-  * some changes for findbar style (psi-typeahead-find.diff)
-  * more css for chats. use TabDlg {} (psi-css-style-sheet.diff)
-  + added new patch to fix headline messages resizing (psi-fix-eventdlg-resizing.diff)
-  + added new patch for optional location of popups.
-    options.ui.notifications.passive-popups.at-left-corner and
-    options.ui.notifications.passive-popups.top-to-bottom options
-  + added wiki/en-US/alt_linux.wiki, wiki/en-US/arch_linux.wiki
-  + added new patch to change unix icon to Psi+ logo (psiplus-nix-application-icon-and-name.diff)
-  - removed psi-fix-eventdlg-resizing.diff. implemented in upstream
-  * resized find line and fixed toggle button (psi-typeahead-find.diff)
-  + added BombusKlub client detection, updated fingerprint.jisp (thanks to westsibe)
-  * fixed bombus-avalon icon in fingerprint.jisp (v0.2.9)
-  * updated birthday reminder plugin to v0.2.5
-  * updated icq must die plugin to v0.1.1
-  * defaults: use Shift+Del shortcut to delete the selected contact
-    (psi-default-application-settings.diff)
-  * more translatable for chess plugin (v0.1.5)
-  * updated orange skin, v.0.5.2 (skins/universal/orange/the_orange.skn)
-  ! updated russian localization by ivan101 (psi-ru svn, r173, 2010-05-23)
-
-
-2010-05-16  zet
-v0.15.2417 Beta
-  --
- Известные проблемы (после r1784):
-  1. не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  * обновлена информация об участниках проекта, Psi -> Help -> About -> About Psi+
-    (psiplus-aboutdlg.diff)
-  + добавлена статья faq.wiki на английском языке,
-    http://code.google.com/p/psi-dev/wiki/faq?wl=en-US
-  * фикс загрузки/выгрузки плагинов при смене профиля Psi+, оптимизация некоторых плагинных патчей
-  * обновлён stop spam plugin до версии 0.3.5,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/stopspamplugin/changelog.txt (UTF-8)
-  * поправлен патч psi-get-your-jid-for-activetab-from-plugins.diff
-  + добавлена статья features.wiki на английском языке,
-    http://code.google.com/p/psi-dev/wiki/features?wl=en-US
-  - убран ненужный патч psi-debianize.diff ( git://github.com/zerkalica/psi-plus-debian.git )
-  * поправлен патч psi-get-account-info-from-plugins.diff
-  * улучшения для psi-plugins-options.diff. теперь стало возможно обновлять плагины без рестарта
-    Psi+. достаточно отключить плагин в настройках приложения, обновить файл плагина и потом вновь
-    включить плагин в настройках приложения
-  * обновлён attention plugin до версии 0.1.0,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/attentionplugin/changelog.txt (UTF-8)
-  * исправлен цвет счётчика пропущенных сообщений в конференции при условии, что статусное
-    сообщение не пустое (psi-muc-minimize-to-roster.diff)
-  * объединены некоторые зависящие друг от друга плагинные патчи в один патч
-    (psi-plugins-options-and-fix-plugins-loading-and-unloading.diff)
-  * большое обновление статьи av_calls.wiki, http://code.google.com/p/psi-dev/wiki/av_calls
-  * завершена английская локализация статьи plugins.wiki,
-    http://psi-plus.com/wiki/en:plugins
-  * обновлён иконпак для activities: gajim-activities.jisp -> rederick-activities.jisp
-  * обновлён скин orange skin, v.0.4 (skins/universal/orange/the_orange.skn)
-  * обновлён иконпак с иконками jabber-клиентов fingerprint.jisp, v0.2.7
-    (добавлена иконка мобильного jabber-клиента Jimm Aspro)
-  * обновлён патч psi-client-icons.diff (Jimm Aspro)
-  --
- Known issues (after r1784):
-  1. hidden group does not work (upstream version bug)
-  --
- Changelog:
-  * updated about psi+ tab, Psi -> Help -> About -> About Psi+ (psiplus-aboutdlg.diff)
-  + added faq.wiki in english, http://code.google.com/p/psi-dev/wiki/faq?wl=en-US
-  * fixed loading and unloading plugins when profile changes, cleanup plugins patches
-  * updated stop spam plugin to v0.3.5,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/stopspamplugin/changelog.txt (UTF-8)
-  * fixed psi-get-your-jid-for-activetab-from-plugins.diff
-  + added features.wiki in english, http://code.google.com/p/psi-dev/wiki/features?wl=en-US
-  - removed psi-debianize.diff. it not needed,
-    for debian specs use git://github.com/zerkalica/psi-plus-debian.git
-  * fixed psi-get-account-info-from-plugins.diff
-  * improved psi-plugins-options.diff. for now possible to update the plugin without restarting
-    the application. just disable it in options, update file, than enable it
-  * updated attention plugin to v0.1.0,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/attentionplugin/changelog.txt (UTF-8)
-  * fixed color of the conference messages counter if the status message is not empty
-    (psi-muc-minimize-to-roster.diff)
-  * merged some patches for plugin system into one patch because these patches do not work
-    separately (psi-plugins-options-and-fix-plugins-loading-and-unloading.diff)
-  * big update to the av_calls page (wiki/av_calls.wiki, wiki/en-US/av_calls.wiki),
-    http://code.google.com/p/psi-dev/wiki/av_calls
-  * plugins.wiki: completed English localization,
-    http://psi-plus.com/wiki/en:plugins
-  * correction for activities iconsets: gajim-activities.jisp -> rederick-activities.jisp
-  * updated orange skin, v.0.4 (skins/universal/orange/the_orange.skn)
-  * updated fingerprint.jisp, v0.2.7 (added icon for Jimm Aspro)
-  * updated psi-client-icons.diff (Jimm Aspro)
-
-
-2010-05-11  zet
-v0.15.2378 Beta
-  --
- Известные проблемы (после r1784):
-  1. не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  + добавлен новый системный иконпак White
-    (iconsets/roster/white_theme.jisp, iconsets/system/whitesys.jisp)
-  * исправления в скинах (black_theme.skn, qip_infium.skn, sky.skn, tkabber.skn, default_skin.skn)
-  * поправлены ссылки на Wiki в настройках плагинов Psi+
-  * попытка решить задачу 68, http://code.google.com/p/psi-dev/issues/detail?id=68 .
-    теперь при запуске Psi+ не должен производить проверку наличия новых версий при отключенной
-    опции options.auto-update.check-on-startup в дополнительных настройках приложения
-    (psi-dirty-check.diff)
-  * обновлён скин Brushed Metal, v0.2 (skins/mac/brushed_metal.skn)
-  * обновлён смайлпак Android.jisp: добавлено 4 смайла, изменено 2 смайла
-    (iconsets/emoticons/Android.jisp)
-  * решена задача 296, http://code.google.com/p/psi-dev/issues/detail?id=296
-    (psi-add-client-icon-to-chatdlg.diff)
-  + добавлена кнопка сброса координат местоположения в форме управления геолокацией
-    (psi-geolocation.diff)
-  * исправлена обработка некоторых полей в форме геолокации (psi-geolocation.diff)
-  + добавлен новый патч для загрузки плагинов в алфавитном порядке при старте приложения
-    (psi-use-plugins-in-alphabetical-order.diff)
-  + на wiki-страницу скачиваний добавлены ссылки на репозитории для Ubuntu (downloads.wiki)
-  * исправлена обработка символа "&" при работе с шаблонами (psi-send-button-context-menu.diff)
-  * обновлён skins plugin до версии 0.2.0,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/skinsplugin/changelog.txt (UTF-8)
-  + добавлен новый скин Orange, v0.3 (skins/universal/orange/the_orange.skn)
-  * изменены размеры по умолчанию для окна редактора топика конференции (psi-muc-topic.diff)
-  + добавлен ростерный иконпак Android (iconsets/roster/Android.jisp)
-  * исправлена очистка ростера от виртуального контакта конференции при отключении от сети,
-    is187, http://code.google.com/p/psi-dev/issues/detail?id=187 (psi-muc-minimize-to-roster.diff)
-  * исправлено падение приложения при открытии окна с пустой историей переписки с контактом
-    (psi-all-in-one-window.diff, psi-improve-historydlg.diff)
-  * изменён порядок следования записей в окне с историей переписки
-    (psi-all-in-one-window.diff, psi-improve-historydlg.diff)
-  + добавлена кнопка сворачивания окна с историей переписки (psi-improve-historydlg.diff)
-  + добавлен новый патч для вызова дополнительной информации о плагинах Psi+ непосредственно
-    из настроек плагинов (задел на будущее) (psi-plugin-info-button.diff)
-  * менеджер контактов: совместимость с draft-ietf-xmpp-3921bis-06 (psi-contact-manager.diff)
-  ! начата работа над английской версией wiki-страниц проекта
-  --
- Known issues (after r1784):
-  1. hidden group does not work (upstream version bug)
-  --
- Changelog:
-  + added new system icons White (iconsets/roster/white_theme.jisp, iconsets/system/whitesys.jisp)
-  * fixed skins (black_theme.skn, qip_infium.skn, sky.skn, tkabber.skn, default_skin.skn)
-  * added Q_OBJECT macro into ContactManagerView (psi-contact-manager.diff)
-  * fixed wiki urls for psi+ plugins
-  * try to fix is68, http://code.google.com/p/psi-dev/issues/detail?id=68 (psi-dirty-check.diff)
-  * updated brushed metal skin to v0.2 (skins/mac/brushed_metal_(mac).skn)
-  * updated Android.jisp: +4 emoticons, changed 2 emoticons (iconsets/emoticons/Android.jisp)
-  * fixed is296, http://code.google.com/p/psi-dev/issues/detail?id=296
-    (psi-add-client-icon-to-chatdlg.diff)
-  + added reset button to geolocationdlg (psi-geolocation.diff)
-  * try to fix psi-add-client-icon-to-chatdlg.diff
-  * fixed psi-geolocation.diff
-  + added new patch psi-use-plugins-in-alphabetical-order.diff
-  + added links to repository for Ubuntu version (downloads.wiki)
-  + added change status from dbus (psi patch from debian), psi-add-dbus-status.diff
-  * fixed '&' char in templates menu (psi-send-button-context-menu.diff)
-  * updated skins plugin to v0.2.0,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/skinsplugin/changelog.txt (UTF-8)
-  + added orange skin, v0.3 (skins/universal/orange/the_orange.skn)
-  * resized topic window (psi-muc-topic.diff)
-  + added Android roster iconset (iconsets/roster/Android.jisp)
-  * fixed remove muc items when offline, is187,
-    http://code.google.com/p/psi-dev/issues/detail?id=187 (psi-muc-minimize-to-roster.diff)
-  * fixed crash on empty history (psi-all-in-one-window.diff, psi-improve-historydlg.diff)
-  * proper sorting of history (psi-all-in-one-window.diff, psi-improve-historydlg.diff)
-  + minimizable history (psi-improve-historydlg.diff)
-  + added new patch: plugin info button to plugins settings window. need plugins support
-    (psi-plugin-info-button.diff)
-  * contactmanager more compatible with draft-ietf-xmpp-3921bis-06 (psi-contact-manager.diff)
-  ! started english localization for wiki content
-
-
-2010-05-03  zet
-v0.15.2296 Beta
-  --
- Известные проблемы (после r1784):
-  1. поиск контактов в ростере работает нестабильно (баг upstream-версии)
-  2. не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  + добавлен патч на исправление поведения окна чата при открытии первого непрочитанного сообщения
-    (psi-fix-proccess-first-message.diff)
-  * обновлён stop spam plugin до версии 0.3.2,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/stopspamplugin/changelog.txt (UTF-8)
-  + добавлено отображение иконки jabber-клиента собеседника в окне чата
-    (psi-add-client-icon-to-chatdlg.diff)
-  * исправлено поведение разделителей в окне конференции (psi-muc-roster-size-and-location.diff)
-  + добавлен патч для решения задачи 98 (psi-add-join-groupchat-item-to-account-menu.diff)
-  + добавлен патч на отображение в ростере собственной аватары, кнопки выбора статуса и поле для
-    быстрого ввода статусного сообщения (psi-roster-avatar-frame.diff)
-  * обновлён skins plugin до версии 0.1.1,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/skinsplugin/changelog.txt (UTF-8)
-  * обновлён watcher plugin до версии 0.2.2,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/watcherplugin/changelog.txt (UTF-8)
-  - убран патч psi-fix-alt+N-crash.diff (реализовано upstream-разработчиками)
-  * обновлён extended options plugin до версии 0.2.4,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/extendedoptionsplugin/changelog.txt
-    (UTF-8)
-  * исправлен порядок расположения групп в ростере (psi-muc-minimize-to-roster.diff)
-  + добавлен ростерный иконпак Berlin Traffic Lights (iconsets/roster/berlin.jisp)
-  * обновлены некоторые скины
-  --
- Known issues (after r1784):
-  1. contacts search in roster works unstable (upstream version bug)
-  2. hidden group does not work (upstream version bug)
-  --
- Changelog:
-  + added patch to fix proccess first message (psi-fix-proccess-first-message.diff)
-  * updated stop spam plugin to v0.3.2,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/stopspamplugin/changelog.txt (UTF-8)
-  + added client icon to chat dialog (psi-add-client-icon-to-chatdlg.diff)
-  * fixed muc splitters position (psi-muc-roster-size-and-location.diff)
-  + added patch to fix issues 98 (psi-add-join-groupchat-item-to-account-menu.diff)
-  + added roster-avatar-frame patch (psi-roster-avatar-frame.diff)
-  * updated skins plugin to v0.1.1,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/skinsplugin/changelog.txt (UTF-8)
-  + added missing options to default.xml for some patches (psi-all-in-one-window.diff,
-    psi-movable-tabs-qt45-and-custom-style.diff, psi-typeahead-find.diff)
-  * fixed status menu for psi-roster-avatar-frame.diff
-  * updated watcher plugin to v0.2.2,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/watcherplugin/changelog.txt (UTF-8)
-  - removed psi-fix-alt+N-crash.diff. implemented by upstream
-  * updated extended options plugin to v0.2.4,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/extendedoptionsplugin/changelog.txt
-    (UTF-8)
-  * fixed roster position groups (psi-muc-minimize-to-roster.diff)
-  + added roster iconset Berlin Traffic Lights (iconsets/roster/berlin.jisp)
-  * updated some skins
-
-
-2010-04-25  zet
-v0.15.2215 Beta
-  --
- Известные проблемы (после r1784):
-  1. не работает поиск контактов в ростере (баг upstream-версии)
-  2. не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  * поправлен смайлпак yahoo_gif.jisp
-  + добавлен системный иконпак в стиле QIP Infium (iconsets/system/qipinfium_sys.jisp)
-  + добавлен скин в стиле QIP Infium (skins/win32/qip_infium.skn)
-  * фикс повторного входа в уже открытую конференцию (psi-muc-minimize-to-roster.diff)
-  + добавлена горячая кнопка для управления табом с конференцией (свернуть, развернуть, покинуть)
-    (psi-muc-minimize-to-roster.diff)
-  + добавлена опция options.ui.muc.show-client-icons на показ иконок jabber-клиентов
-    в ростере конференции (psi-muc-roster-icons.diff)
-  + добавлены универсальные скины (skins/universal/black_theme.skn, skins/universal/qip_infium.skn,
-    skins/universal/sky.skn, skins/universal/tkabber.skn)
-  * обновлён chess plugin до версии 0.1.2,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/chessplugin/changelog.txt (UTF-8)
-  * обновлены некоторые системные иконпаки
-    (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp, qipinfium_sys.jisp, summer-system.jisp)
-  + добавлен новый смайлпак GTalk smiles.jisp, v0.1 (iconsets/emoticons/GTalk-smiles.jisp)
-  + добавлен детект следующих jabber-клиентов (psi-client-icons.diff):
-    QIP 2010, AQQ, asterisk, buddydroid, ovi-chat, weather2jabber, yandexmail, radio-t
-  * обновлён иконпак с иконками клиентов fingerprint.jisp, v0.2.6 (iconsets/clients/fingerprint.jisp)
-  * обновлён conference logger plugin до версии 0.1.3,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/conferenceloggerplugin/changelog.txt
-    (UTF-8)
-  ! обновлена русская локализация (автор - ivan101)
-  --
- Known issues (after r1784):
-  1. contacts search in roster does not work (upstream version bug)
-  2. hidden group does not work (upstream version bug)
-  --
- Changelog:
-  * fixed iconsets/emoticons/yahoo_gif.jisp
-  + added qip infium system iconset (iconsets/system/qipinfium_sys.jisp)
-  + added qip infium skin (skins/win32/qip_infium.skn)
-  * fixed empty contact after join in already opened groupchat (psi-muc-minimize-to-roster.diff)
-  + added shortcuts for manage muc tab (minimize, restore, leave) (psi-muc-minimize-to-roster.diff)
-  + added options.ui.muc.show-client-icons (psi-muc-roster-icons.diff)
-  + added universal skins (skins/universal/black_theme.skn, skins/universal/qip_infium.skn,
-    skins/universal/sky.skn, skins/universal/tkabber.skn)
-  * updated chess plugin to v0.1.2,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/chessplugin/changelog.txt (UTF-8)
-  * updated some system iconsets
-    (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp, qipinfium_sys.jisp, summer-system.jisp)
-  + added GTalk smiles.jisp, v0.1 (iconsets/emoticons/GTalk-smiles.jisp)
-  + added some jabber clients detection (psi-client-icons.diff):
-    QIP 2010, AQQ, asterisk, buddydroid, ovi-chat, weather2jabber, yandexmail, radio-t
-  * updated fingerprint.jisp to v0.2.6 (iconsets/clients/fingerprint.jisp)
-  * updated conference logger plugin to v0.1.3,
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/conferenceloggerplugin/changelog.txt
-    (UTF-8)
-  * updated russian localization (by ivan101)
-
-
-2010-04-19  zet
-v0.15.2173 Beta
-  --
- Известные проблемы (после r1784):
-  1. не работает поиск контактов в ростере (баг upstream-версии)
-  2. не работает группа hidden (баг upstream-версии)
-  --
- Changelog:
-  + добавлен скин "black theme", v0.2 (black_theme_(nix).skn, black_theme_(win32).skn)
-  * исправлено поведение приложения после кика из конференции (psi-muc-minimize-to-roster.diff)
-  * обновлён skins plugin до версии 0.0.9,
-    http://psi-plus.com/wiki/plugins#skins_plugin
-  * обновлён storage notes plugin до версии 0.1.0,
-    http://psi-plus.com/wiki/plugins#storage_notes_plugin
-  * обновлён скин "blue skin", v0.8 (blue_skin.skn)
-  * обновлён qip x-statuses plugin до версии 0.0.4,
-    http://psi-plus.com/wiki/plugins#qip_x-statuses_plugin
-  + добавлена опция на скрытие иконки статуса в заголовке таба (спасибо Nexor)
-    (psi-tab-status-icon.diff)
-  * фикс иконки статуса на табе с конференцией
-    (psi-muc-minimize-to-roster.diff, psi-tab-status-icon.diff)
-  + в папку sound добавлены некоторые музыкальные файлы для звукового сопровождения работы плагинов
-    (attention.wav, chess_error.wav, chess_finish.wav, chess_move.wav, chess_start.wav,
-    reminder.wav, watcher.wav)
-  + добавлен скин "sky", v0.1 (sky_(nix).skn, sky_(win32).skn)
-  * обновлён attention plugin до версии 0.0.8,
-    http://psi-plus.com/wiki/plugins#attention_plugin
-  * обновлён birthday reminder plugin до версии 0.2.2,
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * обновлён watcher plugin до версии 0.2.1,
-    http://psi-plus.com/wiki/plugins#watcher_plugin
-  + добавлен патч для поддержки видеообмена при голосовых вызовах (by Arseniy Lartsev,
-    http://lists.affinix.com/pipermail/psi-devel-affinix.com/2010-March/009046.html
-    (psi-avcalls-enable-video.diff)
-  - убран скин "shine mac"
-  * обновлён extended options plugin до версии 0.2.3,
-    http://psi-plus.com/wiki/plugins#extended_options_plugin
-  + восстановлен патч psi-deactivation-some-menu-items.diff
-  + добавлен скин "minimal theme", v0.1 (minimal_theme_(nix).skn)
-  + добавлен скин "tkabber", v0.2 (tkabber_(nix).skn, tkabber_(win32).skn)
-  + добавлен ростерный иконпак tkabber.jisp
-  + добавлен системный иконпак tkabber_sys.jisp
-  + добавлен показ иконок jabber-клиентов в ростере конференции (psi-muc-roster-icons.diff)
-  + добавлен патч на исправение показа версии jabber-клиента во всплывающей подсказке над контактами
-    в ростере конференции (psi-fix-client-version-in-muc-roster-tooltip.diff)
-  + добавлен скин "brushed metal", v0.1 (brushed_metal_(mac).skn)
-  * обновлён stop spam plugin до версии 0.3.1,
-    http://psi-plus.com/wiki/plugins#stop_spam_plugin
-  * обновлён смайлпак yaemomidget.jisp
-  + добавлен новый плагин Шахматы (chess plugin, v0.0.3), подробнее --
-    http://psi-plus.com/wiki/plugins#chess_plugin
-  * обновлён список участников проекта Psi+ (psiplus-aboutdlg.diff)
-  * решена задача issue 136 (psi-send-custom-status.diff)
-  * обновлён смайлпак mra-emoticons.jisp (v1.0)
-  ! обновлена русская локализация (автор - ivan101)
-  --
- Known issues (after r1784):
-  1. contacts search in roster does not work (upstream version bug)
-  2. hidden group does not work (upstream version bug)
-  --
- Changelog:
-  + added 'black theme' skin, v0.2 (black_theme_(nix).skn, black_theme_(win32).skn)
-  * fixed item conference after kick (psi-muc-minimize-to-roster.diff)
-  * some fix muc join mechanism (psi-muc-minimize-to-roster.diff)
-  * updated skins plugin to v0.0.9, http://psi-plus.com/wiki/plugins#skins_plugin
-  * updated storage notes plugin to v0.1.0,
-    http://psi-plus.com/wiki/plugins#storage_notes_plugin
-  * updated 'blue skin', v0.8 (blue_skin.skn)
-  * updated qip x-statuses plugin to v0.0.4,
-    http://psi-plus.com/wiki/plugins#qip_x-statuses_plugin
-  + added options to hide icons on tabs (thx to Nexor) (psi-tab-status-icon.diff)
-  * fix muc status icons (psi-muc-minimize-to-roster.diff, psi-tab-status-icon.diff)
-  + added some plugins sounds (attention.wav, chess_error.wav, chess_finish.wav, chess_move.wav,
-    chess_start.wav, reminder.wav, watcher.wav) to sound dir
-  + added 'sky' skin, v0.1 (sky_(nix).skn, sky_(win32).skn)
-  * updated attention plugin to v0.0.8,
-    http://psi-plus.com/wiki/plugins#attention_plugin
-  * updated birthday reminder plugin to v0.2.2,
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * updated watcher plugin to v0.2.1, http://psi-plus.com/wiki/plugins#watcher_plugin
-  + added video support patch by Arseniy Lartsev, copied exactly from
-    http://lists.affinix.com/pipermail/psi-devel-affinix.com/2010-March/009046.html
-    (psi-avcalls-enable-video.diff)
-  * fixed accessing missing option for psi-roster-groups-disable.diff
-  - removed 'shine mac' skin
-  * updated extendedoptionsplugin to v0.2.3,
-    http://psi-plus.com/wiki/plugins#extended_options_plugin
-  * some fix muc items (psi-muc-minimize-to-roster.diff)
-  + restored psi-deactivation-some-menu-items.diff
-  + added 'minimal theme' skin, v0.1 (minimal_theme_(nix).skn)
-  + added 'tkabber' skin, v0.2 (tkabber_(nix).skn, tkabber_(win32).skn)
-  + added iconsets/roster/tkabber.jisp
-  + added iconsets/system/tkabber_sys.jisp
-  + added display of jabber client icons in muc roster (psi-muc-roster-icons.diff)
-  * fixed client version in muc tooltip (psi-fix-client-version-in-muc-roster-tooltip.diff)
-  + added brushed metal skin, v0.1 (brushed_metal_(mac).skn)
-  * updated stop spam plugin to v0.3.1,
-    http://psi-plus.com/wiki/plugins#stop_spam_plugin
-  * update iconsets/emoticons/yaemomidget.jisp
-  + added chess plugin (v0.0.3), http://psi-plus.com/wiki/plugins#chess_plugin
-  * updated about psi+ info (psiplus-aboutdlg.diff)
-  * fixed issue 136 (psi-send-custom-status.diff)
-  * updated mra-emoticons.jisp to v1.0
-  ! updated russian localization (by ivan101)
-
-
-2010-04-05  zet
-v0.15.2095 Beta
-  --
- Известные проблемы (после r1784):
-  1. не работает поиск контактов в ростере
-  2. не работает отключение пунктов меню
-  3. не работает группа hidden
-  4. устаревшая русская локализация
-  --
- Changelog:
-  + добавлена возможность вывода кнопки вкл/выкл отображения групп в ростере на панель кнопок
-    (psi-roster-groups-disable.diff)
-  * исправления для системных иконпаков (oxygen_sys.jisp, summer-system.jisp)
-  * исправлено падение приложения при попытке присоединения к конференциям, защищённым капчей
-    (psi-muc-minimize-to-roster.diff)
-  - убран патч psi-roster-fix-online-contacts-coloring.diff (реализовано в upstream-версии)
-  - убран патч psi-paint-roster-background.diff (реализовано в upstream-версии)
-  + добавлен новый плагин qip xstatuses plugin (v0.0.3),
-    http://psi-plus.com/wiki/plugins#qip_x-statuses_plugin
-    и патч для работы данного плагина (psi-change-contacts-status-from-plugins.diff)
-  + добавлен показ кнопки "enable-groups" в главном меню Psi+ и в контекстном меню в трее
-    (psi-roster-groups-disable.diff)
-  * ростерные патчи объединены в один общий патч (psi-modern-roster.diff)
-  * исправлено падение приложения при использовании неподдерживаемой версии psimedia
-    при попытке вызова через контекстное меню ростера
-  + добавлен счётчик пропущенных сообщений от контакта со свёрнутой в ростер конференцией
-    (psi-muc-minimize-to-roster.diff)
-  * убрана лишняя информация из тултипа на контакте конференции в ростере
-    (psi-muc-minimize-to-roster.diff)
-  + добавлен детект jabber-бота osiris rss/atom feed bot (psi-client-icons.diff)
-  + попытка детекта клиента jabbin
-  * обновлён иконпак с иконками jabber-клиентов fingerprint.jisp до версии 0.2.3
-  + в дистрибутив добавлена папка с примерами скинов
-  ! обновлены библиотеки win32 openssl до версии 0.9.8n (теперь мы сами компилируем openssl
-    в mingw gcc из исходников http://www.openssl.org/source/openssl-0.9.8n.tar.gz)
-  ! теперь используются скомпилированные в mingw библиотеки aspell отсюда:
-    ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-mingw.zip
-  ! из дистрибутива убран ненужный пакет библиотек vcredist_x86.exe
-  --
- Known issues (after r1784):
-  1. contacts search in roster does not work
-  2. disabling items in menu does not work
-  3. hidden group does not work
-  4. outdated russian localization
-  --
- Changelog:
-  + added toolbar button to psi-roster-groups-disable.diff
-  * some improvements to psi-css-style-sheet.diff, update blue_skin
-  * fixed translation in psi-roster-groups-disable.diff
-  * fixed system iconsets (oxygen_sys.jisp, summer-system.jisp)
-  * fixed crash when join in captcha protected conferences (psi-muc-minimize-to-roster.diff)
-  * small fixes for psi-activity-icons.diff and psi-roster-icons.diff
-  - removed psi-roster-fix-online-contacts-coloring.diff (already in upstream)
-  - removed psi-paint-roster-background.diff (already in upstream)
-  + added qip xstatuses plugin (v0.0.3),
-    http://psi-plus.com/wiki/plugins#qip_x-statuses_plugin
-    and patch to make this plugin work (psi-change-contacts-status-from-plugins.diff)
-  + added enable-groups button to view menu (psi-roster-groups-disable.diff)
-  * merged roster patches into one patch (psi-modern-roster.diff)
-  * fixed crash when using unsupported psimedia from context menu in roster
-  + added counter messages in conference item (psi-muc-minimize-to-roster.diff)
-  * some cleaning in tooltip conference item (psi-muc-minimize-to-roster.diff)
-  * small fix brackets (psi-muc-minimize-to-roster.diff)
-  + added osiris rss/atom feed bot detection (psi-client-icons.diff)
-  + try to detect jabbin client
-  * updated fingerprint.jisp to v0.2.3
-  + added skins folder with skins to installer
-  ! updated win32 openssl libs to v0.9.8n
-    (compiled by mingw gcc compiler from source http://www.openssl.org/source/openssl-0.9.8n.tar.gz)
-  ! replaced aspell libs
-    (now using libs from ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-mingw.zip)
-  ! removed useless vcredist_x86.exe from installer
-
-
-2010-03-29  zet
-v0.15.2060 Beta
-  --
- Известные проблемы (после r1784):
-  1. не работает сортировка контактов в ростере
-  2. не работает поиск контактов в ростере
-  3. не работает отключение пунктов меню
-  4. не работает группа hidden
-  --
- Changelog:
-  + добавлен новый патч psi-muc-add-affiliation-icons.diff
-  + добавлен объединённый смайлпак mra-emoticons.jisp
-  - убраны ненужные смайлпаки mra_set03.jisp и mrim.jisp
-  * настраиваемые цвета для контактов с различными рангами и ролями в ростере конференции
-    (psi-muc-add-affiliation-icons.diff)
-  + добавлена опция включения/выключения показа иконок аффиляций в ростере конференции
-    (psi-muc-add-affiliation-icons.diff)
-  + добавлена кнопка максимизации окна обзора сервисов, поиска контактов и некоторых других
-    окон и диалогов (psi-customize-dialogs-title-hint.diff)
-  * issue 11: сохранение размера (ширины) ростера конференции (psi-muc-roster-size.diff)
-  * переписан патч psi-muc-nicklist-at-left.diff
-  * фикс запоминания размера ростера конференции для положения "ростер конференции слева"
-    (psi-muc-roster-size.diff)
-  * решена issue 191 (psi-muc-notify-highlight.diff, psi-passive-popups-delays.diff)
-  * решена issue 167 (psi-deactivation-of-some-contact-menu-items.diff)
-  * теперь тулбары включены по умолчанию (psi-default-application-settings.diff)
-  * опция "воспроизводить звуковые события для всех сообщений в конференции" выключена по умолчанию
-    (psi-default-application-settings.diff)
-  + добавления опция на отключение кнопки "вставить и отправить" (psi-send-button-context-menu.diff)
-  * обновлён birthday reminder plugin до версии 0.2.1 (подробнее в wiki)
-  * уменьшен размер формы ввода данных о местоположении (psi-geolocation.diff)
-  + добавлен новый патч psi-paint-roster-background.diff
-  + добавлен новый смайлпак yahoo_gif.jisp
-  - убран ненужный смайлпак yahoo_png.jisp
-  + добавлен патч на вызов в меню трея команды View Groups
-    (psi-add-view-groups-to-tray-menu.diff)
-  + добавлена опция options.ui.contactlist.avatars.avatars-at-left для psi-roster-avatars.diff
-  + добавлен новый патч psi-fix-alt+N-crash.diff
-  + добавлена опция options.ui.contactlist.avatars.use-default-avatar для psi-roster-avatars.diff
-  + добавлен новый патч для доступа к различным меню приложения из плагина
-    (psi-access-to-menus-from-plugins.diff)
-  + добавлен новый плагин storage notes plugin (v0.0.9), подробнее -
-    http://psi-plus.com/wiki/plugins#storage_notes_plugin
-  * выравнивание неквадратных аватаров по центру (psi-roster-avatars.diff)
-  + добавлен новый патч psi-hide-roster-status-icons.diff на обработку
-    опции options.ui.contactlist.show-status-icons
-  * добавлены +3 пикселя между аватаром и ником контакта в ростере
-    (psi-hide-roster-status-icons.diff)
-  + добавлена опция на показ статусной иконки контакта поверх аватара
-    (psi-roster-avatars.diff, psi-hide-roster-status-icons.diff)
-  * исправлено дублирование кнопок тулбаров в режиме "всё-в-одном-окне" (psi-all-in-one-window.diff)
-  + добавлены новые иконки oxygen для ростера и системный иконпак (oxygen.jisp, oxygen_sys.jisp)
-  + добавлен новый патч на показ статусного сообщения контакта ростера в одной строке с
-    ником контакта (psi-roster-single-line-status-messages.diff)
-  * 7 - минимальный размер шрифта для текста статусного сообщения
-    (psi-roster-single-line-status-messages.diff)
-  * теперь по умолчанию отключен toolwindow в главном окне Psi+
-    (psi-default-application-settings.diff)
-  * обновлён juick plugin (v0.9.12) - добавлена возможность указания прокси-сервера и
-    авторизации на нём
-  + добавлен новый патч psi-roster-fix-online-contacts-coloring.diff
-  + добавлен новый плагин history keeper plugin (v0.0.2), подробнее -
-    http://psi-plus.com/wiki/plugins#history_keeper_plugin
-  * фикс для варианта отображения аватаров справа в ростере
-    (psi-roster-single-line-status-messages.diff)
-  * множественные обновления системных иконпаков
-    (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp, summer-system.jisp)
-  * обновлён attention plugin до версии 0.0.7
-  * обновлён cleaner plugin до версии 0.2.4
-  + добавлен новый патч psi-iconsets.diff. теперь иконки Psi+ интегрированы в исходный код
-  - убран ненужный иконсет psiplus.jisp
-  - убран ненужный иконсет crystal_system.jisp
-  * обновлён watcher plugin до версии 0.2.0
-  + добавлен новый патч для настройки цветов тултипа (цвет шрифта, цвет фона)
-    (psi-coloring-tooltip.diff)
-  + добавлен новый плагин skins plugin (v0.0.8), подробнее -
-    http://psi-plus.com/wiki/plugins#skins_plugin
-  + добавлен новый патч psi-fix-grepshortcutkeydialog.diff
-  + добавлен новый патч на совместимость с плагином skins plugin
-    (psiplus-more-compatibility-with-skinsplugin.diff)
-  * обновлён conference logger plugin до версии 0.1.1
-  + добавлена англоязычная страничка wiki по компиляции Psi+ (спасибо Z_God за контроль ошибок)
-  * обновлён autoreply plugin до версии 0.2.7
-  + добавлен патч на обработку опции options.ui.contactlist.css (psi-mainwindow-css.diff)
-  * обновлён extended options plugin до версии 0.2.2
-  + добавлен объединённый патч для обработки css в приложении (psi-css-style-sheet.diff)
-  * обновлён stop spam plugin до версии 0.2.1
-  + добавлен новый патч psi-roster-groups-disable.diff на отключение показа групп в ростере.
-    пока настраивается через опцию options.ui.contactlist.enable-groups, в дальнейшем будет
-    сделана соответствующая кнопка на тулбаре
-  * переписан патч на сворачивание конференций в ростер (psi-muc-minimize-to-roster.diff)
-  ! обновлены системные библиотеки Qt до версии 4.6.2,
-    http://qt.nokia.com/developer/changes/changes-4.6.2
-  ! обновлены библиотеки Psimedia до версии 1.0.3.737, http://delta.affinix.com/svn/trunk/psimedia/
-  ! обновлён GStreamer до версии 0.10.28 (спасибо Z_God)
-  ! обновлены библиотеки Win32OpenSSL до версии 0.9.8m 0.9.8.13,
-    http://www.slproweb.com/products/Win32OpenSSL.html
-  --
- Known issues (after r1784):
-  1. contacts sorting in roster does not work
-  2. contacts search in roster does not work
-  3. disabling items in menu does not work
-  4. hidden group does not work
-  --
- Changelog:
-  + added psi-muc-add-affiliation-icons.diff
-  + added combined mra-emoticons.jisp
-  - removed useless mra_set03.jisp, mrim.jisp
-  * customizable colors for psi-muc-add-affiliation-icons.diff
-  + added option enable/disable affiliation icons for psi-muc-add-affiliation-icons.diff
-  + maximize discovery and some another dialogs (psi-customize-dialogs-title-hint.diff)
-  * issue 11: save/restore roster size in MUC (psi-muc-roster-size.diff)
-  * rewritten psi-muc-nicklist-at-left.diff
-  * psi-muc-roster-size.diff: fix size when roster at left in MUC
-  * issue 191 (psi-muc-notify-highlight.diff, psi-passive-popups-delays.diff)
-  * issue 167 (psi-deactivation-of-some-contact-menu-items.diff)
-  * psi-default-application-settings.diff: default toolbars is enabled
-  * psi-default-application-settings.diff: play sounds for all messages in groupchat is disabled
-  + added options for disable 'paste and send' (psi-send-button-context-menu.diff)
-  * updated birthday reminder plugin to v0.2.1
-  * maximize searchdlg
-  * reduced geolocation form size (psi-geolocation.diff)
-  + added psi-paint-roster-background.diff
-  + added emoticons/yahoo_gif.jisp
-  - removed useless emoticons/yahoo_png.jisp
-  * updated yahoo_gif.jisp: added hidden emoticons
-  + added psi-add-view-groups-to-tray-menu.diff
-  + psi-roster-avatars.diff: added options.ui.contactlist.avatars.avatars-at-left
-  + added psi-fix-alt+N-crash.diff: fix crash on pressing Alt+number when number is out of range
-  + psi-roster-avatars.diff: added options.ui.contactlist.avatars.use-default-avatar
-  + added psi-access-to-menus-from-plugins.diff
-  + added storage notes plugin, v0.0.9,
-    http://psi-plus.com/wiki/plugins#storage_notes_plugin
-  * psi-roster-avatars.diff: alignment of non-square avatars in the center
-  + added psi-hide-roster-status-icons.diff (option options.ui.contactlist.show-status-icons)
-  * psi-hide-roster-status-icons.diff: +3 pixels between the avatar and nickname
-  + added option status-icon-over-avatar (psi-roster-avatars.diff, psi-hide-roster-status-icons.diff)
-  * fixed duplicate toolbar buttons in all in one mode (psi-all-in-one-window.diff)
-  * killed fat arrow specifically for maj (psi-toolbar-button-kill-arrow.diff)
-  * less calls to the options (psi-roster-icons.diff, psi-roster-avatars.diff,
-    psi-hide-roster-status-icons.diff)
-  + added oxygen roster and system icons (oxygen.jisp, oxygen_sys.jisp)
-  + added psi-roster-single-line-status-messages.diff patch
-  * try to fix clipping of statusmessages for psi-roster-single-line-status-messages.diff
-  * psi-roster-single-line-status-messages.diff: o.font.setPointSize(o.font.pointSize()-1);
-  * 7 - minimal font size for status (psi-roster-single-line-status-messages.diff)
-  * disable buggy toolwindow by default (psi-default-application-settings.diff)
-  * updated juick plugin - added proxy settings and proxy authorizations settings (v0.9.12)
-  + added fix-online-contacts-coloring patch (psi-roster-fix-online-contacts-coloring.diff)
-  + added history keeper plugin, v0.0.2,
-    http://psi-plus.com/wiki/plugins#history_keeper_plugin
-  * try to fix patch when avatars at right (psi-roster-single-line-status-messages.diff)
-  * many updates for system iconsets
-    (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp, summer-system.jisp)
-  * changed roster toolbar buttons
-  * added delta from default iconset
-  * updated attention plugin to v0.0.7
-  * updated cleaner plugin to v0.2.4
-  + added new iconsets patch (psi-iconsets.diff)
-  - removed useless psiplus.jisp
-  - removed useless crystal_system.jisp
-  * fixed psibuild script with regards to new icons
-    (trunk/scripts/posix/libpsibuild.sh, trunk/scripts/posix/psibuild.sh)
-  * fixed win32 scripts
-  * updated watcher plugin to v0.2.0
-  + added psi-coloring-tooltip.diff
-  + added skins plugin, v0.0.8, http://psi-plus.com/wiki/plugins#skins_plugin
-  * css for whole chat ui (psi-chat-css.diff)
-  + added fix-grepshortcutkeydialog patch (psi-fix-grepshortcutkeydialog.diff)
-  * changed default colors settings for psi-coloring-tooltip.diff
-  + added patch for more compatibility with skinsplugin
-    (psiplus-more-compatibility-with-skinsplugin.diff)
-  * updated conference logger plugin to v0.1.1
-  * fixed psi-iconsets.diff
-  * fixed system iconsets (blacksys.jisp, nuvola-system.jisp, oxygen_sys.jisp, summer-system.jisp)
-  + added mingw32_en.wiki for English-speaking users (thanks to Z_God for translation fixes)
-  * updated autoreply plugin to v0.2.7
-  + add options.ui.contactlist.css option patch (psi-mainwindow-css.diff)
-  * updated extended options plugin to v0.2.2
-  + added css the world (psi-css-style-sheet.diff)
-  * updated stop spam plugin to v0.2.1
-  + added add roster-groups-disable patch. option options.ui.contactlist.enable-groups,
-    (psi-roster-groups-disable.diff)
-  * rewritten patch psi-muc-minimize-to-roster.diff
-  ! updated Qt libs to v4.6.2, http://qt.nokia.com/developer/changes/changes-4.6.2
-  ! updated Psimedia libs to v1.0.3.737, http://delta.affinix.com/svn/trunk/psimedia/
-  ! updated GStreamer to v0.10.28 (thanks to Z_God)
-  ! updated Win32OpenSSL libs to v0.9.8m 0.9.8.13,
-    http://www.slproweb.com/products/Win32OpenSSL.html
-
-
-2010-01-31  zet
-v0.15.1757 Beta
-  * обновлён плагин extended options plugin до версии 0.0.9,
-    http://psi-plus.com/wiki/plugins#extended_options_plugin
-  + добавлен детект jabber-клиента sim (psi-client-icons.diff)
-  + добавлена возможность загрузки/выгрузки плагинов без перезапуска Psi+ (psi-plugins-options.diff)
-  * обновлён плагин stop spam plugin до версии 0.1.7,
-    http://psi-plus.com/wiki/plugins#stop_spam_plugin
-  * обновлён плагин birthday reminder plugin до версии 0.2.0,
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * обновлён плагин attention plugin до версии 0.0.5,
-    http://psi-plus.com/wiki/plugins#attention_plugin
-  + добавлен новый патч psi-add-standard-transports.diff на автоматическое определение иконок для
-    контактов, подключаемых через транспорты
-  * обновлён плагин cleaner plugin до версии 0.1.1,
-    http://psi-plus.com/wiki/plugins#cleaner_plugin
-  * обновлён иконпак для activity (psiplus-activities.jisp)
-  * возвращёно подтверждение на очистку лога конференции (опционально)
-  + добавлен новый патч на показ иконки прослушиваемой музыкальной композиции во всплывающем окне
-    на контакте ростера (psi-tune-icon-in-tooltip.diff)
-  * режим "всё-в-одном": возвращён показ меню View (Вид) (psi-all-in-one-window.diff)
-  * режим "всё-в-одном": исправлено запоминание размера ростера по ширине после рестарта Psi+
-    (psi-all-in-one-window.diff)
-  * обновлён плагин watcher plugin до версии 0.1.2,
-    http://psi-plus.com/wiki/plugins#watcher_plugin
-  * фикс по мотивам задачи http://code.google.com/p/psi-dev/issues/detail?id=247
-  + добавлен новый патч psi-improve-historydlg.diff, добавляющий календарь в окно истории переписки
-    (на основе патча от lexa_), также меняющий расположение фрейма с логом истории и добавляющий
-    форму быстрого поиска по логу переписки (тестовый вариант)
-  * обновлён системный иконпак summer-system.jisp до версии 0.5
-  --
-  * updated extended options plugin to v0.0.9,
-    http://psi-plus.com/wiki/plugins#extended_options_plugin
-  + added sim jabber client detection (psi-client-icons.diff)
-  + try to load-unload plugins without restart Psi+ (psi-plugins-options.diff)
-  * updated stop spam plugin to v0.1.7,
-    http://psi-plus.com/wiki/plugins#stop_spam_plugin
-  * improved psi-access-to-iconfactory-from-plugins.diff - added getIcon() to iconfactoryaccessor
-  * updated birthday reminder plugin to v0.2.0,
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * updated attention plugin to v0.0.5,
-    http://psi-plus.com/wiki/plugins#attention_plugin
-  + added new patch psi-add-standard-transports.diff
-  * updated cleaner plugin to v0.1.1,
-    http://psi-plus.com/wiki/plugins#cleaner_plugin
-  * updated activity iconset (psiplus-activities.jisp)
-  * returned enable/disable to clear log confirmation for muc
-  + added new patch - adds tune icon in tooltip (psi-tune-icon-in-tooltip.diff)
-  * all-in-one: return View menu item back (psi-all-in-one-window.diff)
-  * all-in-one: fix saving/restoring splitter position (psi-all-in-one-window.diff)
-  * updated watcher plugin to v0.1.2,
-    http://psi-plus.com/wiki/plugins#watcher_plugin
-  * fixed http://code.google.com/p/psi-dev/issues/detail?id=247
-  + added new patch psi-improve-historydlg.diff (unfinished), based on patch by lexa_
-  * updated summer-system.jisp to v0.5
-
-
-2010-01-24  zet
-v0.15.1685 Beta
-  + добавлен новый плагин attention plugin (v0.0.3),
-    http://psi-plus.com/wiki/plugins#attention_plugin
-  * обновлены системные иконпаки: добавлены иконки для attention plugin
-    (blacksys.jisp, summer-system.jisp, nuvola-system.jisp)
-  * фикс для accountinfoaccessor (psi-get-account-info-from-plugins.diff) и плагинов
-    (attention plugin, image plugin)
-  * возвращён показ капсов у контактов конференции (psi-temp-show-caps.diff)
-  + добавлен новый плагин extended options plugin (v0.0.8),
-    http://psi-plus.com/wiki/plugins#extended_options_plugin
-  * исправлен системный иконпак (nuvola-system.jisp)
-  + добавлен новый патч для отображения иконок активности (psi-activity-icons.diff)
-  * исправлен иконпак с иконками активности (gajim-activities.jisp)
-  * фикс Issue 225 (psi-muc-notify-highlight.diff)
-  * исправлено определение jabber-бота JuBo (psi-client-icons.diff), спасибо maj
-  * фикс для psi-movable-tabs-qt45-and-custom-style.diff
-  * обновлён birthday reminder plugin до версии 0.1.9,
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * обновлён cleaner plugin до версии 0.1.0,
-    http://psi-plus.com/wiki/plugins#cleaner_plugin
-  + добавлены специфичные иконки в иконпак активности (gajim-activities.jisp)
-  * фикс для диалога выбора определённого пункта активности (psi-activity-icons.diff)
-  * исправлены иконки для прочих активностей (psi-activity-icons.diff)
-  - убран патч psi-chatdlg-copypaste-keypress.diff, т.к. он принят в основную ветвь Psi
-  * исправлен патч psi-configure-hyperlink-color.diff
-  + добавлен новый патч на показ иконок в меню на заголовке аккаунта
-    (psi-more-icons-in-account-menu.diff)
-  + добавлен новый патч на установку оптимального состояния настроек приложения по умолчанию
-    (psi-default-settings.diff)
-  - убран патч psi-optional-confirmation-when-clearing.diff, т.к. он принят в основную ветвь Psi
-  + добавлен новый иконопак активности по умолчанию от tux-den (psiplus-activities.jisp)
-  + добавлены иконки для пустых активностей и настроений (summer-system.jisp), by tux-den
-  * патчи psi-default-account-settings.diff и psi-default-settings.diff объединены в общий патч
-    psi-default-application-settings.diff (умолчальные настройки приложения и аккаунта)
-  + добавлен показ иконок jabber-клиентов во всплывающем окне на контакте ростера
-    (psi-client-icons.diff)
-  + добавлен новый патч для поддержки XEP-0080: User Location в Psi+,
-    http://xmpp.org/extensions/xep-0080.html (psi-geolocation.diff)
-  + в комплект поставки добавлена вторая лицензия для обеспечения наиболее полной совместимости
-    с оригинальным Psi IM (copying-psi.txt)
-  + добавлено определение jabber-бота JuBo, клиентов Jabbroid и Meebo (psi-client-icons.diff)
-  * исправлен детект клиента android (psi-client-icons.diff)
-  * обновлён иконпак с иконками jabber-клиентов (fingerprint.jisp, v0.2.1)
-  * обновлён состав команды Psi+ Dev Team (psiplus-aboutdlg.diff)
-  * обновлены системные иконпаки: добавлены иконки геолокаций, настроений и активностей
-    (blacksys.jisp, crystal_system.jisp, nuvola-system.jisp, summer-system.jisp)
-  ! обновлены библиотеки Qt до версии 4.6.1
-  --
-  + added attention plugin (v0.0.3), http://psi-plus.com/wiki/plugins#attention_plugin
-  * updated system iconsets: added icons for attention plugin
-    (blacksys.jisp, summer-system.jisp, nuvola-system.jisp)
-  * fixed accountinfoaccessor (psi-get-account-info-from-plugins.diff) and plugins
-    (attention plugin, image plugin)
-  * restored show caps version of groupchat contacts (psi-temp-show-caps.diff)
-  + added extended options plugin (v0.0.8),
-    http://psi-plus.com/wiki/plugins#extended_options_plugin
-  * fixed system iconset (nuvola-system.jisp)
-  + added new patch psi-activity-icons.diff
-  * fixed activities iconset (gajim-activities.jisp)
-  * fixed Issue 225 (psi-muc-notify-highlight.diff)
-  * fixed jubo detection (psi-client-icons.diff), thx to maj
-  * fixed psi-movable-tabs-qt45-and-custom-style.diff
-  * updated birthday reminder plugin to v0.1.9,
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * updated cleaner plugin to v0.1.0, http://psi-plus.com/wiki/plugins#cleaner_plugin
-  + added specific activities icons (gajim-activities.jisp)
-  * fixed activitydlg (psi-activity-icons.diff)
-  * fixed icons for other activity (psi-activity-icons.diff)
-  - removed psi-chatdlg-copypaste-keypress.diff -- patch already in upstream
-  * fixed psi-configure-hyperlink-color.diff
-  + added new patch psi-more-icons-in-account-menu.diff
-  * changed some settings (psi-receipts.diff, psi-roster-settings.diff, psi-client-icons.diff
-  + added new patch psi-default-settings.diff
-  - removed psi-optional-confirmation-when-clearing.diff -- patch already in upstream
-  + added new default activities icons from tux-den (psiplus-activities.jisp)
-  + added icons for empty activity and mood (summer-system.jisp), by tux-den
-  * merged psi-default-account-settings.diff with psi-default-settings.diff to
-    psi-default-application-settings.diff
-  + added client icons to tooltip (psi-client-icons.diff)
-  + added new patch psi-geolocation.diff
-  + added second license to be fully compatible with psi (copying-psi.txt)
-  + added JuBo jabber bot detection, Jabbroid client detection, Meebo client detection
-    (psi-client-icons.diff)
-  * fixed android client detection (psi-client-icons.diff)
-  * updated jabber clients iconset (fingerprint.jisp, v0.2.1)
-  * updated psiplus-aboutdlg.diff
-  * updated system iconsets: add geolocation, moods & activity icons
-    (blacksys.jisp, crystal_system.jisp, nuvola-system.jisp, summer-system.jisp)
-  ! updated Qt libs to v4.6.1
-
-
-2010-01-10  zet
-v0.15.1605 Beta
-  + добавлен новый плагин watcherplugin (v0.0.2), подробнее --
-    http://psi-plus.com/wiki/plugins#watcher_plugin
-  * подправлен gmailnotifyplugin, добавлен changelog.txt к плагину (v0.4.2)
-  * обновлён birthdayreminderplugin до версии 0.1.8, подробнее --
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * фикс попытки доступа к отсутствующим опциям (psi-typeahead-find.diff)
-  * фикс для кнопки "Применить" в настройках плагинов (psi-plugins-options.diff)
-  * редизайн настроек плагинов (psi-redesign-plugin-options.diff)
-  + добавлен детект клиента Jabiru (psi-client-icons.diff)
-  * исправлен детект мобильного клиента QIP PDA (psi-client-icons.diff)
-  * обновлён cleanerplugin до версии 0.0.7, подробнее --
-    http://psi-plus.com/wiki/plugins#cleaner_plugin
-  * теперь не показывается пункт меню vCard при клике ПКМ на адресе e-mail в логе конференции
-    (psi-muc-nickclick-chat.diff)
-  + добавлен детект клиента android android.com (psi-client-icons.diff)
-  + добавлен детект клиента Vacuum (psi-client-icons.diff)
-  + попытка детекта клиента Trillian (psi-client-icons.diff)
-  * обновлён иконпак с иконками jabber-клиентов до версии 0.1.9
-  --
-  + added watcherplugin (v0.0.2), http://psi-plus.com/wiki/plugins#watcher_plugin
-  * fixed gmailnotifyplugin, added changelog.txt (v0.4.2)
-  * updated birthdayreminderplugin to v0.1.8,
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * fixed accessing missing option (psi-typeahead-find.diff)
-  * fixed apply button in plugins (psi-plugins-options.diff)
-  * redesign plugins options (psi-redesign-plugin-options.diff)
-  * small improvements for plugins options (psi-plugins-options.diff,
-    psi-redesign-plugin-options.diff)
-  + added Jabiru client detection (psi-client-icons.diff)
-  * fixed QIP PDA detection (psi-client-icons.diff)
-  * updated cleanerplugin to v0.0.7, http://psi-plus.com/wiki/plugins#cleaner_plugin
-  * do not show vcard menu item on mailto links (psi-muc-nickclick-chat.diff)
-  + added android (android.com) client detection (psi-client-icons.diff)
-  + added Vacuum client detection (psi-client-icons.diff)
-  + try to Trillian client detection (psi-client-icons.diff)
-  * updated iconset with jabber client icons (fingerprint.jisp) to v0.1.9
-
-
-2010-01-04  zet
-v0.15.1575 Beta
-  * поправлен патч psi-movable-tabs-qt45-and-custom-style.diff
-  * поправлены скрипты (trunk/scripts/posix/deploy, trunk/scripts/posix/libpsibuild.sh)
-  * улучшен activetabaccessor (psi-getyourjid-for-activetab-from-plugins.diff)
-  * фиксы для патчей psi-access-to-activetab-from-plugins.diff,
-    psi-access-to-applicationinfo-from-plugins.diff и psi-get-account-info-from-plugins.diff
-  * порция исправлений для патчей psi-user-activity.diff, psi-contact-manager.diff и
-    psi-account-menu-privacy-item.diff
-  + добавлены ростерный иконпак Lamps.jisp от Disabler (trunk/iconsets/roster/Lamps.jisp)
-  + добавлена возможность выводить плагинную кнопку-действие на панель инструментов
-    (psi-add-toolbar-button-from-plugins.diff)
-  + добавлен смайлпак Android.jisp из состава Android SDK (trunk/iconsets/emoticons/Android.jisp)
-  * обновлён системный иконпак blacksys.jisp (trunk/iconsets/system/blacksys.jisp)
-  + добавлен скрипт для сборки debug-версии Psi+ под win32
-    (trunk/scripts/win32/make-debug-paused.cmd)
-  * обновлены системные иконпаки crystal_system.jisp, nuvola-system.jisp и summer-system.jisp
-  + добавлен патч для вывода всплывающей подсказки при наведении указателя мыши на иконку Psi+ в трее
-    (psi-improve-tray-tooltip.diff)
-  + добавлен новый плагин Image Plugin (текущая версия - 0.0.4), подробнее -- 
-    http://psi-plus.com/wiki/plugins#image_plugin
-  * обновлён Conference Logger Plugin до версии 0.1.0, подробнее -- 
-    http://psi-plus.com/wiki/plugins#conference_logger_plugin
-  + добавлена возможность выводить всплывающие окна при работе плагинов
-    (psi-add-access-to-popups-from-plugins.diff)
-  * теперь плагины в опциях отсортированы в алфавитном порядке (psi-plugins-options.diff)
-  + добавлен новый плагин ICQ Must Die Plugin (текущая версия - 0.0.3), подробнее -- 
-    http://psi-plus.com/wiki/plugins#icq_must_die_plugin
-  * обновлён Screenshot Plugin до версии 0.2.2, подробнее -- 
-    http://psi-plus.com/wiki/plugins#screenshot_plugin
-  + добавлен новый плагин Cleaner Plugin (текущая версия - 0.0.6), подробнее -- 
-    http://psi-plus.com/wiki/plugins#cleaner_plugin
-  + добавлен патч на расширение функционала формы приёма/передачи файлов (двойной щелчок на
-    принятом/переданном файле вызывает связанное с ним приложение, а также изображение иконок для
-    принятых/переданных файлов) - (psi-improve-filetransfer-dialog.diff)
-  * модифицирован интерфейс настроек плагинов (psi-plugins-options.diff)
-  * обновлён Gmailnotify Plugin до версии 0.4.0
-  * обновлён Birthday Reminder Plugin до версии 0.1.7, подробнее -- 
-    http://psi-plus.com/wiki/plugins#birthday_reminder_plugin
-  * обновлён Stop Spam Plugin до версии 0.1.6, подробнее -- 
-    http://psi-plus.com/wiki/plugins#stop_spam_plugin
-  ! обновлены системные библиотеки Qt, версия проименована как 4.6.0M (пропатченная версия Qt 4.6.0
-    патчем http://qt.gitorious.org/qt/qt/commit/ddf34f3)
-  --
-  * fixed psi-movable-tabs-qt45-and-custom-style.diff
-  * fixed scripts (trunk/scripts/posix/deploy, trunk/scripts/posix/libpsibuild.sh)
-  * improve activetabaccessor (psi-getyourjid-for-activetab-from-plugins.diff)
-  * fixed psi-access-to-activetab-from-plugins.diff,
-    psi-access-to-applicationinfo-from-plugins.diff, psi-get-account-info-from-plugins.diff
-  * fixed spatch function (deploy, deploy.win, libpsibuild.sh)
-  * fixed patches (psi-user-activity.diff, psi-contact-manager.diff,
-    psi-account-menu-privacy-item.diff)
-  + added Lamps.jisp roster icons by Disabler (trunk/iconsets/roster/Lamps.jisp)
-  + added ability to add toolbar button from plugins (psi-add-toolbar-button-from-plugins.diff)
-  + added Android.jisp smilepack from Android SDK (trunk/iconsets/emoticons/Android.jisp)
-  * updated blacksys.jisp (trunk/iconsets/system/blacksys.jisp)
-  + added make-debug-paused.cmd script (trunk/scripts/win32/make-debug-paused.cmd)
-  * updated system iconsets (crystal_system.jisp, nuvola-system.jisp, summer-system.jisp)
-  + added traytooltip patch (psi-improve-tray-tooltip.diff)
-  + added imageplugin (current version is 0.0.4)
-    (http://psi-plus.com/wiki/plugins#image_plugin)
-  * updated conferenceloggerplugin to v0.1.0
-    (http://psi-plus.com/wiki/plugins#conference_logger_plugin)
-  * fixed psi-add-toolbar-button-from-plugins.diff
-  + added ability to show popups from plugins (psi-add-access-to-popups-from-plugins.diff)
-  * some fixes for plugins (autoreplyplugin, stopspamplugin)
-  * plugins in alphabetical order (psi-plugins-options.diff)
-  + added icqdieplugin (current version is 0.0.3)
-    (http://psi-plus.com/wiki/plugins#icq_must_die_plugin)
-  * updated screenshotplugin to v0.2.2
-    (http://psi-plus.com/wiki/plugins#screenshot_plugin)
-  + added cleanerplugin (current version is 0.0.6)
-    (http://psi-plus.com/wiki/plugins#cleaner_plugin)
-  + added improve filetransfer dialog patch (psi-improve-filetransfer-dialog.diff)
-  * psibuild: fix install patch
-  * modify options interface (psi-plugins-options.diff)
-  * updated gmailnotifyplugin to v0.4.0
-  * updated birthdayreminderplugin to v0.1.7
-    (http://psi-plus.com/wiki/plugins#birthday_reminder_plugin)
-  * updated stopspamplugin to v0.1.6
-    (http://psi-plus.com/wiki/plugins#stop_spam_plugin)
-  ! updated Qt libs to v4.6.0M (included patch from http://qt.gitorious.org/qt/qt/commit/ddf34f3)
-
-
-2009-12-06  zet
-v0.14.1444 Release
-  * обновлён список участников проекта (psiplus-aboutdlg.diff)
-  * обновлён conferenceloggerplugin до версии 0.0.7, подробнее -- 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/conferenceloggerplugin/changelog.txt
-  * фиксы и улучшения для плагинной системы
-  * обновлён birthdayreminderplugin до версии 0.1.1, подробнее -- 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/birthdayreminderplugin/changelog.txt
-  * обновлён stopspamplugin до версии 0.1.0, подробнее -- 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/stopspamplugin/changelog.txt
-  * обновлена страница о плагинах в Wiki (plugins.wiki)
-  * исправления в activetab accessor для режима "всё-в-одном"
-  * обновлён juickplugin до версии 0.9.9, подробнее -- 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/juickplugin/changelog.txt
-  ! обновлены системные библиотеки Qt до версии 4.6.0
-  ! MS Installer: в комплект поставки теперь входят библиотеки PsiMedia версии 1.0.3, подробнее -- 
-    http://delta.affinix.com/psimedia/
-  ! обновлена русская локализация (psi-ru svn, r155, 2009-12-06)
-  ! Psi+ 0.14 -- релизная версия! :)
-  --
-  + fix plugins qcm name (added psi-plugins-qcm-fix.diff)
-  * autodownload libpsibuild (trunk/scripts/posix/psibuild.sh)
-  * no seds for plugins anymore (psi-plugins-qcm-fix.diff)
-  * updated win32 scripts (no seds for plugins anymore)
-  - remove sed plugins from nix scripts
-  * updated psiplus-aboutdlg.diff
-  * fixed QCONF path in debian/rules (psi-debianize.diff)
-  * PKGBUILD: some improvements (trunk/scripts/posix/PKGBUILD)
-  * libpsibuild: fix git submodule update (trunk/scripts/posix/libpsibuild.sh)
-  * updated conferenceloggerplugin to v0.0.7
-  * improved psi-get-account-info-from-plugins.diff
-  * updated birthdayreminderplugin to v0.1.1
-  * updated stopspamplugin to v0.1.0
-  * updated plugins.wiki
-  * small fix in libpsibuild for git archive (trunk/scripts/posix/libpsibuild.sh)
-  * fixed activetab accessor in all-in-onee-window mode
-  * updated juickplugin to v0.9.9
-  ! updated qt libs to v4.6.0
-  ! MS Installer: added PsiMedia 1.0.3 libs, http://delta.affinix.com/psimedia/
-  ! updated russian localization (psi-ru svn, r155, 2009-12-06)
-  ! Psi+ 0.14 released! :)
-
-
-2009-11-22  zet
-v0.14.1382 Beta
-  + добавлен патч на исправление сломанных оф.разработчиками капсов (psi-temp-show-caps.diff)
-  * обновлён список участников проекта (psiplus-aboutdlg.diff)
-  * возвращены капсы Psi+ (psiplus-application-info.diff)
-  * фикс для вызова контекстного меню по клику на нике в логе конференции
-    (psi-muc-nickclick-chat.diff)
-  + добавлено определение клиента pidgin (psi-client-icons.diff)
-  + добавлено определение клиента telepathy (psi-client-icons.diff)
-  + добавлен новый тулбар для поиска в логе чата/конференции (by machekku, mpk)
-    (psi-typeahead-find.diff)
-  * обновлён autoreplyplugin до версии 0.2.3, подробнее - 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/autoreplyplugin/changelog.txt
-  * обновлён birthdayreminderplugin до версии 0.0.8, подробнее - 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/birthdayreminderplugin/changelog.txt
-  * обновлён stopspamplugin до версии 0.0.8, подробнее - 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/stopspamplugin/changelog.txt
-  * обновлены инструкции по сборке Psi+ под различные ОС, подробнее - 
-    http://code.google.com/p/psi-dev/wiki/main?tm=6
-  ! обновлены Win32 OpenSSL Libs до версии 0.9.8l (L) 0.9.8.12
-  ! MS Installer: в комплект поставки включен совмещённый русский+английский словарь (два в одном)
-  --
-  + added psi-temp-show-caps.diff
-  * PKGBUILD: remove debug files from package (trunk/scripts/posix/PKGBUILD)
-  * fix escaping order (psi-muc-nickclick-chat.diff)
-  * updated psiplus-aboutdlg.diff
-  * restored psiplus-application-info.diff (psi+ caps)
-  * try to fix context menu on nicknames in chatlog (psi-muc-nickclick-chat.diff)
-  + make libpsibuild (trunk/scripts/posix/libpsibuild.sh
-  * improved scripts (trunk/scripts/posix/libpsibuild.sh, trunk/scripts/posix/psibuild.sh)
-  + added pidgin detection (psi-client-icons.diff)
-  + added telepathy detection (psi-client-icons.diff)
-  + added typeahead find toolbar by machekku, mpk (psi-typeahead-find.diff)
-  * renamed activeElement to textWidget (psi-typeahead-find.diff)
-  * fixed sed (trunk/scripts/posix/libpsibuild.sh)
-  * updated autoreplyplugin to v0.2.3
-  * updated stopspamplugin to v0.0.8
-  * removed debug binary from package (psi-debianize.diff)
-  * updated birthdayreminderplugin to v0.0.8
-  * updated build instructions for some OS, see at Psi+ Wiki - 
-    http://code.google.com/p/psi-dev/wiki/main?tm=6
-  ! updated Win32 OpenSSL Libs to v0.9.8l (L) 0.9.8.12
-  ! MS Installer: added aspell data and russian+english (2 in 1) dictionary
-
-
-2009-11-08  zet
-v0.14.1318 Beta
-  * psi-all-in-one-window.diff: добавлена опция "ростер слева для режима всё-в-одном"
-    (options.ui.contactlist.roster-at-left-when-all-in-one-window)
-  * исправлено поведение при клике по нелатинским никам в логе конференции
-    (psi-muc-nickclick-chat.diff)
-  + добавлен патч psi-get-account-info-from-plugins.diff
-  * psi-all-in-one-window.diff: хак для показа панели "Контакты" вверху ростера
-  * psi-typed-history.diff: не очищать последний набранный текст при пролистывании истории из ранее
-    введённых сообщений
-  + добавлен патч psi-muc-nicklist-at-left.diff на опциональное переключение отображения ростера
-    конференции с левой стороны
-  - убран ненужный смайлпак QIP_emoticons.jisp
-  + добавлен ростерный иконпак roster/blackroster.jisp
-  + добавлен системный иконпак system/blacksys.jisp
-  * обновлён autoreplyplugin до версии 0.2.1, подробнее - 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/autoreplyplugin/changelog.txt
-  * инструменты qconf и configure работают теперь и при сборке Psi+ в MS Windows
-  * обновлён juickplugin до версии 0.9.8, подробнее - 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/juickplugin/changelog.txt
-  + добавлен conferenceloggerplugin (текущая версия 0.0.2), подробнее - 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/conferenceloggerplugin/changelog.txt
-  - убран ненужный более сериал (trunk/patches/series.txt)
-  + добавлен birthdayreminderplugin (текущая версия 0.0.2), подробнее - 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/birthdayreminderplugin/changelog.txt
-  + добавлен stopspamplugin (текущая версия 0.0.7), подробнее - 
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/stopspamplugin/changelog.txt
-  * поправлен патч psi-entity-time.diff
-  * обновлён патч psi-dirty-check.diff (QDChecker::downloadPageUrl)
-  ! в инсталлер добавлена новая библиотека aspell.dll (v0.60)
-  --
-  * psi-all-in-one-window.diff: add 'options.ui.contactlist.roster-at-left-when-all-in-one-window'
-    option
-  * fix click on non-latin nicknames (psi-muc-nickclick-chat.diff)
-  + added psiplus-os-hide.diff for app and os versions hide (by Xorg)
-  + added psi-get-account-info-from-plugins.diff
-  * psi-all-in-one-window.diff: quick and dirty hack to show 'Contacts' toolbar at top
-  * PKGBUILD: small improvements (trunk/scripts/posix/PKGBUILD)
-  * psi-typed-history.diff: don't clear last typed text during travelling message history
-  + added psi-img-src-file-and-data-protos.diff
-  + psi-muc-nicklist-at-left.diff: option to have nicklist at left in muc
-  - removed useless QIP_emoticons.jisp
-  * added debug option into deploy script (trunk/scripts/posix/deploy)
-  + added roster/blackroster.jisp
-  + added system/blacksys.jisp
-  * juickplugin: fixed # in juick@conference.jabber.ru
-  * updated autoreplyplugin to v0.2.1, see at
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/autoreplyplugin/changelog.txt
-  + added deploy for windows (trunk/scripts/posix/deploy.win)
-  * qconf and configure works now and on windows too
-  * disable conf_windows.pri if conf.pri exists
-  * update juickplugin to v0.9.8, see at
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/juickplugin/changelog.txt
-  * win qconf working ssl
-  * updated win32 scripts (qconf) (trunk/scripts/win32/make.cmd, make-paused.cmd)
-  + added conferenceloggerplugin, v0.0.2 see at
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/conferenceloggerplugin/changelog.txt
-  * updated win32 scripts: make.cmd make-paused.cmd, make-webkit-paused.cmd (--enable-plugins)
-  * a bit improved psibuild.sh (trunk/scripts/posix/psibuild.sh)
-  - deleted trunk/patches/series.txt
-  + addeed birthdayreminderplugin, v0.0.2 see at
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/birthdayreminderplugin/changelog.txt
-  + added stopspamplugin, v0.0.7, see at
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/stopspamplugin/changelog.txt
-  * updated win32 scripts (--with-aspell-inc=c:\MinGW\include --with-aspell-lib=c:\MinGW\lib)
-  * updated blacksys.jisp
-  * psibuild-deb.sh: now builds all plugins from psiplus svn (trunk/scripts/posix/psibuild-deb.sh)
-  * fixed psi-entity-time.diff
-  * updated psi-dirty-check.diff (QDChecker::downloadPageUrl)
-  * fixed deploy (trunk/scripts/posix/deploy)
-  ! added new library aspell.dll (v0.60) into installer
-
-
-2009-10-18  zet
-v0.14.1178 Beta
-  * psi-send-button-context-menu.diff: исправлены ошибки компиляции для MSVS2005
-  + добавлен новый скрипт для bsd-систем. спасибо Shura0 (trunk/scripts/posix/psibuild.bsd)
-  * фикс отправки шаблонов в конференциях (psi-send-button-context-menu.diff,
-    psi-muc-bookmark-toolbar-button.diff)
-  * фикс отправки шаблонов в чатах (psi-send-button-context-menu.diff)
-  * исправлено определение mrim-контактов (psi-client-icons.diff)
-  + добавлен патч на подмену версии клиента/платформы/капсов
-    (psi-application-info-and-sysinfo-from-opts.diff), от oxpa
-  * исправление нулевого указателя внутри конструктора PsiToolBar (psi-all-in-one-window.diff)
-  - убран устаревший иконсет mailru.jisp (trunk/iconsets/roster/mailru.jisp)
-  * обновлён патч psi-application-info-and-sysinfo-from-opts.diff (не требуется перезагрузка Psi+,
-    версия ОС после очистки соответствующих полей возвращается к исходному значению), от oxpa
-  * исправлено предупреждение при компиляции для psi-nix-audacious.diff
-  * обновлён патч about-psi-plus.diff (добавлены/убраны некоторые участники проекта)
-  + добавлен патч psi-plugins-fix-string-warnings.diff
-  + добавлен общий FAQ (для пользователей различных ОС), http://code.google.com/p/psi-dev/wiki/FAQ
-  * обновлены скрипты psibuild-deb.sh, psibuild-tar.sh, psibuild.bsd, psibuild.sh
-  + добавлен смайлпак lgs_15x15.jisp от lgs (trunk/iconsets/emoticons/lgs_15x15.jisp)
-  * убрана очистка истории введённых сообщений при очистке окна чата (psi-typed-history.diff)
-  + добавлена "родная" поддержка перемещения табов в Qt 4.5 (скольжение по таббару)
-    (psi-movable-tabs-qt45-and-custom-style.diff)
-  + добавлен отдельный патч на добавление кнопок управления окном для различных форм
-    (psi-customize-dialogs-title-hint.diff)
-  * установка правильного набора флагов окна для некоторых диалогов
-    (psi-customize-dialogs-title-hint.diff)
-  + добавлена кнопка "закрыть" для табов (psi-movable-tabs-qt45-and-custom-style.diff)
-  + добавлен патч на вызов Privacy Lists из контекстного меню в заголовке аккаунта
-    (psi-account-menu-privacy-item.diff)
-  * добавлены кнопки управления окном для формы Privacy (psi-customize-dialogs-title-hint.diff)
-  * закрытие табов по нажатию средней кнопки мыши (psi-movable-tabs-qt45-and-custom-style.diff)
-  + добавлен патч на исправление загрузки локализации при смене профиля psi-fix-lang-detect.diff от
-    mblsha 
-  * фикс локализации для screenshotplugin, обновлена версия плагина до 1.3
-  + добавлена опция в настройках (вкладка Groupchat) для "hash coloring"
-    (psi-muc-nick-hash-color.diff)
-  - патч psi-fix-lang-detect.diff в upstream
-  * добавлена команда сворачивания в ростер headlines-сообщений по нажатию кнопки Esc
-    (psi-muc-minimize-to-roster.diff)
-  * фикс http://code.google.com/p/psi-dev/issues/detail?id=152
-    (psi-movable-tabs-qt45-and-custom-style.diff)
-  * обновлён смайлпак mra_set03.jisp до версии 0.4 (trunk/iconsets/emoticons/mra_set03.jisp)
-  * фиксы компиляции на Qt < 4.5.0 для psi-customize-dialogs-title-hint.diff
-  * обновлён 050-psi-muc-topic.diff (готов для передачи в upstream)
-  + добавлен плагин-автоответчик (autoreplyplugin), текущая версия 0.0.8, от Dealer_WeARE:
-    + добавлена поддержка списка исключений. если в список добавить jid конференции, то все
-      приватные сообщения от пользователей конференции также окажутся в списке исключений
-    + добавлена возможность задавать количество посылок автоответов
-    ПРИМЕЧАНИЕ: в текущей реализации не поддерживается работа с сервером GMail. это происходит из-за
-      того, что статус аккаунта плагин определяет по приходящим ему от сервера презенсам. А GMail(и,
-      возможно, другие сервера, построенные не на ejabberd2) не шлют этого презенса
-    + добавлена возможность отключения автоответчика для активной закладки
-    * снижена вероятность ложных срабатываний
-    + в настройки плагина по умолчанию добавлены juick и конференция psi-dev@conference.jabber.ru
-      (Примечание: не забудьте добавить в исключения других ботов!)
-    * исправлены некоторые проблемы с опциями
-    http://psi-plus.com/wiki/plugins#autoreply_plugin
-  * патчи, специфичные для Psi+, переименованы с соответствующим префиксом "psiplus"
-  * фикс компиляции на Qt 4.4.3 для psi-movable-tabs-qt45-and-custom-style.diff
-  * обновлён PKGBUILD
-  * исправлена компиляция в ОС Solaris для psi-receipts.diff
-  * фиксы работы табов и кнопки "закрыть" (psi-movable-tabs-qt45-and-custom-style.diff)
-  * смена расположения кнопок управления в форме поиска в конференции
-    (psi-customize-dialogs-title-hint.diff, psi-muc-finddlg-swap-buttons.diff)
-  + добавлен новый патч для парсинга графики в чатах (psi-img-src-data.diff)
-  * обновлён juickplugin до версии 0.9.2, подробности в
-    http://psi-dev.googlecode.com/svn/trunk/plugins/generic/juickplugin/changelog.txt
-  * фикс кодирования данных для psi-img-src-data.diff
-  * исправления для перемещаемых табов (psi-movable-tabs-qt45-and-custom-style.diff)
-  ! обновлена русская локализация (2009-10-10)
-  ! обновлена версия Qt до 4.5.3
-  --
-  * fixed typos in psibuild-deb.sh (trunk/scripts/posix/psibuild-deb.sh)
-  * psi-send-button-context-menu.diff: fixed build errors on win32 platform with MSVS2005
-  + added new bsd script. thanks to Shura0 (trunk/scripts/posix/psibuild.bsd)
-  * psi-send-button-context-menu.diff, psi-muc-bookmark-toolbar-button.diff: fix sending templates
-  * fix sending chat templates (psi-send-button-context-menu.diff)
-  * PKGBUILD: improving and cleaning up build code (trunk/scripts/posix/PKGBUILD)
-  * fixed mrim detection (psi-client-icons.diff)
-  * PKGBUILD: fix patching of version
-  * PKGBUILD: fix program version detection
-  + added ready for use psi-application-info-and-sysinfo-from-opts.diff (by oxpa)
-  * psi-all-in-one-window.diff: fix NULL pointer assertion inside PsiToolBar constructor
-  - removed ugly roster iconset mailru.jisp (trunk/iconsets/roster/mailru.jisp)
-  * updated psi-application-info-and-sysinfo-from-opts.diff (no need to restart the client, OS
-    version after clearing the options back to the original) -- by oxpa
-  * basizm in scripts - not work whis /bin/sh (psibuild-deb.sh, psibuild-tar.sh)
-  * fixed warning for psi-nix-audacious.diff
-  * updated about-psi-plus.diff (added/removed project members)
-  + added fix string warning patch (psi-plugins-fix-string-warnings.diff)
-  * PKGBUILD: add flag for using crash dialog
-  * some fixes for src/libpsi/tools (trunk/scripts/posix/psibuild-deb.sh)
-  + added FAQ.wiki (not for only windows users), http://code.google.com/p/psi-dev/wiki/FAQ
-  * fixed typos in some scripts (psibuild-deb.sh, psibuild-tar.sh, psibuild.bsd, psibuild.sh)
-  + added emoticons/lgs_15x15.jisp by lgs (trunk/iconsets/emoticons/lgs_15x15.jisp)
-  * fixed deploy script to make more consistent diffs (trunk/scripts/posix/deploy)
-  * avoid clearing message history after clearing chat window (psi-typed-history.diff)
-  + supports for native tabs moving in qt 4.5 (sliding along tabbar;)
-    (psi-movable-tabs-qt45-and-custom-style.diff)
-  + customized vcard dialog title hints (psi-customize-dialogs-title-hint.diff)
-  * set correct window flags for some dialogs (psi-customize-dialogs-title-hint.diff)
-  * more translatable for psi-contact-manager.diff
-  + added "close" button for tabs (psi-movable-tabs-qt45-and-custom-style.diff)
-  + adding psi-account-menu-privacy-item.diff
-  * psi-customize-dialogs-title-hint.diff: set title hint for privacy dialog
-  * closing tabs on middle button release (psi-movable-tabs-qt45-and-custom-style.diff)
-  * once again small fix on middle button release (psi-movable-tabs-qt45-and-custom-style.diff)
-  + added psi-fix-lang-detect.diff by mblsha 
-  * more translatable for screenshotplugin, updated version to 1.3
-  + added checkbox for hash coloring (psi-muc-nick-hash-color.diff)
-  * psi-customize-dialogs-title-hint.diff: set window flags for some dialogs
-  - psi-fix-lang-detect.diff in upstream
-  * hide for eventdlg in headlines (psi-muc-minimize-to-roster.diff)
-  * psi-customize-dialogs-title-hint.diff: set window flags for options dialog
-  * psi-account-menu-privacy-item.diff: renamed to Privacy Lists
-  * fixed is#152 (psi-movable-tabs-qt45-and-custom-style.diff)
-  * updated emoticons mra_set03.jisp to v0.4 (trunk/iconsets/emoticons/mra_set03.jisp)
-  * psi-customize-dialogs-title-hint.diff: add preprocessor wrappers for qt < 4.5.0
-  * updated 050-psi-muc-topic.diff
-  + autoreplyplugin: added exclusion by jid's, v0.0.3, still unstable (by Dealer_WeARE),
-    http://psi-plus.com/wiki/plugins#autoreply_plugin
-  * renamed 'psiplus' marked patches
-  * psi-movable-tabs-qt45-and-custom-style.diff: fixed qt443 compilation
-  + autoreplyplugin: added ability to set number of auto messages sent (GMail is not supported...
-    yet...), started changelog.txt, v0.0.6 (by Dealer_WeARE)
-  * updated faq.wiki: Ответ 9.2: Rhythmbox: http://sites.google.com/site/thesomeprojects/main-1/home 
-  * PKGBUILD: handle webkit configuration properly
-  * fixed psi-receipts.diff on solaris
-  * PKGBUILD: fixes and optimization
-  * some fixes for tabs and close buttons (psi-movable-tabs-qt45-and-custom-style.diff)
-  * updated autoreplyplugin, v0.0.7 (by Dealer_WeARE):
-      added exclusion for juick@juick.com and psi-dev@c.j.ru
-      disabled autoreply for active tab
-      reduced the probability of false auto messages
-  * autoreplyplugin: fixed conflicts with juickplugin, v0.0.8 (by Dealer_WeARE)
-  * customize muc find dialog (psi-customize-dialogs-title-hint.diff,
-    psi-muc-finddlg-swap-buttons.diff)
-  + added new patch for parsing embed data in img src (psi-img-src-data.diff)
-  * updated juickplugin to v0.9.2, see changelog
-  * handle percent encoded data as well (psi-img-src-data.diff)
-  * some more fixes for movable tabs (psi-movable-tabs-qt45-and-custom-style.diff)
-  ! updated russian localization (2009-10-10)
-  ! updated Qt to v4.5.3
-
-
-2009-09-20  zet
-v0.14.1008 Beta
-  * поправлены скрипты psibuild-deb.sh, deploy, psibuild.sh
-  * MUC: переписан патч для топика конференции (psi-muc-topic.diff, psi-receipts.diff,
-    psi-send-button-context-menu.diff)
-  * MUC: исправлено отображение ника автора топика (psi-muc-topic.diff)
-  * MUC: настройка цвета текста для статусного сообщения. отключен курсив для статусного сообщения
-    (psi-muc-topic.diff, psi-add-options-color-highlighting.diff)
-  + PLUG: добавлена опция ВКЛ/ВЫКЛ для нотификаций о новых письмах 'notification on/off'
-    (gmailnotifyplugin, версия 0.3.8)
-  * MUC: возможность смены цвета шрифта топика (psi-muc-topic.diff)
-  * исправления для src/libpsi в psibuild-tar.sh
-  + добавлен патч на добавление команды удалённого управления для выхода Psi+ из конференции(й)
-    (added psi-adhoc-leave-muc.diff)
-  - отключен нестабильный патч psi-autojoin-dialog-tab-autofoucus-off.diff (перемещён в /dev)
-  * сохранён старый скрипт PKGBUILD и добавлен новый скрипт PKGBUILD
-    (trunk/scripts/posix/PKGBUILD, trunk/scripts/posix/PKGBUILD.old)
-  * исправлена опечатка в psi-adhoc-leave-muc.diff ('Leave all conferenceS')
-  * PKGBUILD: исправлено присвоение имени ОС для пакета в процессе сборки
-  * PKGBUILD: исправление для сборки плагинов (использование qconf)
-  * PKGBUILD: исправлены зависимости в пакете, добавлены некоторые опции для самостоятельных сборок
-  * мелкий фикс для psi-adhoc-leave-muc.diff ('Leave All Conferences')
-  * важное исправление для psi-typed-history.diff: теперь корректно обрабатываются сообщения из
-    истории ввода, содержащие <b></b>-коды (спасибо RomanU)
-  ! MS Installer: улучшена работа с реестром при установке/удалении/обновлении приложения
-    (HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Psi+
-      DisplayVersion
-      HelpLink
-      Publisher
-      URLInfoAbout)
-  --
-  * src/libpsi submodule export fix (psibuild-deb.sh)
-  * MUC: reworked muc topic (psi-muc-topic.diff, psi-receipts.diff, psi-send-button-context-menu.diff)
-  * fixed some posix scripts (deploy, psibuild.sh)
-  * MUC: fix nick in topic (psi-muc-topic.diff)
-  * fixed submodule export src/libpsi/tools/zip and src/libpsi/tools/idle (psibuild-deb.sh)
-  * MUC: disabled body for topic. other font (psi-muc-topic.diff)
-  * MUC: color setting for additional text. removed italic
-    (psi-muc-topic.diff, psi-add-options-color-highlighting.diff)
-  + PLUG: added option 'notification on/off' (gmailnotifyplugin, v0.3.8)
-  * MUC: improved muc topic patch (psi-muc-topic.diff)
-  * MUC: changed default color (psi-muc-topic.diff)
-  * MUC: improved topic (psi-muc-topic.diff)
-  * fix src/libpsi in psibuild-tar.sh
-  + added psi-adhoc-leave-muc.diff
-  - disable buggy psi-autojoin-dialog-tab-autofoucus-off.diff
-  * save old PKGBUILD and upload new (trunk/scripts/posix/PKGBUILD, trunk/scripts/posix/PKGBUILD.old)
-  * typo in psi-adhoc-leave-muc.diff ('Leave all conferenceS')
-  * PKGBUILD: fix os name for package during build process
-  * PKGBUILD: fix plugins build; using qconf
-  * PKGBUILD: fix package dependences; provide some settings for custom building
-  * fixed psi-adhoc-leave-muc.diff
-  * fixed psi-typed-history.diff - correct parsing for messages with <b></b> codes (thx to RomanU)
-  ! MS Installer: improved add/remove/modify operations with registry
-    (HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Psi+
-      DisplayVersion
-      HelpLink
-      Publisher
-      URLInfoAbout)
-
-
-2009-08-24  zet
-v0.14.956 Beta
-  * фиксы размеров фото в vCard (psi-vcard-photo-addons.diff)
-  * улучшения в форме vCard (psi-vcard-photo-addons.diff, psi-vcard-more-fields-and-buttons.diff)
-  + добавлена обработка css для чатов (psi-chat-css.diff)
-  * обновлены win32-скрипты после тестов на MS Windows 7 RC (make-paused.cmd, make.cmd)
-  + добавлен патч на изменение некоторых иконок (psi-change-some-icons.diff)
-  * обновлён патч psi-avcalls-addons.diff
-  * vCard: фикс цвета фона для поля с датой рождения (psi-vcard-more-fields-and-buttons.diff)
-  * PLUG: обновлён translateplugin до версии 0.3.0
-  * переписан патч psi-vcard-more-fields-and-buttons.diff
-  * vCard: фиксы для Джастина (psi-vcard-photo-addons.diff, psi-vcard-more-fields-and-buttons.diff)
-  * подправлен патч psi-change-some-icons.diff на предмет вывода иконок для аудио/видео-звонков
-  + новый виджет для некоторых полей (psi-lineedit-with-action-widget.diff) -- не завершён
-  + добавлен новый системный иконпак от maj (summer-system.jisp, v0.1)
-  * обновлён psiplus.jisp до версии 0.3.13
-  * фикс в патче psi-all-in-one-window.diff. специально для Nirdosh
-  + PLUG: добавлен патч psi-access-to-applicationinfo-from-plugins.diff
-  + форма vCard теперь поддерживает новый виджет (psi-lineedit-with-action-widget.diff,
-    psi-vcard-more-fields-and-buttons.diff)
-  * обновлена avcalls.wiki (на jabber.ru появился собственный stun-сервер: " stun.jabber.ru:5249 ")
-  + добавлен иконпак для activities (спасибо Gajim) -- задел на будущеее. пока не работает.
-  + добавлены билды для Alt Linux на страницу скачивания (спасибо Arc)
-  + добавлен иконпак для ростера dictionary_es.jisp
-  * некоторые обновления для нового виджета (psi-lineedit-with-action-widget.diff,
-    psi-vcard-more-fields-and-buttons.diff, psi-muc-bookmark-toolbar-button.diff)
-  ! MUC: патч psi-muc-user-count.diff принят в основную ветку Psi
-  ! немного перереботанный патч psi-chat-nick-colors.diff принят в основную ветку Psi
-  * MUC: небольшие фиксы патча psi-muc-nick-hash-color.diff
-  * фикс расположения опций в патче psi-add-options-color-highlighting.diff
-  * обновлён патч psi-xmpp-uri-in-chat-mode.diff
-  + правильное вычисление высоты для ActionLineEdit в Qt 4.5. Всё ещё сломано в Qt 4.4
-    (psi-lineedit-with-action-widget.diff)
-  * фиксы метки имени в патче psi-add-options-color-highlighting.diff
-  * MUC: исправлена работа с кнопкой bookmark в контекстном меню
-  ! патч psi-idle-mcmd-command.diff принят в основную ветку Psi
-  * MUC: фиксы при редактировании "быстрых" закладок (psi-muc-bookmark-toolbar-button.diff)
-  * исправлен краш http://code.google.com/p/psi-dev/issues/detail?id=137 в патче
-    psi-vcard-photo-addons.diff)
-  * исправления в патче psi-vcard-more-fields-and-buttons.diff
-  * фиксы в патчах psi-lineedit-with-action-widget.diff, psi-vcard-more-fields-and-buttons.diff и
-    psi-muc-bookmark-toolbar-button.diff
-  * обновлён fingerprint.jisp до версии 0.1.7
-  + добавлено определение клиента Isida-bot от Disabler (psi-client-icons.diff)
-  * vCard: небольшие графические улучшения, группировка полей vCard в патче
-    psi-vcard-more-fields-and-buttons.diff
-  ! патчи psi-lineedit-with-action-widget.diff, psi-vcard-photo-addons.diff и
-    psi-vcard-more-fields-and-buttons.diff приняты в основную ветку Psi
-  * автокомпиляция всех плагинов, фикс копирования ресурсов в патче psi-debianize.diff
-  * автокомпиляция qconf, фиксы под обновлённый патч psi-debianize.diff
-    (trunk/scripts/posix/psibuild-deb.sh)
-  * PLUG: обновлён juickplugin до версии 0.7.1, подробнее в juickplugin/changelog.txt
-  --
-  * fixed vcard photo sizes on dialog init (psi-vcard-photo-addons.diff)
-  * some vcard improvements (psi-vcard-photo-addons.diff, psi-vcard-more-fields-and-buttons.diff)
-  + css for chat view (psi-chat-css.diff)
-  * updated win32 scripts after testing in win7 (make-paused.cmd, make.cmd)
-  + added psi-change-some-icons.diff
-  * updated psi-avcalls-addons.diff
-  * vCard: fix background color for birthday field (psi-vcard-more-fields-and-buttons.diff)
-  * PLUG: updated translateplugin to v0.3.0
-  * rewritten psi-vcard-more-fields-and-buttons.diff
-  * vcard fixes for justin (psi-vcard-photo-addons.diff, psi-vcard-more-fields-and-buttons.diff)
-  * fixed psi-change-some-icons.diff for chatdlg avcall icon
-  + new widget. not complete (psi-lineedit-with-action-widget.diff)
-  * fixed psi-lineedit-with-action-widget.diff compilation. still incomplete
-  + added summer-system.jisp v0.1 (by maj)
-  * updated psiplus.jisp v0.3.13
-  * fixed psi-all-in-one-window.diff. special for Nirdosh
-  + PLUG: added psi-access-to-applicationinfo-from-plugins.diff
-  + vcard with new lineedit widget
-    (psi-lineedit-with-action-widget.diff, psi-vcard-more-fields-and-buttons.diff)
-  * updated avcalls.wiki (stun.jabber.ru:5249)
-  + added activities icons (thanx to Gajim) -- not implemented
-  + added Alt Linux builds to download page (thanks to Arc)
-  + added dictionary_es.jisp roster iconset
-  * some updates with new edit widget (psi-lineedit-with-action-widget.diff,
-    psi-vcard-more-fields-and-buttons.diff, psi-muc-bookmark-toolbar-button.diff)
-  * fixed psi-muc-topic.diff after last commits
-  ! psi-muc-user-count.diff in mainstream
-  ! a bit reworked psi-chat-nick-colors.diff in mainstream.
-  * small fix for psi-muc-nick-hash-color.diff
-  * fixed appearanace layout for psi-add-options-color-highlighting.diff
-  * updated psi-xmpp-uri-in-chat-mode.diff
-  + compute ActionLineEdit height with qt-4.5 proper way. still broken with qt-4.4
-    (psi-lineedit-with-action-widget.diff)
-  * fixed label name for psi-add-options-color-highlighting.diff
-  * fixed empty row for psi-add-options-color-highlighting.diff
-  * fixed code style for psi-add-options-color-highlighting.diff
-  * fixed bookmark in context menu
-  ! psi-idle-mcmd-command.diff in the mainstream
-  * fixed regression for psi-muc-bookmark-toolbar-button.diff
-  * not remove but edit - second state (psi-muc-bookmark-toolbar-button.diff)
-  * fixed http://code.google.com/p/psi-dev/issues/detail?id=137 (psi-vcard-photo-addons.diff)
-  * fixed psi-vcard-more-fields-and-buttons.diff
-  * majish bug fixed. some ui improvements (psi-lineedit-with-action-widget.diff,
-    psi-vcard-more-fields-and-buttons.diff, psi-muc-bookmark-toolbar-button.diff)
-  * updated fingerprint.jisp to v0.1.7
-  + added detection of Isida-bot by Disabler (psi-client-icons.diff)
-  * vcard: small ui improvement. moving fields (psi-vcard-more-fields-and-buttons.diff)
-  ! some patches in the mainstream (psi-lineedit-with-action-widget.diff,
-    psi-vcard-photo-addons.diff, psi-vcard-more-fields-and-buttons.diff)
-  * autocompile for all plugins, fix resource copying from share/* (psi-debianize.diff)
-  * qconf autocompile, fixes for new debianize patch (trunk/scripts/posix/psibuild-deb.sh)
-  * PLUG: updated juickplugin to v0.7.1, see juickplugin/changelog.txt
-
-
-2009-08-09  zet
-v0.14.875 Beta
-  ! начата работа над Psi+ v0.14 Beta
-  * PLUG: исправлен краш в translateplugin
-  + добавлены новые иконсеты: nuvola-roster.jisp и nuvola-system.jisp
-  + MUC: добавлен патч на быстрое добавление/удаление закладок через кнопку на тулбаре
-  + MUC: добавлена возможность задать ник при быстром добавлении конференции в закладки
-    (psi-muc-bookmark-toolbar-button.diff)
-  + теперь используются иконки из набора psiplus icons для кнопки добавления/удаления закладки
-  + добавлен патч на портабельность (win32) -- тестовый режим
-  * поправлен psibuild-deb.sh
-  * переписан патч psi-debianize.diff под новый скрипт psibuild-deb.sh (спасибо ivan1986)
-  + добавлен скрипт psibuild-tar.sh
-  + добавлен патч на выбор цвета для гиперссылок, psi-configure-hyperlink-color.diff (спасибо Shura0)
-  * обновлён psiplus.jisp до версии 0.2.12
-  + добавлен патч, исправляющий работу с xhtml (psi-bf-xhtml-with-plugins-enabled.diff)
-  - патч psi-bf-xhtml-with-plugins-enabled.diff принят в основную ветку Psi
-  * обновлена иконка application.icns для Mac OS X
-  + PLUG: добавлен патч psi-add-icons-to-iconfactory-from-plugins.diff
-  * PLUG: обновлён translateplugin до версии 0.2.2
-  + PLUG: добавлен changelog.txt для juickplugin
-  * PLUG: обновлён gmailnorifyplugin до версии 0.3.7
-  * PLUG: обновлён juickplugin до версии 0.6.2
-  + добавлен патч на увеличение количества полей в vCard (psi-vcard-addons.diff) -- XEP-0054
-  * исправлено позиционирование формы календаря для psi-vcard-addons.diff
-  * задан формат даты рождения YYYY-MM-DD для psi-vcard-addons.diff
-  - MUC: патч psi-muc-kickban-reasons.diff принят в основную ветку Psi
-  * рефакторинг патчей для vCard
-  + PLUG: добавлен патч psi-access-to-activetab-from-plugins.diff
-  * слияние/реорганизация патчей для vCard
-  --
-  ! Psi+ v0.14 Beta started
-  * PLUG: screenshotplugin -- shortcuts rewritten
-  * PLUG: fixed crash in translate plugin
-  + added new iconsets: nuvola-roster.jisp & nuvola-system.jisp
-  + MUC: added easy way to bookmark conference using button on central toolbar
-  * MUC: fully functional bookmark button
-  * MUC: ability to set a nickname for psi-muc-bookmark-toolbar-button.diff
-  + use psiplus icons for add/remove bookmark button
-  + added psi-portable patch (win32)
-  * resource download fix, plugins download from svn and compile feature, code refactoring for
-    psibuild-deb.sh
-  * rewrited psi-debianize.diff for new psibuild-deb.sh, based on ivan1986 specs
-  + added script for build source tar.bz2 from svn & git (psibuild-tar.sh)
-  * fix errors in psibuild-deb.sh
-  * fix psi-debianize patch
-  * add call qconf to psibuild-deb.sh
-  * psibuild-deb.sh patches for plugins
-  + added psi-configure-hyperlink-color.diff (thanks to Shura0)
-  * updated psiplus.jisp to v0.2.12
-  * fix psibuild-deb.sh - mkdir
-  + fix for xhtml with enabled plugins (psi-bf-xhtml-with-plugins-enabled.diff)
-  - psi-bf-xhtml-with-plugins-enabled.diff in main stream
-  * updated application.icns for Mac OS X
-  + PLUG: added psi-add-icons-to-iconfactory-from-plugins.diff
-  * PLUG: updated translateplugin to v0.2.2
-  + PLUG: added changelog.txt for juickplugin
-  * PLUG: update gmailnorifyplugin to v0.3.7
-  * PLUG: update juickplugin to v0.6.2
-  + new fields in vcard (psi-vcard-addons.diff) -- XEP-0054
-  * fix calendar positioning (psi-vcard-addons.diff)
-  * changed date format for bday (psi-vcard-addons.diff) -- YYYY-MM-DD
-  * some ui improvements for psi-vcard-addons.diff
-  - MUC: psi-muc-kickban-reasons.diff in main stream
-  * combine some vcard patches
-  * vcard patches refactoring
-  * psi-vcard-photo-addons.diff is ready for infiniti
-  - removed wierd button-pilotka
-  * max size for vcard photo (psi-vcard-photo-addons.diff)
-  + PLUG: added psi-access-to-activetab-from-plugins.diff
-  * reorganize vcard patches
-
-
-2009-07-28  zet
-v0.13.795 Release
-  * одинаковое расстояние для аватаров в ростере
-  * обновлён juickplugin до версии 0.4.5 - добавлена опция "использовать номер сообщения как ресурс"
-    (каждый новый тред сообщений открывается в отдельном табе)
-  * полностью работоспособные ярлыки для плагинов
-  * обновлён translateplugin до версии 0.2.1
-  ! Psi+ 0.13 зарелизилась! :)
-  --
-  * equal space for avatars in roster. special for maj
-  * typo in About+ dlg
-  * updated juickplugin to v0.4.5 - added option 'use message id as resource'
-  * fully working shortcuts for plugins
-  * updated translateplugin version to 0.2.1
-  ! Psi+ 0.13 released! :)
-
-
-2009-07-26  zet
-v0.13.783 RC4
-  ! начиная с v0.13.683 сборки Psi+ выпускаются с поддержкой системы проверки орфографии Aspell.
-    в комплекте идёт только aspell-15.dll. словари для проверки орфографии необходимо скачивать
-    отдельно. На данный момент рекомендуется использовать совмещённый словарь English+Russian с
-    поддержкой буквы "Ё" отсюда: http://psi-dev.googlecode.com/files/aspell-ruen.exe (распаковать
-    содержимое архива в каталог Psi+). Для включения функции проверки орфографии необходимо в
-    настройках Psi+ на вкладке Misc. отметить галку v Check spelling
-  * контакт-менеджер: некоторые графические улучшения. обновление элементов при групповом переносе
-  * обновлены logo, psiplus.jisp и fingerprint.jisp (спасибо lgs)
-  + добавлена новая иконка приложения Psi+ (app.ico)
-  + опциональная автокалибровка размера иконок в логе сообщений в зависимости от размера шрифта
-  * фикс для says style
-  * обновлён translateplugin до версии 0.1.7
-  + контакт-менеджер: экспорт контактов
-  * бинарники плагинов (*.dll) перенесены из svn на страницу скачиваний
-  * qtcurve.dll перенесён на страницу скачиваний
-  * скрипт PKGBUILD for ABS перенесён со страницы скачиваний в trunk/scripts/posix
-  * build script for dеb-based Linux (fix #1) перенесён со страницы скачиваний в trunk/scripts/posix
-  * скрипт PKGBUILD for psi-media making перенесён со страницы скачиваний в trunk/scripts/posix
-  + добавлено определение клиента Yabber Instant Messenger
-  * обновлён fingerprint.jisp до версии 0.1.6
-  + контакт-менеджер: импорт контактов
-  + круглые уголки для аватарок в ростере
-  + добавлен jisp для ростера (qipinfium.jisp)
-  * аватары в ростере: фикс расположения элементов ростера при обновлении аватары
-  + убраны стрелки с кнопок со смайлами и с шаблонами (psi-send-button-context-menu.diff)
-  + добавлена опция на выбор цвета подсвечиваемого сообщения (вкладка настройки шрифтов и цветов)
-  + добавлена инструкция по сборке Psi+ под Mac OS X, http://code.google.com/p/psi-dev/wiki/mac_osx
-  * изменено расположение и порядок иконок на централ-баре. av-вызовы в контекстном меню
-  * поправлено присвоение имени версии в скриптах (psibuild-deb.sh, psibuild.bsd, psibuild.sh)
-  * восстановлена отрисовка иконки на отсоединённом табе (psi-tab-status-icon.diff)
-  * обновлён juickplugin до v0.4.1
-  * исправлена перерисовка иконки на табе после сворачивания/разворачивания
-  * исправлено присвоение иконки для функции посылки персонального статуса
-  * обновлён psiplus.jisp до версии 0.2.10
-  ! Beta -> RC4 в названии версии и капсе
-  --
-  ! aspell support (aspell-15.dll) + english+russian dictionary with "Ё" supporting
-    http://psi-dev.googlecode.com/files/aspell-ruen.exe (unpack archive content to Psi+ dir).
-    for activate this feature goto Psi+ options, Misc. tab and enables checkbox v Check spelling
-  * contactmanager: some ui improvements. key events. fix updating on move to group
-  * updated logo, psiplus.jisp, fingerprint.jisp (thanks to lgs)
-  + added app.ico
-  + option to scale messages'es icons
-  * more correct size computation for message icons
-  * fixed says style
-  * updated translateplugin to 0.1.7
-  + contactmanager: export contacts
-  * moved win32 plugins (*.dll) to downloads page
-  * moved qtcurve.dll to downloads page
-  * moved PKGBUILD for ABS script from downloads page to scripts/posix dir
-  * moved build script for dеb-based Linux (fix #1) from downloads page to scripts/posix dir
-  * moved PKGBUILD for psi-media making from downloads page to scripts/posix dir
-  + added detection Yabber Instant Messenger
-  * updated fingerprint.jisp to v0.1.6
-  + contactmanager: import contacts
-  * separate icon for send custom status
-  + roster avatars round corners
-  + added roster jisp (qipinfium.jisp)
-  * avatars in roster: invalidate height on update avatar
-  * roster avatars: proper item's height recomputation on any avatar size
-  + shortcut accessor for plugins
-  + kill arrow for psi-send-button-context-menu.diff
-  + added options color highlighting
-  + created mac_osx.wiki
-  * a bit more elegant patch. but needs more work
-  * codestyling a bit improved for psi-send-button-context-menu.diff
-  * move icons on central bar. avcall icon in context menu
-  * fixed scripts after rc (psibuild-deb.sh, psibuild.bsd, psibuild.sh)
-  * keep tab icon on detach for psi-tab-status-icon.diff
-  * update juickplugin to v0.4.1
-  * muc icons on tabs restored after hide/show
-  * fixed icons in psi-send-custom-status.diff
-  * updated psiplus.jisp to v0.2.10
-  ! Beta -> RC4 for version name and caps
-
-
-2009-07-12  zet
-v0.13.680 Beta
-  * поправлен эскейпинг для системных сообщений (psi-muc-topic.diff)
-  ! поправлен критический баг с html-никами в конференции (psi-muc-topic.diff)
-  * обновлён gmailnotifyplugin до версии 0.3.6
-  + добавлено определение клиента Sameplace Mozilla-based IM (psi-client-icons.diff)
-  + добавлен juickplugin (текущая версия 0.1.2)
-  + добавлен патч psi-xmpp-uri-in-chat-mode.diff
-  * переписан скрипт psibuild.sh (http://psi-dev.googlecode.com/svn/trunk/scripts/posix/psibuild.sh)
-  + добавлен скрипт psibuild для сборки Psi+ в BSD-системах
-    (http://psi-dev.googlecode.com/svn/trunk/scripts/posix/psibuild.bsd)
-  * обновлён системный иконпак psiplus.jisp
-  + добавлен смайлпак QIP_emoticons.jisp
-  + добавлена команда "paste and send" в контекстное меню на централбаре
-  * изменена позиция кнопки "paste and send" на централбаре
-  + добавлена кнопка вызова шаблонов на централбаре (psi-send-button-context-menu.diff)
-  + добавлен патч psi-fix-ns-correcting.diff
-  + добавлено определение клиента Juick (psi-client-icons.diff)
-  * обновлён иконпак с иконками jabber-клиентов fingerprint.jisp до версии 0.1.4
-  + добавлены патчи от Thilo (Ephraim), http://flyspray.psi-im.org/task/855
-    (psi-implements-iq-version-stuff-in-discodlg.diff,
-     psi-add-feature-jabber-iq-version-to-psi-s-feature-list.diff,
-     psi-add-iq-version-feature-stuff.diff)
-  + добавлена команда вызова шаблонов из контекстного меню на централбаре
-  * поправлено обновление списка шаблонов на тулбаре
-  + добавлен патч на вывод версии плагина в опциях (psi-add-plugin-version-to-options-tab.diff)
-  + translateplugin: добавлена команда для отмены конвертации
-  * обновлён translateplugin до версии 0.1.6
-  * обновлено содержимое информационного окна "About Psi+" (about-psi-plus.diff)
-  * исправлен патч psi-xmpp-uri-in-chat-mode.diff
-  ! обновлена русская локализация до ревизии 108
-  --
-  * reverted escaping of sysmessage (psi-muc-topic.diff)
-  ! fixed critical bug with html in nicknames in muc (psi-muc-topic.diff)
-  * updated gmailnotifyplugin to v0.3.6 (src & dll)
-  + added Sameplace Mozilla-based IM detection (psi-client-icons.diff)
-  + added juickplugin v0.1.2 (src & dll)
-  + added psi-xmpp-uri-in-chat-mode.diff
-  * fixed psibuild.sh (http://psi-dev.googlecode.com/svn/trunk/scripts/posix/psibuild.sh)
-  + added psibuild for bsd (http://psi-dev.googlecode.com/svn/trunk/scripts/posix/psibuild.bsd)
-  * mime for psibuild.bsd
-  * updated psiplus.jisp
-  + added QIP_emoticons.jisp
-  + added "paste and send" in central toolbar context menu
-  * change position "paste and send" in central toolbar
-  * updated psi-xmpp-uri-in-chat-mode.diff
-  + added templates in central toolbar (psi-send-button-context-menu.diff)
-  + added psi-fix-ns-correcting.diff for fix default account for uri
-  + added Juick client detection (psi-client-icons.diff)
-  * updated fingerprint.jisp to v0.1.4
-  + added patches by Thilo (Ephraim) from http://flyspray.psi-im.org/task/855
-    (psi-implements-iq-version-stuff-in-discodlg.diff,
-     psi-add-feature-jabber-iq-version-to-psi-s-feature-list.diff,
-     psi-add-iq-version-feature-stuff.diff)
-  + added templates in toolbar context menu
-  * fixed update templates in toolbar
-  + added psi-add-plugin-version-to-options-tab.diff
-  + translateplugin: added revert conversion
-  * updated translateplugin to v0.1.6 (src & dll)
-  * updated About Psi+ dlg (about-psi-plus.diff)
-  * fixed psi-xmpp-uri-in-chat-mode.diff
-  ! updated russian localization (r108)
-
-
-2009-07-05  zet
-v0.13.643 Beta
-  + начата работа над иконками для всех событий чатлога
-    (http://code.google.com/p/psi-dev/issues/detail?id=2)
-  + добавлен патч для вызова контекстного меню на кнопке Send (psi-send-button-context-menu.diff)
-  * обновлены psi-receipts.diff, psi-roster-icons.diff
-  * обновлён VKontakte.ru.jisp
-  + добавлена кнопка Paste & Send на тулбар
-  + добавлена команда "Only Paste" в меню с шаблонами
-  * обновлён psiplus.jisp для меню с шаблонами, обновлён патч "Paste & Send"
-  * изменена иконка для кнопки Paste & Send
-  + контакт-менеджер: перемещение одного или нескольких контактов в заданную группу
-  + добавлен патч на выход из приложения по нажатию кнопки закрытия ростера
-    (quit-on-close-option.diff)
-  * поправлен фокус после вызова контекстного меню на кнопке Send
-  * изменён внешний вид контекстного меню на кнопке Send
-  * обновлён gmailnotifyplugin до версии 0.3.5 (VampiRUS) -- нестабилен
-  + добавлен translateplugin от VampiRUS (текущая версия 0.1.4)
-  + включена поддержка плагинов в psibuild.sh
-  + добавлена основная инструкция по компиляции Psi+ в Linux
-    (http://code.google.com/p/psi-dev/wiki/linux)
-  + увеличен интервал между опросами нажатия на кнопку "Paste & Send"
-  + добавлен патч на вызов функции выгрузки плагинов перед выходом из приложения (VampiRUS)
-  + добавлен патч на вызов дисконнекта в деструкторе (VampiRUS)
-  + plugins.wiki: добавлено описание для translateplugin
-  + контакт-менеджер: добавлен вызов контекстного меню на контакте
-  + контакт-менеджер: иконки для контекстного меню
-  + добавлена иконка голосового вызова на централбар
-  * обновлён psiplus.jisp до версии 0.2.5
-  * обновлены скрипты для автоматической компиляции Psi+ в MS Windows
-  * изменено положение меню голосовых вызовов в групчате
-  * контакт-менеджер: некоторые графические улучшения (специально для maj)
-  + добавлен патч psi-fix-ability-to-modify-events-from-plugins.diff (VampiRUS)
-  ! обновлён Qt до версии 4.5.2
-  ! обновлена русская локализация (ivan101)
-  --
-  + started work on icons for everything in chatlog
-    (http://code.google.com/p/psi-dev/issues/detail?id=2)
-  * get rid 1px align for psi-receipts.diff
-  + added patch psi-send-button-context-menu.diff
-  * read image resources on log clear
-  * updated psi-receipts.diff, psi-roster-icons.diff
-  * updated VKontakte.ru.jisp
-  + added button "Paste & Send" in toolbar
-  + added options "Only Paste" in template menu
-  * updated psiplus.jisp for Paste and send templates
-  * updated Paste and Send patch
-  * change icon for Paste and Send button
-  + contactmanager: move to group
-  + added new patch quit-on-close-option.diff
-  * fixed quit-on-close-option.diff: enable checkbox on init
-  * fix focus after call send button menu
-  * change aspect send button menu
-  * updated gmailnotifyplugin by VampiRUS to v0.3.5 -- still unstable
-  + added translateplugin by VampiRUS (v0.1.4)
-  * psibuild.sh with plugins support
-  * wiki: general linux build instructions (http://code.google.com/p/psi-dev/wiki/linux)
-  + click limit for paste send button
-  + added unload all plugins on exit function by VampiRUS
-  + added discconnect short to destructor by VampiRUS
-  + plugins.wiki: translateplugin
-  + contactmanager: context menu
-  + contactmanager: context menu icons
-  + avcall icon on central bar
-  * updated psiplus.jisp to v0.2.5
-  * updated win32 scripts
-  * avcall menu item in gc right under messages
-  * contactmanager: some ui improvements (special for maj)
-  + added psi-fix-ability-to-modify-events-from-plugins.diff by VampiRUS
-  ! updated Qt to v4.5.2
-  ! updated russian localization by ivan101 (r100)
-
-
-2009-06-21  zet
-v0.13.593 Beta
-  + контакт-менеджер: возможность найти и выбрать контакт
-  * muc-nick-hash-color теперь включен по умолчанию
-  + иконки для psi-receipts.diff, psi-roster-settings.diff и psi-roster-icons.diff теперь берутся из
-    специализированного системного иконпака psiplus.jisp
-  * костыль для работы all-in-one-window в Mac OS X
-  * переименован заголовок диалога "About Psi" в "About"
-  * контакт-менеджер: исправлено падение приложения при смене домена
-  * исправлена загрузка распакованных иконсетов при старте приложения
-  + добавлен путь по умолчанию для psi-additional-system-iconset.diff
-  + добавлена иконка для кнопки Send (Отправить)
-  * небольшая оптимизация кода для топика конференции
-  * обновлён psiplus.jisp
-  + контакт-менеджер: добавлено действие "Удалить"
-  + контакт-менеджер: добавлена группа действий "Авторизация"
-  * контакт-менеджер: увеличена щирина диалогового окна
-  - контакт-менеджер: убран неиспользуемый код
-  * контакт-менеджер: небольшие улучшения
-  * обновлён copying.txt (GPL Version 2.1)
-  + скриншот-плагин: добавлена опция для ввода url-адреса сервера и горячей клавиши вызова плагина,
-    подробнее на http://psi-plus.com/wiki/plugins
-  + скриншот-плагин: добавлен ftp-менеджер для загрузки файлов на ftp-сервер. если не указан
-    url-адрес для ftp-сервера, то графический файл будет сохранён на локальный жёсткий диск
-  + скриншот-плагин: добавлено сообщение об ошибке при неудачной загрузке на ftp-сервер
-  * обновлён screenshotplugin.dll для MS Windows
-  + контакт-менеджер: добавлены кнопки управления окном (maximize, minimize)
-  + скриншот-плагин: добавлена опция для назначения имени графического файла 
-  * скриншот-плагин: изменён основной класс окна с Widget на Dialog. добавлена реакция на Esc для
-    закрытия окна со скриншотом
-  + скриншот-плагин: добавлена кнопка "Загрузить на FTP". если не указан url-адрес в опциях, то
-    кнопка "Загрузить на FTP" будет скрыта
-  * обновлён screenshotplugin.dll для MS Windows
-  + добавлен некоторый функционал для вызова голосовых звонков (команда в контекстном меню на
-    контакте ростера конференции)
-  + добавлена кнопка "Звонок" в тулбар окна чата
-  * контакт-менеджер: исправлен баг с обновлением контактов после резолвинга ников и при других
-    операциях. возможно исправлено падение приложения
-  * обновлён gmailnotifyplugin (src & dll)
-  ! добавлен инсталлятор для PsiMedia версии 1.0.3 (win32).
-    подробнее на http://code.google.com/p/psi-dev/wiki/avcalls
-  --
-  + contactmanager: ability to find and select contacts
-  * muc-nick-hash-color now enabled by default
-  + go to use psiplus.jisp in: psi-receipts.diff, psi-roster-settings.diff, psi-roster-icons.diff
-  * ugly fix for mac in all-in-one-window. we should get rid this ugly patch one day...
-  * About Psi -> About
-  * contactmanager: possibly fix crash on changing domain
-  * fix icon search path for unpacked sets
-  + added default icon path for psi-additional-system-iconset.diff
-  + added icon for send button 
-  * small optimization topic dialog
-  * updated psiplus.jisp
-  + contactmanager: added remove action
-  + contactmanager: added auth actions
-  * contactmanager: increased dialog's width
-  - contactmanager: removed unnecessary includes
-  * contactmanager: small improvements
-  * updated copying.txt (GPL Version 2.1)
-  + screenshotplugin: added url and shortcut options.
-    see at http://psi-plus.com/wiki/plugins for details
-  * screenshotplugin: fixed reassing shortcut
-  + screenshotplugin: added ftp upload, if url is empty picture will be save to local disk
-  * screenshotplugin: fixed ftp errors
-  + screenshotplugin: added options for message
-  * screenshotplugin: fixed reading default message
-  * screenshotplugin: changed date/time format for uploading files
-  * updated win32/gmailnotifyplugin.dll & win32/screenshotplugin.dll
-  + contactmanager: added maximize, minimize buttons
-  * contactmanager: fix menu item unavailable if bookmarks unavailable
-  + screenshotplugin: added file name format to options
-  * screenshotplugin: changed Widget to Dialog main class. added Esc shortcut for close window
-  + screenshotplugin: added upload button. if no url inputed upload button will be hidden
-  * updated screenshotplugin.dll for win32
-  + some additional functionality for avcalls. muc menu item atm
-  + add call button into toolbar of chat dialog
-  + conditional adding of avcall menu items/buttons
-  * contactmanager: fixing bug with not updatable contacts after nick resolve. part1
-  * fixed psi-add-detection-some-os.diff after last git commit
-  * contactmanager: fixed updating contacts on resolve and other actions.
-    possibly fixed possible crash
-  * updated gmailnotifyplugin (src & dll)
-  ! added PsiMedia Installer v1.0.3 (win32).
-    see at http://code.google.com/p/psi-dev/wiki/avcalls for details
-
-
-2009-06-07  zet
-v0.13.537 Beta
-  + добавлены команды контекстного меню для формы с фото в vCard
-  + добавлен патч на вызов специализированных системных иконок из иконпака psiplus.jisp
-  + добавлен иконпак со специализированными системными иконками psiplus.jisp
-  * менеджер контактов теперь умеет рассылать групповые сообщения выбранным контактам
-  + добавлено определение клиента "Прогноз погоды с Gismeteo.RU"
-  * обновлён fingerprint.jisp до версии r129.1
-  * фиксы контакт-менеджера для компиляции под win32
-  * контакт-менеджер: совместимость с Qt 4.4
-  + wiki: добавлен скрипт отката для *nix-систем
-  ! исправлена критическая ошибка, приводившая к падению приложения при закрытии окна/таба
-    конференции с открытым редактором топика
-  ! патч на добавление контакт-менеджера перенесён в общий каталог с патчами и входит теперь в
-    поставку Psi+
-  * исправлено поведение окна с фото в vCard (центрирование при первоначальном вызове)
-  + добавлен патч на добавление опции для подтверждения очистки лога конференции/чата
-    (psi-optional-confirmation-when-clearing.diff)
-  + контакт-менеджер: добавлена функция "преобразовать в ники"
-  + контакт-менеджер: начало работы над функцией "смена домена"
-  * обновлены иконки и превьюшки на главной странице проекта (http://psi-dev.googlecode.com/)
-  + добавлен плагин для уведомлений о новой почте с Gmail (gmailnotifyplugin by VampiRUS)
-  + добавлен патч на поиск директории с плагинами для *nix-систем
-  + добавлено определение клиентов: Мобильный Mail.Ru Агент для Symbian, CenterIM
-  * обновлены иконпаки: psiplus.jisp, fingerprint.jisp
-  - svn: убраны неиспользуемые иконки из директорий с иконпаками
-  * обновлён патч psi-client-icons.diff
-  * svn: устаревшие плагины перемещены в специальный каталог (deprecated)
-  * контакт-менеджер: закончена работа над функцией "смена домена"
-  + добавлен логотип Psi+ в меню "О программе" (About dlg)
-  * gmail notify plugin обновлён до версии 0.2.4 (VampiRUS)
-  * ограничение палитры цветов для патча на hash-раскраску ников (больше контраста для белого фона)
-  * контакт-менеджер теперь готов для локализации
-  + добавлен патч psi-chat-messages-subject-fix.diff для исправления положения темы в чат-сообщениях
-    (спасибо VampiRUS)
-  * gmail notify plugin обновлён до версии 0.3.1 (VampiRUS)
-  ! обновлена русская локализация (ivan101)
-  --
-  + added context menu in vcard photo dlg
-  + added psi-additional-system-iconset.diff (load icons from psiplus.jisp)
-  + added iconsets/psiplus/psiplus.jisp ver. r11.1
-  * contact manager is now spam manager. can send messages to selected contacts
-  + added detection "Прогноз погоды с Gismeteo.RU" client. updated fingerprint.jisp to ver. r129.1
-  * contact manager: compatibility with qt-4.4
-  + wiki: added revert script for nix
-  ! fixed crash when closing window with while topic editor is opened
-  ! contact manager: added psi-contact-manager.diff to general patches dir (ready for use)
-  * fix vcard photo
-  + added patch psi-optional-confirmation-when-clearing.diff
-  + contact manager: added resolve nicknames action
-  + contact manager: started work on changing domain
-  * updated thumbnails for Psi+ homepage
-  + added gmail notify plugin by VampiRUS
-  + added plugins search path for nix
-  + added detection clients: Mail.ru sis MobileAgent, CenterIM
-  * updated jisp: psiplus.jisp, fingerprint.jisp
-  - remove unwanted icons from svn
-  * updated psi-client-icons.diff
-  * deprecated plugins moved to deprecated dir in svn
-  * contact manager: changing domain is done
-  * some cosmetic changes (psiplus logo in About dlg)
-  * gmailnotifyplugin v0.2.4 by VampiRUS
-  * limiting palettes (contrast for white background) for psi-muc-nick-hash-color.diff
-  * contact manager is now translatable
-  + added patch psi-chat-messages-subject-fix.diff
-  * gmailnotifyplugin v0.3.1 by VampiRUS
-  ! updated russian localization by ivan101
-
-
-2009-05-24  zet
-v0.13.491 Beta
-  + добавлено определение клиентов Sapo Messenger Mac и Spark IM Client
-  * обновлён иконпак с ростерными иконками fingerprint.jisp до версии r128.1
-  + добавлено определение клиента Pandion
-  + автоматический ресайзинг фото при изменении размеров окна с фоткой из vCard
-  + добавлено определение платформы Arch Linux в Psi+ (спасибо Dill)
-  * исправлено положение окна с фото из vCard при повторном вызове
-  ! обновлена русская локализация от ivan101
-  --
-  + added clients detection: Sapo Messenger Mac, Spark IM Client
-  * updated fingerprint.jisp to ver r128.1
-  + added detection of Pandion jabber client
-  + resize clickable photo
-  * adding detection of Arch Linux (thx to Dill)
-  * fix central orientation new photo dlg
-  ! updated russian localization (by ivan101)
-
-
-2009-05-11  zet
-v0.13.469 Beta
-  * уменьшен размер иконки о доставке сообщения
-  + добавлен интервал в 1 пиксель между аватарами и иконками клиентов в ростере
-  + добавлен сдвиг на 1 пискель влево от края ростера для аватаров
-  + размер формы редактора топика сопоставим с размером окна самого группчата
-  + теперь окно редактора топика немодальное (не блокирует работу с другими элементами Psi+)
-  * восстановлена работа копирования по Ctrl+C в поле с JID (в окне ростерного чата)
-  + добавлен исходный код для скриншот-плагина (тестовая версия)
-  + добавлен патч на снижение агрессии автофокуса на форме присоединения к конференции (спасибо Nexor)
-  + добавлено определение клиентов OM и freqbot
-  * обновлён fingerprint.jisp до версии r127.2
-  + добавлен патч на выключение горизонтального скролла для ростера конференции
-  * убрана блокировка копирования по Ctrl+C в случае если окно конференции потеряло связь с сервером
-  - временно выключен патч на возможность перемещения табов (из-за нестабильности в работе)
-  + добавлен скомпилированный скриншот-плагин для MS Windows (x86):
-    http://psi-dev.googlecode.com/svn/trunk/plugins/win32/screenshotplugin.dll.
-    инструкция по самостоятельной компиляции плагина: http://code.google.com/p/psi-dev/wiki/mingw32
-  * исправлено включение/выключение скриншот-плагина
-  * исправлено поведение кнопки открытия редактора топика. теперь несколько нажатий не приводит к
-    открытию нескольких редакторов
-  * убран множественный вызов окна с фотографией при клике в форме vCard
-  * обновлена вкладка "About Psi+" в Psi->Help->About
-  * добавлен FAQ для пользователей Psi+ в Windows: http://code.google.com/p/psi-dev/wiki/faq_windows
-  + добавлен патч и скрипт для сборки Psi+ под debian и debian-based системами
-  --
-  * receipts icon size decreased
-  + added 1 pix gap between roster icons
-  + added 1 pix gap between avatar icons and roster edge
-  + size topic dialog relatively groupchat window
-  * topic dialog non modality
-  * fixed Ctrl+C copy jid in chat dialog
-  + added screenshot plugin sources (test version)
-  + added psi-autojoin-dialog-tab-autofoucus-off.diff (thanks to Nexor)
-  + added some clients detection (OM, freqbot). updated fingerprint.jisp to version r127.2
-  + added patch horizontal scrollbar in muc roster always off
-  * fixed Ctrl+C copy when groupchat is offline
-  - disable patch psi-movable-tabs.diff
-  + added compiled screenshot plugin for win32:
-    http://psi-dev.googlecode.com/svn/trunk/plugins/win32/screenshotplugin.dll.
-    instruction for selfcompiling screenshotplugin: http://code.google.com/p/psi-dev/wiki/mingw32
-  * fixed enable-disable for screenshot plugin
-  * fixed topic button in psi-muc-topic.diff
-  * fixed clickable photo in psi-vcard-clickable-photo.diff
-  * updated About Psi+ tab
-  * added FAQ for Windows users: http://code.google.com/p/psi-dev/wiki/faq_windows
-  + added debian package info for dpkg-buildpackage
-
-
-2009-05-01  zet
-v0.13.433 Beta
-  * исправлена критическая ошибка, приводившая к падению приложения при кике в конференции
-  + добавлен патч на определение операционных систем Exherbo Linux и MS Windows 7
-  + добавлено распознавание гиперссылок в топике конференции при присоединении к конференции
-    (спасибо AvadoN)
-  + добавлен патч на возможность drag-n-drop-перемещения табов (работает в Qt 4.5.1)
-  - убрано выделение jid-ов в логе конференции
-  + добавлено определение клиента BombusQD
-  * обновлена иконка по умолчанию для mail.ru агента в fingerprint.jisp
-  * исправлено форматирование сообщения во всплывающем окне на топике
-  + добавлено распознавание гиперссылок во всплывающем окне на топике
-  * поправлено определение клиента Psi+ в psi-client-icons.diff (issue 3 #24)
-  * исправлен баг с перетаскиванием табов (issue 81)
-  * изменён алгоритм для отображения иконки о доставке сообщения: теперь вычисляется размер шрифта
-    лога в пикселях - это и будет являться высотой иконки. в дальнейшем иконка каждый раз ресайзится,
-    пропорционально своим размерам и отрисовывается
-  + добавлена опция для отображение многострочного топика конференции в компактном виде
-    options.muc.compact-multiline-topic (по умолчанию - выключено)
-  + добавлено отображение смайлов во всплывающем окне на топике конференции
-  ! обновлена версия Qt до 4.5.1
-  --
-  * fixed bug with kick in psi-muc-minimize-to-roster.diff
-  + added patch psi-add-detection-some-os.diff for Exherbo Linux detection
-  + added MS Windows 7 detection in psi-add-detection-some-os.diff
-  + added topics' formatting in psi-muc-topic.diff (by AvadoN)
-  + added patch psi-movable-tabs.diff
-  - removed clickable for jids in muc log (psi-muc-topic.diff)
-  + added detection of BombusQD mod client (psi-client-icons.diff)
-  * changed mailru default client icon (psi-client-icons.diff)
-  * updated fingerprint.jisp
-  * added formatting message in topic tooltip (psi-muc-topic.diff)
-  + links in topic tooltip (psi-muc-topic.diff)
-  * small optimisation for psi-client-icons.diff (issue 3 #24)
-  * fixed some bugs in psi-movable-tabs.diff (issue 81)
-  * sized delivery notification icon (psi-receipts.diff)
-  + added options 'Replace | in chat topic with newline' (psi-muc-topic.diff)
-  * fix compact mode for chat topic (psi-muc-topic.diff)
-  + added advanced option 'options.muc.compact-multiline-topic' (false by default)
-  + added show smiles in tooltip (psi-muc-topic.diff)
-  ! updated Qt version to 4.5.1
-
-
-2009-04-19  zet
-v0.13.394 Beta
-  - удалён ненужный патч на запрещение вызова функции голосовых звонков
-  * строки из psi-idle-mcmd-command.diff готовы для локализации
-  * исправлены умолчания для нового аккаунта
-  * исправлена критическая ошибка, приводившая к падению приложения при попытке создания нового
-    аккаунта после первого старта Psi (основная ветка)
-  + добавлена возможность настройки параметров голосовых вызовов через графический интерфейс
-    (основная ветка)
-  ! новая версия библиотек OpenSSL 0.9.8k
-  --
-  - deleted unused patch psi-disable-av-calls.diff
-  * strings in mcmd is not-translable
-  * fixed options after last git commits
-  * changes to psiaccount belong in setUserAccount not in accountmodifydlg (mainline)
-  + make avcall options normally accessible in the UI (mainline)
-  ! new OpenSSL 0.9.8k version 
-
-
-2009-04-05  zet
-v0.13.381 Beta
-  + добавлено определение клиента nimbuzz
-  + теперь проверка наличия новой версии дистрибутива Psi+ происходит по состоянию файла version.txt
-  - патч на портабельность ВРЕМЕННО выключен из-за глюков совместного использования Psi+
-    несколькими пользователями и глюками под не_админом (win32)
-  + добавлен psi-portable.bat для запуска Psi+ с профилем из текущего каталога (Psi+\PsiData)
-  + начата работа над совместимостью плагинной системы Psi для версии 0.13.
-    подробнее на http://psi-plus.com/wiki/plugins
-  * возвращено прежнее поведение фокуса после клика на фото в форме vCard (issue 69)
-  * поправлено название опции "цвет ника для входящего/исходящего сообщения чата"
-  * обновлена русская локализация (спасибо ivan101)
-  --
-  + added detection of nimbuzz client
-  + added version.txt for monitoring current version
-  * updated psi-dirty-check.diff
-  - temporary disabled patch psi-win32-portable.diff (rewrite needed)
-  + added psi-portable.bat for start Psi+ with profile from current dir (Psi+\PsiData)
-  * fixed Plugin System. Now it can save & restore options. added psi-plugins-options.diff
-  + added test option plugin. It save-load int & string values.
-  * fixed old plugins. Removed const from method options. added virtual methods
-    (psi-fixed-plugins.diff)
-  * reverted changes from r107 (170-psi-vcard-clickable-photo.diff)
-  * updated text in 360-psi-chat-nick-colors.diff
-  * updated russian localization (thanks to ivan101)
-
-
-2009-03-29  zet
-v0.13.352 Beta
-  * изменён размер формы About для более удобного отображения вкладки About Psi+ :)
-  + добавлена копия changelog.txt в кодировке cp1251
-  + добавлен патч на hash-раскраску ников в конференциях (спасибо L29Ah).
-    патч имеет advanced-настройки:
-    • использовать hash-раскраску ников для истории конференции (по умолчанию - отключено)
-    • включение/отключение hash-раскраски ников (по умолчанию - отключено)
-  + добавлен патч, восстанавливающий работу Ctrl+C/Ctrl+V в обычных чатах (спасибо mpk)
-  + добавлен патч "всё в одном" (ростер, чаты и конференции в одном окне) -
-    данный режим экспериментальный и отключен по умолчанию
-  + добавлено опеределение клиента mcabber и вывод его иконки в ростер
-  + добавлено корректное отображение статуса конференции в ростере
-  + добавлен патч, убирающий кнопки в заголовке панели с табами (отключаемо)
-  * исправлена критическая ошибка, приводящая к падению приложения при попытке захода
-    в конференцию по приглашению
-  + добавлено определение клиентов Ya.Online j2me и Adium
-  * обновлён fingerprint.jisp
-  --
-  * updated about-psi-plus.diff
-  + added changelog_cp1251.txt
-  + added patch psi-muc-nick-hash-color.diff
-  + added patch psi-chatdlg-copypaste-keypress.diff (thanks to mpk)
-  + added patch psi-all-in-one-window.diff (experimental, disabled by default)
-  * updated psi-muc-nick-hash-color.diff (thnx to L29Ah). added two advanced options:
-    • options.ui.muc.colored-history (disabled by default)
-    • options.ui.muc.use-hash-nick-coloring (disabled by default)
-  + added mcabber detection for psi-client-icons.diff
-  + added showing muc's status in roster for psi-muc-minimize-to-roster.diff
-  + added patch psi-tabs-button-killer.diff
-  * fixed some bugs with invite in psi-muc-minimize-to-roster.diff
-  + added detection: Ya.Online j2me client, Adium
-  * updated fingerprint.jisp
-
-
-2009-03-22  zet
-v0.13.333 Beta
-  + добавлена иконка ростера для JaPyT-транспорта
-  * обновлены иконки для pyvk-t транспорта
-  * добавлена информация о Psi+ в капсы
-  + добавлен патч для автокорректировки размеров окна vCard (psi-vcard-smartsize.diff)
-  + добавлен патч для отправки прямого статуса выбранному контакту ростера и/или в открытую
-    конференцию psi-send-custom-status.diff (спасибо mpk)
-  + добавлена иконка для меню Send status (psi-send-custom-status.diff)
-  + добавлен патч на запрет вызова меню голосовых звонков (данная функция требует доработки)
-  * переименованы патчи для win32
-  + добавлена новая вкладка в меню справки Help->About->About Psi+ с информацией
-    об участниках проекта Psi+
-  --
-  + added roster icon for JaPyT in iconsets/clients/fingerprint.jisp
-  * Replaced pyvk-t and added pyvk-t2 icon in iconsets/clients/fingerprint.jisp
-  * updated Psi+ caps info (psi-application-info.diff)
-  + added patch for autocorrect vCard fields size (psi-vcard-smartsize.diff)
-  + added patch psi-send-custom-status.diff (thanks to mpk)
-  + added icon send status for psi-send-custom-status.diff
-  + added patch psi-disable-av-calls.diff
-  * renamed psi-info-size.diff to psi-vcard-smartsize.diff
-  * renamed win32-specific patches (win->win32)
-  + added About Psi+ tab in Help->About menu (about-psi-plus.diff)
-
-
-2009-03-15  zet
-v0.13.302 Beta
-  + добавлены иконки для ростера в стиле группчатов (muc.jisp)
-  + добавлен патч на проверку новых доступных версий Psi+ при старте приложения (спасибо AlekSi)
-  + добавлен счётчик непрочитанных сообщений для свёрнутых в ростер табах
-    (psi-muc-minimize-to-roster.diff)
-  * поправлено поведение кнопки Delete при нажатии на свёрнутой в ростер конференции
-  + теперь имя контакта для свёрнутой в ростер конференции берётся из имени закладки
-  * поправлено положение индикатора доставки сообщения после очистки чата
-  * добавлено отображение индикатора доставки сообщения для self-контактов и запрещено
-    для невидимых контактов
-  * поправлено отображение индикатора доставки сообщения для первого сообщения в новом чате
-  * поправлена позиция положения индикатора доставки сообщения для чатов в режиме
-    use-chat-says-style
-  * исправлена http://code.google.com/p/psi-dev/issues/detail?id=58
-  * доработки psi-muc-minimize-to-roster.diff
-  + добавлено определение клиентов Barracuda IM и Jimm, обновлён fingerprint.jisp
-  ! в инсталляторе заменён vcredist_x86.exe на более свежий Microsoft Visual C++ 2008 SP1
-    Redistributable Package (x86), который не мусорит в корень жёсткого диска :)
-  --
-  + added roster iconset muc.jisp
-  + added patch psi-dirty-check.diff (thanks to AlekSi)
-  + added count of unread message of conference into roster in psi-muc-minimize-to-roster.diff
-  * fixed key 'del' bug with conferences in roster in psi-muc-minimize-to-roster.diff
-  + added headlined unreaded message counter and getting name of conference from bookmarks into
-    psi-muc-minimize-to-roster.diff
-  * fix broken 1px align icon after chat clear
-  * fixed receipts for self contact and from invisibility
-  * fixed received icon position in use-chat-says-style mode and partially fixed issue 58
-  * fixed issue 58
-  * fixed some bugs in 320-psi-muc-minimize-to-roster.diff
-  * fixed first receipt in muc private chat
-  + added detection Barracuda IM, Jimm. Updated fingerprint.jisp
-  ! added new vcredist_x86.exe from Microsoft Visual C++ 2008 SP1 Redistributable Package (x86)
-    in Psi+ installer (no trash in root dir)
-
-
-2009-03-10  zet
-v0.13.282 Beta
-  + добавлен смайлпак puzazBox.jisp by puz
-  + добавлена ростерная иконка для GluxiBot
-  + добавлен патч, меняющий местами кнопки Apply и Cancel в окне настроек (win32)
-  + добавлен смайлпак YaEmoMidget
-  + добавлены иконки ростера Yandex Status Icons и Yandex Big Status Icons
-  * поправлен патч psi-muc-notify-highlight.diff.
-    добавлена опция options.ui.notifications.passive-popups.notify-every-muc-message:
-    • true = показывает в попапах все сообщения из конференции
-    • false = показывает попап только при обращении и при упоминании заданных в настройках слов
-  + добавлены ярлыки для psi-typed-history.diff
-  + добавлена опция вывода иконок клиентов в ростере: всех имеющихся ресурсов или только ресурса
-    с наивысшим приоритетом. также убран знак вопроса в ростере у muc-контакта
-  * поправлен патч psi-altN-key-switch-tab.diff
-  + добавлен патч на регулировку времени показа всплывающих окон (спасибо Shura0)
-  + добавлена иконка для клиента swift
-  * Psi+Fingerprint.jisp переименован в fingerprint.jisp
-  * поправлен баг с системными сообщениями в конференции (psi-muc-minimize-to-roster.diff)
-  ! патч на совместимость с qt-4.5 принят в основную ветку (mainline)
-  --
-  + added iconsets/emoticons/puzazBox.jisp by puz
-  + added client-icon for GluxiBot
-  + added psi-options-change-buttons-places.diff
-  + added YaEmoMidget smiles
-  + added: Yandex Status Icons, Yandex Big Status Icons
-  * fixed psi-muc-notify-highlight.diff
-  + added shortcuts for psi-typed-history.diff
-  + realize some proposals for psi-client-icons.diff
-  * fixed alt+n patch
-  + added patch psi-passive-popups-delays.diff (thnx to Shura0, issue 27 closed)
-  * updated Psi+Fingerprint.jisp (swift icon)
-  * simple name for iconpack fingerprint.jisp
-  * fixed bug with headline from conference in psi-muc-minimize-to-roster.diff
-
-
-2009-03-05  zet
-v0.13.256 Beta
-  + начат changelog.txt
-  --
-  + changelog.txt started
-
-
-====
-  Условные обозначения (Legend):
-  + добавлено (added)
-  - убрано (removed)
-  * изменено (modified)
-  ! важное сообщение (important message)
-
-
-====
-  ! Если Вы хотите поддержать развитие проекта Psi+, то можете внести небольшое пожертвование
-    на один из нижеприведённых счетов:
-    http://passport.webmoney.ru/asp/certview.asp?wmid=351281428776
-    WMZ: Z217989559723
-    WMR: R347278107127
-    WME: E196199593868
-    Яндекс.Деньги: 41001348342725
-  --
-    ! If you want to support the development of the Psi+ Project, you can make a small donation
-    to one of the following accounts:
-    http://passport.webmoney.ru/asp/certview.asp?wmid=351281428776
-    WMZ: Z217989559723
-    WMR: R347278107127
-    WME: E196199593868
-    Yandex.Money: 41001348342725
-

psi-plus-main-20160309.tar.xz/copying-psi.txt Deleted

@@ -1,296 +0,0 @@
-
-  As a special exception, the copyright holder(s) give permission to link
-  this program with the Qt Library (commercial or non-commercial edition),
-  and distribute the resulting executable, without including the source
-  code for the Qt library in the source distribution.
-
-  As a special exception, the copyright holder(s) give permission to link
-  this program with any other library, and distribute the resulting
-  executable, without including the source code for the library in the
-  source distribution, provided that the library interfaces with this
-  program only via the following plugin interfaces:
-
-    1. The Qt Plugin APIs, only as authored by Trolltech
-    2. The QCA Plugin API, only as authored by Justin Karneges
-
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-&#xc;
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-&#xc;
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-&#xc;
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-&#xc;
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS

psi-plus-main-20160309.tar.xz/copying.txt Deleted

@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-&#xc;
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-&#xc;
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-&#xc;
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-&#xc;
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-&#xc;
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-&#xc;
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-&#xc;
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-&#xc;
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-&#xc;
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

psi-plus-main-20160309.tar.xz/iconsets/activities Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_buying_groceries.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_cleaning.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_cooking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_doing_maintenance.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_doing_the_dishes.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_doing_the_laundry.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_gardening.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_running_an_errand.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_walking_the_dog.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/drinking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/drinking_having_a_beer.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/drinking_having_coffee.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/drinking_having_tea.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating_having_a_snack.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating_having_breakfast.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating_having_dinner.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating_having_lunch.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_cycling.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_dancing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_hiking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_jogging.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_playing_sports.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_running.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_skiing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_swimming.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_working_out.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_at_the_spa.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_brushing_teeth.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_getting_a_haircut.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_shaving.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_taking_a_bath.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_taking_a_shower.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/having_appointment.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/icondef.xml Deleted

@@ -1,432 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<icondef>                                                         
-        <meta>                                                    
-                <name>Psi+ Activities - size 16</name>
-                <version>0.3</version>
-                <creation>2010-07-18</creation>
-                <home>http://psi-dev.googlecode.com/</home>
-                <author email='tuxden@ru.ru'>tux-den</author>
-                <author email='maksim.maj@gmail.com'>maj</author>
-                <description>Activities iconset for Psi+ IM</description>
-           </meta>
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores</x>
-                <object mime='image/png'>doing_chores.png</object>
-        </icon>                                                 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_buying_groceries</x>
-                <object mime='image/png'>doing_chores_buying_groceries.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_cleaning</x>
-                <object mime='image/png'>doing_chores_cleaning.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_cooking</x>
-                <object mime='image/png'>doing_chores_cooking.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_doing_maintenance</x>
-                <object mime='image/png'>doing_chores_doing_maintenance.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_doing_the_dishes</x>
-                <object mime='image/png'>doing_chores_doing_the_dishes.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_doing_the_laundry</x>
-                <object mime='image/png'>doing_chores_doing_the_laundry.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_gardening</x>
-                <object mime='image/png'>doing_chores_gardening.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_running_an_errand</x>
-                <object mime='image/png'>doing_chores_running_an_errand.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_walking_the_dog</x>
-                <object mime='image/png'>doing_chores_walking_the_dog.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/drinking</x>
-                <object mime='image/png'>drinking.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/drinking_having_a_beer</x>
-                <object mime='image/png'>drinking_having_a_beer.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/drinking_having_coffee</x>
-                <object mime='image/png'>drinking_having_coffee.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/drinking_having_tea</x>
-                <object mime='image/png'>drinking_having_tea.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/eating</x>
-                <object mime='image/png'>eating.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/eating_having_a_snack</x>
-                <object mime='image/png'>eating_having_a_snack.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/eating_having_breakfast</x>
-                <object mime='image/png'>eating_having_breakfast.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/eating_having_dinner</x>
-                <object mime='image/png'>eating_having_dinner.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/eating_having_lunch</x>
-                <object mime='image/png'>eating_having_lunch.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/exercising</x>
-                <object mime='image/png'>exercising.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_cycling</x>
-                <object mime='image/png'>exercising_cycling.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_dancing</x>
-                <object mime='image/png'>exercising_dancing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_hiking</x>
-                <object mime='image/png'>exercising_hiking.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_jogging</x>
-                <object mime='image/png'>exercising_jogging.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_playing_sports</x>
-                <object mime='image/png'>exercising_playing_sports.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_running</x>
-                <object mime='image/png'>exercising_running.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_skiing</x>
-                <object mime='image/png'>exercising_skiing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_swimming</x>
-                <object mime='image/png'>exercising_swimming.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_working_out</x>
-                <object mime='image/png'>exercising_working_out.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/grooming</x>
-                <object mime='image/png'>grooming.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_at_the_spa</x>
-                <object mime='image/png'>grooming_at_the_spa.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_brushing_teeth</x>
-                <object mime='image/png'>grooming_brushing_teeth.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_getting_a_haircut</x>
-                <object mime='image/png'>grooming_getting_a_haircut.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_shaving</x>
-                <object mime='image/png'>grooming_shaving.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_taking_a_bath</x>
-                <object mime='image/png'>grooming_taking_a_bath.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_taking_a_shower</x>
-                <object mime='image/png'>grooming_taking_a_shower.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/having_appointment</x>
-                <object mime='image/png'>having_appointment.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/inactive</x>
-                <object mime='image/png'>inactive.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/inactive_day_off</x>
-                <object mime='image/png'>inactive_day_off.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/inactive_hanging_out</x>
-                <object mime='image/png'>inactive_hanging_out.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/inactive_hiding</x>
-                <object mime='image/png'>inactive_hiding.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/inactive_on_vacation</x>
-                <object mime='image/png'>inactive_on_vacation.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/inactive_praying</x>
-                <object mime='image/png'>inactive_praying.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/inactive_scheduled_holiday</x>
-                <object mime='image/png'>inactive_scheduled_holiday.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/inactive_sleeping</x>
-                <object mime='image/png'>inactive_sleeping.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/inactive_thinking</x>
-                <object mime='image/png'>inactive_thinking.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/relaxing</x>
-                <object mime='image/png'>relaxing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_fishing</x>
-                <object mime='image/png'>relaxing_fishing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_gaming</x>
-                <object mime='image/png'>relaxing_gaming.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_going_out</x>
-                <object mime='image/png'>relaxing_going_out.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_partying</x>
-                <object mime='image/png'>relaxing_partying.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_reading</x>
-                <object mime='image/png'>relaxing_reading.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_rehearsing</x>
-                <object mime='image/png'>relaxing_rehearsing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_shopping</x>
-                <object mime='image/png'>relaxing_shopping.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_smoking</x>
-                <object mime='image/png'>relaxing_smoking.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_socializing</x>
-                <object mime='image/png'>relaxing_socializing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_sunbathing</x>
-                <object mime='image/png'>relaxing_sunbathing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_watching_a_movie</x>
-                <object mime='image/png'>relaxing_watching_a_movie.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/relaxing_watching_tv</x>
-                <object mime='image/png'>relaxing_watching_tv.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/talking</x>
-                <object mime='image/png'>talking.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/talking_in_real_life</x>
-                <object mime='image/png'>talking_in_real_life.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/talking_on_the_phone</x>
-                <object mime='image/png'>talking_on_the_phone.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/talking_on_video_phone</x>
-                <object mime='image/png'>talking_on_video_phone.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/traveling</x>
-                <object mime='image/png'>traveling.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_commuting</x>
-                <object mime='image/png'>traveling_commuting.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_cycling</x>
-                <object mime='image/png'>traveling_cycling.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_driving</x>
-                <object mime='image/png'>traveling_driving.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_in_a_car</x>
-                <object mime='image/png'>traveling_in_a_car.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_on_a_bus</x>
-                <object mime='image/png'>traveling_on_a_bus.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_on_a_plane</x>
-                <object mime='image/png'>traveling_on_a_plane.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_on_a_train</x>
-                <object mime='image/png'>traveling_on_a_train.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_on_a_trip</x>
-                <object mime='image/png'>traveling_on_a_trip.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/traveling_walking</x>
-                <object mime='image/png'>traveling_walking.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/unknown</x>
-                <object mime='image/png'>unknown.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/working</x>
-                <object mime='image/png'>working_working.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/working_coding</x>
-                <object mime='image/png'>working_coding.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/working_in_a_meeting</x>
-                <object mime='image/png'>working_in_a_meeting.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/working_studying</x>
-                <object mime='image/png'>working_studying.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/working_writing</x>
-                <object mime='image/png'>working_writing.png</object>
-        </icon> 
-
-</icondef>

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_day_off.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_hanging_out.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_hiding.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_on_vacation.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_praying.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_scheduled_holiday.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_sleeping.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_thinking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_fishing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_gaming.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_going_out.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_partying.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_reading.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_rehearsing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_shopping.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_smoking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_socializing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_sunbathing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_watching_a_movie.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_watching_tv.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/talking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/talking_in_real_life.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/talking_on_the_phone.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/talking_on_video_phone.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_commuting.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_cycling.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_driving.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_in_a_car.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_on_a_bus.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_on_a_plane.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_on_a_train.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_on_a_trip.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_walking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/unknown.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_coding.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_in_a_meeting.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_studying.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_working.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_writing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/admin.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/icondef.xml Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/member.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/noaffiliation.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/outcast.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/owner.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Afraid.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Amazed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Amorous.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Angry.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Annoyed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Anxious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Aroused.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Ashamed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Bored.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Brave.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Calm.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Cautious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Cold.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Confident.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Confused.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Contemplative.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Contented.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Cranky.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Crazy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Creative.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Curious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Dejected.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Depressed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Disappointed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Disgusted.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Dismayed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Distracted.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Embarrassed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Envious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Excited.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Flirtatious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Frustrated.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Grumpy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Guilty.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Happy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Hopeful.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Hot.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Humbled.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Humiliated.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Hungry.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Hurt.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Impressed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/In_awe.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/In_love.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Indignant.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Interested.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Intoxicated.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Invincible.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Jealous.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Lonely.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Lucky.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Mean.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Moody.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Nervous.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Neutral.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Offended.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Outraged.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Playful.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Proud.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Readme.txt Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Relaxed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Relieved.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Remorseful.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Restless.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Sad.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Sarcastic.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Serious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Shocked.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Shy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Sick.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Sleepy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Spontaneous.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Stressed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Strong.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Surprised.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Thankful.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Thirsty.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Tired.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Undefined.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Weak.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Worried.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/icondef.xml Deleted

@@ -1,415 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<icondef>                                                         
-        <meta>                                                    
-                <name>silk</name>
-                <version>1.2</version>
-                <description>
-Name: silk
-Author: http://www.famfamfam.com/lab/icons/silk/
-Made for Psi: maksim.maj@gmail.com, ky6uk@jabber.ufanet.ru
-Date: 2010-11-16
-                </description>
-				<creation>2008-12-25</creation>
-           </meta>
-
-        <icon>
-                <x xmlns='name'>mood/afraid</x>
-                <object mime='image/png'>Afraid.png</object>
-        </icon>                                                 
-
-        <icon>
-                <x xmlns='name'>mood/amazed</x>
-                <object mime='image/png'>Amazed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/angry</x>
-                <object mime='image/png'>Angry.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/amorous</x>
-			<object mime='image/png'>Amorous.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/annoyed</x>
-                <object mime='image/png'>Annoyed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/anxious</x>
-                <object mime='image/png'>Anxious.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/aroused</x>
-                <object mime='image/png'>Aroused.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/ashamed</x>
-                <object mime='image/png'>Ashamed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/bored</x>
-                <object mime='image/png'>Bored.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/brave</x>
-                <object mime='image/png'>Brave.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/calm</x>
-                <object mime='image/png'>Calm.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/cautious</x>
-			<object mime='image/png'>Cautious.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/cold</x>
-                <object mime='image/png'>Cold.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/confident</x>
-			<object mime='image/png'>Confident.png</object>
-		</icon>
-
-
-        <icon>
-                <x xmlns='name'>mood/confused</x>
-                <object mime='image/png'>Confused.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/contemplative</x>
-			<object mime='image/png'>Contemplative.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/contented</x>
-                <object mime='image/png'>Contented.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/cranky</x>
-                <object mime='image/png'>Cranky.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/crazy</x>
-			<object mime='image/png'>Crazy.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/creative</x>
-			<object mime='image/png'>Creative.png</object>
-        </icon>
-		
-        <icon>
-                <x xmlns='name'>mood/curious</x>
-                <object mime='image/png'>Curious.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/dejected</x>
-			<object mime='image/png'>Dejected.png</object>
-        </icon>
-		
-        <icon>
-                <x xmlns='name'>mood/depressed</x>
-                <object mime='image/png'>Depressed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/disappointed</x>
-                <object mime='image/png'>Disappointed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/disgusted</x>
-                <object mime='image/png'>Disgusted.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/dismayed</x>
-			<object mime='image/png'>Dismayed.png</object>
-		</icon>
-
-        <icon>
-                <x xmlns='name'>mood/distracted</x>
-                <object mime='image/png'>Distracted.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/embarrassed</x>
-                <object mime='image/png'>Embarrassed.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/envious</x>
-			<object mime='image/png'>Envious.png</object>
-        </icon>
-		
-        <icon>
-                <x xmlns='name'>mood/excited</x>
-                <object mime='image/png'>Excited.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/flirtatious</x>
-                <object mime='image/png'>Flirtatious.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/frustrated</x>
-                <object mime='image/png'>Frustrated.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/grumpy</x>
-                <object mime='image/png'>Grumpy.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/guilty</x>
-                <object mime='image/png'>Guilty.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/happy</x>
-                <object mime='image/png'>Happy.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/hopeful</x>
-			<object mime='image/png'>Hopeful.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/hot</x>
-                <object mime='image/png'>Hot.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/humbled</x>
-                <object mime='image/png'>Humbled.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/humiliated</x>
-                <object mime='image/png'>Humiliated.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/hungry</x>
-                <object mime='image/png'>Hungry.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/hurt</x>
-                <object mime='image/png'>Hurt.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/impressed</x>
-                <object mime='image/png'>Impressed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/in_awe</x>
-                <object mime='image/png'>In_awe.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/in_love</x>
-                <object mime='image/png'>In_love.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/indignant</x>
-                <object mime='image/png'>Indignant.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/interested</x>
-                <object mime='image/png'>Interested.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/intoxicated</x>
-                <object mime='image/png'>Intoxicated.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/invincible</x>
-                <object mime='image/png'>Invincible.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/jealous</x>
-                <object mime='image/png'>Jealous.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/lonely</x>
-                <object mime='image/png'>Lonely.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/lucky</x>
-			<object mime='image/png'>Lucky.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/mean</x>
-                <object mime='image/png'>Mean.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/moody</x>
-                <object mime='image/png'>Moody.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/nervous</x>
-                <object mime='image/png'>Nervous.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/neutral</x>
-                <object mime='image/png'>Neutral.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/offended</x>
-                <object mime='image/png'>Offended.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/outraged</x>
-			<object mime='image/png'>Outraged.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/playful</x>
-                <object mime='image/png'>Playful.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/proud</x>
-                <object mime='image/png'>Proud.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/relaxed</x>
-			<object mime='image/png'>Relaxed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/relieved</x>
-                <object mime='image/png'>Relieved.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/remorseful</x>
-                <object mime='image/png'>Remorseful.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/restless</x>
-                <object mime='image/png'>Restless.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/sad</x>
-                <object mime='image/png'>Sad.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/sarcastic</x>
-                <object mime='image/png'>Sarcastic.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/serious</x>
-                <object mime='image/png'>Serious.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/shocked</x>
-                <object mime='image/png'>Shocked.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/shy</x>
-                <object mime='image/png'>Shy.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/sick</x>
-                <object mime='image/png'>Sick.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/sleepy</x>
-                <object mime='image/png'>Sleepy.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/spontaneous</x>
-			<object mime='image/png'>Spontaneous.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/stressed</x>
-                <object mime='image/png'>Stressed.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/strong</x>
-			<object mime='image/png'>Strong.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/surprised</x>
-                <object mime='image/png'>Surprised.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/thankful</x>
-			<object mime='image/png'>Thankful.png</object>
-        </icon>
-		
-        <icon>
-                <x xmlns='name'>mood/thirsty</x>
-                <object mime='image/png'>Thirsty.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/tired</x>
-			<object mime='image/png'>Tired.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/undefined</x>
-			<object mime='image/png'>Undefined.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/weak</x>
-			<object mime='image/png'>Weak.png</object>
-        </icon>
-		
-        <icon>
-                <x xmlns='name'>mood/worried</x>
-                <object mime='image/png'>Worried.png</object>
-        </icon>
-</icondef>

psi-plus-main-20160309.tar.xz/patches Deleted

psi-plus-main-20160309.tar.xz/patches/0010-psi-iconsets.diff Deleted

@@ -1,143 +0,0 @@
---- psi.orig/iconsets.qrc
-+++ psi/iconsets.qrc
-@@ -71,7 +71,7 @@
-         <file>iconsets/system/default/pgp.png</file>
-         <file>iconsets/system/default/play.png</file>
-         <file>iconsets/system/default/play_sounds.png</file>
--        <file>iconsets/system/default/psilogo.png</file>
-+        <file>iconsets/system/default/psiplus/psilogo.png</file>
-         <file>iconsets/system/default/psimain.png</file>
-         <file>iconsets/system/default/quit.png</file>
-         <file>iconsets/system/default/register.png</file>
-@@ -125,6 +125,23 @@
-         <file>iconsets/system/default/autojid.png</file>
- 	<file>iconsets/system/default/ignore_global_actions.png</file>
-         <file>iconsets/system/default/action_direct_presence.png</file>
-+        <file>iconsets/system/default/psiplus/psiplus_icon.png</file>
-+        <file>iconsets/system/default/psiplus/action_paste_and_send.png</file>
-+        <file>iconsets/system/default/psiplus/action_vcard_restore.png</file>
-+        <file>iconsets/system/default/psiplus/action_vcard_save_as.png</file>
-+        <file>iconsets/system/default/psiplus/cm_check.png</file>
-+        <file>iconsets/system/default/psiplus/cm_invertcheck.png</file>
-+        <file>iconsets/system/default/psiplus/cm_uncheck.png</file>
-+        <file>iconsets/system/default/psiplus/psiplus_logo.png</file>
-+        <file>iconsets/system/default/psiplus/action_contacts_manager.png</file>
-+        <file>iconsets/system/default/psiplus/doublenextarrow.png</file>
-+        <file>iconsets/system/default/psiplus/doublebackarrow.png</file>
-+        <file>iconsets/system/default/psiplus/crop.png</file>
-+        <file>iconsets/system/default/psiplus/draw.png</file>
-+        <file>iconsets/system/default/psiplus/frame.png</file>
-+        <file>iconsets/system/default/psiplus/palette.png</file>
-+        <file>iconsets/system/default/psiplus/undo.png</file>
-+        <file>iconsets/system/default/psiplus/print.png</file>
-         <file>iconsets/system/default/whiteboarding/whiteboard.png</file>
-         <file>iconsets/system/default/whiteboarding/save.png</file>
-         <file>iconsets/system/default/whiteboarding/select.png</file>
---- psi.orig/iconsets/system/default/icondef.xml
-+++ psi/iconsets/system/default/icondef.xml
-@@ -342,7 +342,7 @@
- 
- 	<icon>
- 		<x xmlns='name'>psi/psiLogo</x>
--		<object mime='image/png'>psilogo.png</object>
-+		<object mime='image/png'>psiplus/psilogo.png</object>
- 	</icon>
- 
- 	<icon>
-@@ -678,4 +678,96 @@
- 		<object mime='image/png'>whiteboarding/ungroup.png</object>
- 	</icon>
- 	
-+
-+    
-+    <icon>
-+		<x xmlns='name'>loggerplugin/openlog</x>
-+		<object mime='image/png'>history.png</object>
-+	</icon>
-+    
-+
-+	
-+	<icon>
-+		<x xmlns='name'>psi/action_paste_and_send</x>
-+		<object mime='image/png'>psiplus/action_paste_and_send.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/action_contacts_manager</x>
-+		<object mime='image/png'>psiplus/action_contacts_manager.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/action_vcard_restore</x>
-+		<object mime='image/png'>psiplus/action_vcard_restore.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/action_vcard_save_as</x>
-+		<object mime='image/png'>psiplus/action_vcard_save_as.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/cm_check</x>
-+		<object mime='image/png'>psiplus/cm_check.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/cm_invertcheck</x>
-+		<object mime='image/png'>psiplus/cm_invertcheck.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/cm_uncheck</x>
-+		<object mime='image/png'>psiplus/cm_uncheck.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/psiplus_logo</x>
-+		<object mime='image/png'>psiplus/psiplus_logo.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/doubleNextArrow</x>
-+		<object mime='image/png'>psiplus/doublenextarrow.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/doubleBackArrow</x>
-+		<object mime='image/png'>psiplus/doublebackarrow.png</object>
-+	</icon>
-+	
-+
-+	
-+	<icon>
-+		<x xmlns='name'>psi/crop</x>
-+		<object mime='image/png'>psiplus/crop.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/draw</x>
-+		<object mime='image/png'>psiplus/draw.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/frame</x>
-+		<object mime='image/png'>psiplus/frame.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/palette</x>
-+		<object mime='image/png'>psiplus/palette.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/undo</x>
-+		<object mime='image/png'>psiplus/undo.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/print</x>
-+		<object mime='image/png'>psiplus/print.png</object>
-+	</icon>
-+	
-+
- </icondef>

psi-plus-main-20160309.tar.xz/patches/0020-psi-icon-actions-shortcuts.diff Deleted

@@ -1,149 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -442,6 +442,81 @@
- 			</tabs>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
-+			<alist comment="Action List" >
-+				<menu_disco type="QKeySequence" comment="Service Discovery"></menu_disco>
-+				<menu_add_contact type="QKeySequence" comment="Add Contact"></menu_add_contact>
-+				<menu_new_message type="QKeySequence" comment="New Message"></menu_new_message>
-+				<menu_join_groupchat type="QKeySequence" comment="Join Group Chat"></menu_join_groupchat>
-+				<menu_account_setup type="QKeySequence" comment="Account Setup"></menu_account_setup>
-+				<menu_options type="QKeySequence" comment="Options"></menu_options>
-+				<menu_file_transfer type="QKeySequence" comment="File Transfer"></menu_file_transfer>
-+				<menu_toolbars type="QKeySequence" comment="Toolbars"></menu_toolbars>
-+				<menu_xml_console type="QKeySequence" comment="XML Console"></menu_xml_console>
-+				<menu_change_profile type="QKeySequence" comment="Change Profile"></menu_change_profile>
-+				<menu_play_sounds type="QKeySequence" comment="Play Sounds"></menu_play_sounds>
-+				<menu_quit type="QKeySequence" comment="Quit"></menu_quit>
-+				<button_options type="QKeySequence" comment="Options"></button_options>
-+				<button_status type="QKeySequence" comment="Status"></button_status>
-+				<enable_groups type="QKeySequence" comment="Enable Groups"></enable_groups>
-+				<event_notifier type="QKeySequence" comment="Event Notifier"></event_notifier>
-+				<view_groups type="QKeySequence" comment="View Groups"></view_groups>
-+				<show_offline type="QKeySequence" comment="Show Offline Contacts"></show_offline>
-+				<show_away type="QKeySequence" comment="Show Away Contacts"></show_away>
-+				<show_hidden type="QKeySequence" comment="Show Hidden Contacts"></show_hidden>
-+				<show_agents type="QKeySequence" comment="Show Agents"></show_agents>
-+				<show_self type="QKeySequence" comment="Show Self"></show_self>
-+				<show_statusmsg type="QKeySequence" comment="Show Status Message"></show_statusmsg>
-+				<publish_tune type="QKeySequence" comment="Publish Tune"></publish_tune>
-+				<active_contacts type="QKeySequence" comment="Active contacts"/>
-+				<status_all type="QKeySequence" comment="Status All"></status_all>
-+				<status_group type="QKeySequence" comment="Status Group"></status_group>
-+				<status_chat type="QKeySequence" comment="Status Chat"></status_chat>
-+				<status_online type="QKeySequence" comment="Status Online"></status_online>
-+				<status_away type="QKeySequence" comment="Status Away"></status_away>
-+				<status_xa type="QKeySequence" comment="Status XA"></status_xa>
-+				<status_dnd type="QKeySequence" comment="Status DND"></status_dnd>
-+				<status_invisible type="QKeySequence" comment="Status Invisible"></status_invisible>
-+				<status_offline type="QKeySequence" comment="Status Offline"></status_offline>
-+				<choose_status type="QKeySequence" comment="Choose status"></choose_status>
-+				<reconnect_all type="QKeySequence" comment="Reconnect all accounts"></reconnect_all>
-+				<set_mood type="QKeySequence" comment="Set Mood"/>
-+				<set_activity type="QKeySequence" comment="Set Activity"/>
-+				<set_geoloc type="QKeySequence" comment="Set Geolocation"/>
-+				<help_readme type="QKeySequence" comment="README"></help_readme>
-+				<help_tip type="QKeySequence" comment="Tips"></help_tip>
-+				<help_online_forum type="QKeySequence" comment="Psi Forum (Online)"></help_online_forum>
-+				<help_online_help type="QKeySequence" comment="Open Help"></help_online_help>
-+				<help_online_wiki type="QKeySequence" comment="Open Wiki"></help_online_wiki>
-+				<help_online_home type="QKeySequence" comment="Open Home Page"></help_online_home>
-+				<help_psi_muc type="QKeySequence" comment="Help Psi MUC"></help_psi_muc>
-+				<help_report_bug type="QKeySequence" comment="Report Bug"></help_report_bug>
-+				<help_about type="QKeySequence" comment="About Psi"></help_about>
-+				<help_about_psimedia type="QKeySequence" comment="About PsiMedia" />
-+				<help_about_qt type="QKeySequence" comment="About Qt"></help_about_qt>
-+				<help_diag_qcaplugin type="QKeySequence" comment="QCA plugin diag"></help_diag_qcaplugin>
-+				<help_diag_qcakeystore type="QKeySequence" comment="QCA key store diag"></help_diag_qcakeystore>
-+				<chat_active_contacts type="QKeySequence"></chat_active_contacts>
-+				<chat_add_contact type="QKeySequence"></chat_add_contact>
-+				<chat_clear type="QKeySequence"></chat_clear>
-+				<chat_compact type="QKeySequence"></chat_compact>
-+				<chat_file type="QKeySequence"></chat_file>
-+				<chat_find type="QKeySequence"></chat_find>
-+				<chat_history type="QKeySequence"></chat_history>
-+				<chat_html_text type="QKeySequence"></chat_html_text>
-+				<chat_icon type="QKeySequence"></chat_icon>
-+				<chat_info type="QKeySequence"></chat_info>
-+				<chat_pgp type="QKeySequence"></chat_pgp>
-+				<chat_ps type="QKeySequence"></chat_ps>
-+				<chat_templates type="QKeySequence"></chat_templates>
-+				<chat_voice type="QKeySequence"></chat_voice>
-+				<gchat_clear type="QKeySequence"></gchat_clear>
-+				<gchat_configure type="QKeySequence"></gchat_configure>
-+				<gchat_find type="QKeySequence"></gchat_find>
-+				<gchat_html_text type="QKeySequence"></gchat_html_text>
-+				<gchat_icon type="QKeySequence"></gchat_icon>
-+				<gchat_ps type="QKeySequence"></gchat_ps>
-+				<gchat_templates type="QKeySequence"></gchat_templates>
-+			</alist>
- 			<chat comment="Shortcuts in the chat dialog">
- 				<next-tab type="QVariantList" comment="Switch to the next tab">
- 					<item type="QKeySequence">Ctrl+PgDown</item>
---- psi.orig/src/psiactionlist.cpp
-+++ psi/src/psiactionlist.cpp
-@@ -19,15 +19,20 @@
-  */
- 
- #include "psiactionlist.h"
-+#include "shortcutmanager.h"
- 
- #include <QObject>
- #include <QPointer>
-+#include <map>
-+#include <utility>
- 
- #include "iconset.h"
- #include "psioptions.h"
- 
- #include "mainwin_p.h"
- 
-+using namespace std;
-+
- //----------------------------------------------------------------------------
- // PsiActionList::Private
- //----------------------------------------------------------------------------
-@@ -43,6 +48,7 @@ private:
- 	PsiActionList *list;
- 	PsiCon *psi;
- 	QPointer<ActionList> statusActionList;
-+	map<QString,IconAction*> actionmap;
- 
- 	void createCommon();
- 	void createMainWin();
-@@ -92,13 +98,21 @@ PsiActionList::Private::~Private()
- 
- ActionList* PsiActionList::Private::createActionList( QString name, int id, ActionNames *actionlist )
- {
-+	static const QStringList skipList = QStringList() << "separator" << "spacer";
-+
- 	ActionList *actions = new ActionList( name, id, false );
- 
- 	QString aName;
- 	for ( int i = 0; !(aName = QString(actionlisti.name)).isEmpty(); i++ ) {
- 		IconAction *action = actionlisti.action;
- 		if (action)
-+		{
- 			actions->addAction( aName, action );
-+			if(!skipList.contains(aName)) {
-+				action->setShortcuts(ShortcutManager::instance()->shortcuts("alist." + aName));
-+				actionmapaName = action;
-+			}
-+		}
- 	}
- 
- 	list->addList( actions );
-@@ -503,6 +517,11 @@ void PsiActionList::Private::optionsChan
- 	statusActionList->action("status_chat")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool());
- 	statusActionList->action("status_xa")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool());
- 	statusActionList->action("status_invisible")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.invisible").toBool());
-+
-+	for(map<QString,IconAction*>::iterator i=actionmap.begin(); i!=actionmap.end(); i++)
-+	{
-+		 i->second->setShortcuts(ShortcutManager::instance()->shortcuts("alist." + i->first));
-+	}
- }
- 
- //----------------------------------------------------------------------------

psi-plus-main-20160309.tar.xz/patches/0030-psi-default-application-settings.diff Deleted

@@ -1,224 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -33,7 +33,7 @@
- 		<extended-presence comment="Extended presence options">
- 			<notify comment="Get notified of extended presence changes" type="bool">true</notify>
- 			<tune comment="Tune options">
--				<publish comment="Publish user tune information" type="bool">false</publish>
-+				<publish comment="Publish user tune information" type="bool">true</publish>
- 				<url-filter comment="Ingore tune by media file extension" type="QString">avi asf asx mpg mpg2 mpeg mpe mst mp4 flv 3gp mkv wmv swf rv rm rst dat vob ifo ogv</url-filter>
- 				<title-filter comment="Ignore tune by name via RegExp" type="QString"></title-filter>
- 				<controller-filter comment="List of disabled controllers" type="QString">WinAmp</controller-filter>
-@@ -47,7 +47,7 @@
- 			</bookmarks>
- 			<show-joins comment="Display notices of users joining and leaving conferences" type="bool">true</show-joins>
- 			<show-role-affiliation comment="Include role and affiliation changes in join messages, and display notices of changes" type="bool">true</show-role-affiliation>
--			<show-status-changes comment="Show status changes in groupchat window" type="bool">false</show-status-changes>
-+			<show-status-changes comment="Show status changes in groupchat window" type="bool">true</show-status-changes>
- 			<accept-defaults comment="Automatically accept the default room configuration when a new room is created." type="bool">true</accept-defaults>
- 			<auto-configure comment="Automatically open the configuration dialog when a new room is created. This option only has effect if accept-defaults is false." type="bool">true</auto-configure>
- 			<context comment="Options regarding the context being sent when joining a room">
-@@ -92,14 +92,14 @@
- 				<auto-grab-urls-from-clipboard type="bool">false</auto-grab-urls-from-clipboard>
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-popup-headlines type="bool">false</auto-popup-headlines>
--				<show-character-count type="bool">false</show-character-count>
-+				<show-character-count type="bool">true</show-character-count>
- 				<show-subjects type="bool">true</show-subjects>
- 				<use-jid-auto-completion type="bool">true</use-jid-auto-completion>
- 				<size type="QString"></size> 
- 			</message>
- 			<chat comment="Chat dialog options">
- 				<theme comment="The theme used for chat messages rendering" type="QString">psi/classic</theme>
--				<central-toolbar comment="Have a central toolbar" type="bool">false</central-toolbar>
-+				<central-toolbar comment="Have a central toolbar" type="bool">true</central-toolbar>
- 				<size comment="Remembered window size" type="QSize">
- 				</size>
- 				<opacity comment="Opacity percentage of chat dialogs" type="int">100</opacity>
-@@ -110,11 +110,11 @@
- 				</avatars>
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
--				<delete-contents-after type="QString">hour</delete-contents-after>
-+				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
- 				<use-chat-says-style type="bool">false</use-chat-says-style>
--				<use-expanding-line-edit type="bool">true</use-expanding-line-edit>
-+				<use-expanding-line-edit type="bool">false</use-expanding-line-edit>
- 				<use-small-chats type="bool">false</use-small-chats>
- 				<use-message-icons type="bool">true</use-message-icons>
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
-@@ -195,7 +195,7 @@
- 				<use-single-click type="bool">false</use-single-click>
- 				<use-status-change-animation type="bool">true</use-status-change-animation>
- 				<aio-left-roster type="bool">false</aio-left-roster>
--				<use-transport-icons type="bool">false</use-transport-icons>
-+				<use-transport-icons type="bool">true</use-transport-icons>
- 				<saved-window-geometry type="QRect" >
- 					<x>64</x>
- 					<y>64</y>
-@@ -236,7 +236,7 @@
- 					<invisible comment="Enable invisibility" type="bool">false</invisible>
- 				</status>
- 				<view comment="Options for the view menu">
--					<show-away comment="Show the 'show away/xa' toggle" type="bool">false</show-away>
-+					<show-away comment="Show the 'show away/xa' toggle" type="bool">true</show-away>
- 				</view>
- 			</menu>
- 			<muc comment="Multi-User Chat options">
-@@ -399,8 +399,8 @@
- 					</status>
- 				</passive-popups>
- 				<popup-dialogs>
--					<suppress-when-not-on-roster type="bool">false</suppress-when-not-on-roster>
--					<suppress-while-away type="bool">false</suppress-while-away>
-+					<suppress-when-not-on-roster type="bool">true</suppress-when-not-on-roster>
-+					<suppress-while-away type="bool">true</suppress-while-away>
- 				</popup-dialogs>
- 				<sounds>
- 					<chat-message type="QString">sound/chat2.wav</chat-message>
-@@ -419,10 +419,10 @@
- 					<system-message type="QString">sound/chat2.wav</system-message>
- 					<unix-sound-player type="QString"/>
- 				</sounds>
--				<successful-subscription type="bool">false</successful-subscription>
-+				<successful-subscription type="bool">true</successful-subscription>
- 			</notifications>
- 			<service-discovery>
--				<automatically-get-info type="bool">true</automatically-get-info>
-+				<automatically-get-info type="bool">false</automatically-get-info>
- 				<automatically-get-items type="bool">false</automatically-get-items>
- 				<recent-jids type="QStringList" />
- 			</service-discovery>
-@@ -431,7 +431,7 @@
- 				<can-close-inactive-tab type="bool">true</can-close-inactive-tab>
- 				<show-tab-close-buttons type="bool">true</show-tab-close-buttons>
- 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
--				<use-tabs type="bool">false</use-tabs>
-+				<use-tabs type="bool">true</use-tabs>
- 				<mouse-middle-button type="QString">close</mouse-middle-button> 
- 				<mouse-doubleclick-action type="QString">detach</mouse-doubleclick-action>
- 				<size type="QString"></size> 
-@@ -534,7 +534,7 @@
- 					<item type="QKeySequence">Enter</item>
- 				</send>
- 				<clear type="QKeySequence" comment="Clear the text"/>
--				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
-+				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+Space</quick-command>
- 				<show-messageLast type="QKeySequence" comment="Show last message" >Alt+Home</show-messageLast>
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
-@@ -543,7 +543,7 @@
- 			<contactlist comment="Shortcuts in the contactlist">
- 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
- 				<clear-custom-avatar type="QKeySequence" comment="Remove custom avatar from the selected contact"/>
--				<delete type="QKeySequence" comment="Delete the selected contact">Del</delete>
-+				<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
- 				<chat type="QKeySequence" comment="Open a chat to the selected contact">Ctrl+C</chat>
- 				<message type="QKeySequence" comment="Send a message to the selected contact">Ctrl+M</message>
- 				<event type="QKeySequence" comment="Receive incoming event">Ctrl+R</event>
-@@ -591,7 +591,7 @@
- 		</shortcuts>
- 		<contactlist>
- 			<hide-on-start type="bool">false</hide-on-start>
--			<resolve-nicks-on-contact-add type="bool">false</resolve-nicks-on-contact-add>
-+			<resolve-nicks-on-contact-add type="bool">true</resolve-nicks-on-contact-add>
- 			<use-toolwindow type="bool">false</use-toolwindow>
- 			<autohide-interval type="int">0</autohide-interval>
- 		</contactlist>
-@@ -608,6 +608,10 @@
- 			</emoticons>
- 			<status type="QString">default</status>
- 			<system type="QString">default</system>
-+			<moods type="QString">default</moods>
-+			<clients type="QString">default</clients>
-+			<activities type="QString">default</activities>
-+			<affiliations type="QString">default</affiliations>
- 		</iconsets>
- 		<messages>
- 			<default-outgoing-message-type type="QString">chat</default-outgoing-message-type>
---- psi.orig/options/macosx.xml
-+++ psi/options/macosx.xml
-@@ -16,14 +16,25 @@
- 		</ui>
- 		<shortcuts comment="Shortcuts">
- 			<contactlist comment="Shortcuts in the contactlist">
--				<delete type="QVariantList" comment="Delete the selected contact">
--					<item type="QKeySequence">Backspace</item>
--					<item type="QKeySequence">Del</item>
--				</delete>
-+				<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
- 			</contactlist>
- 			<common comment="Common actions" >
- 				<history type="QKeySequence" comment="Open the message history">Ctrl+Shift+H</history>
- 			</common>
-+			<chat comment="Shortcuts in the chat dialog">
-+				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
-+			</chat>
- 		</shortcuts>
-+		<ui comment="User interface options">
-+			<disable-send-button type="bool">true</disable-send-button>
-+			<look>
-+				<font>
-+					<chat type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</chat>
-+					<contactlist type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</contactlist>
-+					<message type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</message>
-+					<passive-popup type="QString">Lucida Grande,9,-1,5,50,0,0,0,0,0</passive-popup>
-+				</font>
-+			</look>
-+		</ui>
- 	</options>
- </psi>
---- psi.orig/options/windows.xml
-+++ psi/options/windows.xml
-@@ -6,6 +6,9 @@
- 				<enable type="bool">true</enable>
- 				<use-double-click type="bool">true</use-double-click>
- 			</systemtray>
-+			<spell-check comment="Options related to the spell checker">
-+				<enabled comment="Whether the spell checker is enabled" type="bool">false</enabled>
-+			</spell-check>
- 		</ui>
- 	</options>
- </psi>
---- psi.orig/src/psi_profiles.cpp
-+++ psi/src/psi_profiles.cpp
-@@ -131,17 +131,17 @@ void UserAccount::reset()
- 	port = 5222;
- 	opt_host = false;
- 	host = "";
--	opt_automatic_resource = true;
-+	opt_automatic_resource = false;
- 	priority_dep_on_status = true;
- 	ignore_global_actions = false;
- 	resource = ApplicationInfo::name();
--	priority = 5;
-+	priority = 55;
- 	ibbOnly = false;
- 	opt_keepAlive = true;
- 	allow_plain = XMPP::ClientStream::AllowPlainOverTLS;
--	opt_compress = false;
-+	opt_compress = true;
- 	opt_log = true;
--	opt_reconn = false;
-+	opt_reconn = true;
- 	opt_connectAfterSleep = false;
- 	opt_autoSameStatus = true;
- 	lastStatusWithPriority = false;
---- psi.orig/src/psioptions.cpp
-+++ psi/src/psioptions.cpp
-@@ -207,10 +207,12 @@ bool PsiOptions::newProfile()
- 		buttons.dock = Qt3Dock_Bottom;
- 
- 		ToolbarPrefs showContacts;
-+		showContacts.on = true;
- 		showContacts.name = tr("Show contacts");
--		showContacts.keys << "show_offline" << "show_hidden" << "show_agents" << "show_self" << "show_statusmsg";
-+		showContacts.keys << "view_groups" << "menu_add_contact" << "menu_disco" << "menu_options" << "menu_play_sounds" <<"menu_xml_console";
- 
- 		ToolbarPrefs eventNotifier;
-+		eventNotifier.on = true;
- 		eventNotifier.name = tr("Event notifier");
- 		eventNotifier.keys << "event_notifier";
- 		eventNotifier.dock = Qt3Dock_Bottom;

psi-plus-main-20160309.tar.xz/patches/0040-psi-tabs-button-killer.diff Deleted

@@ -1,80 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -439,6 +439,7 @@
- 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
- 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
- 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
-+				<show-tab-buttons type="bool">true</show-tab-buttons>
- 			</tabs>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
---- psi.orig/src/options/opt_chat.cpp
-+++ psi/src/options/opt_chat.cpp
-@@ -107,6 +107,7 @@ void OptionsTabChat::applyOptions()
- 	PsiOptions::instance()->setOption("options.ui.chat.raise-chat-windows-on-new-messages", d->ck_raiseChatWindow->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.chat.switch-tab-on-new-messages", d->ck_switchTabOnMessage->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.chat.use-small-chats", d->ck_smallChats->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.tabs.show-tab-buttons", d->ck_showTabButtons->isChecked());
- 
- 	QString delafter;
- 	switch (bg_delChats->buttons().indexOf( bg_delChats->checkedButton() )) {
-@@ -184,6 +185,7 @@ void OptionsTabChat::restoreOptions()
- 	d->ck_raiseChatWindow->setChecked( PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool() );
- 	d->ck_switchTabOnMessage->setChecked( PsiOptions::instance()->getOption("options.ui.chat.switch-tab-on-new-messages").toBool() );
- 	d->ck_smallChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool() );
-+	d->ck_showTabButtons->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool() );
- 	d->ck_tabChats->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() );
- 	d->cb_tabGrouping->setEnabled(PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool());
- 	QString tabGrouping = PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString();
---- psi.orig/src/options/opt_chat.ui
-+++ psi/src/options/opt_chat.ui
-@@ -127,6 +127,13 @@
-     </layout>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_showTabButtons" >
-+     <property name="text" >
-+      <string>Show tab buttons</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QCheckBox" name="ck_autoResize" >
-      <property name="text" >
-       <string>Auto-resize text input field</string>
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -1414,7 +1414,8 @@ void PsiCon::optionChanged(const QString
- 	}
- 
- 	if (option == "options.ui.tabs.use-tabs" ||
--		option == "options.ui.tabs.grouping") {
-+		option == "options.ui.tabs.grouping" ||
-+		option == "options.ui.tabs.show-tab-buttons") {
- 		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
- 		//notifyRestart = false;
- 	}
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -825,7 +825,7 @@ void TabDlg::setUserManagementEnabled(bo
- 	}
- 
- 	userManagement_ = enabled;
--	tabWidget_->setTabButtonsShown(enabled);
-+	tabWidget_->setTabButtonsShown(PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool());
- 	tabWidget_->setDragsEnabled(enabled);
- }
- 
---- psi.orig/src/widgets/psitabwidget.cpp
-+++ psi/src/widgets/psitabwidget.cpp
-@@ -78,6 +78,10 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-close-buttons").toBool()){
- 		tabBar_->setTabsClosable(false);
- 	}
-+	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool()){
-+		closeButton_->hide();
-+		downButton_->hide();
-+	}
- 	connect(tabBar_, SIGNAL(mouseDoubleClickTab(int)), SLOT(mouseDoubleClickTab(int)));
- 	connect(tabBar_, SIGNAL(mouseMiddleClickTab(int)), SLOT(mouseMiddleClickTab(int)));
- 	connect(tabBar_, SIGNAL( currentChanged(int)), SLOT(tab_currentChanged(int)));

psi-plus-main-20160309.tar.xz/patches/0050-psi-plugins-qcm-fix.diff Deleted

@@ -1,43 +0,0 @@
---- psi.orig/qcm/plugins.qcm
-+++ psi/qcm/plugins.qcm
-@@ -1,8 +1,6 @@
- /*
- -----BEGIN QCMOD-----
--name: Plugins
--arg: enable-plugins,Enable Psi Plugin support
--
-+name: Psi Plugin support
- -----END QCMOD-----
- */
- 
-@@ -13,17 +11,10 @@ class qc_plugins : public ConfObj
- {
- public:
- 	qc_plugins(Conf *c) : ConfObj(c) {}
--	QString name() const { return "Plugins"; }
--	QString shortname() const { return "Plugins"; }
-+	QString name() const { return "Psi Plugin support"; }
-+	QString shortname() const { return "plugins"; }
- 	bool exec()
- 	{
--		QString s;
--
--		// Check if Jingle was enabled explicitly
--		s = conf->getenv("QC_ENABLE_PLUGINS");
--		if(s.isEmpty())
--			return false;
--
- 		conf->addDefine("PSI_PLUGINS");
- 
- 		// Finish
---- psi.orig/psi.qc
-+++ psi/psi.qc
-@@ -45,7 +45,7 @@
-   <dep type='spell'>
-     <required/>
-   </dep>
--  
-+  <dep type='plugins'><disabled/></dep>
-   <dep type='conf'>
-     <required/>
-   </dep>

psi-plus-main-20160309.tar.xz/patches/0060-psi-configure-hyperlink-color.diff Deleted

@@ -1,35 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -345,6 +345,10 @@
- 						<usertext type="QColor" comment="Color used to indicate additional text for informational messages.">#606060</usertext>
- 						<highlighting type="QColor">#FF0000</highlighting>
- 					</messages>
-+					<chat>
-+						<link-color type="QColor">#0000ff</link-color>
-+						<mailto-color type="QColor">#0000ff</mailto-color>
-+					</chat>
- 					<passive-popup>
- 						<border type="QColor">#5297f9</border>
- 					</passive-popup>
---- psi.orig/src/textutil.cpp
-+++ psi/src/textutil.cpp
-@@ -411,7 +411,8 @@ QString TextUtil::linkify(const QString
- 			href = escape(href);
- 			href = linkify_htmlsafe(href);
- 			//printf("link: %s, href=%s\n", link.latin1(), href.latin1());
--			linked = QString("<a href=\"%1\">").arg(href) + escape(link) + "</a>" + escape(pre.mid(cutoff));
-+			QColor lcolor=PsiOptions::instance()->getOption("options.ui.look.colors.chat.link-color").toString();
-+			linked = QString("<a href=\"%1\" style=\"color:"+lcolor.name()+"\">").arg(href) + escape(link) + "</a>" + escape(pre.mid(cutoff));
- 			out.replace(x1, len, linked);
- 			n = x1 + linked.length() - 1;
- 		}
-@@ -444,7 +445,8 @@ QString TextUtil::linkify(const QString
- 
- 			href += link;
- 			//printf("link: %s, href=%s\n", link.latin1(), href.latin1());
--			linked = QString("<a href=\"%1\">").arg(href) + link + "</a>";
-+			QColor mcolor=PsiOptions::instance()->getOption("options.ui.look.colors.chat.mailto-color").toString();
-+			linked = QString("<a href=\"%1\" style=\"color:"+mcolor.name()+"\">").arg(href) + link + "</a>";
- 			out.replace(x1, len, linked);
- 			n = x1 + linked.length() - 1;
- 		}

psi-plus-main-20160309.tar.xz/patches/0070-psi-dirty-check.diff Deleted

@@ -1,295 +0,0 @@
---- psi.orig/src/AutoUpdater/AutoUpdater.pri
-+++ psi/src/AutoUpdater/AutoUpdater.pri
-@@ -16,3 +16,16 @@ Sparkle {
- 
- 	LIBS += -framework Sparkle
- }
-+
-+QuickDirtyChecker {
-+        DEFINES += USE_QDCHECKER
-+
-+        HEADERS += \
-+                $$PWD/QDChecker.h
-+
-+        SOURCES += \
-+                $$PWD/QDChecker.cpp
-+
-+        FORMS += \
-+                $$PWD/QDChangeLog.ui
-+}
---- /dev/null
-+++ psi/src/AutoUpdater/QDChangeLog.ui
-@@ -0,0 +1,71 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>ShowChangeLogForm</class>
-+ <widget class="QWidget" name="ShowChangeLogForm">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>400</width>
-+    <height>300</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>New version is available!</string>
-+  </property>
-+  <layout class="QGridLayout" name="gridLayout">
-+   <property name="margin">
-+    <number>6</number>
-+   </property>
-+   <property name="spacing">
-+    <number>2</number>
-+   </property>
-+   <item row="0" column="0">
-+    <widget class="QTextEdit" name="logText">
-+     <property name="readOnly">
-+      <bool>true</bool>
-+     </property>
-+     <property name="textInteractionFlags">
-+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="1" column="0">
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QLabel" name="label">
-+       <property name="text">
-+        <string>Open download page?</string>
-+       </property>
-+       <property name="alignment">
-+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QDialogButtonBox" name="buttonBox">
-+       <property name="standardButtons">
-+        <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- /dev/null
-+++ psi/src/AutoUpdater/QDChecker.cpp
-@@ -0,0 +1,100 @@
-+/*
-+ * Quick-and-dirty checker for updates.
-+ * Written by Aleksey Palazhchenko.
-+ * No rights reserved for this ugly code. This file is in public domain.
-+ */
-+
-+#include "QDChecker.h"
-+#include "ui_QDChangeLog.h"
-+
-+#include <QUrl>
-+#include <QDesktopServices>
-+#include <QNetworkAccessManager>
-+#include <QNetworkRequest>
-+#include <QNetworkReply>
-+#include <QNetworkProxy>
-+
-+#include "psioptions.h"
-+#include "proxy.h"
-+
-+const QUrl QDChecker::updateCheckUrl_ = QUrl("https://raw.githubusercontent.com/psi-plus/main/master/version.txt");
-+const QUrl QDChecker::changelogUrl_ = QUrl("https://raw.githubusercontent.com/psi-plus/main/master/changelog.txt");
-+const QUrl QDChecker::downloadPageUrl_ = QUrl("http://sourceforge.net/projects/psiplus/files/MS-Windows/Installers/0.16/");
-+
-+const QString QDChecker::settingsKey_ = QLatin1String("options.auto-update.last-check-value");
-+
-+QDChecker::QDChecker()
-+	: manager_(new QNetworkAccessManager(this)), logForm_(0)
-+{
-+	ProxyItem it = ProxyManager::instance()->getItemForObject("Auto Updater");
-+	ProxySettings ps = it.settings;
-+	if(!ps.host.isEmpty()) {
-+		QNetworkProxy prx(QNetworkProxy::HttpCachingProxy, ps.host, ps.port, ps.user, ps.pass);
-+		if(it.type == "socks")
-+			prx.setType(QNetworkProxy::Socks5Proxy);
-+		manager_->setProxy(prx);
-+	}
-+}
-+
-+QDChecker::~QDChecker()
-+{
-+	delete logForm_;
-+}
-+
-+void QDChecker::checkForUpdates()
-+{
-+	QNetworkRequest request(updateCheckUrl_);
-+	QNetworkReply* reply = manager_->get(request);
-+	connect(reply, SIGNAL(finished()), this, SLOT(onCheckFinished()));
-+}
-+
-+void QDChecker::onCheckFinished()
-+{
-+	qDebug("onCheckFinished");
-+	QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-+	if(reply && reply->error() == QNetworkReply::NoError) {
-+		const QByteArray data = reply->readAll();
-+		const quint16 newValue = qChecksum(data.constData(), data.size());
-+		const quint16 oldValue = PsiOptions::instance()->getOption(settingsKey_).toUInt();
-+
-+		if(newValue != oldValue) {
-+			QNetworkRequest request(changelogUrl_);
-+			QNetworkReply* reply = manager_->get(request);
-+			connect(reply, SIGNAL(finished()), this, SLOT(onDownloadLogFinished()));
-+			PsiOptions::instance()->setOption(settingsKey_, newValue);
-+		}
-+
-+		reply->deleteLater();
-+	} else {
-+		qCritical("WTF?! at %s %d", __FILE__, __LINE__);
-+	}
-+}
-+
-+void QDChecker::onDownloadLogFinished()
-+{
-+	qDebug("onDownloadLogFinished");
-+	QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-+	if(reply && reply->error() == QNetworkReply::NoError) {
-+		if(logForm_) {
-+			logForm_->deleteLater();
-+		}
-+		Ui::ShowChangeLogForm ui;
-+		logForm_ = new QWidget;
-+		ui.setupUi(logForm_);
-+
-+		ui.logText->setText(QString::fromUtf8(reply->readAll()));
-+
-+		connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(onOpenDownloadPage()));
-+		connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), logForm_, SLOT(hide()));
-+		logForm_->show();
-+
-+		reply->deleteLater();
-+	} else {
-+		qCritical("WTF?! at %s %d", __FILE__, __LINE__);
-+	}
-+}
-+
-+void QDChecker::onOpenDownloadPage()
-+{
-+	QDesktopServices::openUrl(downloadPageUrl_);
-+}
---- /dev/null
-+++ psi/src/AutoUpdater/QDChecker.h
-@@ -0,0 +1,44 @@
-+/*
-+ * Quick-and-dirty checker for updates.
-+ * Written by Aleksey Palazhchenko.
-+ * No rights reserved for this ugly code. This file is in public domain.
-+ */
-+
-+#ifndef QDCHECKER_H
-+#define QDCHECKER_H
-+
-+#include <QObject>
-+class QWidget;
-+class QUrl;
-+class QNetworkAccessManager;
-+
-+#include "AutoUpdater.h"
-+
-+class QDChecker : public QObject, public AutoUpdater
-+{
-+	Q_OBJECT
-+
-+public:
-+	QDChecker();
-+	virtual ~QDChecker();
-+
-+	// from AutoUpdater
-+	virtual void checkForUpdates();
-+
-+private slots:
-+	void onCheckFinished();
-+	void onDownloadLogFinished();
-+	void onOpenDownloadPage();
-+
-+private:
-+	QNetworkAccessManager* manager_;
-+	QWidget* logForm_;
-+
-+	static const QUrl updateCheckUrl_;
-+	static const QUrl changelogUrl_;
-+	static const QUrl downloadPageUrl_;
-+
-+	static const QString settingsKey_;
-+};
-+
-+#endif // QDCHECKER_H
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -119,6 +119,8 @@
- #include "AutoUpdater/AutoUpdater.h"
- #ifdef HAVE_SPARKLE
- #include "AutoUpdater/SparkleAutoUpdater.h"
-+#elif defined(USE_QDCHECKER)
-+#	include "AutoUpdater/QDChecker.h"
- #endif
- 
- #ifdef Q_OS_MAC
-@@ -462,14 +464,6 @@ bool PsiCon::init()
- 	d->tuneManager = new TuneControllerManager();
- #endif
- 
--	// Auto updater initialization
--#ifdef HAVE_SPARKLE
--	d->autoUpdater = new SparkleAutoUpdater(ApplicationInfo::getAppCastURL());
--#endif
--	if (d->autoUpdater && options->getOption("options.auto-update.check-on-startup").toBool()) {
--		d->autoUpdater->checkForUpdates();
--	}
--
- 	// calculate the small font size
- 	const int minimumFontSize = 7;
- 	common_smallFontSize = qApp->font().pointSize();
-@@ -505,6 +499,15 @@ bool PsiCon::init()
- 	QDir profileDir( pathToProfile(activeProfile, ApplicationInfo::DataLocation) );
- 	profileDir.rmdir( "info" ); // remove unused dir
- 
-+	// Auto updater initialization
-+#ifdef HAVE_SPARKLE
-+	d->autoUpdater = new SparkleAutoUpdater(ApplicationInfo::getAppCastURL());
-+#elif defined(USE_QDCHECKER)
-+	d->autoUpdater = new QDChecker();
-+#endif
-+	if (PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool() && d->autoUpdater)
-+		d->autoUpdater->checkForUpdates();
-+
- 	d->iconSelect = new IconSelectPopup(0);
- 	connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
- 
---- psi.orig/src/src.pri
-+++ psi/src/src.pri
-@@ -51,6 +51,7 @@ use_crash {
- }
- 
- # AutoUpdater
-+win32:CONFIG += QuickDirtyChecker
- include($$PWD/AutoUpdater/AutoUpdater.pri)
- 
- # Widgets

psi-plus-main-20160309.tar.xz/patches/0080-psi-temp-show-caps.diff Deleted

psi-plus-main-20160309.tar.xz/patches/0090-psi-add-view-groups-to-tray-menu.diff Deleted

psi-plus-main-20160309.tar.xz/patches/0100-psi-contact-manager.diff Deleted

@@ -1,1228 +0,0 @@
---- a/src/contactlistaccountmenu.cpp
-+++ b/src/contactlistaccountmenu.cpp
-@@ -32,6 +32,7 @@
- #include "privacy/privacydlg.h"
- #include "psiiconset.h"
- #include "common.h"
-+#include "contactmanager/contactmanagerdlg.h"
- #include "mucjoindlg.h"
- 
- class ContactListAccountMenu::Private : public QObject
-@@ -46,6 +47,7 @@ class ContactListAccountMenu::Private : public QObject
- 	QAction* setAvatarAction_;
- 	QMenu* avatarMenu_;
- 	QAction* unsetAvatarAction_;
-+	QAction* contactManagerAction_;
- 	QMenu* bookmarksMenu_;
- 	QAction* bookmarksManageAction_;
- 	QList<QAction*> bookmarksJoinActions_;
-@@ -101,6 +103,9 @@ public:
- 		unsetAvatarAction_ = new QAction(tr("Unset Avatar"), this);
- 		connect(unsetAvatarAction_, SIGNAL(triggered()), SLOT(unsetAvatar()));
- 
-+		contactManagerAction_ = new IconAction(tr("&Contacts Manager"), this, "psi/action_contacts_manager");
-+		connect(contactManagerAction_, SIGNAL(triggered()), SLOT(contactManager()));
-+
- 		bookmarksManageAction_ = new QAction(tr("Manage Bookmarks"), this);
- 		connect(bookmarksManageAction_, SIGNAL(triggered()), SLOT(bookmarksManage()));
- 
-@@ -155,6 +160,7 @@ public:
- 		menu->addAction(addContactAction_);
- 		menu->addAction(serviceDiscoveryAction_);
- 		menu->addAction(newMessageAction_);
-+		menu->addAction(contactManagerAction_);
- 		menu->addAction(privacyListsAction_);
- 		menu->addSeparator();
- 		menu->addAction(xmlConsoleAction_);
-@@ -219,6 +225,7 @@ private slots:
- 		newMessageAction_->setEnabled(account->account()->isAvailable());
- 		addContactAction_->setEnabled(account->account()->isAvailable());
- 		serviceDiscoveryAction_->setEnabled(account->account()->isAvailable());
-+		contactManagerAction_->setEnabled(account->account()->isAvailable());
- 		privacyListsAction_->setEnabled(account->account()->isAvailable());
- 		if (!PsiOptions::instance()->getOption("options.ui.menu.account.admin").toBool()) {
- 			adminMenu_->menuAction()->setVisible(false);
-@@ -344,6 +351,19 @@ private slots:
- 			bringToFront(dlg);
- 	}
- 
-+	void contactManager()
-+	{
-+		if (!account)
-+			return;
-+
-+		ContactManagerDlg *dlg = account->account()->findDialog<ContactManagerDlg*>();
-+		if(!dlg) {
-+			dlg = new ContactManagerDlg(account->account());
-+			dlg->show();
-+		} else
-+			bringToFront(dlg);
-+	}
-+
- 	void xmlConsole()
- 	{
- 		if (!account)
-new file mode 100644
---- /dev/null
-+++ b/src/contactmanager/contactmanager.pri
-@@ -0,0 +1,7 @@
-+HEADERS += $$PWD/contactmanagerdlg.h \
-+    $$PWD/contactmanagermodel.h \
-+	$$PWD/contactmanagerview.h
-+SOURCES += $$PWD/contactmanagerdlg.cpp \
-+    $$PWD/contactmanagermodel.cpp \
-+	$$PWD/contactmanagerview.cpp
-+FORMS += $$PWD/contactmanagerdlg.ui
-new file mode 100644
---- /dev/null
-+++ b/src/contactmanager/contactmanagerdlg.cpp
-@@ -0,0 +1,318 @@
-+/*
-+ * contactmanagerdlg.cpp
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <QMessageBox>
-+#include <QItemSelectionModel>
-+#include <QFileDialog>
-+#include <QFile>
-+#include <QScrollArea>
-+#include <QCheckBox>
-+
-+#include "contactmanagerdlg.h"
-+
-+#include "psiaccount.h"
-+#include "userlist.h"
-+#include "xmpp_tasks.h"
-+#include "psiiconset.h"
-+#include "vcardfactory.h"
-+//#include "contactview.h"
-+
-+
-+ContactManagerDlg::ContactManagerDlg(PsiAccount *pa) :
-+	QDialog(0, Qt::Window),
-+	pa_(pa),
-+	um(0)
-+{
-+	setAttribute(Qt::WA_DeleteOnClose, true);
-+	ui_.setupUi(this);
-+	pa_->dialogRegister(this);
-+	setWindowTitle(tr("Contacts Manager")+" - "+pa->jid().bare());
-+
-+	um = new ContactManagerModel(this, pa_);
-+	um->reloadUsers();
-+	ui_.usersView->setModel(um);
-+	ui_.usersView->init();
-+
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/sendMessage").icon(), tr("Message"), 1);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/remove").icon(), tr("Remove"), 2);
-+	ui_.cbAction->addItem(IconsetFactory::icon("status/ask").icon(), tr("Auth request"), 3);
-+	ui_.cbAction->addItem(IconsetFactory::icon("status/ask").icon(), tr("Auth grant"), 4);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/command").icon(), tr("Change domain"), 5);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/info").icon(), tr("Resolve nicks"), 6);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/browse").icon(), tr("Move to group"), 7);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/export").icon(), tr("Export"), 8);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/import").icon(), tr("Import"), 9);
-+	connect(ui_.cbAction, SIGNAL(currentIndexChanged(int)), this, SLOT(showParamField(int)));
-+	showParamField(0); // 0 - default index of combobox
-+
-+	ui_.cmbField->insertItems(0, um->manageableFields());
-+	ui_.cmbMatchType->addItem(tr("Simple"), ContactManagerModel::SimpleMatch);
-+	ui_.cmbMatchType->addItem(tr("RegExp"), ContactManagerModel::RegexpMatch);
-+	connect(ui_.btnExecute, SIGNAL(clicked()), this, SLOT(executeCurrent()));
-+	connect(ui_.btnSelect, SIGNAL(clicked()), this, SLOT(doSelect()));
-+
-+	connect(pa_->client(), SIGNAL(rosterRequestFinished(bool,int,QString)), this, SLOT(client_rosterUpdated(bool,int,QString)));
-+}
-+
-+
-+
-+ContactManagerDlg::~ContactManagerDlg()
-+{
-+	pa_->dialogUnregister(this);
-+}
-+
-+void ContactManagerDlg::changeEvent(QEvent *e)
-+{
-+    switch (e->type()) {
-+    case QEvent::LanguageChange:
-+		ui_.retranslateUi(this);
-+        break;
-+    default:
-+        break;
-+    }
-+}
-+
-+void ContactManagerDlg::doSelect()
-+{
-+	int type = ui_.cmbMatchType->itemData(ui_.cmbMatchType->currentIndex()).toInt();
-+	int coumnIndex = ui_.cmbField->currentIndex();
-+	um->invertByMatch(coumnIndex + 1, type,  ui_.edtMatch->text());
-+}
-+
-+void ContactManagerDlg::executeCurrent()
-+{
-+	int action = ui_.cbAction->itemData(ui_.cbAction->currentIndex()).toInt();
-+	QList<UserListItem *> users = um->checkedUsers();
-+	if (!users.count() && action != 9) {
-+		return;
-+	}
-+	switch (action) {
-+		case 1: //message
-+			{
-+				QList<XMPP::Jid> list;
-+				foreach (UserListItem *u, users) {
-+					list.append(u->jid().full());
-+				}
-+				pa_->actionSendMessage(list);
-+			}
-+			break;
-+		case 2: //remove
-+			{
-+				if (QMessageBox::question(this, tr("Removal confirmation"),
-+										  tr("Are you sure want to delete selected contacts?"),
-+										  QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) {
-+					return;
-+				}
-+				um->startBatch();
-+				foreach (UserListItem *u, users) {
-+					if(u->isTransport() && !Jid(pa_->client()->host()).compare(u->jid())) {
-+						JT_UnRegister *ju = new JT_UnRegister(pa_->client()->rootTask());
-+						ju->unreg(u->jid());
-+						ju->go(true);
-+					}
-+					JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
-+					r->remove(u->jid());
-+					r->go(true);
-+				}
-+				um->clear();
-+				pa_->client()->rosterRequest();
-+			}
-+			break;
-+		case 3: //Auth request
-+			foreach (UserListItem *u, users) {
-+				pa_->dj_authReq(u->jid());
-+			}
-+			break;
-+		case 4: //Auth grant
-+			foreach (UserListItem *u, users) {
-+				pa_->dj_auth(u->jid());
-+			}
-+			break;
-+		case 5: //change domain
-+			changeDomain(users);
-+			break;
-+		case 6: //resolve nicks
-+			foreach (UserListItem *u, users) {
-+				VCardFactory::instance()->getVCard(u->jid(), pa_->client()->rootTask(), pa_, SLOT(resolveContactName()));
-+			}
-+			break;
-+		case 7:
-+			changeGroup(users);
-+			break;
-+		case 8: //export
-+			exportRoster(users);
-+			break;
-+		case 9: //import
-+			importRoster();
-+			break;
-+		default:
-+			QMessageBox::warning(this, tr("Invalid"), tr("This action is not supported atm"));
-+	}
-+}
-+
-+void ContactManagerDlg::showParamField(int index)
-+{
-+	int action = ui_.cbAction->itemData(index).toInt();
-+	ui_.edtActionParam->hide();
-+	ui_.cmbActionParam->hide();
-+	switch (action) {
-+		case 5:
-+			ui_.edtActionParam->show();
-+			break;
-+		case 7:
-+			ui_.cmbActionParam->clear();
-+			ui_.cmbActionParam->addItems(pa_->groupList());
-+			ui_.cmbActionParam->show();
-+			break;
-+	}
-+}
-+
-+void ContactManagerDlg::changeDomain(QList<UserListItem *>& users)
-+{
-+	QString domain = ui_.edtActionParam->text();
-+	if (domain.size()) {
-+		um->startBatch();
-+		um->clear();
-+		foreach (UserListItem *u, users) {
-+			JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
-+			if (!u->jid().node().isEmpty()) {
-+				r->set(u->jid().withDomain(domain), u->name(), u->groups());
-+				r->remove(u->jid());
-+			}
-+			r->go(true);
-+		}
-+		pa_->client()->rosterRequest();
-+	} else {
-+		QMessageBox::warning(this, tr("Invalid"), tr("Please fill parameter field with new domain name"));
-+	}
-+}
-+
-+void ContactManagerDlg::changeGroup(QList<UserListItem *>& users)
-+{
-+	QStringList groups(ui_.cmbActionParam->currentText());
-+
-+	foreach (UserListItem *u, users) {
-+		JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
-+		r->set(u->jid(), u->name(), groups);
-+		r->go(true);
-+	}
-+}
-+
-+void ContactManagerDlg::client_rosterUpdated(bool success, int statusCode,QString statusString)
-+{
-+	if (success) {
-+		um->reloadUsers();
-+	}
-+	ui_.usersView->viewport()->update();
-+	Q_UNUSED(statusCode);
-+	Q_UNUSED(statusString);
-+	um->stopBatch();
-+}
-+
-+void ContactManagerDlg::exportRoster(QList<UserListItem *>& users)
-+{
-+	QString fileName = QFileDialog::getSaveFileName(this, tr("Roster file"), QDir::homePath());
-+	if (!fileName.isEmpty()) {
-+		QDomDocument doc;
-+		QString nick;
-+		QDomElement root = doc.createElement("roster");
-+		doc.appendChild(root);
-+		foreach (UserListItem *u, users) {
-+			QDomElement contact = root.appendChild(doc.createElement("contact")).toElement();
-+			contact.setAttribute("jid", u->jid().bare());
-+			foreach (QString group, u->groups()) {
-+				contact.appendChild(doc.createElement("group")).appendChild(doc.createTextNode(group));
-+			}
-+			nick = u->name();
-+			if (!nick.isEmpty()) {
-+				contact.appendChild(doc.createElement("nick")).appendChild(doc.createTextNode(nick));
-+			}
-+		}
-+		QFile file(fileName);
-+		if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+			QMessageBox::critical(this, tr("Save error!"), tr("Can't open file %1 for writing").arg(fileName));
-+			return;
-+		}
-+		file.write(doc.toString().toLocal8Bit());
-+		file.close();
-+	}
-+}
-+
-+void ContactManagerDlg::importRoster()
-+{
-+	QString fileName = QFileDialog::getOpenFileName(this, tr("Roster file"), QDir::homePath());
-+	if (!fileName.isEmpty()) {
-+		QFile file(fileName);
-+		if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-+			QMessageBox::critical(this, tr("Open error!"), tr("Can't open file %1 for reading").arg(fileName));
-+			return;
-+		}
-+		QDomDocument doc;
-+		if (!doc.setContent(&file)) {
-+			QMessageBox::critical(this, tr("Open error!"), tr("File %1 is not xml file").arg(fileName));
-+			return;
-+		}
-+		QDomNodeList domContacts = doc.documentElement().elementsByTagName("contact");
-+		if (domContacts.isEmpty()) {
-+			QMessageBox::warning(this, tr("Nothing to do.."), tr("No contacts found in file %1").arg(fileName));
-+		}
-+
-+		QHash<QString, QString>nicks;
-+		QHash<QString, QStringList>groups;
-+		QString jid, nick;
-+		QStringList jids;
-+		QStringList labelContent;
-+		for (unsigned i=0; i<domContacts.length(); i++) {
-+			QDomElement contact = domContacts.item(i).toElement();
-+			jid = contact.attribute("jid");
-+			jids.append(jid);
-+			QDomNodeList props = contact.childNodes();
-+			for (unsigned j=0; j<props.length(); j++) {
-+				if (!props.item(j).isElement()) {
-+					continue;
-+				}
-+				QDomElement el = props.item(j).toElement();
-+				if (el.tagName() == "nick") {
-+					nicksjid = el.text();
-+				}
-+				if (el.tagName() == "group") {
-+					groupsjid.append(el.text());
-+				}
-+			}
-+			labelContent.append(QString("%1 (%2)").arg(jid).arg(nicksjid));
-+		}
-+
-+		QMessageBox confirmDlg(
-+				QMessageBox::Question,tr("Confirm contacts importing"),
-+				tr("Do you really want to import these contacts?"), QMessageBox::Cancel | QMessageBox::Yes);
-+		confirmDlg.setDetailedText(labelContent.join("\n"));
-+		if (confirmDlg.exec() == QMessageBox::Yes) {
-+			um->startBatch();
-+			um->clear();
-+			foreach (QString jid, jids) {
-+				JT_Roster *r = new JT_Roster(pa_->client()->rootTask());
-+				r->set(Jid(jid), nicksjid, groupsjid);
-+				r->go(true);
-+			}
-+			pa_->client()->rosterRequest(); // через ж.., но пускай пока так.
-+		}
-+		file.close();
-+	}
-+}
-new file mode 100644
-index 0000000..3b37a6f
---- /dev/null
-+++ b/src/contactmanager/contactmanagerdlg.h
-@@ -0,0 +1,60 @@
-+/*
-+ * contactmanagerdlg.h
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef CONTACTMANAGERDLG_H
-+#define CONTACTMANAGERDLG_H
-+#include "ui_contactmanagerdlg.h"
-+
-+#include <QDialog>
-+#include "contactmanagermodel.h"
-+class PsiAccount;
-+
-+namespace Ui {
-+    class ContactManagerDlg;
-+}
-+
-+class ContactManagerDlg : public QDialog {
-+    Q_OBJECT
-+    Q_DISABLE_COPY(ContactManagerDlg)
-+public:
-+	explicit ContactManagerDlg(PsiAccount *pa);
-+    virtual ~ContactManagerDlg();
-+
-+protected:
-+    virtual void changeEvent(QEvent *e);
-+
-+private:
-+	void changeDomain(QList<UserListItem *>& users);
-+	void changeGroup(QList<UserListItem *>& users);
-+	void exportRoster(QList<UserListItem *>& users);
-+	void importRoster();
-+
-+	Ui::ContactManagerDlg ui_;
-+	PsiAccount *pa_;
-+	ContactManagerModel *um;
-+
-+private slots:
-+	void doSelect();
-+	void executeCurrent();
-+	void showParamField(int index);
-+	void client_rosterUpdated(bool,int,QString);
-+};
-+
-+#endif // CONTACTMANAGERDLG_H
-new file mode 100644
-index 0000000..8fd702a
---- /dev/null
-+++ b/src/contactmanager/contactmanagerdlg.ui
-@@ -0,0 +1,203 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>ContactManagerDlg</class>
-+ <widget class="QDialog" name="ContactManagerDlg">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>600</width>
-+    <height>390</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Contacts Manager</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <widget class="ContactManagerView" name="usersView">
-+     <property name="selectionBehavior">
-+      <enum>QAbstractItemView::SelectRows</enum>
-+     </property>
-+     <property name="sortingEnabled">
-+      <bool>true</bool>
-+     </property>
-+     <attribute name="horizontalHeaderCascadingSectionResizes">
-+      <bool>true</bool>
-+     </attribute>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <widget class="QLabel" name="lblField">
-+       <property name="text">
-+        <string>Field</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cmbField"/>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cmbMatchType"/>
-+     </item>
-+     <item>
-+      <widget class="QLineEdit" name="edtMatch">
-+       <property name="maximumSize">
-+        <size>
-+         <width>32000</width>
-+         <height>16777215</height>
-+        </size>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnSelect">
-+       <property name="sizePolicy">
-+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-+         <horstretch>0</horstretch>
-+         <verstretch>0</verstretch>
-+        </sizepolicy>
-+       </property>
-+       <property name="maximumSize">
-+        <size>
-+         <width>32</width>
-+         <height>16777215</height>
-+        </size>
-+       </property>
-+       <property name="text">
-+        <string notr="true">+/-</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout_2">
-+     <item>
-+      <widget class="QLabel" name="lblAction">
-+       <property name="text">
-+        <string>Action</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cbAction"/>
-+     </item>
-+     <item>
-+      <widget class="QLineEdit" name="edtActionParam">
-+       <property name="whatsThis">
-+        <string extracomment="Action's parameter"/>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cmbActionParam">
-+       <property name="editable">
-+        <bool>true</bool>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnExecute">
-+       <property name="text">
-+        <string>Execute</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <widget class="QDialogButtonBox" name="buttonBox">
-+     <property name="orientation">
-+      <enum>Qt::Horizontal</enum>
-+     </property>
-+     <property name="standardButtons">
-+      <set>QDialogButtonBox::Close</set>
-+     </property>
-+     <property name="centerButtons">
-+      <bool>false</bool>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <customwidgets>
-+  <customwidget>
-+   <class>ContactManagerView</class>
-+   <extends>QTableView</extends>
-+   <header>contactmanager/contactmanagerview.h</header>
-+  </customwidget>
-+ </customwidgets>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>accepted()</signal>
-+   <receiver>ContactManagerDlg</receiver>
-+   <slot>accept()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>257</x>
-+     <y>380</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>157</x>
-+     <y>274</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>rejected()</signal>
-+   <receiver>ContactManagerDlg</receiver>
-+   <slot>reject()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>325</x>
-+     <y>380</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>286</x>
-+     <y>274</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>edtMatch</sender>
-+   <signal>returnPressed()</signal>
-+   <receiver>btnSelect</receiver>
-+   <slot>click()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>343</x>
-+     <y>292</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>386</x>
-+     <y>302</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+</ui>
-new file mode 100644
-index 0000000..a48b52c
---- /dev/null
-+++ b/src/contactmanager/contactmanagermodel.cpp
-@@ -0,0 +1,304 @@
-+/*
-+ * contactmanagermodel.cpp
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "contactmanagermodel.h"
-+#include "psiaccount.h"
-+#include "userlist.h"
-+#include "xmpp_tasks.h"
-+#include "QDebug"
-+
-+
-+ContactManagerModel::ContactManagerModel(QObject * parent, PsiAccount *pa) :
-+		QAbstractTableModel(parent),
-+		pa_(pa)
-+{
-+	columnNames
-+			<<""
-+			<<tr("Nick")
-+			<<tr("Group")
-+			<<tr("Node")
-+			<<tr("Domain")
-+			<<tr("Subscription");
-+	roles	<<CheckRole
-+			<<NickRole
-+			<<GroupRole
-+			<<NodeRole
-+			<<DomainRole
-+			<<SubscriptionRole;
-+	connect(pa_, SIGNAL(updateContact(UserListItem)), this, SLOT(view_contactUpdated(UserListItem)));
-+	connect(pa_->client(), SIGNAL(rosterItemUpdated(const RosterItem &)), this, SLOT(client_rosterItemUpdated(const RosterItem &)));
-+}
-+
-+void ContactManagerModel::reloadUsers()
-+{
-+	beginResetModel();
-+	clear();
-+	UserList *ul = pa_->userList();
-+	foreach (UserListItem *u, *ul) {
-+		if (u->inList()) {
-+			addContact(u);
-+		}
-+	}
-+	endResetModel();
-+}
-+
-+void ContactManagerModel::clear()
-+{
-+	_userList.clear();
-+	checks.clear();
-+}
-+
-+int ContactManagerModel::rowCount(const QModelIndex &parent) const
-+{
-+	if (parent.isValid()) return 0;
-+	return _userList.count();
-+}
-+
-+int ContactManagerModel::columnCount ( const QModelIndex & parent) const
-+{
-+	Q_UNUSED(parent);
-+	return columnNames.count();
-+}
-+
-+QVariant ContactManagerModel::data(const QModelIndex &index, int role) const
-+{
-+	Role columnRole = rolesindex.column();
-+	UserListItem *u = _userList.at(index.row());
-+	if (u) {
-+		switch (columnRole) {
-+			case CheckRole: //checkbox
-+				if (role == Qt::CheckStateRole) {
-+					return checks.contains(u->jid().full())?2:0;
-+				} else if (role == Qt::TextAlignmentRole) {
-+					return (int)(Qt::AlignRight | Qt::AlignVCenter);
-+				}
-+				break;
-+			case NodeRole:
-+				if (role == Qt::TextAlignmentRole) {
-+					return (int)(Qt::AlignRight | Qt::AlignVCenter);
-+				}
-+			default:
-+				if (role == Qt::DisplayRole) {
-+					return userFieldString(u, columnRole);
-+				}
-+		}
-+	}
-+	return QVariant();
-+}
-+
-+QString ContactManagerModel::userFieldString(UserListItem *u, ContactManagerModel::Role columnRole) const
-+{
-+	QString data;
-+	switch (columnRole) {
-+		case NodeRole: //node
-+			data = u->jid().node();
-+			break;
-+		case DomainRole: //domain
-+			data = u->jid().domain();
-+			break;
-+		case NickRole: //nick
-+			data = u->name();
-+			break;
-+		case GroupRole: //group
-+			if (u->groups().isEmpty()) {
-+				data = "";
-+			} else {
-+				data = u->groups().first();
-+			}
-+			break;
-+		case SubscriptionRole: //subscription
-+			data = u->subscription().toString();
-+			break;
-+		default:
-+			break;
-+	}
-+	return data;
-+}
-+
-+QVariant ContactManagerModel::headerData(int section, Qt::Orientation orientation,
-+					 int role) const
-+{
-+	if (role == Qt::DisplayRole) {
-+		if (orientation == Qt::Horizontal) {
-+			return columnNamessection;
-+		} else {
-+			return section+1;
-+		}
-+	}
-+	return QVariant();
-+}
-+
-+
-+QStringList ContactManagerModel::manageableFields()
-+{
-+	QStringList ret = columnNames;
-+	ret.removeFirst();
-+	return ret;
-+}
-+
-+void ContactManagerModel::addContact(UserListItem *u)
-+{
-+	_userList.append(u);
-+}
-+
-+Qt::ItemFlags ContactManagerModel::flags ( const QModelIndex & index ) const
-+{
-+	Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-+	Role columnRole = rolesindex.column();
-+	if ( columnRole == CheckRole ) {
-+		flags |= ( Qt::ItemIsUserCheckable );
-+	}
-+	return flags;
-+}
-+
-+bool ContactManagerModel::setData ( const QModelIndex & index, const QVariant & value, int role )
-+{
-+	Q_UNUSED(role);
-+	if (index.isValid()) {
-+		Role columnRole = rolesindex.column();
-+		if ( columnRole == CheckRole ) {
-+			QString jid = _userList.at(index.row())->jid().full();
-+			if (value.toInt() == 3) { //iversion
-+				if (checks.contains(jid)) {
-+					checks.remove(jid);
-+				} else {
-+					checks.insert(jid);
-+				}
-+				emit dataChanged ( index, index );
-+			} else {
-+				if (checks.contains(jid)) {
-+					if (!value.toBool()) {
-+						checks.remove(jid);
-+						emit dataChanged ( index, index );
-+					}
-+				} else {
-+					if (value.toBool()) {
-+						checks.insert(jid);
-+						emit dataChanged ( index, index );
-+					}
-+				}
-+			}
-+		}
-+	}
-+	return false;
-+}
-+
-+ContactManagerModel::Role ContactManagerModel::sortRole;
-+Qt::SortOrder ContactManagerModel::sortOrder = Qt::AscendingOrder;
-+
-+void ContactManagerModel::sort ( int column, Qt::SortOrder order = Qt::AscendingOrder )
-+{
-+	Role columnRole = rolescolumn;
-+	ContactManagerModel::sortRole = columnRole;
-+	ContactManagerModel::sortOrder = order;
-+	if (columnRole != CheckRole) {
-+		emit layoutAboutToBeChanged();
-+		qSort(_userList.begin(), _userList.end(), ContactManagerModel::sortLessThan);
-+		emit layoutChanged();
-+	}
-+}
-+
-+bool ContactManagerModel::sortLessThan(UserListItem *u1, UserListItem *u2)
-+{
-+	QString g1, g2;
-+	bool result = false;
-+	switch (ContactManagerModel::sortRole) {
-+		case NodeRole: //node
-+			result = u1->jid().node() < u2->jid().node();
-+			break;
-+		case DomainRole: //domain
-+			result = u1->jid().domain() < u2->jid().domain();
-+			break;
-+		case NickRole: //nick
-+			result = u1->name() < u2->name();
-+			break;
-+		case GroupRole: //group
-+			if (!u1->groups().isEmpty()) {
-+				g1 = u1->groups().first();
-+			}
-+			if (!u2->groups().isEmpty()) {
-+				g2 = u2->groups().first();
-+			}
-+			result = g1 < g2;
-+			break;
-+		case SubscriptionRole: //subscription
-+			result = u1->subscription().toString() < u2->subscription().toString();
-+			break;
-+		default:
-+			break;
-+	}
-+	return ContactManagerModel::sortOrder == Qt::AscendingOrder? result : !result;
-+}
-+
-+QList<UserListItem *> ContactManagerModel::checkedUsers()
-+{
-+	QList<UserListItem *> users;
-+	foreach (UserListItem *u, _userList) {
-+		if (checks.contains(u->jid().full())) {
-+			users.append(u);
-+		}
-+	}
-+	return users;
-+}
-+
-+void ContactManagerModel::invertByMatch(int columnIndex, int matchType, const QString &str)
-+{
-+	emit layoutAboutToBeChanged();
-+	Role columnRole = rolescolumnIndex;
-+	QString data;
-+	QRegExp reg;
-+	if (matchType == ContactManagerModel::RegexpMatch) {
-+		reg = QRegExp(str);
-+	}
-+	foreach (UserListItem *u, _userList) {
-+		data = userFieldString(u, columnRole);
-+		if ((matchType == ContactManagerModel::SimpleMatch && str == data) ||
-+			(matchType == ContactManagerModel::RegexpMatch && reg.indexIn(data) != -1)) {
-+			QString jid = u->jid().full();
-+			if (checks.contains(jid)) {
-+				checks.remove(jid);
-+			} else {
-+				checks.insert(jid);
-+			}
-+		}
-+	}
-+	emit layoutChanged();
-+}
-+
-+void ContactManagerModel::view_contactUpdated(const UserListItem &u)
-+{
-+	contactUpdated(u.jid());
-+}
-+
-+void ContactManagerModel::client_rosterItemUpdated(const RosterItem &item)
-+{
-+	contactUpdated(item.jid());
-+}
-+
-+void  ContactManagerModel::contactUpdated(const Jid &jid)
-+{
-+	int i = 0;
-+	foreach (UserListItem *lu, _userList) {
-+		if (lu->jid() == jid) {
-+			dataChanged(index(i, 1), index(i, columnNames.count()-1));
-+		}
-+		i++;
-+	}
-+}
-new file mode 100644
---- /dev/null
-+++ b/src/contactmanager/contactmanagermodel.h
-@@ -0,0 +1,93 @@
-+/*
-+ * contactmanagermodel.h
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef CONTACTMANAGERMODEL_H
-+#define CONTACTMANAGERMODEL_H
-+
-+#include <QAbstractTableModel>
-+#include <QStringList>
-+#include <QSet>
-+
-+class UserListItem;
-+class PsiAccount;
-+namespace XMPP
-+{
-+	class RosterItem;
-+	class Jid;
-+}
-+using namespace XMPP;
-+
-+class ContactManagerModel : public QAbstractTableModel
-+{
-+	Q_OBJECT
-+public:
-+	enum Role {
-+		// DisplayRole / EditRole
-+		CheckRole,
-+		NickRole,
-+		GroupRole,
-+		NodeRole,
-+		DomainRole,
-+		SubscriptionRole
-+	};
-+	const static int SimpleMatch = 1;
-+	const static int RegexpMatch = 2;
-+
-+	ContactManagerModel(QObject * parent, PsiAccount *pa);
-+	int rowCount(const QModelIndex &parent = QModelIndex()) const;
-+	int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
-+	QVariant data(const QModelIndex &index, int role) const;
-+	QVariant headerData(int section, Qt::Orientation orientation,
-+						 int role = Qt::DisplayRole) const;
-+	Qt::ItemFlags flags ( const QModelIndex & index ) const;
-+	bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole );
-+	void sort ( int column, Qt::SortOrder order );
-+	static bool sortLessThan(UserListItem *u1, UserListItem *u2);
-+	static Role sortRole;
-+	static Qt::SortOrder sortOrder;
-+
-+
-+	QStringList manageableFields();
-+	void reloadUsers();
-+	void clear();
-+	void addContact(UserListItem *u);
-+	QList<UserListItem *> checkedUsers();
-+	void invertByMatch(int columnIndex, int matchType, const QString &str);
-+
-+	void startBatch() { layoutAboutToBeChanged(); }
-+	void stopBatch() { layoutChanged(); }
-+
-+
-+private:
-+	PsiAccount *pa_;
-+	QList<UserListItem *> _userList;
-+	QStringList columnNames;
-+	QList<Role> roles;
-+	QSet<QString> checks;
-+
-+	QString userFieldString(UserListItem *u, ContactManagerModel::Role columnRole) const;
-+	void contactUpdated(const Jid &);
-+
-+private slots:
-+	void view_contactUpdated(const UserListItem &);
-+	void client_rosterItemUpdated(const RosterItem &);
-+};
-+
-+#endif // CONTACTMANAGERMODEL_H
-new file mode 100644
---- /dev/null
-+++ b/src/contactmanager/contactmanagerview.cpp
-@@ -0,0 +1,96 @@
-+/*
-+ * contactmanagerview.cpp
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <QMenu>
-+#include <QContextMenuEvent>
-+#include <QHeaderView>
-+
-+#include "contactmanagerview.h"
-+#include "psiiconset.h"
-+
-+ContactManagerView::ContactManagerView( QWidget * parent )
-+		: QTableView(parent)
-+{
-+
-+}
-+
-+void ContactManagerView::init()
-+{
-+	resizeColumnsToContents();
-+#ifdef HAVE_QT5
-+	horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
-+#else
-+	horizontalHeader()->setResizeMode(0, QHeaderView::ResizeToContents);
-+#endif
-+	horizontalHeader()->setStretchLastSection(true);
-+	horizontalHeader()->setSortIndicator(-1, Qt::AscendingOrder);
-+	verticalHeader()->setDefaultAlignment( Qt::AlignHCenter );
-+
-+	connect(horizontalHeader(), SIGNAL(sectionClicked(int)), this, SLOT(sortByColumn(int)));
-+}
-+
-+void ContactManagerView::contextMenuEvent( QContextMenuEvent * e )
-+{
-+	QMenu *popup = new QMenu(this);
-+	QList<QAction *> actions;
-+	actions <<new QAction(IconsetFactory::icon("psi/cm_check").icon(), tr("Check"), popup)
-+			<<new QAction(IconsetFactory::icon("psi/cm_uncheck").icon(), tr("Uncheck"), popup)
-+			<<new QAction(IconsetFactory::icon("psi/cm_invertcheck").icon(), tr("Invert"), popup);
-+	popup->addActions(actions);
-+	QAction *result = popup->exec(e->globalPos());
-+	int iresult;
-+	if (result) {
-+		iresult = actions.indexOf(result);
-+		const QVariant value(2);
-+		foreach(const QModelIndex &check, selectionModel()->selectedRows(0)) {
-+			switch (iresult) {
-+				case 0: //check
-+					model()->setData(check, 2);
-+					break;
-+				case 1: //uncheck
-+					model()->setData(check, 0);
-+					break;
-+				case 2: //invert
-+					model()->setData(check, 3);
-+					break;
-+			}
-+		}
-+	}
-+	delete popup;
-+}
-+
-+void ContactManagerView::keyPressEvent( QKeyEvent * e )
-+{
-+	if (e->key() == Qt::Key_Space) {
-+		int data = 2; //check
-+		if (e->modifiers() & Qt::ControlModifier) {
-+			data = 3; //invert
-+		} else if (e->modifiers() & Qt::ShiftModifier) {
-+			data = 0; //uncheck
-+		}
-+		foreach(const QModelIndex &check, selectionModel()->selectedRows(0)) {
-+			model()->setData(check, data);
-+		}
-+		e->accept();
-+	} else {
-+		QTableView::keyPressEvent(e);
-+		e->ignore();
-+	}
-+}
-new file mode 100644
---- /dev/null
-+++ b/src/contactmanager/contactmanagerview.h
-@@ -0,0 +1,38 @@
-+/*
-+ * contactmanagerview.h
-+ * Copyright (C) 2010 Rion
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef CONTACTMANAGERVIEW_H
-+#define CONTACTMANAGERVIEW_H
-+
-+#include <QTableView>
-+
-+class ContactManagerView : public QTableView
-+{
-+	Q_OBJECT
-+public:
-+	ContactManagerView( QWidget * parent = 0 );
-+	void init();
-+
-+protected:
-+	void contextMenuEvent( QContextMenuEvent * e );
-+	void keyPressEvent( QKeyEvent * e );
-+};
-+
-+#endif // CONTACTMANAGERVIEW_H
---- a/src/src.pri
-+++ b/src/src.pri
-@@ -17,6 +17,7 @@ include($$PWD/irisprotocol/irisprotocol.pri)
- include($$PWD/privacy/privacy.pri)
- include($$PWD/tabs/tabs.pri)
- include($$PWD/Certificates/Certificates.pri)
-+include($$PWD/contactmanager/contactmanager.pri)
- 
- # tools
- # include($$PWD/tools/trayicon/trayicon.pri)

psi-plus-main-20160309.tar.xz/patches/0110-psiplus-more-compatibility-with-skinsplugin.diff Deleted

@@ -1,37 +0,0 @@
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -358,6 +358,8 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	} else
- 		setCentralWidget(rosterBar);
- 
-+	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
-+
- 	d->vb_roster = new QVBoxLayout(rosterBar);
- #ifndef NEWCONTACTLIST
- 	cvlist = new ContactView(rosterBar);
-@@ -600,6 +602,14 @@ void MainWin::splitterMoved()
- 	d->tabsSize = d->isLeftRoster ? list.last() : list.first();
- }
- 
-+void MainWin::optionChanged(const QString& option)
-+{
-+	if (option == toolbarsStateOptionPath) { //for compatibility with skins plugin
-+		loadToolbarsState();
-+		//buildToolbars(); //FIXME!!! not a very good solution
-+	}
-+}
-+
- void MainWin::registerAction( IconAction* action )
- {
- 	const char *activated  = SIGNAL( triggered() );
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -168,6 +168,8 @@ private slots:
- 
- 	void hideTimerTimeout();
- 
-+	void optionChanged(const QString&);
-+
- public slots:
- 	void setWindowIcon(const QPixmap&);
- 	void showNoFocus();

psi-plus-main-20160309.tar.xz/patches/0120-psi-css-style-sheet.diff Deleted

@@ -1,349 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -120,6 +120,7 @@
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
- 				<show-status-changes type="bool">true</show-status-changes>
- 				<warn-before-clear type="bool">true</warn-before-clear>
-+				<css type="QString" />
- 				<hide-when-closing type="bool">false</hide-when-closing>
- 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
- 				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
-@@ -144,6 +145,7 @@
- 					<show comment="Show status messages" type="bool">false</show>
- 				</status-messages>
- 				<tooltip comment="Display options for the contact list tooltips">
-+					<css type="QString"></css>
- 					<avatar comment="Display avatar" type="bool">true</avatar>
- 					<client-version comment="Display client version information" type="bool">true</client-version>
- 					<geolocation comment="Display geolocation information" type="bool">true</geolocation>
-@@ -152,6 +154,58 @@
- 				</tooltip>
- 				<temp-no-roster-animation comment="Disable animated icons. This option will be removed as soon as the contactlist code is optimized enough" type="bool">false</temp-no-roster-animation>
- 				<account-sort-style type="QString">alpha</account-sort-style>
-+				<css type="QString">/* frame of avatar - general settings */
-+/* фрейм с аватаром - общие настройки */
-+RosterAvatarFrame * {
-+	margin: 1px;
-+}
-+
-+/* frame of avatar - avatar */
-+/* фрейм с аватаром - аватар */
-+QLabel#lb_avatar {
-+	margin-left: 0px;
-+	margin-top: 2px;
-+	margin-bottom: 2px;
-+	border: 1px solid #949494;
-+	border-radius: 3px;
-+}
-+
-+/* frame of avatar - nick */
-+/* фрейм с аватаром - ник */
-+QLabel#lb_nick {
-+	margin: 2px;
-+	margin-right: 1px;
-+	margin-bottom: 3px;
-+	border: 1px solid #949494;
-+	border-radius: 3px;
-+}
-+
-+/* frame of avatar - buttons of PEP and status */
-+/* фрейм с аватаром - кнопки PEP и статуса */
-+QToolButton#tb_status, #tb_mood, #tb_activity {
-+	margin-left: 1px;
-+	margin-right: 1px;
-+	margin-bottom: 2px;
-+	width: 100%;
-+}
-+
-+QToolButton#tb_status {
-+	margin-top: 0px;
-+	margin-bottom: 1px;
-+}
-+
-+/* frame of avatar - button of status, arrow */
-+/* фрейм с аватаром - кнопка статуса, стрелка */
-+QToolButton#tb_status::menu-indicator {
-+	background: argb(0,0,0,0);
-+}
-+
-+/* frame of avatar - field of status message */
-+/* фрейм с аватаром - строка статусного сообщения */
-+QLineEdit#le_status_text {
-+	margin-right: 0px;
-+	margin-bottom: 2px;
-+}</css>
- 				<always-on-top type="bool">false</always-on-top>
- 				<automatically-resize-roster type="bool">false</automatically-resize-roster>
- 				<grow-roster-upwards type="bool">true</grow-roster-upwards>
-@@ -363,6 +417,7 @@
- 					<message type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</message>
- 					<passive-popup type="QString">Sans Serif,7,-1,5,50,0,0,0,0,0</passive-popup>
- 				</font>
-+				<css type="QString" />
- 			</look>
- 			<notifications>
- 				<send-receipts type="bool" >true</send-receipts>
-@@ -379,6 +434,7 @@
- 						<status type="int">2000</status>
- 					</delays>
- 					<enabled type="bool">false</enabled>
-+					<css type="QString"></css>
- 					<top-to-bottom type="bool">false</top-to-bottom>
- 					<at-left-corner type="bool">false</at-left-corner>
- 					<incoming-chat type="bool">true</incoming-chat>
---- psi.orig/src/contactlistitemmenu.cpp
-+++ psi/src/contactlistitemmenu.cpp
-@@ -21,12 +21,17 @@
- #include "contactlistitemmenu.h"
- 
- #include "shortcutmanager.h"
-+#include "psioptions.h"
- 
- ContactListItemMenu::ContactListItemMenu(ContactListItem* item, ContactListModel* model)
- 	: QMenu(0)
- 	, item_(item)
- 	, model_(model)
- {
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- }
- 
- ContactListItemMenu::~ContactListItemMenu()
---- psi.orig/src/gcuserview.cpp
-+++ psi/src/gcuserview.cpp
-@@ -721,6 +721,10 @@ void GCUserView::doContextMenu(QTreeWidg
- 	pm->addAction(act);
- 	act->setData(3);
- 
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		pm->setStyleSheet(css);
-+	}
- 	int x = -1;
- 	bool enabled = false;
- 	act = pm->exec(QCursor::pos());
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -1907,6 +1907,11 @@ QString GCMainDlg::desiredCaption() cons
- 
- void GCMainDlg::setLooks()
- {
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+		d->mle()->setCssString(css);
-+	}
- 	ui_.vsplitter->optionsChanged();
- 	ui_.mle->optionsChanged();
- 
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -574,6 +574,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 
- 		/*QShortcut *sp_ss = new QShortcut(QKeySequence(tr("Ctrl+Shift+N")), this);
- 		connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
-+	optionChanged("options.ui.contactlist.css");
- 
- 	reinitAutoHide();
- }
-@@ -608,6 +609,12 @@ void MainWin::optionChanged(const QStrin
- 		loadToolbarsState();
- 		//buildToolbars(); //FIXME!!! not a very good solution
- 	}
-+	else if (option == "options.ui.contactlist.css") {
-+		const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+		if (!css.isEmpty()) {
-+			setStyleSheet(css);
-+		}
-+	}
- }
- 
- void MainWin::registerAction( IconAction* action )
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -284,6 +284,11 @@ void PsiChatDlg::setLooks()
- {
- 	ChatDlg::setLooks();
- 
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+		chatEdit()->setCssString(css);
-+	}
- 	ui_.splitter->optionsChanged();
- 	ui_.mle->optionsChanged();
- 
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -511,6 +511,10 @@ bool PsiCon::init()
- 	d->iconSelect = new IconSelectPopup(0);
- 	connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
- 
-+	const QString css = options->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty())
-+		d->iconSelect->setStyleSheet(css);
-+
- 	// first thing, try to load the iconset
- 	bool result = true;;
- 	if( !PsiIconset::instance()->loadAll() ) {
-@@ -1428,6 +1432,13 @@ void PsiCon::optionChanged(const QString
- 		s5b_init();
- 	}
- 
-+	if (option == "options.ui.chat.css") {
-+		QString css = PsiOptions::instance()->getOption(option).toString();
-+		if (!css.isEmpty())
-+			d->iconSelect->setStyleSheet(css);
-+		return;
-+	}
-+
- 	if (option == "options.ui.spell-check.langs") {
- 		QStringList langs = PsiOptions::instance()->getOption(option).toString().split(QRegExp("\\s+"), QString::SkipEmptyParts);
- 		if(langs.isEmpty()) {
---- psi.orig/src/statusmenu.cpp
-+++ psi/src/statusmenu.cpp
-@@ -36,6 +36,10 @@
- StatusMenu::StatusMenu(QWidget* parent, PsiCon* _psi )
- 	: QMenu(parent), psi(_psi)
- {
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- 	connect(psi, SIGNAL(statusPresetsChanged()), this, SLOT(presetsChanged()));
- 	installEventFilter(this);
- }
-@@ -65,6 +69,10 @@ void StatusMenu::fill()
- 		IconActionGroup* submenu = new IconActionGroup(this);
- 		submenu->setText(tr("Presets"));
- 		submenu->setPsiIcon("psi/action_templates");
-+		const QString css = o->getOption("options.ui.contactlist.css").toString();
-+		if (!css.isEmpty()) {
-+			submenu->popup()->setStyleSheet(css);
-+		}
- 		addPresets(submenu);
- 		submenu->popup()->installEventFilter(this);
- 	}
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -374,6 +374,11 @@ void TabDlg::setLooks()
- 		tabWidget_->setTabPosition(QTabWidget::South);
- 
- 	setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt()))/100);
-+
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- }
- 
- void TabDlg::tabSelected(QWidget* _selected)
---- psi.orig/src/widgets/fancypopup.cpp
-+++ psi/src/widgets/fancypopup.cpp
-@@ -213,6 +213,11 @@ void FancyPopup::Private::initContents(Q
- 	ui_.closeButton->setIcon( popup->style()->standardPixmap(QStyle::SP_TitleBarCloseButton) );
- 	ui_.closeButton->setFixedSize(BUTTON_WIDTH, BUTTON_HEIGHT);
- 	connect(ui_.closeButton, SIGNAL(clicked()), popup, SLOT(hide()));
-+
-+	const QString css = PsiOptions::instance()->getOption("options.ui.notifications.passive-popups.css").toString();
-+	if (!css.isEmpty()) {
-+		popup->setStyleSheet(css);
-+	}
- }
- 
- bool FancyPopup::Private::eventFilter(QObject *o, QEvent *e)
---- psi.orig/src/widgets/iconaction.cpp
-+++ psi/src/widgets/iconaction.cpp
-@@ -30,6 +30,8 @@ class PsiIcon;
- class Iconset;
- #endif
- 
-+#include "psioptions.h"
-+
- #include <QLayout>
- #include <QMenu>
- #include <QTimer>
-@@ -441,6 +443,11 @@ IconActionGroup::IconActionGroup(QObject
- 	d->updatePopup();
- 
- 	d->exclusive = exclusive;
-+
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+	if (!css.isEmpty()) {
-+		d->popup->setStyleSheet(css);
-+	}
- }
- 
- IconActionGroup::~IconActionGroup()
---- psi.orig/src/widgets/psitabwidget.cpp
-+++ psi/src/widgets/psitabwidget.cpp
-@@ -74,6 +74,7 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 	stacked_ = new QStackedLayout(layout_);
- 
- 	setTabPosition(QTabWidget::North);
-+	setLooks();
- 
- 	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-close-buttons").toBool()){
- 		tabBar_->setTabsClosable(false);
-@@ -177,9 +178,18 @@ void PsiTabWidget::addTab(QWidget *widge
- 		tabBar_->addTab(icon, name);
- 	else
- 		tabBar_->addTab(name);
-+	setLooks();
- 	showPage(currentPage());
- }
- 
-+void PsiTabWidget::setLooks()
-+{
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
-+}
-+
- /**
-  * Selects the page for the specified widget.
-  */
---- psi.orig/src/widgets/psitabwidget.h
-+++ psi/src/widgets/psitabwidget.h
-@@ -67,6 +67,7 @@ public:
- public slots:
- 	void setCurrentPage(int);
- 	void removeCurrentPage();
-+	void setLooks();
- 
- signals:
- 	void mouseDoubleClickTab(QWidget *tab);
---- psi.orig/src/widgets/psitiplabel.cpp
-+++ psi/src/widgets/psitiplabel.cpp
-@@ -55,6 +55,10 @@ void PsiTipLabel::init(const QString& te
- 			enableColoring_ = false;
- 		}
- 	}
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.tooltip.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- }
- 
- void PsiTipLabel::setText(const QString& text)
---- psi.orig/src/widgets/urlobject.cpp
-+++ psi/src/widgets/urlobject.cpp
-@@ -19,6 +19,7 @@
-  */
- 
- #include "urlobject.h"
-+#include "psioptions.h"
- 
- #include <QApplication>
- #include <QClipboard>
-@@ -231,6 +232,7 @@ QMenu *URLObject::createPopupMenu(const
- 	}
- 
- 	m->addAction(d->act_copy);
-+	m->setStyleSheet(PsiOptions::instance()->getOption("options.ui.look.css").toString());
- 	return m;
- }
-

psi-plus-main-20160309.tar.xz/patches/0130-psiplus-nix-application-icon-and-name.diff Deleted

@@ -1,34 +0,0 @@
---- psi.orig/psi.desktop
-+++ psi/psi.desktop
-@@ -2,7 +2,7 @@
- # This is the spec version, *not* the application version
- Version=1.0
- Type=Application
--Name=Psi
-+Name=Psi+
- GenericName=XMPP Client
- Comment=Communicate over the XMPP network
- Icon=psi
---- psi.orig/src/src.pro
-+++ psi/src/src.pro
-@@ -45,15 +45,15 @@ unix {
- 	dt.path=$$PREFIX/share/applications/
- 	dt.files = ../psi.desktop
- 	icon1.path=$$PREFIX/share/icons/hicolor/16x16/apps
--	icon1.extra = cp -f ../iconsets/system/default/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
-+	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
- 	icon2.path=$$PREFIX/share/icons/hicolor/32x32/apps
--	icon2.extra = cp -f ../iconsets/system/default/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
-+	icon2.extra = cp -f ../iconsets/system/default/psiplus/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
- 	icon3.path=$$PREFIX/share/icons/hicolor/48x48/apps
--	icon3.extra = cp -f ../iconsets/system/default/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
-+	icon3.extra = cp -f ../iconsets/system/default/psiplus/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
- 	icon4.path=$$PREFIX/share/icons/hicolor/64x64/apps
--	icon4.extra = cp -f ../iconsets/system/default/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
-+	icon4.extra = cp -f ../iconsets/system/default/psiplus/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
- 	icon5.path=$$PREFIX/share/icons/hicolor/128x128/apps
--	icon5.extra = cp -f ../iconsets/system/default/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
-+	icon5.extra = cp -f ../iconsets/system/default/psiplus/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
- 	INSTALLS += dt icon1 icon2 icon3 icon4 icon5
- }
-

psi-plus-main-20160309.tar.xz/patches/0140-psi-tray-act-bring-to-front.diff Deleted

@@ -1,441 +0,0 @@
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -218,6 +218,7 @@ QLineEdit#le_status_text {
- 				<lockdown-roster type="bool">false</lockdown-roster>
- 				<raise-on-new-event type="bool">false</raise-on-new-event>
- 				<quit-on-close type="bool">false</quit-on-close>
-+				<raise-inactive type="bool">true</raise-inactive>
- 				<show-avatar-frame type="bool">false</show-avatar-frame>
- 				<show>
- 					<agent-contacts type="bool">true</agent-contacts>
---- a/src/mainwin.cpp
-+++ b/src/mainwin.cpp
-@@ -84,6 +84,10 @@
- #include "rosteravatarframe.h"
- #include "avatars.h"
- 
-+#ifdef HAVE_X11
-+#include <x11windowsystem.h>
-+#endif
-+
- using namespace XMPP;
- 
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
-@@ -161,6 +165,10 @@ public:
- 	PsiRosterWidget* rosterWidget_;
- #endif
- 
-+#ifdef Q_OS_WIN
-+	DWORD deactivationTickCount;
-+#endif
-+
- 	void registerActions();
- 	IconAction* getAction( QString name );
- 	void updateMenu(QStringList actions, QMenu* menu);
-@@ -1478,7 +1486,23 @@ void MainWin::closeEvent(QCloseEvent* e)
- 
- void MainWin::changeEvent(QEvent *event)
- {
--    if (event->type() == QEvent::ActivationChange ||
-+#ifdef Q_OS_WIN
-+	if (event->type() == QEvent::ActivationChange
-+		&& PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool()
-+		&& PsiOptions::instance()->getOption("options.ui.contactlist.raise-inactive").toBool()) {
-+		//On Windows app window loose active state when you
-+		//  click on tray icon. Workaround is to use timer:
-+		//  we'll keep activated == true within 300 msec
-+		//  (+ doubleClickInterval, if double click is enabled)
-+		//  after deactivation.
-+		if (!isActiveWindow())
-+		{
-+			d->deactivationTickCount = GetTickCount();
-+		}
-+	}
-+#endif
-+
-+	if (event->type() == QEvent::ActivationChange ||
- 	    event->type() == QEvent::WindowStateChange)
- 	{
- 		if (d->mainTabs) {
-@@ -1606,18 +1630,42 @@ void MainWin::optionsUpdate()
- 	updateTray();
- }
- 
--void MainWin::toggleVisible()
-+void MainWin::toggleVisible(bool fromTray)
- {
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
-+	if (PsiOptions::instance()->getOption("options.ui.contactlist.raise-inactive").toBool())
-+	{
-+		bool hidden = false;
-+#ifdef Q_OS_WIN
-+		if (fromTray) {
-+			int timeout = 300;
-+			if (PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool())
-+				timeout += qApp->doubleClickInterval();
-+			hidden = isHidden() || (GetTickCount() - d->deactivationTickCount > timeout);
-+		}
-+		else {
-+			hidden = isHidden() || !isActiveWindow();
-+		}
-+#elif defined(HAVE_X11)
-+		Q_UNUSED(fromTray);
-+		hidden = isHidden() || X11WindowSystem::instance()->isWindowObscured(this, PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool());
-+#else
-+		Q_UNUSED(fromTray);
-+		hidden = isHidden() || !isActiveWindow();
-+#endif
-+		if(hidden) {
-+			trayShow();
-+		}
-+		else {
-+			trayHide();
-+		}
- 	}
-+	else
-+		isHidden() ? trayShow() : trayHide();
- }
- 
- void MainWin::setTrayToolTip(const Status& status, bool, bool)
- {
-+	Q_UNUSED (status);
- 	if (!d->tray) {
- 		return;
- 	}
-@@ -1635,32 +1683,21 @@ void MainWin::trayClicked(const QPoint &, int button)
- 		return;
- 	}
- 
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
--	}
-+	toggleVisible(true);
- }
- 
- void MainWin::trayDoubleClicked()
- {
--	if(!PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) {
--		return;
--	}
-+	//Double click works like second single click now if "double-click" style is disabled
- 
--	if(d->nextAmount > 0) {
--		doRecvNextEvent();
--		return;
-+	if(PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) {
-+		if(d->nextAmount > 0) {
-+			doRecvNextEvent();
-+			return;
-+		}
- 	}
- 
--
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
--	}
-+	toggleVisible(true);
- }
- 
- void MainWin::trayShow()
---- a/src/mainwin.h
-+++ b/src/mainwin.h
-@@ -180,7 +180,7 @@ public slots:
- 	void optionsUpdate();
- 	void setTrayToolTip(const XMPP::Status &, bool usePriority = false, bool isManualStatus = false);
- 
--	void toggleVisible();
-+	void toggleVisible(bool fromTray = false);
- 
- 	void avcallConfig();
- 
---- a/src/src.pri
-+++ b/src/src.pri
-@@ -349,6 +349,10 @@ SOURCES += \
- 	$$PWD/accountloginpassword.cpp \
- 	$$PWD/mcmdcompletion.cpp
- 
-+unix:!macx:!haiku {
-+	HEADERS += $$PWD/x11windowsystem.h
-+	SOURCES += $$PWD/x11windowsystem.cpp
-+}
- 
- CONFIG += filetransfer
- filetransfer {
-new file mode 100644
-index 0000000..ea1ae7d
---- /dev/null
-+++ b/src/x11windowsystem.cpp
-@@ -0,0 +1,215 @@
-+#include "x11windowsystem.h"
-+
-+#include <QX11Info>
-+#include <X11/Xlib.h>
-+
-+const long MAX_PROP_SIZE = 100000;
-+X11WindowSystem* X11WindowSystem::_instance = 0;
-+
-+X11WindowSystem::X11WindowSystem()
-+{
-+	const int atomsCount = 10;
-+	const char* namesatomsCount = {
-+		"_NET_CLIENT_LIST_STACKING",
-+		"_NET_FRAME_EXTENTS",
-+
-+		"_NET_WM_WINDOW_TYPE",
-+		"_NET_WM_WINDOW_TYPE_NORMAL",
-+		"_NET_WM_WINDOW_TYPE_DIALOG",
-+		"_NET_WM_WINDOW_TYPE_UTILITY",
-+		"_NET_WM_WINDOW_TYPE_SPLASH",
-+
-+		"_NET_WM_STATE",
-+		"_NET_WM_STATE_ABOVE",
-+		"_NET_WM_STATE_HIDDEN"
-+	};
-+	Atom atomsatomsCount, *atomspatomsCount = {
-+		&net_client_list_stacking,
-+		&net_frame_extents,
-+
-+		&net_wm_window_type,
-+		&net_wm_window_type_normal,
-+		&net_wm_window_type_dialog,
-+		&net_wm_window_type_utility,
-+		&net_wm_window_type_splash,
-+
-+		&net_wm_state,
-+		&net_wm_state_above,
-+		&net_wm_state_hidden
-+	};
-+	int i = atomsCount;
-+	while (i--)
-+		atomsi = 0;
-+
-+	XInternAtoms(QX11Info::display(), (char**)names, atomsCount, true, atoms);
-+
-+	i = atomsCount;
-+	while (i--)
-+		*atomspi = atomsi;
-+
-+	if (net_wm_window_type_normal != None)
-+		normalWindows.insert(net_wm_window_type_normal);
-+	if (net_wm_window_type_dialog != None)
-+		normalWindows.insert(net_wm_window_type_dialog);
-+	if (net_wm_window_type_utility != None)
-+		normalWindows.insert(net_wm_window_type_utility);
-+	if (net_wm_window_type_splash != None)
-+		normalWindows.insert(net_wm_window_type_splash);
-+
-+	if (net_wm_state_hidden != None)
-+		ignoredWindowStates.insert(net_wm_state_hidden);
-+}
-+
-+X11WindowSystem* X11WindowSystem::instance()
-+{
-+	if (!_instance)
-+		_instance = new X11WindowSystem();
-+	return X11WindowSystem::_instance;
-+}
-+
-+// Get window coords relative to desktop window
-+QRect X11WindowSystem::windowRect(Window win)
-+{
-+	Window w_unused;
-+	int x, y;
-+	unsigned int w, h, junk;
-+	XGetGeometry(QX11Info::display(), win, &w_unused, &x, &y, &w, &h, &junk, &junk);
-+	XTranslateCoordinates(QX11Info::display(), win, QX11Info::appRootWindow(), 0, 0, &x, &y, &w_unused);
-+
-+	Atom type_ret;
-+	int format_ret;
-+	unsigned char *data_ret;
-+	unsigned long nitems_ret, unused;
-+	const Atom XA_CARDINAL = (Atom) 6;
-+	if (net_frame_extents != None && XGetWindowProperty(QX11Info::display(), win, net_frame_extents,
-+														0l, 4l, False, XA_CARDINAL, &type_ret, &format_ret,
-+														&nitems_ret, &unused, &data_ret) == Success)
-+	{
-+		if (type_ret == XA_CARDINAL && format_ret == 32 && nitems_ret == 4) {
-+			//Struts array: 0 - left, 1 - right, 2 - top, 3 - bottom
-+			long *d = (long *) data_ret;
-+			x -= d0;
-+			y -= d2;
-+			w += d0 + d1;
-+			h += d2 + d3;
-+		}
-+		if ( data_ret )
-+			XFree(data_ret);
-+	}
-+
-+	return QRect(x, y, w, h);
-+}
-+
-+// Determine if window is obscured by other windows
-+bool X11WindowSystem::isWindowObscured(QWidget *widget, bool alwaysOnTop)
-+{
-+	if (net_wm_state_above != None)
-+	{
-+		if (!alwaysOnTop)
-+			ignoredWindowStates.insert(net_wm_state_above);
-+		else
-+			ignoredWindowStates.remove(net_wm_state_above);
-+	}
-+
-+	//TODO Is it correct to use QX11Info::appRootWindow() as root window?
-+	Q_ASSERT(widget);
-+	QWidget* w = widget->window();
-+	Window win = w->winId();
-+
-+	const Atom XA_WINDOW= (Atom) 33;
-+	Atom type_ret;
-+	int format_ret;
-+	unsigned char *data_ret;
-+	unsigned long nitems_ret, unused;
-+
-+	if (net_client_list_stacking != None)
-+	{
-+		QRect winRect = windowRect(win);
-+		if (XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), net_client_list_stacking,
-+					   0, MAX_PROP_SIZE, False, XA_WINDOW, &type_ret,
-+					   &format_ret, &nitems_ret, &unused, &data_ret) == Success) {
-+			if (type_ret == XA_WINDOW && format_ret == 32) {
-+				Window *wins = (Window *) data_ret;
-+
-+				//Enumerate windows in reverse order (from most foreground window)
-+				while (nitems_ret--)
-+				{
-+					Window current = winsnitems_ret;
-+
-+					//We are not interested in underlying windows
-+					if (current == win)
-+						break;
-+
-+					//If our window in not alwaysOnTop ignore such windows, because we can't raise on top of them
-+					if (windowHasAnyOfStates(current, ignoredWindowStates))
-+						continue;
-+
-+					if (!windowHasOnlyTypes(current, normalWindows))
-+						continue;
-+
-+					QRect rect = windowRect(current);
-+					if (winRect.intersects(rect))
-+						return true;
-+				}
-+			}
-+			if (data_ret)
-+				XFree(data_ret);
-+		}
-+	}
-+	return false;
-+}
-+
-+//If window has any type other than allowed_types return false, else return true
-+bool X11WindowSystem::windowHasOnlyTypes(Window win, const QSet<Atom> &allowedTypes)
-+{
-+	const Atom XA_ATOM = (Atom) 4;
-+	Atom type_ret;
-+	int format_ret;
-+	unsigned char *data_ret;
-+	unsigned long nitems_ret, unused;
-+
-+	if (net_wm_window_type != None && XGetWindowProperty(QX11Info::display(), win, net_wm_window_type,
-+														 0l, 2048l, False, XA_ATOM, &type_ret,
-+														 &format_ret, &nitems_ret, &unused, &data_ret) == Success) {
-+		if (type_ret == XA_ATOM && format_ret == 32 && nitems_ret > 0) {
-+			Atom *types = (Atom *) data_ret;
-+			for (unsigned long i = 0; i < nitems_ret; i++)
-+			{
-+				if (!allowedTypes.contains(typesi))
-+				{
-+					return false;
-+				}
-+			}
-+		}
-+		if (data_ret)
-+			XFree(data_ret);
-+		return true;
-+	}
-+	else
-+		return false;
-+}
-+
-+//If window has any of filteredStates return
-+bool X11WindowSystem::windowHasAnyOfStates(Window win, const QSet<Atom> &filteredStates)
-+{
-+	const Atom XA_ATOM = (Atom) 4;
-+	Atom type_ret;
-+	int format_ret;
-+	unsigned char *data_ret;
-+	unsigned long nitems_ret, unused;
-+	if (net_wm_state != None && XGetWindowProperty(QX11Info::display(), win, net_wm_state, 0l, 2048l,
-+												   False, XA_ATOM, &type_ret, &format_ret,
-+												   &nitems_ret, &unused, &data_ret) == Success) {
-+		if (type_ret == XA_ATOM && format_ret == 32 && nitems_ret > 0) {
-+			Atom *states = (Atom *) data_ret;
-+			for (unsigned long i = 0; i < nitems_ret; i++) {
-+
-+				if (filteredStates.contains(statesi))
-+					return true;
-+			}
-+		}
-+		if ( data_ret )
-+			XFree(data_ret);
-+	}
-+	return false;
-+}
-new file mode 100644
---- /dev/null
-+++ b/src/x11windowsystem.h
-@@ -0,0 +1,44 @@
-+#ifndef X11WINDOWSYSTEM_H
-+#define X11WINDOWSYSTEM_H
-+
-+#include <QtCore>
-+#include <QWidget>
-+#include <QRect>
-+#include <QSet>
-+
-+//TODO: Find a way to include Xlib here and not redefine Atom and Window types
-+typedef unsigned long Atom;
-+typedef unsigned long Window;
-+
-+class X11WindowSystem {
-+private:
-+	Atom net_client_list_stacking;
-+	Atom net_frame_extents;
-+
-+	Atom net_wm_window_type;
-+	Atom net_wm_window_type_normal;
-+	Atom net_wm_window_type_dialog;
-+	Atom net_wm_window_type_utility;
-+	Atom net_wm_window_type_splash;
-+
-+	Atom net_wm_state;
-+	Atom net_wm_state_above;
-+	Atom net_wm_state_hidden;
-+
-+	QSet<Atom> normalWindows, ignoredWindowStates;
-+
-+	static X11WindowSystem* _instance;
-+	X11WindowSystem();
-+	~X11WindowSystem() {}
-+	X11WindowSystem(const X11WindowSystem& ) {};
-+	X11WindowSystem & operator=(const X11WindowSystem &) {return *this;};
-+
-+public:
-+	static X11WindowSystem* instance();
-+	QRect windowRect(Window win);
-+	bool isWindowObscured(QWidget *widget, bool alwaysOnTop);
-+	bool windowHasOnlyTypes(Window win, const QSet<Atom> &allowedTypes);
-+	bool windowHasAnyOfStates(Window win, const QSet<Atom> &filteredStates);
-+};
-+
-+#endif // X11WINDOWSYSTEM_H

psi-plus-main-20160309.tar.xz/patches/0150-psi-options-language-select.diff Deleted

@@ -1,101 +0,0 @@
---- psi.orig/src/options/opt_application.cpp
-+++ psi/src/options/opt_application.cpp
-@@ -3,11 +3,16 @@
- #include "iconwidget.h"
- #include "psioptions.h"
- #include "proxy.h"
-+#include "translationmanager.h"
-+#include "varlist.h"
-+#include "applicationinfo.h"
- 
- #include <QCheckBox>
- #include <QComboBox>
- #include <QLineEdit>
-+#include "qsettings.h"
- #include <QList>
-+#include <QMessageBox>
- 
- #include "ui_opt_application.h"
- 
-@@ -101,6 +106,23 @@ void OptionsTabApplication::applyOptions
- 
- 	//Proxy
- 	ProxyManager::instance()->proxyForObject()->save();
-+
-+	// Language
-+	QString curLang = TranslationManager::instance()->currentLanguage();
-+	QString lang = d->cb_lang->currentText();
-+	QString itemData;
-+	foreach(VarListItem it, TranslationManager::instance()->availableTranslations() ) {
-+		if(it.data() == lang) {
-+			itemData = it.key();
-+			break;
-+		}
-+	}
-+	if(curLang != itemData && !itemData.isEmpty()) {
-+		TranslationManager::instance()->loadTranslation(itemData);
-+		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
-+	}
-+	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
-+	s.setValue("last_lang", itemData);
- }
- 
- void OptionsTabApplication::restoreOptions()
-@@ -123,6 +145,21 @@ void OptionsTabApplication::restoreOptio
- 	// data transfer
- 	d->le_dtPort->setText( QString::number(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) );
- 	d->le_dtExternal->setText( PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString() );
-+
-+	// Language
-+	VarList vList = TranslationManager::instance()->availableTranslations();
-+	QStringList lang = vList.varsToStringList();
-+	d->cb_lang->addItem(tr("Default"));
-+	foreach(QString item, lang) {
-+		d->cb_lang->addItem(vList.get(item));
-+	}
-+	QString curLang = TranslationManager::instance()->currentLanguage();
-+	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
-+	QString curL = s.value("last_lang", "").toString();
-+	if (curL.isEmpty())
-+		d->cb_lang->setCurrentIndex( 0 );
-+	else if(!curLang.isEmpty() && lang.contains(curLang) )
-+		d->cb_lang->setCurrentIndex( d->cb_lang->findText(vList.get(curLang)) );
- }
- 
- void OptionsTabApplication::doEnableQuitOnClose(int state)
---- psi.orig/src/options/opt_application.ui
-+++ psi/src/options/opt_application.ui
-@@ -179,6 +179,33 @@
-     </widget>
-    </item>
-    <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <widget class="QLabel" name="label_2">
-+       <property name="text">
-+        <string>Language</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cb_lang"/>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Vertical</enum>

psi-plus-main-20160309.tar.xz/patches/0160-psi-minimize-chat-hotkey.diff Deleted

@@ -1,104 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -601,6 +601,7 @@ QLineEdit#le_status_text {
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
- 				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
-+				<minimize type="QKeySequence" comment="Minimize active chat window"/>
- 			</chat>
- 			<contactlist comment="Shortcuts in the contactlist">
- 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -224,6 +224,7 @@ public:
- //#endif
- 	QAction *act_send, *act_scrollup, *act_scrolldown, *act_close;
- 	QAction *act_mini_cmd, *act_nick, *act_hide, *act_copy_muc_jid;
-+	QAction *act_minimize;
- 
- 	MCmdSimpleSite mCmdSite;
- 	MCmdManager mCmdManager;
-@@ -786,6 +787,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	connect(bm, SIGNAL(conferencesChanged(QList<ConferenceBookmark>)), SLOT(updateBookmarkIcon()));
- 	connect(bm, SIGNAL(bookmarksSaved()), SLOT(updateBookmarkIcon()));
- 
-+	d->act_minimize = new QAction(this);
-+	connect(d->act_minimize, SIGNAL(triggered()), SLOT(doMinimize()));
-+	addAction(d->act_minimize);
-+
- 	int s = PsiIconset::instance()->system().iconSize();
- 	ui_.toolbar->setIconSize(QSize(s,s));
- 
-@@ -896,6 +901,11 @@ void GCMainDlg::horizSplitterMoved()
- 	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
- }
- 
-+void GCMainDlg::doMinimize()
-+{
-+	window()->showMinimized();
-+}
-+
- void GCMainDlg::ensureTabbedCorrectly()
- {
- 	TabbableWidget::ensureTabbedCorrectly();
-@@ -939,6 +949,7 @@ void GCMainDlg::setShortcuts()
- 	d->act_scrollup->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up"));
- 	d->act_scrolldown->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down"));
- 	d->act_mini_cmd->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
-+	d->act_minimize->setShortcuts(ShortcutManager::instance()->shortcuts("chat.minimize"));
- }
- 
- void GCMainDlg::scrollUp()
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -141,6 +141,7 @@ private slots:
- #endif
- 	void chatEditCreated();
- 	void horizSplitterMoved();
-+	void doMinimize();
- 	void avatarUpdated(const Jid& jid);
- 
- public:
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -349,6 +349,11 @@ void PsiChatDlg::setShortcuts()
- 
- 	act_mini_cmd_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
- 
-+	act_minimize_ = new QAction(this);
-+
-+	connect(act_minimize_, SIGNAL(triggered()), SLOT(doMinimize()));
-+	addAction(act_minimize_);
-+	act_minimize_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.minimize"));
- }
- 
- void PsiChatDlg::updateIdentityVisibility()
-@@ -884,6 +889,10 @@ void PsiChatDlg::chatEditCreated()
- 	tabCompletion.setTextEdit(chatEdit());
- }
- 
-+void PsiChatDlg::doMinimize()
-+{
-+	window()->showMinimized();
-+}
- 
- void PsiChatDlg::doSend() {
- 	tabCompletion.reset();
---- psi.orig/src/psichatdlg.h
-+++ psi/src/psichatdlg.h
-@@ -36,6 +36,7 @@ private slots:
- 	void toggleSmallChat();
- 	void doClearButton();
- 	void doMiniCmd();
-+	void doMinimize();
- 	void addContact();
- 	void buildMenu();
- 	void updateCounter();
-@@ -85,6 +86,7 @@ private:
- 
- 	ActionList* actions_;
- 	QAction *act_mini_cmd_;
-+	QAction *act_minimize_;
- 	TypeAheadFindBar *typeahead_;
- 
- 	ActionLineEdit *le_autojid;

psi-plus-main-20160309.tar.xz/patches/0170-psi-add-bookmarks-to-join-conference-dlg.diff Deleted

@@ -1,173 +0,0 @@
---- psi.orig/src/mucjoin.ui
-+++ psi/src/mucjoin.ui
-@@ -27,7 +27,7 @@
-    <item row="0" column="1">
-     <widget class="AccountsComboBox" name="cb_ident"/>
-    </item>
--   <item row="1" column="0">
-+   <item row="2" column="0">
-     <widget class="QLabel" name="TextLabel1_2">
-      <property name="text">
-       <string>Recent:</string>
-@@ -37,7 +37,7 @@
-      </property>
-     </widget>
-    </item>
--   <item row="1" column="1">
-+   <item row="2" column="1">
-     <widget class="QComboBox" name="cb_recent">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-@@ -47,7 +47,7 @@
-      </property>
-     </widget>
-    </item>
--   <item row="2" column="0" colspan="2">
-+   <item row="4" column="0" colspan="2">
-     <widget class="QGroupBox" name="gb_info">
-      <property name="title">
-       <string>Room information</string>
-@@ -119,7 +119,7 @@
-      </layout>
-     </widget>
-    </item>
--   <item row="3" column="0" colspan="2">
-+   <item row="5" column="0" colspan="2">
-     <spacer>
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-@@ -135,7 +135,7 @@
-      </property>
-     </spacer>
-    </item>
--   <item row="4" column="0" colspan="2">
-+   <item row="6" column="0" colspan="2">
-     <widget class="Line" name="Line1">
-      <property name="frameShape">
-       <enum>QFrame::HLine</enum>
-@@ -148,16 +148,29 @@
-      </property>
-     </widget>
-    </item>
--   <item row="5" column="0">
-+   <item row="7" column="0">
-     <widget class="BusyWidget" name="busy" native="true"/>
-    </item>
--   <item row="5" column="1">
-+   <item row="7" column="1">
-     <widget class="QDialogButtonBox" name="buttonBox">
-      <property name="standardButtons">
-       <set>QDialogButtonBox::Cancel</set>
-      </property>
-     </widget>
-    </item>
-+   <item row="1" column="0">
-+    <widget class="QLabel" name="label">
-+     <property name="text">
-+      <string>Bookmarks:</string>
-+     </property>
-+     <property name="alignment">
-+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="1" column="1">
-+    <widget class="QComboBox" name="cb_bookmarks"/>
-+   </item>
-   </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11"/>
---- psi.orig/src/mucjoindlg.cpp
-+++ psi/src/mucjoindlg.cpp
-@@ -29,6 +29,7 @@
- #include "mucjoindlg.h"
- #include "psicontactlist.h"
- #include "groupchatdlg.h"
-+#include "bookmarkmanager.h"
- 
- static const int nickConflictCode = 409;
- static const QString additionalSymbol = "_";
-@@ -70,6 +71,7 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 
- 	setWindowTitle(CAP(windowTitle()));
- 	connect(ui_.cb_recent, SIGNAL(activated(int)), SLOT(recent_activated(int)));
-+	connect(ui_.cb_bookmarks, SIGNAL(activated(int)), SLOT(bookmarksActivated(int)));
- 	if (!ui_.cb_recent->count()) {
- 		ui_.cb_recent->setEnabled(false);
- 		ui_.le_host->setFocus();
-@@ -77,6 +79,13 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 	else {
- 		recent_activated(0);
- 	}
-+	if (!ui_.cb_bookmarks->count()) {
-+		ui_.cb_bookmarks->setEnabled(false);
-+		ui_.le_host->setFocus();
-+	}
-+	else {
-+		bookmarksActivated(0);
-+	}
- 
- 	setWidgetsEnabled(true);
- 	adjustSize();
-@@ -114,6 +123,8 @@ void MUCJoinDlg::updateIdentity(PsiAccou
- 		return;
- 	}
- 
-+	updateBookmarks(account_);
-+
- 	connect(account_, SIGNAL(disconnected()), this, SLOT(pa_disconnected()));
- }
- 
-@@ -142,6 +153,33 @@ void MUCJoinDlg::recent_activated(int x)
- 	ui_.le_nick->setText(jid.resource());
- }
- 
-+void MUCJoinDlg::bookmarksActivated(int x)
-+{
-+	Jid jid(ui_.cb_bookmarks->itemData(x).toString());
-+	if (jid.full().isEmpty())
-+		return;
-+
-+	ui_.le_host->setText(jid.domain());
-+	ui_.le_room->setText(jid.node());
-+	ui_.le_nick->setText(jid.resource());
-+}
-+
-+void MUCJoinDlg::updateBookmarks(PsiAccount *pa)
-+{
-+	ui_.cb_bookmarks->clear();
-+	if (pa && pa->bookmarkManager()->isAvailable()) {
-+		ui_.cb_bookmarks->setEnabled(true);
-+		foreach(ConferenceBookmark c, pa->bookmarkManager()->conferences()) {
-+			Jid jid = c.jid().withResource(c.nick());
-+			ui_.cb_bookmarks->addItem(JIDUtil::toString(jid, false));
-+			ui_.cb_bookmarks->setItemData(ui_.cb_bookmarks->count()-1, QVariant(jid.full()));
-+		}
-+	}
-+	else {
-+		ui_.cb_bookmarks->setEnabled(false);
-+	}
-+}
-+
- void MUCJoinDlg::doJoin(MucJoinReason r)
- {
- 	if (!account_ || !account_->checkConnected(this))
-@@ -197,6 +235,7 @@ void MUCJoinDlg::setWidgetsEnabled(bool
- {
- 	ui_.cb_ident->setEnabled(enabled);
- 	ui_.cb_recent->setEnabled(enabled && ui_.cb_recent->count() > 0);
-+	ui_.cb_bookmarks->setEnabled(enabled && ui_.cb_bookmarks->count() > 0);
- 	ui_.gb_info->setEnabled(enabled);
- 	joinButton_->setEnabled(enabled);
- }
---- psi.orig/src/mucjoindlg.h
-+++ psi/src/mucjoindlg.h
-@@ -68,6 +68,8 @@ private slots:
- 	void updateIdentityVisibility();
- 	void pa_disconnected();
- 	void recent_activated(int);
-+	void bookmarksActivated(int);
-+	void updateBookmarks(PsiAccount *pa);
- 
- private:
- 	Ui::MUCJoin ui_;

psi-plus-main-20160309.tar.xz/patches/0180-psiplus-decorate-windows.diff Deleted

@@ -1,1109 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -482,6 +482,7 @@ QLineEdit#le_status_text {
- 				</sounds>
- 				<successful-subscription type="bool">true</successful-subscription>
- 			</notifications>
-+			<decorate-windows type="bool">true</decorate-windows>
- 			<service-discovery>
- 				<automatically-get-info type="bool">false</automatically-get-info>
- 				<automatically-get-items type="bool">false</automatically-get-items>
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -87,6 +87,7 @@
- #include "mcmdmanager.h"
- #include "lastactivitytask.h"
- #include "psirichtext.h"
-+#include "psiwindowheader.h"
- 
- #include "mcmdsimplesite.h"
- 
-@@ -247,9 +248,13 @@ public:
- 
- 	int logSize;
- 	int rosterSize;
-+
- public:
- 	bool trackBar;
- 
-+	bool tabmode;
-+	PsiWindowHeader *winHeader_;
-+
- public:
- 	ChatEdit* mle() const { return dlg->ui_.mle->chatEdit(); }
- 	ChatView* te_log() const { return dlg->ui_.log; }
-@@ -677,6 +682,14 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.lb_ident->setAccount(account());
- 	ui_.lb_ident->setShowJid(false);
- 	ui_.log->setSessionData(true, jid().full(), jid().full()); //FIXME change conference name
-+	d->tabmode = PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool();
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+	if (!d->tabmode && !isBorder()) {
-+		d->winHeader_ = new PsiWindowHeader(this);
-+		ui_.vboxLayout1->insertWidget(0, d->winHeader_);
-+	}
-+	setMargins();
-+
- #ifdef WEBKIT
- 	ui_.log->setAccount(account());
- #endif
-@@ -2185,6 +2198,25 @@ void GCMainDlg::resizeEvent(QResizeEvent
- 	QTimer::singleShot(0, this, SLOT(horizSplitterMoved()));
- }
- 
-+void GCMainDlg::setMargins()
-+{
-+	ui_.vboxLayout->setContentsMargins(0,0,0,0);
-+	ui_.vboxLayout2->setContentsMargins(4,0,4,4);
-+	if (!d->tabmode) {
-+		ui_.hboxLayout->setContentsMargins(4,0,4,0);
-+		if (!isBorder()) {
-+			ui_.vboxLayout1->setContentsMargins(0,0,0,0);
-+		}
-+		else {
-+			ui_.vboxLayout1->setContentsMargins(0,4,0,0);
-+		}
-+	}
-+	else {
-+		ui_.vboxLayout1->setContentsMargins(4,4,4,0);
-+		ui_.hboxLayout->setContentsMargins(2,0,4,0);
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // GCFindDlg
- //----------------------------------------------------------------------------
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -166,6 +166,8 @@ private:
- 
- 	inline XMPP::Jid jidForNick(const QString &nick) const;
- 
-+	void setMargins();
-+
- };
- 
- class GCFindDlg : public QDialog
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -135,6 +135,7 @@ public:
- 	int tabsSize;
- 	int rosterSize;
- 	bool isLeftRoster;
-+	bool isHide;
- 
- 	PopupAction* optionsButton, *statusButton;
- 	IconActionGroup* statusGroup, *viewGroups;
-@@ -584,6 +585,9 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 		connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
- 	optionChanged("options.ui.contactlist.css");
- 
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+	setMouseTracking(!isBorder());
-+
- 	reinitAutoHide();
- }
- 
-@@ -623,6 +627,11 @@ void MainWin::optionChanged(const QStrin
- 			setStyleSheet(css);
- 		}
- 	}
-+	else if (option == "options.ui.decorate-windows") {
-+		setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+		setMouseTracking(!isBorder());
-+		show();
-+	}
- }
- 
- void MainWin::registerAction( IconAction* action )
-@@ -812,13 +821,19 @@ void MainWin::setWindowOpts(bool _onTop,
- 	d->onTop = _onTop;
- 	d->asTool = _asTool;
- 
--	Qt::WindowFlags flags = 0;
-+	Qt::WindowFlags flags = windowFlags();
- 	if(d->onTop) {
- 		flags |= Qt::WindowStaysOnTopHint;
- 	}
-+	else {
-+		flags &= ~Qt::WindowStaysOnTopHint;
-+	}
- 	if(d->asTool) {
- 		flags |= Qt::Tool | TOOLW_FLAGS;
- 	}
-+	else {
-+		flags &= ~Qt::Tool;
-+	}
- 
- 	setWindowFlags(flags);
- 	show();
-@@ -1783,6 +1798,7 @@ void MainWin::statusClicked(int x)
- {
- 	if(x == Qt::MidButton) {
- 		recvNextEvent();
-+		d->isHide = false;
- 	}
- }
- 
-@@ -2036,4 +2052,32 @@ void MainWin::resizeEvent(QResizeEvent *
- 	}
- }
- 
-+void MainWin::mousePressEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::MidButton && !isBorder()) {
-+		d->isHide = true;
-+	}
-+
-+	AdvancedWidget<QMainWindow>::mousePressEvent(e);
-+}
-+
-+void MainWin::mouseReleaseEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::MidButton && !isBorder() && d->isHide) {
-+		d->isHide = false;
-+		if (e->globalPos().x() >= geometry().left()
-+			&& e->globalPos().x() <= geometry().right()
-+			&& e->globalPos().y() >= geometry().top()
-+			&& e->globalPos().y() <= geometry().bottom()){
-+			if (d->asTool){
-+				d->mainWin->trayHide();
-+			} else {
-+				setWindowState(windowState() | Qt::WindowMinimized);
-+			}
-+		}
-+	}
-+
-+	AdvancedWidget<QMainWindow>::mouseReleaseEvent(e);
-+}
-+
- //#endif
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -26,6 +26,7 @@
- #include <QList>
- #include <QString>
- #include <QStringList>
-+#include <QMouseEvent>
- 
- #include "advwidget.h"
- #include "xmpp_status.h"
-@@ -88,6 +89,8 @@ protected:
- #ifdef Q_OS_WIN
- 	bool winEvent(MSG *, long *);
- #endif
-+	void mousePressEvent(QMouseEvent *e);
-+	void mouseReleaseEvent(QMouseEvent *e);
- 
- signals:
- 	void statusChanged(XMPP::Status::Type);
---- psi.orig/src/options/opt_application.cpp
-+++ psi/src/options/opt_application.cpp
-@@ -43,7 +43,9 @@ QWidget *OptionsTabApplication::widget()
- 
- 	w = new OptApplicationUI();
- 	OptApplicationUI *d = (OptApplicationUI *)w;
--
-+	d->ck_winDecor->setWhatsThis(
-+		tr("Set or remove window decorations for roster and chats."
-+		" For chats there are special header with close, hide and maximize buttons"));
- 	// docklet
- 	d->ck_docklet->setWhatsThis(
- 		tr("Makes Psi use a docklet icon, also known as system tray icon."));
-@@ -90,6 +92,7 @@ void OptionsTabApplication::applyOptions
- 	OptApplicationUI *d = (OptApplicationUI *)w;
- 
- 	PsiOptions::instance()->setOption("options.ui.contactlist.quit-on-close", d->ck_quitOnClose->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.decorate-windows", d->ck_winDecor->isChecked());
- 
- 	// Auto-update
- 	PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked());
-@@ -134,6 +137,7 @@ void OptionsTabApplication::restoreOptio
- 
- 	d->ck_autoUpdate->setChecked(PsiOptions::instance()->getOption("options.auto-update.check-on-startup").toBool());
- 	d->ck_quitOnClose->setChecked(PsiOptions::instance()->getOption("options.ui.contactlist.quit-on-close").toBool());
-+	d->ck_winDecor->setChecked(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
- 
- 	// docklet
- 	d->ck_docklet->setChecked( PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool() );
---- psi.orig/src/options/opt_application.ui
-+++ psi/src/options/opt_application.ui
-@@ -24,6 +24,16 @@
-     </widget>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_winDecor" >
-+     <property name="text" >
-+      <string>Decorate windows</string>
-+     </property>
-+     <property name="checked" >
-+      <bool>true</bool>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QGroupBox" name="gb_docklet" >
-      <property name="title" >
-       <string>Docklet</string>
-@@ -223,6 +233,7 @@
-  <layoutdefault spacing="6" margin="11" />
-  <tabstops>
-   <tabstop>ck_docklet</tabstop>
-+  <tabstop>ck_winDecor</tabstop>
-   <tabstop>ck_dockDCstyle</tabstop>
-   <tabstop>ck_dockHideMW</tabstop>
-   <tabstop>ck_dockToolMW</tabstop>
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -179,6 +179,8 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, P
- 	connect(account(), SIGNAL(removedContact(PsiContact*)), SLOT(updateContactAdding(PsiContact*)));
- 	connect(account(), SIGNAL(updateContact(const Jid &)), SLOT(updateContactAdding(const Jid &)));
- 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
-+	tabmode = PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool();
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
- }
- 
- void PsiChatDlg::initUi()
-@@ -260,6 +262,11 @@ void PsiChatDlg::initUi()
- 	act_mini_cmd_->setText(tr("Input command..."));
- 	connect(act_mini_cmd_, SIGNAL(triggered()), SLOT(doMiniCmd()));
- 	addAction(act_mini_cmd_);
-+	if (!tabmode) {
-+		winHeader_ = new PsiWindowHeader(this);
-+		ui_.vboxLayout1->insertWidget(0, winHeader_);
-+	}
-+	setMargins();
- 
- 	ui_.log->realTextWidget()->installEventFilter(this);
- 	ui_.mini_prompt->hide();
-@@ -527,6 +534,22 @@ void PsiChatDlg::activated()
- 	ChatDlg::activated();
- 
- 	updateCountVisibility();
-+
-+	bool border = PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool();
-+	if (!PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool()){
-+		if (!winHeader_.isNull())
-+			winHeader_->setVisible(!border);
-+		setWindowBorder(border);
-+		setMargins();
-+#if defined(Q_OS_MAC) || defined(Q_WS_HAIKU)
-+		//
-+#else
-+		bringToFront(true);
-+#endif
-+	} else {
-+		if (!winHeader_.isNull())
-+			winHeader_->setVisible(false);
-+	}
- }
- 
- void PsiChatDlg::setContactToolTip(QString text)
-@@ -1030,4 +1053,23 @@ void PsiChatDlg::doSwitchJidMode()
- 	}
- }
- 
-+void PsiChatDlg::setMargins()
-+{
-+	ui_.vboxLayout->setContentsMargins(0,0,0,0);
-+	ui_.vboxLayout2->setContentsMargins(4,0,4,4);
-+	if (!tabmode) {
-+		ui_.hboxLayout->setContentsMargins(4,0,4,0);
-+		if (!isBorder()) {
-+			ui_.vboxLayout1->setContentsMargins(0,0,0,0);
-+		}
-+		else {
-+			ui_.vboxLayout1->setContentsMargins(0,4,0,0);
-+		}
-+	}
-+	else {
-+		ui_.vboxLayout1->setContentsMargins(4,4,4,0);
-+		ui_.hboxLayout->setContentsMargins(2,0,4,0);
-+	}
-+}
-+
- #include "psichatdlg.moc"
---- psi.orig/src/psichatdlg.h
-+++ psi/src/psichatdlg.h
-@@ -10,6 +10,7 @@
- 
- #include "ui_chatdlg.h"
- #include "typeaheadfind.h"
-+#include "psiwindowheader.h"
- #include "widgets/actionlineedit.h"
- #include "actionlist.h"
- 
-@@ -78,6 +79,7 @@ private:
- 	ChatEdit* chatEdit() const;
- 	void updateAutojidIcon();
- 	void setJidComboItem(int pos, const QString &text, const Jid &jid, const QString &icon_str);
-+	void setMargins();
- 
- private:
- 	Ui::ChatDlg ui_;
-@@ -107,6 +109,8 @@ private:
- 	int unacked_messages;
- 
- 	static PsiIcon *throbber_icon;
-+	bool tabmode;
-+	QPointer <PsiWindowHeader> winHeader_;
- };
- 
- #endif
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -167,9 +167,19 @@ TabDlg::TabDlg(TabManager* tabManager, c
- 		delegate_->tabWidgetCreated(this, tabWidget_);
- 
- 	QVBoxLayout *vert1 = new QVBoxLayout(this);
--	vert1->setMargin(1);
-+	//Add windowheader widget if window not decorated
-+	if (!PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool()
-+		&& !PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A')) {
-+		winHeader_ = new PsiWindowHeader(this);
-+		vert1->addWidget(winHeader_);
-+		vert1->setSpacing(0);
-+		vert1->setMargin(0);
-+	} else {
-+		vert1->setMargin(1);
-+	}
- 	vert1->addWidget(tabWidget_);
- 
-+
- 	setAcceptDrops(true);
- 
- 	X11WM_CLASS("tabs");
-@@ -189,6 +199,7 @@ TabDlg::TabDlg(TabManager* tabManager, c
- 
- 	if(!PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString().contains('A'))
- 		setGeometryOptionPath(geometryOption);
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
- }
- 
- TabDlg::~TabDlg()
---- psi.orig/src/tabs/tabdlg.h
-+++ psi/src/tabs/tabdlg.h
-@@ -29,6 +29,7 @@
- #include "advwidget.h"
- 
- #include "tabbablewidget.h"
-+#include "psiwindowheader.h"
- 
- class PsiCon;
- class ChatTabs;
-@@ -169,6 +170,7 @@ private:
- 	void extinguishFlashingTabs();
- 	void updateCaption();
- 	void updateTabBar();
-+	PsiWindowHeader *winHeader_;
- };
- 
- #endif
---- psi.orig/src/tools/advwidget/advwidget.h
-+++ psi/src/tools/advwidget/advwidget.h
-@@ -21,6 +21,7 @@
- #ifndef ADVWIDGET_H
- #define ADVWIDGET_H
- 
-+#include <QMouseEvent>
- #include <QWidget>
- 
- class GAdvancedWidget : public QObject
-@@ -65,6 +66,65 @@ class AdvancedWidget : public BaseClass
- {
- private:
- 	GAdvancedWidget *gAdvWidget;
-+#ifdef Q_OS_WIN
-+	Qt::WindowFlags deltaflags;
-+#endif
-+	QPoint movepath;
-+	bool isResize;
-+	bool isDrag;
-+	bool border;
-+	Qt::WindowFrameSection region;
-+	void mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom)
-+	{
-+		const int top = geom.top();
-+		const int bottom = geom.bottom();
-+		const int left = geom.left();
-+		const int right = geom.right();
-+		const int delta = 10;
-+		const int maxtop = top + delta;
-+		const int minbottom = bottom -delta;
-+		if(mouse_y <= bottom
-+				&& mouse_y >= minbottom
-+				&& qAbs(mouse_x - left) < delta) {
-+			region = Qt::BottomLeftSection;
-+		}
-+		else if (mouse_x > (left + delta)
-+			 && mouse_x < (right - delta)
-+			 && qAbs(mouse_y - bottom) < delta) {
-+			region = Qt::BottomSection;
-+		}
-+		else if ((bottom - mouse_y) < delta
-+			     && qAbs(mouse_x - right) < delta){
-+			region = Qt::BottomRightSection;
-+		}
-+		else if ((right - mouse_x) < delta
-+			 &&  mouse_y > maxtop
-+			 && mouse_y < minbottom) {
-+			region = Qt::RightSection;
-+		}
-+		else if ((mouse_x - left) < delta
-+			 &&  mouse_y > maxtop
-+			 && mouse_y < minbottom) {
-+			region = Qt::LeftSection;
-+		}
-+		else if ((mouse_y - top) < delta
-+			 && mouse_x > (left + delta)
-+			 && mouse_x < (right -delta)){
-+			region = Qt::TopSection;
-+		}
-+		else if ((top - mouse_y) < delta
-+			 && qAbs(mouse_x - right) < delta){
-+
-+			region = Qt::TopRightSection;
-+		}
-+		else if ((top - mouse_y) < delta
-+			 && qAbs(mouse_x - left) < delta){
-+			region = Qt::TopLeftSection;
-+		}
-+		else {
-+			region = Qt::NoSection;
-+		}
-+	}
- 
- public:
- 	AdvancedWidget(QWidget *parent = 0, Qt::WindowFlags f = 0)
-@@ -73,6 +133,7 @@ public:
- 	{
- 		if (f != 0)
- 			BaseClass::setWindowFlags(f);
-+		border = true;
- 		gAdvWidget = new GAdvancedWidget( this );
- 	}
- 
-@@ -151,6 +212,46 @@ public:
- 		windowTitleChanged();
- 	}
- 
-+	void setWindowBorder(bool isDecorated)
-+	{
-+		Qt::WindowFlags flags = BaseClass::windowFlags();
-+#ifdef Q_OS_WIN
-+		if (deltaflags == 0) {
-+			deltaflags = flags;
-+		}
-+		if (isDecorated) {
-+			if (flags != deltaflags) {
-+				flags |= Qt::WindowTitleHint;
-+				flags &= ~Qt::FramelessWindowHint;
-+				deltaflags = 0;
-+				if (flags != BaseClass::windowFlags()) {
-+					setWindowFlags(flags);
-+				}
-+			}
-+		} else {
-+			flags &= ~Qt::WindowTitleHint;
-+			flags |= Qt::FramelessWindowHint;
-+			if (flags != BaseClass::windowFlags()) {
-+				setWindowFlags(flags);
-+			}
-+
-+		}
-+#else
-+		if (isDecorated) {
-+			flags &= ~Qt::FramelessWindowHint;
-+		} else {
-+			flags |= Qt::FramelessWindowHint;
-+		}
-+		if (flags != BaseClass::windowFlags()) {
-+			setWindowFlags(flags);
-+		}
-+#endif
-+		border = isDecorated;
-+	}
-+	bool isBorder(){
-+		return border;
-+	}
-+
- protected:
- 	virtual void windowTitleChanged()
- 	{
-@@ -165,6 +266,132 @@ protected:
- 		}
- 		BaseClass::changeEvent(event);
- 	}
-+
-+protected:
-+	void setWindowFlags(Qt::WindowFlags flags){
-+		BaseClass::setWindowFlags(flags);
-+	}
-+	void mousePressEvent(QMouseEvent *event)
-+	{
-+		QWidget *window = BaseClass::window();
-+		if (!border && (event->button()==Qt::LeftButton)) {
-+			mouseEnterEvent(event->globalPos().x(), event->globalPos().y(), window->geometry());
-+			if (region != Qt::NoSection) {
-+				isResize = true;
-+			}
-+			else{
-+				movepath = event->globalPos() - window->pos();
-+				isResize = false;
-+			}
-+			isDrag = true;
-+			BaseClass::mousePressEvent(event);
-+		}
-+	}
-+	void mouseMoveEvent(QMouseEvent *event)
-+	{
-+		bool isLeftButton = (event->buttons() & Qt::LeftButton);
-+		const QPoint pg = event->globalPos();
-+		QWidget *window = BaseClass::window();
-+		int ypath = 0;
-+		int xpath = 0;
-+		const int right = window->geometry().right();
-+		const int left =  window->geometry().left();
-+		const int top =  window->geometry().top();
-+		const int bottom = window->geometry().bottom();
-+		if (isLeftButton && isResize && !border) {
-+			switch (region) {
-+			case Qt::BottomLeftSection:
-+				window->setCursor(QCursor(Qt::SizeBDiagCursor));
-+				ypath =  pg.y() - bottom;
-+				xpath = left - pg.x();
-+				if ((window->width() + xpath) < window->minimumWidth()) {
-+					xpath = window->minimumWidth() - window->width();
-+				}
-+				window->setGeometry(window->x() - xpath, window->y(),
-+						    window->width() + xpath, window->height() + ypath);
-+				break;
-+			case Qt::BottomRightSection:
-+				window->setCursor(QCursor(Qt::SizeFDiagCursor));
-+				ypath = pg.y() - bottom;
-+				xpath = pg.x() - right;
-+				window->resize(window->width() + xpath, window->height() + ypath);
-+				break;
-+			case Qt::TopLeftSection:
-+				window->setCursor(QCursor(Qt::SizeFDiagCursor));
-+				ypath =  top - pg.y();
-+				xpath = left - pg.x();
-+				if ((window->width() + xpath) < window->minimumWidth()) {
-+					xpath = window->minimumWidth() - window->width();
-+				}
-+				if ((window->height() + ypath) < window->minimumHeight()) {
-+					ypath = window->minimumHeight() - window->height();
-+				}
-+				window->setGeometry(window->x() - xpath, window->y() - ypath,
-+						    window->width() + xpath, window->height() + ypath);
-+				break;
-+			case Qt::TopRightSection:
-+				window->setCursor(QCursor(Qt::SizeBDiagCursor));
-+				ypath =  top - pg.y();
-+				xpath = pg.x() - right;
-+				if ((window->width() + xpath) < window->minimumWidth()) {
-+					xpath = window->minimumWidth() - window->width();
-+				}
-+				if ((window->height() + ypath) < window->minimumHeight()) {
-+					ypath = window->minimumHeight() - window->height();
-+				}
-+				window->setGeometry(window->x(), window->y() - ypath,
-+						    window->width() + xpath, window->height() + ypath);
-+				break;
-+			case Qt::BottomSection:
-+				window->setCursor(QCursor(Qt::SizeVerCursor));
-+				ypath =  pg.y() - bottom;
-+				window->resize(window->width(), window->height() + ypath);
-+				break;
-+			case Qt::RightSection:
-+				window->setCursor(QCursor(Qt::SizeHorCursor));
-+				xpath =  pg.x() - right;
-+				window->resize(window->width() + xpath, window->height());
-+				break;
-+			case Qt::LeftSection:
-+				window->setCursor(QCursor(Qt::SizeHorCursor));
-+				xpath =  left - pg.x();
-+				if ((window->width() + xpath) < window->minimumWidth()) {
-+					xpath = window->minimumWidth() - window->width();
-+				}
-+				window->setGeometry(window->x() - xpath, window->y(),
-+						    window->width() + xpath, window->height());
-+				break;
-+			case Qt::TopSection:
-+				window->setCursor(QCursor(Qt::SizeVerCursor));
-+				ypath =  top - pg.y();
-+				if ((window->height() + ypath) < window->minimumHeight()) {
-+					ypath = window->minimumHeight() - window->height();
-+				}
-+				window->setGeometry(window->x(), window->y() - ypath,
-+						    window->width(), window->height() + ypath);
-+				break;
-+			case Qt::NoSection:
-+			default:
-+				break;
-+			}
-+		}
-+		else if(isLeftButton && isDrag && !isResize && !border) {
-+			window->setCursor(QCursor(Qt::ArrowCursor));
-+			window->move( event->globalPos() - movepath );
-+		}
-+		BaseClass::mouseMoveEvent(event);
-+	}
-+	void mouseReleaseEvent(QMouseEvent *event)
-+	{
-+		QWidget *window = BaseClass::window();
-+		if (!border && (event->button() == Qt::LeftButton) && isDrag) {
-+			movepath = QPoint(0,0);
-+			isDrag = false;
-+			isResize = false;
-+			window->setCursor(QCursor(Qt::ArrowCursor));
-+			BaseClass::mouseReleaseEvent(event);
-+		}
-+	}
- };
- 
- #endif
---- /dev/null
-+++ psi/src/widgets/psiwindowheader.cpp
-@@ -0,0 +1,226 @@
-+/*
-+ * psiwindowheader.cpp
-+ * Copyright (C) 2010  Khryukin Evgeny, Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+
-+#include <QIcon>
-+#include <QDesktopWidget>
-+
-+#include "psiwindowheader.h"
-+#include "psiiconset.h"
-+
-+PsiWindowHeader::PsiWindowHeader(QWidget *p)
-+	: QWidget(p),
-+	  maximized(false),
-+	  defaultSize(QSize(320, 280))
-+{
-+	parent_ = p->window();
-+	ui_.setupUi(this);
-+#ifdef Q_OS_MAC
-+	ui_.horiz->insertWidget(0, ui_.closeButton);
-+	ui_.horiz->insertWidget(1, ui_.hideButton);
-+	ui_.horiz->insertWidget(2, ui_.maximizeButton);
-+#endif
-+	ui_.hideButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarMinButton));
-+	ui_.maximizeButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarMaxButton));
-+	ui_.closeButton->setIcon(qApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton));
-+	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-+
-+	connect(ui_.hideButton, SIGNAL(clicked()), SLOT(hidePressed()));
-+	connect(ui_.closeButton, SIGNAL(clicked()), SLOT(closePressed()));
-+	connect(ui_.maximizeButton, SIGNAL(clicked()), SLOT(maximizePressed()));
-+	setMouseTracking(true);
-+}
-+
-+PsiWindowHeader::~PsiWindowHeader()
-+{
-+}
-+
-+void PsiWindowHeader::hidePressed()
-+{
-+	parent_->setWindowState(parent_->windowState() | Qt::WindowMinimized);
-+}
-+
-+void PsiWindowHeader::closePressed()
-+{
-+	parent_->close();
-+}
-+
-+void PsiWindowHeader::maximizePressed()
-+{
-+	const QRect desktop = qApp->desktop()->availableGeometry(-1);
-+	if (!maximized) {
-+		if (parent_->window()->width() != qApp->desktop()->width()
-+			&& parent_->window()->height() != qApp->desktop()->height()) {
-+			oldSize = parent_->window()->geometry();
-+			parent_->window()->setGeometry(desktop);
-+			maximized = true;
-+		}
-+		else if (!oldSize.isNull() && !oldSize.isEmpty()) {
-+			parent_->window()->setGeometry(oldSize);
-+			maximized = false;
-+		}
-+		else {
-+			parent_->window()->resize(defaultSize);
-+			maximized = false;
-+		}
-+	} else {
-+		if (oldSize.top() < desktop.top()) {
-+			oldSize.setTop(desktop.top());
-+		}
-+		if (oldSize.left() < desktop.left() ) {
-+			oldSize.setLeft(desktop.left());
-+		}
-+		if (oldSize.right() > desktop.right()) {
-+			oldSize.setRight(desktop.right());
-+		}
-+		if (oldSize.bottom() > desktop.bottom()) {
-+			oldSize.setBottom(desktop.bottom());
-+		}
-+		parent_->window()->setGeometry(oldSize);
-+		maximized = false;
-+	}
-+}
-+
-+void PsiWindowHeader::mouseDoubleClickEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::LeftButton) {
-+		maximizePressed();
-+		e->accept();
-+	}
-+}
-+
-+void PsiWindowHeader::mousePressEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::LeftButton) {
-+		mouseEnterEvent(e->pos().x(),e->pos().y(),geometry());
-+		if (inVRect || inLDRect || inRDRect) {
-+			isResize = true;
-+		}
-+		else{
-+			movepath = e->pos();
-+			isResize = false;
-+		}
-+		isDrag = true;
-+		e->accept();
-+	}
-+}
-+
-+void PsiWindowHeader::mouseMoveEvent(QMouseEvent *e)
-+{
-+	bool isLeftButton = (e->buttons() & Qt::LeftButton);
-+	const QPoint pg = e->globalPos();
-+	int ypath = 0;
-+	int xpath = 0;
-+	if (isLeftButton && inLDRect && isResize && !maximized) {
-+		setCursor(QCursor(Qt::SizeFDiagCursor));
-+		ypath = parent_->window()->y() - pg.y() ;
-+		xpath = parent_->window()->x() - pg.x();
-+		if ((parent_->window()->width() + xpath) < parent_->window()->minimumWidth()) {
-+			xpath = parent_->window()->minimumWidth() - parent_->window()->width();
-+		}
-+		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
-+			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
-+		}
-+		parent_->window()->setGeometry(parent_->window()->x() - xpath,
-+						parent_->window()->y() - ypath,
-+						parent_->window()->width() + xpath,
-+						parent_->window()->height() + ypath);
-+
-+	}
-+	else if (isLeftButton && inVRect && isResize && !maximized) {
-+		setCursor(QCursor(Qt::SizeVerCursor));
-+		ypath = parent_->window()->y() - pg.y();
-+		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
-+			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
-+		}
-+		parent_->window()->setGeometry(parent_->window()->x(),
-+						parent_->window()->y() - ypath,
-+						parent_->window()->width(),
-+						parent_->window()->height() + ypath);
-+	}
-+	else if (isLeftButton && inRDRect && isResize && !maximized) {
-+		setCursor(QCursor(Qt::SizeBDiagCursor));
-+		ypath = parent_->window()->y() - pg.y();
-+		xpath = pg.x() - parent_->window()->geometry().right();
-+		if ((parent_->window()->height() + ypath) < parent_->window()->minimumHeight()) {
-+			ypath = parent_->window()->minimumHeight() - parent_->window()->height();
-+		}
-+		parent_->window()->setGeometry(parent_->window()->x(),
-+						parent_->window()->y() - ypath,
-+						parent_->window()->width() + xpath,
-+						parent_->window()->height() + ypath);
-+
-+	}
-+	else if(isLeftButton && isDrag &&!isResize && !maximized) {
-+		setCursor(QCursor(Qt::ArrowCursor));
-+		parent_->window()->move( e->globalPos() - movepath );
-+	}
-+	e->accept();
-+}
-+
-+void PsiWindowHeader::mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom)
-+{
-+	if(mouse_y <= geom.top()+7
-+		&& qAbs(mouse_x - geom.left()) <= 4) {
-+		inLDRect = true;
-+		inRDRect = false;
-+		inVRect = false;
-+	}
-+	else if(mouse_y <= geom.top()+7
-+		&& qAbs(mouse_x - geom.right()) <= 4) {
-+		inRDRect = true;
-+		inLDRect = false;
-+		inVRect = false;
-+	}
-+	else if (mouse_x > (geom.left() + 4)
-+		&& mouse_x < (geom.right() - 4)
-+		&& qAbs(mouse_y - geom.top()) <= 4) {
-+		inVRect = true;
-+		inLDRect = false;
-+		inRDRect = false;
-+	}
-+	else {
-+		inVRect = false;
-+		inLDRect = false;
-+		inRDRect = false;
-+	}
-+}
-+
-+void PsiWindowHeader::mouseReleaseEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::LeftButton && isDrag) {
-+		movepath.setX(0);
-+		movepath.setY(0);
-+		isDrag = false;
-+		isResize = false;
-+		setCursor(QCursor(Qt::ArrowCursor));
-+	}
-+	int min_x = qMin(ui_.hideButton->geometry().left(), qMin(ui_.maximizeButton->geometry().left(), ui_.closeButton->geometry().left()));
-+	int max_x = qMax(ui_.hideButton->geometry().right(), qMax(ui_.maximizeButton->geometry().right(), ui_.closeButton->geometry().right()));
-+	if (e->button() == Qt::MidButton) {
-+		if (((e->x() > geometry().left() && e->x() < min_x)
-+			|| (e->x() < geometry().right() && e->x() > max_x ))
-+			&& e->y() > geometry().top()
-+			&& e->y() < geometry().bottom()) {
-+			hidePressed();
-+		}
-+	}
-+	e->accept();
-+}
---- /dev/null
-+++ psi/src/widgets/psiwindowheader.h
-@@ -0,0 +1,65 @@
-+/*
-+ * psiwindowheader.cpp
-+ * Copyright (C) 2010  Khryukin Evgeny, Vitaly Tonkacheyev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+
-+#ifndef PSIWINDOWHEADER_H
-+#define PSIWINDOWHEADER_H
-+
-+#include "ui_psiwindowheader.h"
-+
-+#include <QToolButton>
-+#include <QMouseEvent>
-+#include <QRect>
-+
-+class PsiWindowHeader : public QWidget
-+{
-+	Q_OBJECT
-+public:
-+	PsiWindowHeader(QWidget* p);
-+	~PsiWindowHeader();
-+
-+private:
-+	Ui::PsiWindowHeader ui_;
-+	QWidget *parent_;
-+	QPoint movepath;
-+	bool isDrag;
-+	bool isResize;
-+	bool inVRect;
-+	bool inLDRect;
-+	bool inRDRect;
-+	bool maximized;
-+	QRect oldSize;
-+	QSize defaultSize;
-+	void mouseEnterEvent(const int mouse_x, const int mouse_y, const QRect &geom);
-+
-+private slots:
-+	void hidePressed();
-+	void closePressed();
-+	void maximizePressed();
-+
-+protected:
-+	void mouseMoveEvent(QMouseEvent *e);
-+	void mousePressEvent(QMouseEvent *e);
-+	void mouseReleaseEvent(QMouseEvent *e);
-+	void mouseDoubleClickEvent(QMouseEvent *e);
-+
-+};
-+
-+#endif // PSIWINDOWHEADER_H
---- /dev/null
-+++ psi/src/widgets/psiwindowheader.ui
-@@ -0,0 +1,120 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>PsiWindowHeader</class>
-+ <widget class="QWidget" name="PsiWindowHeader">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>130</width>
-+    <height>31</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="mouseTracking">
-+   <bool>true</bool>
-+  </property>
-+  <property name="windowTitle">
-+   <string>PsiWindowHeader</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <property name="spacing">
-+    <number>0</number>
-+   </property>
-+   <property name="margin">
-+    <number>0</number>
-+   </property>
-+   <item>
-+    <layout class="QHBoxLayout" name="horiz">
-+     <property name="spacing">
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <widget class="QFrame" name="headerFrame">
-+       <property name="frameShape">
-+        <enum>QFrame::NoFrame</enum>
-+       </property>
-+       <property name="frameShadow">
-+        <enum>QFrame::Plain</enum>
-+       </property>
-+       <property name="lineWidth">
-+        <number>1</number>
-+       </property>
-+       <layout class="QHBoxLayout" name="horizontalLayout_3">
-+        <property name="spacing">
-+         <number>0</number>
-+        </property>
-+        <property name="margin">
-+         <number>0</number>
-+        </property>
-+        <item>
-+         <layout class="QHBoxLayout" name="horiz1">
-+          <property name="spacing">
-+           <number>2</number>
-+          </property>
-+          <item>
-+           <spacer name="spacer">
-+            <property name="orientation">
-+             <enum>Qt::Horizontal</enum>
-+            </property>
-+            <property name="sizeHint" stdset="0">
-+             <size>
-+              <width>40</width>
-+              <height>20</height>
-+             </size>
-+            </property>
-+           </spacer>
-+          </item>
-+          <item>
-+           <widget class="QToolButton" name="hideButton">
-+            <property name="text">
-+             <string>...</string>
-+            </property>
-+            <property name="autoRaise">
-+             <bool>true</bool>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QToolButton" name="maximizeButton">
-+            <property name="text">
-+             <string>...</string>
-+            </property>
-+            <property name="autoRaise">
-+             <bool>true</bool>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QToolButton" name="closeButton">
-+            <property name="sizePolicy">
-+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-+              <horstretch>0</horstretch>
-+              <verstretch>0</verstretch>
-+             </sizepolicy>
-+            </property>
-+            <property name="text">
-+             <string>...</string>
-+            </property>
-+            <property name="autoRaise">
-+             <bool>true</bool>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+       </layout>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- psi.orig/src/widgets/widgets.pri
-+++ psi/src/widgets/widgets.pri
-@@ -16,6 +16,7 @@ SOURCES += \
- 	$$PWD/psitiplabel.cpp \
- 	$$PWD/psitabwidget.cpp \
- 	$$PWD/psitabbar.cpp \
-+	$$PWD/psiwindowheader.cpp \
- 	$$PWD/actionlineedit.cpp \
- 	$$PWD/typeaheadfind.cpp
- 
-@@ -43,10 +44,12 @@ HEADERS += \
- 	$$PWD/psitiplabel.h \
- 	$$PWD/psitabwidget.h \
- 	$$PWD/psitabbar.h \
-+	$$PWD/psiwindowheader.h \
- 	$$PWD/actionlineedit.h \
- 	$$PWD/typeaheadfind.h
- 
--FORMS += $$PWD/fancypopup.ui
-+FORMS += $$PWD/fancypopup.ui \
-+	$$PWD/psiwindowheader.ui
- 
- # to remove dependency on iconset and stuff
- #DEFINES += WIDGET_PLUGIN

psi-plus-main-20160309.tar.xz/patches/0190-psi-colors-for-tabs.diff Deleted

@@ -1,32 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -403,6 +403,8 @@ QLineEdit#le_status_text {
- 					<chat>
- 						<link-color type="QColor">#0000ff</link-color>
- 						<mailto-color type="QColor">#0000ff</mailto-color>
-+						<composing-color type="QColor">darkGreen</composing-color>
-+						<unread-message-color type="QColor">red</unread-message-color>
- 					</chat>
- 					<passive-popup>
- 						<border type="QColor">#5297f9</border>
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -653,15 +653,15 @@ void TabDlg::updateTab(TabbableWidget* c
- 	//now set text colour based upon whether there are new messages/composing etc
- 
- 	if (chat->state() == TabbableWidget::StateComposing) {
--		tabWidget_->setTabTextColor(chat, Qt::darkGreen);
-+		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.composing-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
- 	}
- 	else if (chat->unreadMessageCount()) {
--		tabWidget_->setTabTextColor(chat, Qt::red);
-+		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
- 	}
- 	else {
--		tabWidget_->setTabTextColor(chat, palette().windowText().color());
-+		tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
- 		tabWidget_->setTabIcon(chat, chat->icon());
- 	}
- 	updateCaption();

psi-plus-main-20160309.tar.xz/patches/0200-psi-chatview-quote-feature.diff Deleted

@@ -1,408 +0,0 @@
---- psi.orig/src/chatview_te.cpp
-+++ psi/src/chatview_te.cpp
-@@ -35,6 +35,8 @@
- #include <QTimer>
- #include <QKeyEvent>
- #include <QUrl>
-+#include <QMenu>
-+#include <QTextDocumentFragment>
- 
- static const char *informationalColorOpt = "options.ui.look.colors.messages.informational";
- 
-@@ -59,6 +61,12 @@ ChatView::ChatView(QWidget *parent)
- 	connect(this, SIGNAL(selectionChanged()), SLOT(autoCopy()));
- 	connect(this, SIGNAL(cursorPositionChanged()), SLOT(autoCopy()));
- #endif
-+	actQuote_ = new QAction(tr("Quote"), this);
-+	actQuote_->setEnabled(false);
-+	actQuote_->setShortcut(QKeySequence(tr("Ctrl+S")));
-+	addAction(actQuote_);
-+	connect(actQuote_, SIGNAL(triggered()), SLOT(quoteEvent()));
-+	connect(this, SIGNAL(selectionChanged()), SLOT(changeActQuoteState()));
- 
- 	useMessageIcons_ = PsiOptions::instance()->getOption("options.ui.chat.use-message-icons").toBool();
- 	if (useMessageIcons_) {
-@@ -135,10 +143,20 @@ void ChatView::contextMenuEvent(QContext
- 		e->accept();
- 	}
- 	else {
--		PsiTextView::contextMenuEvent(e);
-+		QMenu *menu = createStandardContextMenu(e->pos());
-+		menu->exec(e->globalPos());
-+		delete menu;
-+		e->accept();
- 	}
- }
- 
-+QMenu* ChatView::createStandardContextMenu(const QPoint &position)
-+{
-+	QMenu *menu = PsiTextView::createStandardContextMenu(position);
-+	menu->addAction(actQuote_);
-+	return menu;
-+}
-+
- void ChatView::addLogIconsResources()
- {
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
-@@ -203,6 +221,24 @@ void ChatView::autoCopy()
- }
- 
- /**
-+ * Make quote from any selected text and paste it in chat window
-+ */
-+
-+void ChatView::quoteEvent()
-+{
-+	emit quote(getPlainText());
-+}
-+
-+/**
-+ * Enable or disable actQuote_ in relations from hasSelection()
-+ */
-+
-+void ChatView::changeActQuoteState()
-+{
-+	actQuote_->setEnabled(textCursor().hasSelection());
-+}
-+
-+/**
-  * Handle KeyPress events that happen in ChatEdit widget. This is used
-  * to 'fix' the copy shortcut.
-  * \param object object that should receive the event
---- psi.orig/src/chatview_te.h
-+++ psi/src/chatview_te.h
-@@ -47,6 +47,7 @@ public:
- 	QSize sizeHint() const;
- 	void clear();
- 	void contextMenuEvent(QContextMenuEvent *e);
-+	QMenu* createStandardContextMenu(const QPoint &position);
- 
- 	void init();
- 	void setDialog(QWidget* dialog);
-@@ -85,12 +86,15 @@ protected:
- 
- protected slots:
- 	void autoCopy();
-+	void quoteEvent();
-+	void changeActQuoteState();
- 
- private slots:
- 	void slotScroll();
- 
- signals:
- 	void showNM(const QString&);
-+	void quote(const QString &text);
- 
- private:
- 	bool isMuc_;
-@@ -109,6 +113,7 @@ private:
- 	QPixmap logIconDeliveredPgp;
- 	QPixmap logIconTime;
- 	QPixmap logIconInfo;
-+	QAction *actQuote_;
- };
- 
- #endif
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -881,6 +881,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	invalidateTab();
- 	setConnecting();
- 
-+	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
- 	connect(pa->avatarFactory(), SIGNAL(avatarChanged(Jid)), SLOT(avatarUpdated(Jid)));
- }
- 
---- psi.orig/src/msgmle.cpp
-+++ psi/src/msgmle.cpp
-@@ -33,6 +33,7 @@
- #include <QTextDocument>
- #include <QTimer>
- #include <QMimeData>
-+#include <QClipboard>
- 
- #include "shortcutmanager.h"
- #include "spellchecker/spellhighlighter.h"
-@@ -93,6 +94,13 @@ void ChatEdit::initActions()
- 	act_showMessageLast= new QAction(this);
- 	addAction(act_showMessageLast);
- 	connect(act_showMessageLast, SIGNAL(triggered()), SLOT(showHistoryMessageLast()));
-+
-+	QClipboard *clipboard = QApplication::clipboard();
-+	actPasteAsQuote_ = new QAction(tr("Paste as Quotation"), this);
-+	actPasteAsQuote_->setEnabled(clipboard->mimeData()->hasText());
-+	addAction(actPasteAsQuote_);
-+	connect(actPasteAsQuote_, SIGNAL(triggered()), SLOT(pasteAsQuote()));
-+	connect(clipboard, SIGNAL(dataChanged()), SLOT(changeActPasteAsQuoteState()));
- }
- 
- void ChatEdit::setShortcuts()
-@@ -119,6 +127,13 @@ void ChatEdit::setFont(const QFont &f)
- 	controller_->setFont(f);
- }
- 
-+QMenu* ChatEdit::createStandardContextMenu(const QPoint &position)
-+{
-+	QMenu *menu = QTextEdit::createStandardContextMenu(position);
-+	menu->addAction(actPasteAsQuote_);
-+	return menu;
-+}
-+
- bool ChatEdit::checkSpellingGloballyEnabled()
- {
- 	return (SpellChecker::instance()->available() && PsiOptions::instance()->getOption("options.ui.spell-check.enabled").toBool());
-@@ -223,8 +238,10 @@ void ChatEdit::contextMenuEvent(QContext
- 		}
- 	}
- 
--	// Do normal menu
--	QTextEdit::contextMenuEvent(e);
-+	// Do custom menu
-+	QMenu *menu = createStandardContextMenu(e->pos());
-+	menu->exec(e->globalPos());
-+	delete menu;
- 	e->accept();
- }
- 
-@@ -299,6 +316,18 @@ void ChatEdit::showHistoryMessageNext()
- 	}
- }
- 
-+void ChatEdit::changeActPasteAsQuoteState()
-+{
-+	QClipboard *clipboard = QApplication::clipboard();
-+	actPasteAsQuote_->setEnabled(clipboard->mimeData()->hasText());
-+}
-+
-+void ChatEdit::pasteAsQuote()
-+{
-+	QString text = QApplication::clipboard()->mimeData()->text();
-+	insertAsQuote(text);
-+}
-+
- void ChatEdit::showHistoryMessagePrev()
- {
- 	if (!typedMsgsHistory.isEmpty() && typedMsgsIndex > 0) {
-@@ -408,6 +437,24 @@ void ChatEdit::setCssString(const QStrin
- 	controller_->setCssString(css);
- }
- 
-+void ChatEdit::insertAsQuote(const QString &text)
-+{
-+	int pos =  textCursor().position();
-+	QString prevLine = toPlainText().left(pos - 1);
-+	prevLine = prevLine.mid(prevLine.lastIndexOf("\n") + 1);
-+
-+	QString quote = QString::fromUtf8("» ") + text;
-+	quote.replace("\n", QString::fromUtf8("\n» "));
-+
-+	// Check for previous quote and merge if true
-+	if(!prevLine.startsWith(QString::fromUtf8("»"))) {
-+		quote.prepend("\n");
-+	}
-+	quote.append("\n");
-+	insertPlainText(quote);
-+}
-+
-+
- //----------------------------------------------------------------------------
- // LineEdit
- //----------------------------------------------------------------------------
---- psi.orig/src/msgmle.h
-+++ psi/src/msgmle.h
-@@ -49,6 +49,7 @@ public:
- 	// reimplemented
- 	QSize sizeHint() const;
- 	void setFont(const QFont &);
-+	QMenu* createStandardContextMenu(const QPoint &position);
- 
- 	static bool checkSpellingGloballyEnabled();
- 	void setCheckSpelling(bool);
-@@ -59,6 +60,7 @@ public slots:
- 	void clearMessageHistory();
- 	void doHTMLTextMenu();
- 	void setCssString(const QString& css);
-+	void insertAsQuote(const QString& text);
- 
- protected slots:
-  	void applySuggestion();
-@@ -68,6 +70,8 @@ protected slots:
- 	void showHistoryMessagePrev();
- 	void showHistoryMessageFirst();
- 	void showHistoryMessageLast();
-+	void changeActPasteAsQuoteState();
-+	void pasteAsQuote();
- 
- protected:
- 	// override the tab/esc behavior
-@@ -92,6 +96,8 @@ private:
- 	QAction* act_showMessageNext;
- 	QAction* act_showMessageFirst;
- 	QAction* act_showMessageLast;
-+	QAction *actPasteAsQuote_;
-+
- 	QString currentText;
- 	HTMLTextController *controller_;
- };
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -267,6 +267,7 @@ void PsiChatDlg::initUi()
- 		ui_.vboxLayout1->insertWidget(0, winHeader_);
- 	}
- 	setMargins();
-+	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
- 
- 	ui_.log->realTextWidget()->installEventFilter(this);
- 	ui_.mini_prompt->hide();
---- psi.orig/src/webview.cpp
-+++ psi/src/webview.cpp
-@@ -45,6 +45,11 @@ WebView::WebView(QWidget* parent) : QWeb
- 	connect(page()->action(QWebPage::Cut), SIGNAL(triggered()), SLOT(textCopiedEvent()));
- 	connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStartedEvent()));
- 	connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinishedEvent(bool)));
-+
-+	actQuote_ = new QAction(tr("Quote"), this);
-+	actQuote_->setShortcut(QKeySequence(tr("Ctrl+S")));
-+	addAction(actQuote_);
-+	connect(actQuote_, SIGNAL(triggered()), SLOT(quoteEvent()));
- }
- 
- void WebView::linkClickedEvent(const QUrl& url)
-@@ -68,6 +73,11 @@ void WebView::loadFinishedEvent(bool suc
- 	isLoading_ = false;
- }
- 
-+void WebView::quoteEvent()
-+{
-+	emit quote(selectedText());
-+}
-+
- void WebView::contextMenuEvent(QContextMenuEvent* event)
- {
- 	if (isLoading_) return;
-@@ -85,6 +95,7 @@ void WebView::contextMenuEvent(QContextM
- 		menu = new QMenu(this);
- 		if (!page()->selectedText().isEmpty()) {
- 			menu->addAction(pageAction(QWebPage::Copy));
-+			menu->addAction(actQuote_);
- 		} else {
- 			if (!menu->isEmpty()) {
- 				menu->addSeparator();
---- psi.orig/src/webview.h
-+++ psi/src/webview.h
-@@ -100,13 +100,17 @@ private:
- 	bool isLoading_;
- 	QStringList jsBuffer_;
- 	QPoint dragStartPosition;
-+	QAction *actQuote_;
- 
-+signals:
-+	void quote(const QString &text);
- 
- protected slots:
- 	void linkClickedEvent(const QUrl& url);
- 	void textCopiedEvent();
- 	void loadStartedEvent();
- 	void loadFinishedEvent(bool);
-+	void quoteEvent();
- };
- 
- 
---- psi.orig/src/widgets/psitextview.cpp
-+++ psi/src/widgets/psitextview.cpp
-@@ -25,6 +25,7 @@
- #include <QAbstractTextDocumentLayout>
- #include <QTextDocumentFragment>
- #include <QTextFragment>
-+#include <QRegExp>
- #include <QMimeData>
- 
- #include "urlobject.h"
-@@ -79,6 +80,54 @@ PsiTextView::PsiTextView(QWidget *parent
- 	viewport()->setMouseTracking(true); // we want to get all mouseMoveEvents
- }
- 
-+ /**
-+ * Reimplemented createStandardContextMenu(const QPoint &position)
-+ * for creating of custom context menu
-+ */
-+
-+QMenu* PsiTextView::createStandardContextMenu(const QPoint &position)
-+{
-+	QTextCursor textcursor = cursorForPosition(position);
-+	QMenu *menu;
-+	QString anc = anchorAt(position);
-+	if (!anc.isEmpty()) {
-+		menu = URLObject::getInstance()->createPopupMenu(anc);
-+
-+		int posInBlock = textcursor.position() - textcursor.block().position();
-+		QString textblock = textcursor.block().text();
-+		int begin = textcursor.block().position() + textblock.lastIndexOf(QRegExp("\\s|^"), posInBlock) + 1;
-+		int end = textcursor.block().position() + textblock.indexOf(QRegExp("\\s|$"), posInBlock);
-+		textcursor.setPosition(begin);
-+		textcursor.setPosition(end, QTextCursor::KeepAnchor);
-+		setTextCursor(textcursor);
-+
-+		menu = URLObject::getInstance()->createPopupMenu(anc);
-+	}
-+	else {
-+		if (isSelectedBlock() || !textCursor().hasSelection()) { // only if no selection we select text block
-+			int begin = textcursor.block().position();
-+			int end = begin + textcursor.block().length() - 1;
-+			textcursor.setPosition(begin);
-+			textcursor.setPosition(end, QTextCursor::KeepAnchor);
-+			setTextCursor(textcursor);
-+		}
-+		menu = QTextEdit::createStandardContextMenu();
-+	}
-+	return menu;
-+}
-+
-+bool PsiTextView::isSelectedBlock()
-+{
-+	if (textCursor().hasSelection()) {
-+		const QTextCursor &cursor = textCursor();
-+		const QTextBlock  &block  = cursor.block();
-+		int start = cursor.selectionStart();
-+		if (block.position() == start && block.length() == cursor.selectionEnd() - start + 1)
-+			return true;
-+	}
-+	return false;
-+}
-+
- /**
-  * This function returns true if vertical scroll bar is
-  * at its maximum position.
-@@ -175,11 +224,7 @@ QString PsiTextView::getPlainText() cons
- 
- void PsiTextView::contextMenuEvent(QContextMenuEvent *e)
- {
--	QMenu *menu;
--	if (!anchorAt(e->pos()).isEmpty())
--		menu = URLObject::getInstance()->createPopupMenu(anchorAt(e->pos()));
--	else
--		menu = createStandardContextMenu();
-+	QMenu *menu = createStandardContextMenu(e->pos());
- 	menu->exec(e->globalPos());
- 	e->accept();
- 	delete menu;
---- psi.orig/src/widgets/psitextview.h
-+++ psi/src/widgets/psitextview.h
-@@ -32,6 +32,9 @@ class PsiTextView : public QTextEdit
- public:
- 	PsiTextView(QWidget *parent = 0);
- 
-+	// Reimplemented
-+	QMenu* createStandardContextMenu(const QPoint &position);
-+
- 	bool atBottom();
- 
- 	virtual void appendText(const QString &text);
-@@ -68,6 +71,7 @@ protected:
- 	class Private;
- private:
- 	Private *d;
-+	bool isSelectedBlock();
- };
- 
- #endif

psi-plus-main-20160309.tar.xz/patches/0210-psi-vert-splitter-position.diff Deleted

@@ -1,266 +0,0 @@
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -123,6 +123,8 @@
- 				<css type="QString" />
- 				<hide-when-closing type="bool">false</hide-when-closing>
- 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
-+				<log-height type="int">325</log-height>
-+				<chatedit-height type="int">10</chatedit-height>
- 				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
- 				<default-jid-mode-ignorelist comment="Default autojid mode ignore list: jid1,jid2,..." type="QString"></default-jid-mode-ignorelist>
- 			</chat>
---- a/src/chatsplitter.cpp
-+++ b/src/chatsplitter.cpp
-@@ -75,6 +75,15 @@ void ChatSplitter::setSizes(const QList<int>& list)
- 		splitter_->setSizes(list);
- }
- 
-+QList<int> ChatSplitter::sizes()
-+{
-+	QList<int> list;
-+	if(splitter_)
-+		list = splitter_->sizes();
-+
-+	return list;
-+}
-+
- /**
-  * Moves \a child either to the real QSplitter, or adds it to the
-  * private layout.
-@@ -130,6 +139,8 @@ void ChatSplitter::updateLayout()
- 
- 	foreach(QWidget* child, children_)
- 		updateChildLayout(child);
-+
-+	connect(splitter_, SIGNAL(splitterMoved(int,int)), SIGNAL(splitterMoved(int,int)));
- }
- 
- /**
---- a/src/chatsplitter.h
-+++ b/src/chatsplitter.h
-@@ -35,6 +35,7 @@ public:
- 	void setOrientation(Qt::Orientation orientation);
- 	void addWidget(QWidget* widget);
- 	void setSizes(const QList<int>& list);
-+	QList<int> sizes();
- 
- protected:
- 	/**
-@@ -49,6 +50,9 @@ public slots:
- private slots:
- 	void childDestroyed(QObject* obj);
- 
-+signals:
-+	void splitterMoved(int,int);
-+
- private:
- 	void updateChildLayout(QWidget* child);
- 	void updateLayout();
---- a/src/groupchatdlg.cpp
-+++ b/src/groupchatdlg.cpp
-@@ -249,6 +249,9 @@ public:
- 	int logSize;
- 	int rosterSize;
- 
-+	int logHeight;
-+	int chateditHeight;
-+
- public:
- 	bool trackBar;
- 
-@@ -844,6 +847,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 	ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
- 
- 	connect(ui_.hsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(horizSplitterMoved()));
-+	connect(ui_.vsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
- 
- 	// resize the horizontal splitter
- 	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
-@@ -861,10 +865,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 		ui_.hsplitter->insertWidget(0, ui_.lv_users);  // Swap widgets
- 
- 	// resize the vertical splitter
--	list.clear();
--	list << 324;
--	list << 10;
--	ui_.vsplitter->setSizes(list);
-+	d->logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
-+	d->chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
-+	setVSplitterPosition(d->logHeight, d->chateditHeight);
- 
- 	X11WM_CLASS("groupchat");
- 
-@@ -915,6 +918,26 @@ void GCMainDlg::horizSplitterMoved()
- 	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
- }
- 
-+void GCMainDlg::verticalSplitterMoved(int, int)
-+{
-+	QList<int> list = ui_.vsplitter->sizes();
-+	d->logHeight = list.first();
-+	d->chateditHeight = list.last();
-+	PsiOptions::instance()->setOption("options.ui.chat.log-height", d->logHeight);
-+	PsiOptions::instance()->setOption("options.ui.chat.chatedit-height", d->chateditHeight);
-+
-+	emit vSplitterMoved(d->logHeight, d->chateditHeight);
-+}
-+
-+void GCMainDlg::setVSplitterPosition(int log,int chat)
-+{
-+	QList<int> list;
-+	d->logHeight = log;
-+	d->chateditHeight = chat;
-+	list << log << chat;
-+	ui_.vsplitter->setSizes(list);
-+}
-+
- void GCMainDlg::doMinimize()
- {
- 	window()->showMinimized();
---- a/src/groupchatdlg.h
-+++ b/src/groupchatdlg.h
-@@ -85,6 +85,7 @@ public:
- 	virtual TabbableWidget::State state() const;
- 	virtual int unreadMessageCount() const;
- 	virtual QString desiredCaption() const;
-+	virtual void setVSplitterPosition(int log,int chat);
- 
- protected:
- 	void setShortcuts();
-@@ -141,6 +142,7 @@ private slots:
- #endif
- 	void chatEditCreated();
- 	void horizSplitterMoved();
-+	void verticalSplitterMoved(int, int);
- 	void doMinimize();
- 	void avatarUpdated(const Jid& jid);
- 
---- a/src/psichatdlg.cpp
-+++ b/src/psichatdlg.cpp
-@@ -249,10 +249,11 @@ void PsiChatDlg::initUi()
- 
- 	connect(account()->client()->capsManager(), SIGNAL(capsChanged(const Jid&)), SLOT(capsChanged(const Jid&)));
- 
--	QList<int> list;
--	list << 324;
--	list << 96;
--	ui_.splitter->setSizes(list);
-+	logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
-+	chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
-+	setVSplitterPosition(logHeight, chateditHeight);
-+
-+	connect(ui_.splitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
- 
- 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
-  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
-@@ -278,6 +279,26 @@ void PsiChatDlg::initUi()
- 	unacked_messages = 0;
- }
- 
-+void PsiChatDlg::verticalSplitterMoved(int, int)
-+{
-+	QList<int> list = ui_.splitter->sizes();
-+	logHeight = list.first();
-+	chateditHeight = list.last();
-+	PsiOptions::instance()->setOption("options.ui.chat.log-height", logHeight);
-+	PsiOptions::instance()->setOption("options.ui.chat.chatedit-height", chateditHeight);
-+
-+	emit vSplitterMoved(logHeight, chateditHeight);
-+}
-+
-+void PsiChatDlg::setVSplitterPosition(int log,int chat)
-+{
-+	QList<int> list;
-+	logHeight = log;
-+	chateditHeight = chat;
-+	list << log << chat;
-+	ui_.splitter->setSizes(list);
-+}
-+
- void PsiChatDlg::updateCountVisibility()
- {
- 	if (PsiOptions::instance()->getOption("options.ui.message.show-character-count").toBool() && !smallChat_) {
---- a/src/psichatdlg.h
-+++ b/src/psichatdlg.h
-@@ -23,6 +23,8 @@ class PsiChatDlg : public ChatDlg
- public:
- 	PsiChatDlg(const Jid& jid, PsiAccount* account, TabManager* tabManager);
- 
-+	virtual void setVSplitterPosition(int log,int chat);
-+
- protected:
- 	// reimplemented
- 	void contextMenuEvent(QContextMenuEvent *);
-@@ -45,6 +47,7 @@ private slots:
- 	void updateCountVisibility();
- 	void updateContactAdding(PsiContact* c = 0);
- 	void updateContactAdding(const Jid &j);
-+	void verticalSplitterMoved(int, int);
- 	void contactChanged();
- 	QString makeContactName(const QString &name, const Jid &jid) const;
- 	void updateToolbuttons();
-@@ -111,6 +114,9 @@ private:
- 	static PsiIcon *throbber_icon;
- 	bool tabmode;
- 	QPointer <PsiWindowHeader> winHeader_;
-+
-+	int logHeight;
-+	int chateditHeight;
- };
- 
- #endif
---- a/src/tabs/tabbablewidget.h
-+++ b/src/tabs/tabbablewidget.h
-@@ -67,11 +67,13 @@ public:
- 	virtual State state() const = 0;
- 	virtual int unreadMessageCount() const = 0;
- 	virtual QString desiredCaption() const = 0;
-+	virtual void setVSplitterPosition(int,int){}; // default implementation do nothing
- 
- signals:
- 	void invalidateTabInfo();
- 	void updateFlashState();
- 	void eventsRead(const Jid &);
-+	void vSplitterMoved(int,int);
- 
- public slots:
- 	virtual void deactivated();
---- a/src/tabs/tabdlg.cpp
-+++ b/src/tabs/tabdlg.cpp
-@@ -426,6 +426,7 @@ void TabDlg::addTab(TabbableWidget* tab)
- 
- 	connect(tab, SIGNAL(invalidateTabInfo()), SLOT(updateTab()));
- 	connect(tab, SIGNAL(updateFlashState()), SLOT(updateFlashState()));
-+	connect(tab, SIGNAL(vSplitterMoved(int,int)), SLOT(updateVSplitters(int,int)));
- 
- 	updateTab(tab);
- 	setUpdatesEnabled(true);
-@@ -496,6 +497,7 @@ void TabDlg::removeTabWithNoChecks(TabbableWidget *tab)
- {
- 	disconnect(tab, SIGNAL(invalidateTabInfo()), this, SLOT(updateTab()));
- 	disconnect(tab, SIGNAL(updateFlashState()), this, SLOT(updateFlashState()));
-+	disconnect(tab, SIGNAL(vSplitterMoved(int,int)), this, SLOT(updateVSplitters(int,int)));
- 
- 	tabs_.removeAll(tab);
- 	tabWidget_->removePage(tab);
-@@ -901,3 +903,10 @@ void TabDlg::setTabIcon(QWidget *widget,const QIcon &icon)
- {
- 	tabWidget_->setTabIcon(widget, icon);
- }
-+
-+void TabDlg::updateVSplitters(int log, int chat)
-+{
-+	foreach(TabbableWidget *w, tabs_) {
-+		w->setVSplitterPosition(log, chat);
-+	}
-+}
---- a/src/tabs/tabdlg.h
-+++ b/src/tabs/tabdlg.h
-@@ -145,6 +145,7 @@ private slots:
- 	void menu_sendTabTo(QAction *act);
- 	void queuedSendTabTo(TabbableWidget* chat, TabDlg *dest);
- 	void showTabMenu(int tab, QPoint pos, QContextMenuEvent * event);
-+	void updateVSplitters(int log, int chat);
- 
- private:
- 	TabDlgDelegate *delegate_;

psi-plus-main-20160309.tar.xz/patches/0220-psi-auto-capitalizer.diff Deleted

@@ -1,239 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -110,6 +110,7 @@
- 				</avatars>
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
-+				<auto-capitalize type="bool">false</auto-capitalize>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
-@@ -606,6 +607,7 @@ QLineEdit#le_status_text {
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
- 				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
-+				<change-case type="QKeySequence" comment="Change case of letters in the chat edit" >Ctrl+Alt+x</change-case>
- 				<minimize type="QKeySequence" comment="Minimize active chat window"/>
- 			</chat>
- 			<contactlist comment="Shortcuts in the contactlist">
---- psi.orig/src/msgmle.cpp
-+++ psi/src/msgmle.cpp
-@@ -41,6 +41,126 @@
- #include "psioptions.h"
- #include "htmltextcontroller.h"
- 
-+#include "qdebug.h"
-+
-+//----------------------------------------------------------------------------
-+// CapitalLettersController
-+//----------------------------------------------------------------------------
-+
-+class CapitalLettersController : public QObject
-+{
-+	Q_OBJECT
-+public:
-+	CapitalLettersController(QTextEdit* parent)
-+		: QObject()
-+		, te_(parent)
-+		, enabled_(true)
-+	{
-+		connect(te_->document(), SIGNAL(contentsChange(int,int,int)), SLOT(textChanged(int,int,int)));
-+	}
-+
-+	virtual ~CapitalLettersController() {};
-+
-+	void setAutoCapitalizeEnabled(bool enabled)
-+	{
-+		enabled_ = enabled;
-+	}
-+
-+private:
-+	void capitalizeChar(int pos, QChar c)
-+	{
-+		changeChar(pos, c.toUpper());
-+	}
-+
-+	void decapitalizeChar(int pos, QChar c)
-+	{
-+		changeChar(pos, c.toLower());
-+	}
-+
-+	void changeChar(int pos, QChar c)
-+	{
-+		QTextCursor cur = te_->textCursor();
-+		cur.setPosition(pos+1);
-+		const QTextCharFormat cf = cur.charFormat();
-+		cur.deletePreviousChar();
-+		cur.setCharFormat(cf);
-+		cur.insertText(c);
-+	}
-+
-+public slots:
-+	void textChanged(int pos, int /*charsRemoved*/, int charsAdded)
-+	{
-+		if(enabled_) {
-+			if(charsAdded == 0) {
-+				return;
-+			}
-+			if(!te_->textCursor().atEnd()) { //Editing the letter in the middle of the text
-+				return;
-+			}
-+			bool capitalizeNext_ = false;
-+
-+			if(pos == 0 && charsAdded < 3) { //the first letter after the previous message was sent
-+				capitalizeNext_ = true;
-+			}
-+			else if (charsAdded > 1) { //Insert a piece of text
-+				return;
-+			}
-+			else {
-+				QString txt = te_->toPlainText();
-+				QRegExp capitalizeAfter("(?:^^..+\\s+)|(?:\\s*^.{2,}.+\\s+)|(?:!?\\s+)");
-+				int index = txt.lastIndexOf(capitalizeAfter);
-+				if(index != -1 && index == pos-capitalizeAfter.matchedLength()) {
-+					capitalizeNext_ = true;
-+				}
-+			}
-+
-+			if(capitalizeNext_) {
-+				QChar ch = te_->document()->characterAt(pos);
-+				if(!ch.isLetter() || !ch.isLower()) {
-+					return;
-+				}
-+				else {
-+					capitalizeChar(pos, ch);
-+				}
-+			}
-+		}
-+	}
-+
-+	void changeCase()
-+	{
-+		bool tmpEnabled = enabled_;
-+		enabled_ = false;
-+		QTextCursor oldCur = te_->textCursor();
-+		int pos = oldCur.position();
-+		int begin = 0;
-+		int end = te_->document()->characterCount();
-+		if(oldCur.hasSelection()) {
-+			begin = oldCur.selectionStart();
-+			end = oldCur.selectionEnd();
-+		}
-+		for(; begin < end; begin++) {
-+			QChar ch = te_->document()->characterAt(begin);
-+			if(!ch.isLetter()) {
-+				continue;
-+			}
-+
-+			if(ch.isLower()) {
-+				capitalizeChar(begin, ch);
-+			}
-+			else {
-+				decapitalizeChar(begin, ch);
-+			}
-+		}
-+		oldCur.setPosition(pos);
-+		te_->setTextCursor(oldCur);
-+		enabled_ = tmpEnabled;
-+	}
-+
-+private:
-+	QTextEdit* te_;
-+	bool enabled_;
-+};
-+
- 
- //----------------------------------------------------------------------------
- // ChatEdit
-@@ -52,6 +172,7 @@ ChatEdit::ChatEdit(QWidget *parent)
- 	, spellhighlighter_(0)
- {
- 	controller_ = new HTMLTextController(this);
-+	capitalizer_ = new CapitalLettersController(this);
- 
- 	setWordWrapMode(QTextOption::WordWrap);
- 	setAcceptRichText(false);
-@@ -68,6 +189,7 @@ ChatEdit::ChatEdit(QWidget *parent)
- 
- 	initActions();
- 	setShortcuts();
-+	optionsChanged();
- }
- 
- ChatEdit::~ChatEdit()
-@@ -75,6 +197,12 @@ ChatEdit::~ChatEdit()
- 	clearMessageHistory();
- 	delete spellhighlighter_;
- 	delete controller_;
-+	delete capitalizer_;
-+}
-+
-+CapitalLettersController * ChatEdit::capitalizer()
-+{
-+	return capitalizer_;
- }
- 
- void ChatEdit::initActions()
-@@ -101,6 +229,10 @@ void ChatEdit::initActions()
- 	addAction(actPasteAsQuote_);
- 	connect(actPasteAsQuote_, SIGNAL(triggered()), SLOT(pasteAsQuote()));
- 	connect(clipboard, SIGNAL(dataChanged()), SLOT(changeActPasteAsQuoteState()));
-+
-+	act_changeCase = new QAction(this);
-+	addAction(act_changeCase);
-+	connect(act_changeCase, SIGNAL(triggered()), capitalizer_, SLOT(changeCase()));
- }
- 
- void ChatEdit::setShortcuts()
-@@ -109,6 +241,7 @@ void ChatEdit::setShortcuts()
- 	act_showMessageNext->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageNext"));
- 	act_showMessageFirst->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageFirst"));
- 	act_showMessageLast->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageLast"));
-+	act_changeCase->setShortcuts(ShortcutManager::instance()->shortcuts("chat.change-case"));
- }
- 
- void ChatEdit::setDialog(QWidget* dialog)
-@@ -298,6 +431,7 @@ void ChatEdit::addToDictionary()
- void ChatEdit::optionsChanged()
- {
- 	setCheckSpelling(checkSpellingGloballyEnabled());
-+	capitalizer_->setAutoCapitalizeEnabled(PsiOptions::instance()->getOption("options.ui.chat.auto-capitalize").toBool());
- }
- 
- void ChatEdit::showHistoryMessageNext()
-@@ -508,3 +642,5 @@ void LineEdit::updateScrollBar()
- 	setVerticalScrollBarPolicy(sizeHint().height() > height() ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff);
- 	ensureCursorVisible();
- }
-+
-+#include "msgmle.moc"
---- psi.orig/src/msgmle.h
-+++ psi/src/msgmle.h
-@@ -34,6 +34,7 @@ class QResizeEvent;
- class QTimer;
- class SpellHighlighter;
- class HTMLTextController;
-+class CapitalLettersController;
- 
- 
- class ChatEdit : public QTextEdit
-@@ -54,6 +55,7 @@ public:
- 	static bool checkSpellingGloballyEnabled();
- 	void setCheckSpelling(bool);
- 	XMPP::HTMLElement toHTMLElement();
-+	CapitalLettersController * capitalizer();
- 
- public slots:
- 	void appendMessageHistory(const QString& text);
-@@ -97,9 +99,11 @@ private:
- 	QAction* act_showMessageFirst;
- 	QAction* act_showMessageLast;
- 	QAction *actPasteAsQuote_;
-+	QAction *act_changeCase;
- 
- 	QString currentText;
- 	HTMLTextController *controller_;
-+	CapitalLettersController *capitalizer_;
- };
- 
-

psi-plus-main-20160309.tar.xz/patches/0230-psi-autostart.diff Deleted

@@ -1,139 +0,0 @@
---- psi.orig/src/applicationinfo.cpp
-+++ psi/src/applicationinfo.cpp
-@@ -383,3 +383,28 @@ QString ApplicationInfo::currentProfileD
- {
- 	return pathToProfile(activeProfile, type);
- }
-+
-+QString ApplicationInfo::desktopFile()
-+{
-+	QString dFile;
-+	const QString execFileName = QFileInfo(qApp->applicationFilePath()).fileName();
-+	const QString desktopFile = QString("/usr/share/applications/%1.desktop").arg(execFileName);
-+	QFile f(desktopFile);
-+	if(f.open(QIODevice::ReadOnly)) {
-+		dFile = QString::fromUtf8(f.readAll());
-+	}
-+	else {
-+		dFile = "Desktop Entry\n";
-+		dFile += "Version=1.0\n";
-+		dFile += "Type=Application\n";
-+		dFile += QString("Name=%1\n").arg(name());
-+		dFile += "GenericName=Jabber Client\n";
-+		dFile += "Comment=Communicate over the Jabber network\n";
-+		dFile += QString("Icon=%1\n").arg(execFileName);
-+		dFile += QString("Exec=%1\n").arg(execFileName);
-+		dFile += "Terminal=false\n";
-+		dFile += "Categories=Network;InstantMessaging;Qt;";
-+	}
-+
-+	return dFile;
-+}
---- psi.orig/src/applicationinfo.h
-+++ psi/src/applicationinfo.h
-@@ -44,6 +44,9 @@ public:
- 	static QString optionsNS();
- 	static QString storageNS();
- 	static QString fileCacheNS();
-+
-+	// Common
-+	static QString desktopFile();
- };
- 
- #endif
---- psi.orig/src/options/opt_application.cpp
-+++ psi/src/options/opt_application.cpp
-@@ -13,9 +13,17 @@
- #include "qsettings.h"
- #include <QList>
- #include <QMessageBox>
-+#include <QDir>
- 
- #include "ui_opt_application.h"
- 
-+#ifdef Q_OS_WIN
-+	static const QString regString = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
-+#endif
-+#ifdef HAVE_X11
-+	static const QString psiAutoStart = "/.config/autostart/psi-plus.desktop";
-+#endif
-+
- class OptApplicationUI : public QWidget, public Ui::OptApplication
- {
- public:
-@@ -60,6 +68,7 @@ QWidget *OptionsTabApplication::widget()
- 
- #ifdef Q_OS_MAC
- 	d->gb_docklet->hide();
-+	d->ck_auto_load->hide();
- #endif
- 
- 	if (!haveAutoUpdater_) {
-@@ -126,6 +135,29 @@ void OptionsTabApplication::applyOptions
- 	}
- 	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
- 	s.setValue("last_lang", itemData);
-+
-+	//Auto-load
-+#ifdef Q_OS_WIN
-+	QSettings set(regString, QSettings::NativeFormat);
-+	if(d->ck_auto_load->isChecked()) {
-+		set.setValue(ApplicationInfo::name(), QDir::toNativeSeparators(qApp->applicationFilePath()));
-+	}
-+	else {
-+		set.remove(ApplicationInfo::name());
-+	}
-+#endif
-+#ifdef HAVE_X11
-+	QDir home = QDir::home();
-+	if (!home.exists(".config/autostart")) {
-+		home.mkpath(".config/autostart");
-+	}
-+	QFile f(home.absolutePath() + psiAutoStart);
-+	if (f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
-+		const QString contents = ApplicationInfo::desktopFile().trimmed();
-+		f.write(contents.toUtf8());
-+		f.write(QString("\nHidden=%1").arg(d->ck_auto_load->isChecked() ? "false\n" : "true\n").toUtf8());
-+	}
-+#endif
- }
- 
- void OptionsTabApplication::restoreOptions()
-@@ -164,6 +196,21 @@ void OptionsTabApplication::restoreOptio
- 		d->cb_lang->setCurrentIndex( 0 );
- 	else if(!curLang.isEmpty() && lang.contains(curLang) )
- 		d->cb_lang->setCurrentIndex( d->cb_lang->findText(vList.get(curLang)) );
-+
-+	//Auto-load
-+#ifdef Q_OS_WIN
-+	QSettings set(regString, QSettings::NativeFormat);
-+	const QString path = set.value(ApplicationInfo::name()).toString();
-+	d->ck_auto_load->setChecked( (path == QDir::toNativeSeparators(qApp->applicationFilePath())) );
-+#endif
-+#ifdef HAVE_X11
-+	QFile desktop(QDir::homePath() + psiAutoStart);
-+	if (desktop.open(QIODevice::ReadOnly)
-+		&& QString(desktop.readAll()).contains(QRegExp("\\bhidden\\s*=\\s*false", Qt::CaseInsensitive)))
-+	{
-+		d->ck_auto_load->setChecked(true);
-+	}
-+#endif
- }
- 
- void OptionsTabApplication::doEnableQuitOnClose(int state)
---- psi.orig/src/options/opt_application.ui
-+++ psi/src/options/opt_application.ui
-@@ -14,6 +14,13 @@
-   </property>
-   <layout class="QVBoxLayout" >
-    <item>
-+    <widget class="QCheckBox" name="ck_auto_load">
-+     <property name="text">
-+      <string>Automatically launch application when OS starts</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QCheckBox" name="ck_docklet" >
-      <property name="text" >
-       <string>Enable docklet</string>

psi-plus-main-20160309.tar.xz/patches/0240-psi-fix-psitooltiphandler.diff Deleted

@@ -1,47 +0,0 @@
---- psi.orig/src/widgets/psitooltip.cpp
-+++ psi/src/widgets/psitooltip.cpp
-@@ -40,7 +40,6 @@ class PsiToolTipHandler : public QObject
- public:
- 	static PsiToolTipHandler *getInstance()
- 	{
--		static PsiToolTipHandler *instance = 0;
- 		if (!instance)
- 			instance = new PsiToolTipHandler();
- 
-@@ -49,8 +48,10 @@ public:
- 
- 	void install(QWidget *widget)
- 	{
-+		if(!watchedWidgets_.contains(widget)) {
-+			connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
-+		}
- 		watchedWidgets_widget = true;
--		connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
- 	}
- 
- private slots:
-@@ -58,10 +59,15 @@ private slots:
- 	{
- 		QWidget* widget = static_cast<QWidget*>(obj);
- 		watchedWidgets_.remove(widget);
-+		if(watchedWidgets_.isEmpty()) {
-+			instance->deleteLater();
-+			instance = 0;
-+		}
- 	}
- 
- private:
- 	QHash<QWidget*, bool> watchedWidgets_;
-+	static PsiToolTipHandler *instance;
- 
- 	PsiToolTipHandler()
- 		: QObject(qApp)
-@@ -87,6 +93,8 @@ private:
- 	}
- };
- 
-+PsiToolTipHandler* PsiToolTipHandler::instance = 0;
-+
- //----------------------------------------------------------------------------
- // ToolTipPosition
- //----------------------------------------------------------------------------

psi-plus-main-20160309.tar.xz/patches/0250-psi-disable-auto-scroll-to-bottom.diff Deleted

@@ -1,30 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -111,6 +111,7 @@
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-capitalize type="bool">false</auto-capitalize>
-+				<auto-scroll-to-bottom type="bool">true</auto-scroll-to-bottom>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
---- psi.orig/src/chatview_te.cpp
-+++ psi/src/chatview_te.cpp
-@@ -361,7 +361,7 @@ void ChatView::renderMucMessage(const Me
- 		}
- 	}
- 
--	if(mv.isLocal()) {
-+	if(mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
- 		scrollToBottom();
- 	}
- }
-@@ -390,7 +390,7 @@ void ChatView::renderMessage(const Messa
- 		}
- 	}
- 
--	if (mv.isLocal()) {
-+	if (mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
- 		deferredScroll();
- 	}
- }

psi-plus-main-20160309.tar.xz/patches/0260-psi-tab-highlight-color.diff Deleted

@@ -1,79 +0,0 @@
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -1127,9 +1127,15 @@ void ChatDlg::chatEditCreated()
- 
- TabbableWidget::State ChatDlg::state() const
- {
--	return contactChatState_ == XMPP::StateComposing ?
--		   TabbableWidget::StateComposing :
--		   TabbableWidget::StateNone;
-+	TabbableWidget::State state = TabbableWidget::StateNone;
-+	if(contactChatState_ == XMPP::StateComposing) {
-+		state = TabbableWidget::StateComposing;
-+	}
-+	else if(unreadMessageCount()) {
-+		state = TabbableWidget::StateHighlighted;
-+	}
-+
-+	return state;
- }
- 
- int ChatDlg::unreadMessageCount() const
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -2182,7 +2182,7 @@ void GCMainDlg::chatEditCreated()
- 
- TabbableWidget::State GCMainDlg::state() const
- {
--	return TabbableWidget::StateNone;
-+	return d->hPending ? TabbableWidget::StateHighlighted : TabbableWidget::StateNone;
- }
- 
- int GCMainDlg::unreadMessageCount() const
---- psi.orig/src/tabs/tabbablewidget.h
-+++ psi/src/tabs/tabbablewidget.h
-@@ -62,7 +62,8 @@ public:
- 
- 	enum State {
- 		StateNone = 0,
--		StateComposing
-+		StateComposing,
-+		StateHighlighted
- 	};
- 	virtual State state() const = 0;
- 	virtual int unreadMessageCount() const = 0;
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -654,17 +654,25 @@ void TabDlg::updateTab(TabbableWidget* c
- 	tabWidget_->setTabText(chat, captionForTab(chat));
- 	//now set text colour based upon whether there are new messages/composing etc
- 
--	if (chat->state() == TabbableWidget::StateComposing) {
-+	TabbableWidget::State state = chat->state();
-+	if (state == TabbableWidget::StateComposing) {
- 		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.composing-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
- 	}
--	else if (chat->unreadMessageCount()) {
--		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
--		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
--	}
- 	else {
--		tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
--		tabWidget_->setTabIcon(chat, chat->icon());
-+		if (state == TabbableWidget::StateHighlighted) {
-+			tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
-+		}
-+		else {
-+			tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
-+		}
-+
-+		if(chat->unreadMessageCount()) {
-+			tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
-+		}
-+		else {
-+			tabWidget_->setTabIcon(chat, chat->icon());
-+		}
- 	}
- 	updateCaption();
- }

psi-plus-main-20160309.tar.xz/patches/0270-psi-set-window-icons.diff Deleted

@@ -1,277 +0,0 @@
---- psi.orig/src/aboutdlg.cpp
-+++ psi/src/aboutdlg.cpp
-@@ -24,12 +24,14 @@
- 
- #include "applicationinfo.h"
- #include "aboutdlg.h"
-+#include "iconset.h"
- 
- AboutDlg::AboutDlg(QWidget* parent)
- 	: QDialog(parent)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/psiplus_logo").icon());
- 
- 	setModal(false);
- 
---- psi.orig/src/accountmanagedlg.cpp
-+++ psi/src/accountmanagedlg.cpp
-@@ -42,6 +42,7 @@
- #include "psicontactlist.h"
- #include "iconaction.h"
- #include "shortcutmanager.h"
-+#include "iconset.h"
- 
- using namespace XMPP;
- 
-@@ -95,6 +96,7 @@ AccountRemoveDlg::AccountRemoveDlg(const
- :QDialog(parent)
- {
- 	setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/account").icon());
- 	setModal(false);
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- 	d = new Private;
---- psi.orig/src/activitydlg.cpp
-+++ psi/src/activitydlg.cpp
-@@ -33,7 +33,9 @@ ActivityDlg::ActivityDlg(QList<PsiAccoun
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("activities/other").icon());
- 	setModal(false);
-+
- 	connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString&)), SLOT(loadSpecificActivities(const QString&)));
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
---- psi.orig/src/avcall/calldlg.cpp
-+++ psi/src/avcall/calldlg.cpp
-@@ -28,6 +28,7 @@
- #include "common.h"
- #include "psiaccount.h"
- #include "psioptions.h"
-+#include "iconset.h"
- 
- // from opt_avcall.cpp
- extern void options_avcall_update();
-@@ -68,6 +69,7 @@ public:
- 	{
- 		ui.setupUi(q);
- 		q->setWindowTitle(tr("Voice Call"));
-+		q->setWindowIcon(IconsetFactory::icon("psi/avcall").icon());
- 
- 		ui.lb_bandwidth->setEnabled(false);
- 		ui.cb_bandwidth->setEnabled(false);
---- psi.orig/src/bookmarkmanagedlg.cpp
-+++ psi/src/bookmarkmanagedlg.cpp
-@@ -39,6 +39,8 @@ BookmarkManageDlg::BookmarkManageDlg(Psi
- 	setAttribute(Qt::WA_DeleteOnClose, true);
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/bookmarks").icon());
-+
- 	account_->dialogRegister(this);
- 
- 	QAction* removeBookmarkAction = new QAction(this);
---- psi.orig/src/contactmanager/contactmanagerdlg.cpp
-+++ psi/src/contactmanager/contactmanagerdlg.cpp
-@@ -44,6 +44,7 @@ ContactManagerDlg::ContactManagerDlg(Psi
- 	ui_.setupUi(this);
- 	pa_->dialogRegister(this);
- 	setWindowTitle(tr("Contacts Manager")+" - "+pa->jid().bare());
-+	setWindowIcon(IconsetFactory::icon("psi/action_contacts_manager").icon());
- 
- 	um = new ContactManagerModel(this, pa_);
- 	um->reloadUsers();
---- psi.orig/src/geolocationdlg.cpp
-+++ psi/src/geolocationdlg.cpp
-@@ -27,6 +27,7 @@
- #include "pepmanager.h"
- #include "geolocation.h"
- #include <QLineEdit>
-+#include "iconset.h"
- 
- GeoLocationDlg::GeoLocationDlg(QList<PsiAccount*> list) : QDialog(0), pa_(list)
- {
-@@ -34,7 +35,9 @@ GeoLocationDlg::GeoLocationDlg(QList<Psi
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("system/geolocation").icon());
- 	setModal(false);
-+
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
-  	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setGeoLocation()));
- 	connect(ui_.pb_reset, SIGNAL(clicked()), SLOT(reset()));
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -678,7 +678,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	setAcceptDrops(true);
- 
- #ifndef Q_OS_MAC
--	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
-+	setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
- #endif
- 
- 	ui_.setupUi(this);
-@@ -1298,6 +1298,7 @@ void GCMainDlg::doBookmark()
- 	formLayout->addRow(tr("&Auto join:"), cbAutoJoin);
- 	layout->addLayout(formLayout);
- 	layout->addLayout(blayout);
-+	dlg->setWindowIcon(IconsetFactory::icon("psi/bookmark_remove").icon());
- 	dlg->setLayout(layout);
- 	dlg->setMinimumWidth(300);
- 	dlg->connect(saveBtn, SIGNAL(clicked()), dlg, SLOT(accept()));
-@@ -1994,7 +1995,7 @@ void GCMainDlg::setLooks()
- 
- 	// update the widget icon
- #ifndef Q_OS_MAC
--	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
-+	setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
- #endif
- 
- 	ui_.lv_users->setLooks();
---- psi.orig/src/mooddlg.cpp
-+++ psi/src/mooddlg.cpp
-@@ -34,7 +34,9 @@ MoodDlg::MoodDlg(QList<PsiAccount*> list
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("mood/").icon());
- 	setModal(false);
-+
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setMood()));
- 
---- psi.orig/src/mucjoindlg.cpp
-+++ psi/src/mucjoindlg.cpp
-@@ -30,6 +30,7 @@
- #include "psicontactlist.h"
- #include "groupchatdlg.h"
- #include "bookmarkmanager.h"
-+#include "iconset.h"
- 
- static const int nickConflictCode = 409;
- static const QString additionalSymbol = "_";
-@@ -42,6 +43,7 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- 	setModal(false);
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
- 	controller_ = psi;
- 	account_ = 0;
- 	controller_->dialogRegister(this);
---- psi.orig/src/options/optionsdlg.cpp
-+++ psi/src/options/optionsdlg.cpp
-@@ -509,6 +509,7 @@ OptionsDlg::OptionsDlg(PsiCon *psi, QWid
- 	: QDialog(parent)
- {
- 	setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/options").icon());
- 	pb_apply = buttonBox->button(QDialogButtonBox::Apply);
- 
- 	setAttribute(Qt::WA_DeleteOnClose);
---- psi.orig/src/privacy/privacydlg.cpp
-+++ psi/src/privacy/privacydlg.cpp
-@@ -26,6 +26,7 @@
- #include "privacylist.h"
- #include "privacymanager.h"
- #include "privacylistmodel.h"
-+#include "iconset.h"
- 
- // fixme: subscribe on the destroyed() signal of the manager
- 
-@@ -34,6 +35,7 @@ PrivacyDlg::PrivacyDlg(const QString& ac
- 	ui_.setupUi(this);
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	setWindowTitle(tr("%1: Privacy Lists").arg(account_name));
-+	setWindowIcon(IconsetFactory::icon("psi/eye").icon());
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- 
- 	connect(manager_,SIGNAL(listsReceived(const QString&, const QString&, const QStringList&)),SLOT(updateLists(const QString&, const QString&, const QStringList&)));
---- psi.orig/src/profiledlg.cpp
-+++ psi/src/profiledlg.cpp
-@@ -81,6 +81,7 @@ ProfileOpenDlg::ProfileOpenDlg(const QSt
- 	setupUi(this);
- 	setModal(true);
- 	setWindowTitle(CAP(windowTitle()));
-+	setWindowIcon(IconsetFactory::icon("psi/profile").icon());
- 	pb_open->setDefault(true);
- 
- 	langs = _langs;
---- psi.orig/src/psioptionseditor.cpp
-+++ psi/src/psioptionseditor.cpp
-@@ -184,6 +184,9 @@ PsiOptionsEditor::PsiOptionsEditor(QWidg
- 		pb_detach->setToolTip(tr("Open a detached option editor window."));
- 		buttonLine->addWidget(pb_detach);
- 		connect(pb_detach, SIGNAL(clicked()), SLOT(detach()));
-+	} else {
-+		setWindowIcon(IconsetFactory::icon("psi/advanced-plus").icon());
-+		setWindowTitle(CAP(tr("Advanced")));
- 	}
- 
- 
---- psi.orig/src/statusdlg.cpp
-+++ psi/src/statusdlg.cpp
-@@ -72,6 +72,7 @@ StatusShowDlg::StatusShowDlg(const UserL
- 	te->setText(u.makeDesc());
- 
- 	setWindowTitle(tr("Status for %1").arg(JIDUtil::nickOrJid(u.name(), u.jid().full())));
-+	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
- 	resize(400,240);
- 
- 	pb->setFocus();
-@@ -113,6 +114,7 @@ StatusSetDlg::StatusSetDlg(PsiCon *psi,
- 	d->withPriority = withPriority;
- 
- 	setWindowTitle(CAP(tr("Set Status: All accounts")));
-+	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
- 	d->setStatusMode = setStatusForAccount;
- 	init();
- }
-@@ -129,6 +131,7 @@ StatusSetDlg::StatusSetDlg(PsiAccount *p
- 	d->withPriority = withPriority;
- 
- 	setWindowTitle(CAP(tr("Set Status: %1").arg(d->pa->name())));
-+	setWindowIcon(IconsetFactory::icon("psi/action_direct_presence").icon());
- 	d->setStatusMode = setStatusForAccount;
- 	init();
- }
---- psi.orig/src/tipdlg.cpp
-+++ psi/src/tipdlg.cpp
-@@ -27,6 +27,7 @@
- 
- #include "psioptions.h"
- #include "psicon.h"
-+#include "iconset.h"
- 
- void TipDlg::show(PsiCon* psi)
- {
-@@ -48,6 +49,7 @@ TipDlg::TipDlg(PsiCon* psi)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/tip").icon());
- 	setModal(false);
- 
- 	psi_->dialogRegister(this);
---- psi.orig/src/xmlconsole.cpp
-+++ psi/src/xmlconsole.cpp
-@@ -33,6 +33,7 @@
- #include "psicon.h"
- #include "psicontactlist.h"
- #include "textutil.h"
-+#include "iconset.h"
- 
- //----------------------------------------------------------------------------
- // XmlConsole
-@@ -41,7 +42,7 @@ XmlConsole::XmlConsole(PsiAccount *_pa)
- :QWidget()
- {
- 	ui_.setupUi(this);
--
-+	setWindowIcon(IconsetFactory::icon("psi/xml").icon());
- 	pa = _pa;
- 	pa->dialogRegister(this);
- 	connect(pa, SIGNAL(updatedAccount()), SLOT(updateCaption()));

psi-plus-main-20160309.tar.xz/patches/0280-psi-optionseditor-show-only-first-line.diff Deleted

psi-plus-main-20160309.tar.xz/patches/0290-psi-custom-chat-window-caption.diff Deleted

@@ -1,52 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -112,6 +112,7 @@
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-capitalize type="bool">false</auto-capitalize>
- 				<auto-scroll-to-bottom type="bool">true</auto-scroll-to-bottom>
-+				<caption type="QString"></caption>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -637,7 +637,10 @@ void ChatDlg::setSelfDestruct(int minute
- 
- QString ChatDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 
- 	if (pending_ > 0) {
- 		cap += "* ";
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -1941,7 +1941,10 @@ void GCMainDlg::doAlert()
- 
- QString GCMainDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 
- 	if (d->pending > 0) {
- 		cap += "* ";
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -558,7 +558,10 @@ void TabDlg::activated()
- 
- QString TabDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 	uint pending = 0;
- 	foreach(TabbableWidget* tab, tabs_) {
- 		pending += tab->unreadMessageCount();

psi-plus-main-20160309.tar.xz/patches/0300-psi-fix-trackbar.diff Deleted

@@ -1,107 +0,0 @@
---- psi.orig/src/tabs/tabbablewidget.cpp
-+++ psi/src/tabs/tabbablewidget.cpp
-@@ -37,10 +37,14 @@
- 
- TabbableWidget::TabbableWidget(const Jid &jid, PsiAccount *pa, TabManager *tabManager)
- 	: AdvancedWidget<QWidget>(0)
-+	, state_(Deactivated)
- 	, jid_(jid)
- 	, pa_(pa)
- 	, tabManager_(tabManager)
- {
-+	stateCommitTimer_.setInterval(100);
-+	stateCommitTimer_.setSingleShot(true);
-+	connect(&stateCommitTimer_, SIGNAL(timeout()), SLOT(commitState()));
- 	//QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
- }
- 
-@@ -205,11 +209,22 @@ void TabbableWidget::changeEvent(QEvent*
- 	    event->type() == QEvent::WindowStateChange)
- 	{
- 		if (isActiveTab()) {
--			activated();
-+			state_ = Activated;
- 		}
- 		else {
--			deactivated();
-+			state_ = Deactivated;
- 		}
-+		stateCommitTimer_.start();
-+	}
-+}
-+
-+void TabbableWidget::commitState()
-+{
-+	if(state_ == Activated) {
-+		activated();
-+	}
-+	else {
-+		deactivated();
- 	}
- }
- 
---- psi.orig/src/tabs/tabbablewidget.h
-+++ psi/src/tabs/tabbablewidget.h
-@@ -22,6 +22,7 @@
- #define TABBABLE_H
- 
- #include <QIcon>
-+#include <QTimer>
- #include "advwidget.h"
- #include "im.h" // ChatState
- 
-@@ -77,19 +78,26 @@ signals:
- 	void vSplitterMoved(int,int);
- 
- public slots:
--	virtual void deactivated();
--	virtual void activated();
- 	void bringToFront(bool raiseWindow = true);
- 	virtual void ensureTabbedCorrectly();
- 	void hideTab();
- 
- protected:
- 	virtual void setJid(const Jid&);
-+	virtual void deactivated();
-+	virtual void activated();
- 
- 	// reimplemented
- 	void changeEvent(QEvent* e);
- 
-+private slots:
-+	void commitState();
-+
- private:
-+	enum ActivationState { Activated, Deactivated };
-+	ActivationState state_;
-+	QTimer stateCommitTimer_;
-+
- 	Jid jid_;
- 	PsiAccount *pa_;
- 	TabManager *tabManager_;
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -397,12 +397,12 @@ void TabDlg::tabSelected(QWidget* _selec
- 	// _selected could be null when TabDlg is closing and deleting all its tabs
- 	TabbableWidget* selected = _selected ? qobject_cast<TabbableWidget*>(_selected) : 0;
- 	if (!selectedTab_.isNull()) {
--		selectedTab_->deactivated();
-+		QCoreApplication::postEvent(selectedTab_, new QEvent(QEvent::ActivationChange));
- 	}
- 
- 	selectedTab_ = selected;
- 	if (selected) {
--		selected->activated();
-+		QCoreApplication::postEvent(selected, new QEvent(QEvent::ActivationChange));
- 	}
- 
- 	updateCaption();
-@@ -520,7 +520,7 @@ void TabDlg::closeTab(TabbableWidget* ch
- 	chat->hide();
- 	removeTabWithNoChecks(chat);
- 	chat->setParent(0);
--	chat->deactivated();
-+	QCoreApplication::postEvent(chat, new QEvent(QEvent::ActivationChange));
- 	if (tabWidget_->count() > 0) {
- 		updateCaption();
- 	}

psi-plus-main-20160309.tar.xz/patches/0310-psi-fix-online-contacts-count-update.diff Deleted

@@ -1,45 +0,0 @@
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -448,6 +448,11 @@ public:
- 		reconnectTimeoutTimer_ = new QTimer(this);
- 		reconnectTimeoutTimer_->setSingleShot(true);
- 		connect(reconnectTimeoutTimer_, SIGNAL(timeout()), SLOT(reconnectTimerTimeout()));
-+
-+		updateOnlineContactsCountTimer_ = new QTimer(this);
-+		updateOnlineContactsCountTimer_->setInterval(500);
-+		updateOnlineContactsCountTimer_->setSingleShot(true);
-+		connect(updateOnlineContactsCountTimer_, SIGNAL(timeout()), SLOT(updateOnlineContactsCountTimeout()));
- 	}
- 
- 	PsiContactList* contactList;
-@@ -475,6 +480,7 @@ public:
- 	bool pepAvailable;
- 	QString currentConnectionError;
- 	int currentConnectionErrorCondition;
-+	QTimer *updateOnlineContactsCountTimer_;
- 
- 	// Tune
- 	Tune lastTune;
-@@ -644,7 +650,8 @@ public:
- 		return pathToProfile(activeProfile, ApplicationInfo::DataLocation) + "/events-" + JIDUtil::encode(acc.id).toLower() + ".xml";
- 	}
- 
--	void updateOnlineContactsCount()
-+private slots:
-+	void updateOnlineContactsCountTimeout()
- 	{
- 		int newOnlineContactsCount = 0;
- 		foreach(const PsiContact* c, contacts) {
-@@ -660,6 +667,12 @@ public:
- 		}
- 	}
- 
-+public:
-+	void updateOnlineContactsCount()
-+	{
-+		updateOnlineContactsCountTimer_->start();
-+	}
-+
- 	// FIXME: Rename updateEntry -> updateContact
- 	void updateEntry(const UserListItem& u)
- 	{

psi-plus-main-20160309.tar.xz/patches/0320-psi-muc-highlight-events.diff Deleted

@@ -1,383 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -328,6 +328,7 @@ QLineEdit#le_status_text {
- 					<height>420</height>
- 				</size>
- 				<use-highlighting type="bool">true</use-highlighting><use-nick-coloring type="bool">true</use-nick-coloring><use-hash-nick-coloring type="bool">true</use-hash-nick-coloring><colored-history type="bool">true</colored-history>
-+				<allow-highlight-events type="bool">false</allow-highlight-events>
- 			</muc>
- 			<show-deprecated comment="Deprecated functionality or protocols">
- 				<service-discovery comment="Service discovery dialog">
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -449,6 +449,8 @@ void ChatDlg::ensureTabbedCorrectly()
- 
- void ChatDlg::updateContact(const Jid &j, bool fromPresence)
- {
-+	if (account()->groupchats().contains(j.full()))
-+		return;
- 	// if groupchat, only update if the resource matches
- 	if (account()->findGCContact(j) && !jid().compare(j)) {
- 		return;
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -199,6 +199,7 @@ public:
- 		dlg = d;
- 		nickSeparator = ":";
- 		nonAnonymous = false;
-+		alert = false;
- 
- 		trackBar = false;
- 		mCmdManager.registerProvider(this);
-@@ -236,6 +237,7 @@ public:
- 	int pending;
- 	int hPending; // highlight pending
- 	bool connecting;
-+	bool alert;
- 
- 	QStringList hist;
- 	int histAt;
-@@ -1025,6 +1027,7 @@ void GCMainDlg::activated()
- 			u->setPending(d->pending, d->hPending);
- 			account()->updateEntry(*u);
- 		}
-+		messagesRead(jid());
- 		invalidateTab();
- 	}
- 	doFlash(false);
-@@ -1733,11 +1736,11 @@ void GCMainDlg::avatarUpdated(const Jid
- 	}
- }
- 
--void GCMainDlg::message(const Message &_m)
-+void GCMainDlg::message(const Message &_m, const PsiEvent::Ptr &e)
- {
- 	Message m = _m;
- 	QString from = m.from().resource();
--	bool alert = false;
-+	d->alert = false;
- 
- 	if (m.getMUCStatuses().contains(100)) {
- 		d->nonAnonymous = true;
-@@ -1787,7 +1790,7 @@ void GCMainDlg::message(const Message &_
- 
- 	// code to determine if the speaker was addressing this client in chat
- 	if(m.body().contains(d->self))
--		alert = true;
-+		d->alert = true;
- 
- 	if (m.body().left(d->self.length()) == d->self)
- 		d->lastReferrer = m.from().resource();
-@@ -1796,7 +1799,7 @@ void GCMainDlg::message(const Message &_
- 		QStringList highlightWords = options->getOption("options.ui.muc.highlight-words").toStringList();
- 		foreach (QString word, highlightWords) {
- 			if(m.body().contains((word), Qt::CaseInsensitive)) {
--				alert = true;
-+				d->alert = true;
- 			}
- 		}
- 	}
-@@ -1807,13 +1810,12 @@ void GCMainDlg::message(const Message &_
- 			account()->playSound(PsiAccount::eSend);
- 	}
- 	else {
--		if(alert || (options->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
-+		if(d->alert || (options->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
- 			account()->playSound(PsiAccount::eGroupChat);
- 
--		if(alert || (options->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
-+		if(d->alert || (options->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
- 			if (!m.spooled() && !isActiveTab() && !m.from().resource().isEmpty()) {
- 				XMPP::Jid jid = m.from()/*.withDomain("")*/;
--				MessageEvent::Ptr e(new MessageEvent(m, account()));
- 				UserListItem i;
- 				i.setPrivate(true);
- 				account()->psi()->popupManager()->doPopup(account(), PopupManager::AlertGcHighlight, jid, m.from().resource(), &i, e);
-@@ -1822,9 +1824,9 @@ void GCMainDlg::message(const Message &_
- 	}
- 
- 	if(from.isEmpty())
--		appendSysMsg(m.body(), alert, m.timeStamp());
-+		appendSysMsg(m.body(), d->alert, m.timeStamp());
- 	else
--		appendMessage(m, alert);
-+		appendMessage(m, d->alert);
- }
- 
- void GCMainDlg::joined()
-@@ -1861,6 +1863,11 @@ const QDateTime & GCMainDlg::lastMsgTime
- 	return d->te_log()->lastMsgTime();
- }
- 
-+bool GCMainDlg::isLastMessageAlert() const
-+{
-+	return d->alert;
-+}
-+
- void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts)
- {
- 	MessageView mv = MessageView::fromPlainText(str, MessageView::System);
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -31,6 +31,7 @@
- #include "ui_groupchatdlg.h"
- #include "mucmanager.h"
- #include "advwidget.h"
-+#include "psievent.h"
- 
- using namespace XMPP;
- 
-@@ -70,12 +71,13 @@ public:
- 
- 	void error(int, const QString &);
- 	void presence(const QString &, const Status &);
--	void message(const Message &);
-+	void message(const Message &, const PsiEvent::Ptr &e = PsiEvent::Ptr());
- 	void joined();
- 	void setPassword(const QString&);
- 	const QString& nick() const;
- 	const QString& topic() const;
- 	const QDateTime& lastMsgTime() const;
-+	bool isLastMessageAlert() const;
- 
- 	bool isInactive() const;
- 	void reactivate();
-@@ -100,6 +102,7 @@ protected:
- 
- signals:
- 	void aSend(const Message &);
-+	void messagesRead(const Jid &);
- 
- public slots:
- 	// reimplemented
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -2789,9 +2789,9 @@ void PsiAccount::processIncomingMessage(
- 
- #ifdef GROUPCHAT
- 	if(_m.type() == "groupchat") {
--		GCMainDlg *w = findDialog<GCMainDlg*>(Jid(_m.from().bare()));
--		if(w)
--			w->message(_m);
-+		MessageEvent::Ptr me(new MessageEvent(_m, this));
-+		me->setOriginLocal(false);
-+		handleEvent(me, IncomingStanza);
- 		return;
- 	}
- #endif
-@@ -5076,7 +5076,17 @@ void PsiAccount::handleEvent(const PsiEv
- 				!(e->type() == PsiEvent::Message &&
- 				 e.staticCast<MessageEvent>()->message().body().isEmpty()))
- 			{
--				logEvent(e->from(), e);
-+				bool isMuc = false;
-+#ifdef GROUPCHAT
-+				if(e->type() == PsiEvent::Message) {
-+					MessageEvent::Ptr me = e.staticCast<MessageEvent>();
-+					if (me->message().type() == "groupchat")
-+						isMuc = true;
-+				}
-+#endif
-+				if (!isMuc) {
-+					logEvent(e->from(), e);
-+				}
- 			}
- 		}
- 	}
-@@ -5116,7 +5126,7 @@ void PsiAccount::handleEvent(const PsiEv
- 		}
- 
- 		// Pass message events to chat window
--		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty()) {
-+		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty() && m.type() != "groupchat") {
- 			if (o->getOption("options.messages.send-composing-events").toBool()) {
- 				ChatDlg *c = findChatDialogEx(e->from());
- 				if (c) {
-@@ -5180,6 +5190,22 @@ void PsiAccount::handleEvent(const PsiEv
- 			doPopup = true;
- 			popupType = PopupManager::AlertHeadline;
- 		} // /headline
-+#ifdef GROUPCHAT
-+		else if (m.type() == "groupchat") {
-+			putToQueue = false;
-+			bool allowMucEvents = o->getOption("options.ui.muc.allow-highlight-events").toBool();
-+			if (activationType != FromXml) {
-+				GCMainDlg *c = findDialog<GCMainDlg*>(e->from());
-+				if (c) {
-+					c->message(m, e);
-+					if (!c->isActiveTab() && c->isLastMessageAlert() && !m.spooled() && allowMucEvents)
-+						putToQueue = true;
-+				}
-+			}
-+			else if (allowMucEvents)
-+				putToQueue = true;
-+		} // /groupchat
-+#endif
- 		else if (m.type().isEmpty()) {
- 			soundType = eMessage;
- 			doPopup = true;
-@@ -5577,11 +5603,18 @@ void PsiAccount::processReadNext(const U
- 		return;
- 
- 	bool isChat = false;
-+#ifdef GROUPCHAT
-+	bool isMuc = false;
-+#endif
- 	if(e->type() == PsiEvent::Message) {
- 		MessageEvent::Ptr me = e.staticCast<MessageEvent>();
- 		const Message &m = me->message();
- 		if(m.type() == "chat" && m.getForm().fields().empty())
- 			isChat = true;
-+#ifdef GROUPCHAT
-+		else if (m.type() == "groupchat")
-+			isMuc = true;
-+#endif
- 	}
- 
- 	// if it's a chat message, just open the chat window.  there is no need to do
-@@ -5592,6 +5625,17 @@ void PsiAccount::processReadNext(const U
- 		return;
- 	}
- 
-+#ifdef GROUPCHAT
-+	if (isMuc) {
-+		GCMainDlg *c = findDialog<GCMainDlg*>(e->from());
-+		if (c)
-+		{
-+			c->bringToFront(true);
-+			return;
-+		}
-+	}
-+#endif
-+
- 	// remove from queue
- 	e = d->eventQueue->dequeue(u.jid());
- 
-@@ -5696,6 +5740,19 @@ void PsiAccount::chatMessagesRead(const
- //	}
- }
- 
-+#ifdef GROUPCHAT
-+void PsiAccount::groupChatMessagesRead(const Jid &j)
-+{
-+	d->eventQueue->clear(j);
-+
-+	QList<UserListItem*> ul = findRelevant(j);
-+	if(!ul.isEmpty()) {
-+		UserListItem *u = ul.first();
-+		cpUpdate(*u);
-+	}
-+}
-+#endif
-+
- void PsiAccount::logEvent(const Jid &j, const PsiEvent::Ptr &e)
- {
- 	if (!d->acc.opt_log)
-@@ -5718,6 +5775,7 @@ void PsiAccount::openGroupChat(const Jid
- 	GCMainDlg *w = new GCMainDlg(this, j, d->tabManager);
- 	w->setPassword(d->client->groupChatPassword(j.domain(), j.node()));
- 	connect(w, SIGNAL(aSend(const Message &)), SLOT(dj_sendMessage(const Message &)));
-+	connect(w, SIGNAL(messagesRead(const Jid &)), SLOT(groupChatMessagesRead(const Jid &)));
- 	connect(d->psi, SIGNAL(emitOptionsUpdate()), w, SLOT(optionsUpdate()));
- 	if(reason != MUCJoinDlg::MucAutoJoin || !PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool()) {
- 		w->ensureTabbedCorrectly();
---- psi.orig/src/psiaccount.h
-+++ psi/src/psiaccount.h
-@@ -451,6 +451,9 @@ private slots:
- 	void itemRetracted(const Jid&, const QString&, const PubSubRetraction&);
- 
- 	void chatMessagesRead(const Jid &);
-+#ifdef GROUPCHAT
-+	void groupChatMessagesRead(const Jid &);
-+#endif
- 
- 	void slotCheckVCard();
- 	void edb_finished();
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -81,6 +81,9 @@
- #include "accountscombobox.h"
- #include "tabdlg.h"
- #include "chatdlg.h"
-+#ifdef GROUPCHAT
-+#include "groupchatdlg.h"
-+#endif
- #include "spellchecker/aspellchecker.h"
- #ifdef WEBKIT
- #include "avatars.h"
-@@ -1735,16 +1738,28 @@ void PsiCon::processEvent(const PsiEvent
- 	}
- 
- 	bool isChat = false;
-+#ifdef GROUPCHAT
-+	bool isMuc = false;
-+#endif
- 	bool sentToChatWindow = false;
- 	if ( e->type() == PsiEvent::Message ) {
- 		MessageEvent::Ptr me = e.staticCast<MessageEvent>();
- 		const Message &m = me->message();
--		bool emptyForm = m.getForm().fields().empty();
--		// FIXME: Refactor this, PsiAccount and PsiEvent out
--		if (m.type() == "chat" && emptyForm) {
--			isChat = true;
--			sentToChatWindow = me->sentToChatWindow();
-+#ifdef GROUPCHAT
-+		if (m.type() == "groupchat") {
-+			isMuc = true;
- 		}
-+		else {
-+#endif
-+			bool emptyForm = m.getForm().fields().empty();
-+			// FIXME: Refactor this, PsiAccount and PsiEvent out
-+			if (m.type() == "chat" && emptyForm) {
-+				isChat = true;
-+				sentToChatWindow = me->sentToChatWindow();
-+			}
-+#ifdef GROUPCHAT
-+		}
-+#endif
- 	}
- 
- 	if ( isChat ) {
-@@ -1776,6 +1791,17 @@ void PsiCon::processEvent(const PsiEvent
- 	}
- #endif
- 	else {
-+#ifdef GROUPCHAT
-+		if (isMuc) {
-+			PsiAccount *account = e->account();
-+			GCMainDlg *c = account->findDialog<GCMainDlg*>(e->from());
-+			if (c) {
-+				c->ensureTabbedCorrectly();
-+				c->bringToFront(true);
-+				return;
-+			}
-+		}
-+#endif
- 		// search for an already opened eventdlg
- 		EventDlg *w = e->account()->findDialog<EventDlg*>(u->jid());
- 
---- psi.orig/src/psievent.cpp
-+++ psi/src/psievent.cpp
-@@ -241,6 +241,10 @@ int MessageEvent::type() const
- 
- Jid MessageEvent::from() const
- {
-+#ifdef GROUPCHAT
-+	if (v_m.type() == "groupchat")
-+		return v_m.from().bare();
-+#endif
- 	return v_m.from();
- }
- 
---- psi.orig/src/psiiconset.cpp
-+++ psi/src/psiiconset.cpp
-@@ -686,7 +686,7 @@ PsiIcon *PsiIconset::event2icon(const Ps
- 		const Message &m = me->message();
- 		if(m.type() == "headline")
- 			icon = "psi/headline";
--		else if(m.type() == "chat")
-+		else if(m.type() == "chat" || m.type() == "groupchat")
- 			icon = "psi/chat";
- 		else if(m.type() == "error")
- 			icon = "psi/system";

psi-plus-main-20160309.tar.xz/patches/0330-iris-XEP-0083-nested-roster-groups.diff Deleted

@@ -1,479 +0,0 @@
---- psi.orig/iris/src/xmpp/xmpp-im/client.cpp
-+++ psi/iris/src/xmpp/xmpp-im/client.cpp
-@@ -102,6 +102,8 @@ using namespace Jabber;*/
- #define vsnprintf _vsnprintf
- #endif
- 
-+#define GROUPS_DELIMITER_TIMEOUT 10
-+
- namespace XMPP
- {
- 
-@@ -887,12 +889,38 @@ void Client::prRoster(const Roster &r)
- 	importRoster(r);
- }
- 
--void Client::rosterRequest()
-+void Client::rosterRequest(bool withGroupsDelimiter)
- {
- 	if(!d->active)
- 		return;
- 
- 	JT_Roster *r = new JT_Roster(rootTask());
-+	int timeout = 0;
-+	if (withGroupsDelimiter) {
-+		connect(r, SIGNAL(finished()), SLOT(slotRosterDelimiterRequestFinished()));
-+		r->getGroupsDelimiter();
-+		// WORKAROUND: Some bad servers (Facebook for example) don't response
-+		// on groups delimiter request. Wait timeout and go ahead.
-+		r->setTimeout(GROUPS_DELIMITER_TIMEOUT);
-+	}
-+	else {
-+		connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
-+		r->get();
-+		d->roster.flagAllForDelete(); // mod_groups patch
-+	}
-+
-+	r->go(true);
-+}
-+
-+void Client::slotRosterDelimiterRequestFinished()
-+{
-+	JT_Roster *r = qobject_cast<JT_Roster*>(sender());
-+	if(r->success()) {
-+		d->roster.setGroupsDelimiter(r->groupsDelimiter());
-+		emit rosterGroupsDelimiterRequestFinished(r->groupsDelimiter());
-+	}
-+
-+	r = new JT_Roster(rootTask());
- 	connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
- 	r->get();
- 	d->roster.flagAllForDelete(); // mod_groups patch
-@@ -1256,13 +1284,35 @@ void LiveRosterItem::setFlagForDelete(bo
- //---------------------------------------------------------------------------
- // LiveRoster
- //---------------------------------------------------------------------------
-+class LiveRoster::Private
-+{
-+public:
-+	QString groupsDelimiter;
-+};
-+
- LiveRoster::LiveRoster()
--:QList<LiveRosterItem>()
-+	: QList<LiveRosterItem>()
-+	, d(new LiveRoster::Private)
- {
- }
- 
- LiveRoster::~LiveRoster()
- {
-+	delete d;
-+}
-+
-+LiveRoster::LiveRoster(const LiveRoster &other)
-+	: QList<LiveRosterItem>(other)
-+	, d(new LiveRoster::Private)
-+{
-+	d->groupsDelimiter = other.d->groupsDelimiter;
-+}
-+
-+LiveRoster &LiveRoster::operator=(const LiveRoster &other)
-+{
-+	QList<LiveRosterItem>::operator=(other);
-+	d->groupsDelimiter = other.d->groupsDelimiter;
-+	return *this;
- }
- 
- void LiveRoster::flagAllForDelete()
-@@ -1291,4 +1341,14 @@ LiveRoster::ConstIterator LiveRoster::fi
- 	return it;
- }
- 
-+void LiveRoster::setGroupsDelimiter(const QString &groupsDelimiter)
-+{
-+	d->groupsDelimiter = groupsDelimiter;
-+}
-+
-+QString LiveRoster::groupsDelimiter() const
-+{
-+	return d->groupsDelimiter;
-+}
-+
- }
---- psi.orig/iris/src/xmpp/xmpp-im/types.cpp
-+++ psi/iris/src/xmpp/xmpp-im/types.cpp
-@@ -2846,13 +2846,35 @@ bool RosterItem::fromXml(const QDomEleme
- //---------------------------------------------------------------------------
- // Roster
- //---------------------------------------------------------------------------
-+class Roster::Private
-+{
-+public:
-+	QString groupsDelimiter;
-+};
-+
- Roster::Roster()
--:QList<RosterItem>()
-+	: QList<RosterItem>()
-+	, d(new Roster::Private)
- {
- }
- 
- Roster::~Roster()
- {
-+	delete d;
-+}
-+
-+Roster::Roster(const Roster &other)
-+	: QList<RosterItem>(other)
-+	, d(new Roster::Private)
-+{
-+	d->groupsDelimiter = other.d->groupsDelimiter;
-+}
-+
-+Roster &Roster::operator=(const Roster &other)
-+{
-+	QList<RosterItem>::operator=(other);
-+	d->groupsDelimiter = other.d->groupsDelimiter;
-+	return *this;
- }
- 
- Roster::Iterator Roster::find(const Jid &j)
-@@ -2875,6 +2897,16 @@ Roster::ConstIterator Roster::find(const
- 	return end();
- }
- 
-+void Roster::setGroupsDelimiter(const QString &groupsDelimiter)
-+{
-+	d->groupsDelimiter = groupsDelimiter;
-+}
-+
-+QString Roster::groupsDelimiter() const
-+{
-+	return d->groupsDelimiter;
-+}
-+
- 
- //---------------------------------------------------------------------------
- // FormField
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_client.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_client.h
-@@ -79,7 +79,7 @@ namespace XMPP
- 		QString resource() const;
- 		Jid jid() const;
- 
--		void rosterRequest();
-+		void rosterRequest(bool withGroupsDelimiter = true);
- 		void sendMessage(const Message &, bool want_notify = false);
- 		void sendSubscription(const Jid &, const QString &, const QString& nick = QString());
- 		void setPresence(const Status &);
-@@ -138,6 +138,7 @@ namespace XMPP
- 		void activated();
- 		void disconnected();
- 		//void authFinished(bool, int, const QString &);
-+		void rosterGroupsDelimiterRequestFinished(const QString &);
- 		void rosterRequestFinished(bool, int, const QString &);
- 		void rosterItemAdded(const RosterItem &);
- 		void rosterItemUpdated(const RosterItem &);
-@@ -171,6 +172,7 @@ namespace XMPP
- 		void streamIncomingXml(const QString &);
- 		void streamOutgoingXml(const QString &);
- 
-+		void slotRosterDelimiterRequestFinished();
- 		void slotRosterRequestFinished();
- 
- 		// basic daemons
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_liveroster.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_liveroster.h
-@@ -34,9 +34,19 @@ namespace XMPP
- 		LiveRoster();
- 		~LiveRoster();
- 
-+		LiveRoster(const LiveRoster &other);
-+		LiveRoster &operator=(const LiveRoster &other);
-+
- 		void flagAllForDelete();
- 		LiveRoster::Iterator find(const Jid &, bool compareRes=true);
- 		LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const;
-+
-+		void setGroupsDelimiter(const QString &groupsDelimiter);
-+		QString groupsDelimiter() const;
-+
-+	private:
-+		class Private;
-+		Private *d;
- 	};
- }
- 
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_roster.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_roster.h
-@@ -36,11 +36,18 @@ namespace XMPP
- 		Roster();
- 		~Roster();
- 
-+		Roster(const Roster &other);
-+		Roster &operator=(const Roster &other);
-+
- 		Roster::Iterator find(const Jid &);
- 		Roster::ConstIterator find(const Jid &) const;
- 
-+		void setGroupsDelimiter(const QString &groupsDelimiter);
-+		QString groupsDelimiter() const;
-+
- 	private:
--		class RosterPrivate *d;
-+		class Private;
-+		Private *d;
- 	};
- }
- 
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_task.cpp
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_task.cpp
-@@ -24,6 +24,8 @@
- #include "xmpp_client.h"
- #include "xmpp_xmlcommon.h"
- 
-+#define DEFAULT_TIMEOUT 300
-+
- using namespace XMPP;
- 
- class Task::TaskPrivate
-@@ -38,6 +40,7 @@ public:
- 	Client *client;
- 	bool insig, deleteme, autoDelete;
- 	bool done;
-+	int timeout;
- };
- 
- Task::Task(Task *parent)
-@@ -72,6 +75,7 @@ void Task::init()
- 	d->deleteme = false;
- 	d->autoDelete = false;
- 	d->done = false;
-+	d->timeout = DEFAULT_TIMEOUT;
- }
- 
- Task *Task::parent() const
-@@ -109,6 +113,16 @@ const QString & Task::statusString() con
- 	return d->statusString;
- }
- 
-+void Task::setTimeout(int seconds) const
-+{
-+	d->timeout = seconds;
-+}
-+
-+int Task::timeout()
-+{
-+	return d->timeout;
-+}
-+
- void Task::go(bool autoDelete)
- {
- 	d->autoDelete = autoDelete;
-@@ -121,6 +135,9 @@ void Task::go(bool autoDelete)
- 	}
- 	else {
- 		onGo();
-+		if (d->timeout) {
-+			QTimer::singleShot(d->timeout * 1000, this, SLOT(timeoutFinished()));
-+		}
- 	}
- }
- 
-@@ -169,6 +186,16 @@ void Task::onDisconnect()
- 	}
- }
- 
-+void Task::onTimeout()
-+{
-+	if(!d->done) {
-+		d->success = false;
-+		// d->statusCode = ErrTimeout;
-+		d->statusString = tr("Request timed out");
-+		done();
-+	}
-+}
-+
- void Task::send(const QDomElement &x, bool want_notify)
- {
- 	client()->send(x, want_notify);
-@@ -225,6 +252,11 @@ void Task::clientDisconnected()
- 	onDisconnect();
- }
- 
-+void Task::timeoutFinished()
-+{
-+	onTimeout();
-+}
-+
- void Task::debug(const char *fmt, ...)
- {
- 	va_list ap;
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_task.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_task.h
-@@ -49,6 +49,9 @@ namespace XMPP {
- 		int statusCode() const;
- 		const QString & statusString() const;
- 
-+		void setTimeout(int seconds) const;
-+		int timeout();
-+
- 		void go(bool autoDelete=false);
- 		virtual bool take(const QDomElement &);
- 		void safeDelete();
-@@ -59,6 +62,7 @@ namespace XMPP {
- 	protected:
- 		virtual void onGo();
- 		virtual void onDisconnect();
-+		virtual void onTimeout();
- 		void send(const QDomElement &, bool want_notify = false);
- 		void setSuccess(int code=0, const QString &str="");
- 		void setError(const QDomElement &);
-@@ -69,6 +73,7 @@ namespace XMPP {
- 
- 	private slots:
- 		void clientDisconnected();
-+		void timeoutFinished();
- 		void done();
- 
- 	private:
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_tasks.cpp
-@@ -373,9 +373,11 @@ public:
- 	Private() {}
- 
- 	Roster roster;
-+	QString groupsDelimiter;
- 	QList<QDomElement> itemList;
- };
- 
-+
- JT_Roster::JT_Roster(Task *parent)
- :Task(parent)
- {
-@@ -413,7 +415,7 @@ void JT_Roster::set(const Jid &jid, cons
- 
- void JT_Roster::remove(const Jid &jid)
- {
--	type = 1;
-+	type = 2;
- 	//to = client()->host();
- 	QDomElement item = doc()->createElement("item");
- 	item.setAttribute("jid", jid.full());
-@@ -421,11 +423,47 @@ void JT_Roster::remove(const Jid &jid)
- 	d->itemList += item;
- }
- 
-+void JT_Roster::getGroupsDelimiter()
-+{
-+	type = 3;
-+	//to = client()->host();
-+	iq = createIQ(doc(), "get", to.full(), id());
-+
-+	QDomElement roster = doc()->createElement("roster");
-+	roster.setAttribute("xmlns", "roster:delimiter");
-+
-+	QDomElement query = doc()->createElement("query");
-+	query.setAttribute("xmlns", "jabber:iq:private");
-+	query.appendChild(roster);
-+
-+	iq.appendChild(query);
-+}
-+
-+void JT_Roster::setGroupsDelimiter(const QString &groupsDelimiter)
-+{
-+	type = 4;
-+	//to = client()->host();
-+	iq = createIQ(doc(), "set", to.full(), id());
-+
-+	QDomText text = doc()->createTextNode(groupsDelimiter);
-+
-+	QDomElement roster = doc()->createElement("roster");
-+	roster.setAttribute("xmlns", "roster:delimiter");
-+	roster.appendChild(text);
-+
-+	QDomElement query = doc()->createElement("query");
-+	query.setAttribute("xmlns", "jabber:iq:private");
-+	query.appendChild(roster);
-+
-+	iq.appendChild(query);
-+}
-+
- void JT_Roster::onGo()
- {
--	if(type == 0)
-+	if (type == 0) {
- 		send(iq);
--	else if(type == 1) {
-+	}
-+	else if(type == 1 || type == 2) {
- 		//to = client()->host();
- 		iq = createIQ(doc(), "set", to.full(), id());
- 		QDomElement query = doc()->createElement("query");
-@@ -435,6 +473,12 @@ void JT_Roster::onGo()
- 			query.appendChild(it);
- 		send(iq);
- 	}
-+	else if (type == 3) {
-+		send(iq);
-+	}
-+	else if (type == 4) {
-+		send(iq);
-+	}
- }
- 
- const Roster & JT_Roster::roster() const
-@@ -442,6 +486,11 @@ const Roster & JT_Roster::roster() const
- 	return d->roster;
- }
- 
-+QString JT_Roster::groupsDelimiter() const
-+{
-+	return d->groupsDelimiter;
-+}
-+
- QString JT_Roster::toString() const
- {
- 	if(type != 1)
-@@ -510,6 +559,24 @@ bool JT_Roster::take(const QDomElement &
- 		setSuccess();
- 		return true;
- 	}
-+	// getGroupsDelimiter
-+	else if (type == 3) {
-+		if(x.attribute("type") == "result") {
-+			QDomElement q = queryTag(x);
-+			QDomElement delimiter = q.firstChild().toElement();
-+			d->groupsDelimiter = delimiter.firstChild().toText().data();
-+			setSuccess();
-+		}
-+		else {
-+			setError(x);
-+		}
-+		return true;
-+	}
-+	// setGroupsDelimiter
-+	else if (type == 4) {
-+		setSuccess();
-+		return true;
-+	}
- 
- 	return false;
- }
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_tasks.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_tasks.h
-@@ -97,7 +97,12 @@ namespace XMPP
- 		void set(const Jid &, const QString &name, const QStringList &groups);
- 		void remove(const Jid &);
- 
-+		// XEP-0083
-+		void getGroupsDelimiter();
-+		void setGroupsDelimiter(const QString &groupsDelimiter);
-+
- 		const Roster & roster() const;
-+		QString groupsDelimiter() const;
- 
- 		QString toString() const;
- 		bool fromString(const QString &);

psi-plus-main-20160309.tar.xz/patches/0340-psi-multirows-tab.diff Deleted

@@ -1,920 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -510,6 +510,7 @@ QLineEdit#le_status_text {
- 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
- 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
- 				<show-tab-buttons type="bool">true</show-tab-buttons>
-+				<multi-rows comment="Use multi rows mode for chat tab bar" type="bool">true</multi-rows>
- 			</tabs>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
---- psi.orig/src/widgets/psitabbar.cpp
-+++ psi/src/widgets/psitabbar.cpp
-@@ -32,7 +32,7 @@
-  * Constructor
-  */
- PsiTabBar::PsiTabBar(PsiTabWidget *parent)
--		: QTabBar(parent)
-+		: TabBar(parent)
- 		, dragsEnabled_(true) {
- 	//setAcceptDrops(true);
- 
-@@ -79,7 +79,7 @@ int PsiTabBar::findTabUnder(const QPoint
- }
- 
- void PsiTabBar::mousePressEvent(QMouseEvent *event) {
--	QTabBar::mousePressEvent(event);
-+	TabBar::mousePressEvent(event);
- 	event->accept();
- }
- 
-@@ -145,7 +145,7 @@ void PsiTabBar::setDragsEnabled(bool ena
- 
- void PsiTabBar::paintEvent(QPaintEvent *event)
- {
--	QTabBar::paintEvent(event);
-+	TabBar::paintEvent(event);
- };
- 
- void PsiTabBar::resizeEvent(QResizeEvent * event)
---- psi.orig/src/widgets/psitabbar.h
-+++ psi/src/widgets/psitabbar.h
-@@ -21,12 +21,12 @@
- #ifndef _PSITABBAR_H_
- #define _PSITABBAR_H_
- 
--#include <QTabBar>
-+#include "tabbar.h"
- #include <QPoint>
- 
- class PsiTabWidget;
- 
--class PsiTabBar : public QTabBar
-+class PsiTabBar : public TabBar
- {
- 	Q_OBJECT
- 
---- psi.orig/src/widgets/psitabwidget.cpp
-+++ psi/src/widgets/psitabwidget.cpp
-@@ -38,7 +38,10 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 		: QWidget(parent) {
- 	tabsPosition_ = QTabWidget::East; // impossible => uninitialised state
- 	tabBar_ = new PsiTabBar(this);
--	tabBar_->setUsesScrollButtons(true);
-+
-+	bool multiRow = PsiOptions::instance()->getOption("options.ui.tabs.multi-rows", true).toBool();
-+	tabBar_->setMultiRow(multiRow);
-+	tabBar_->setUsesScrollButtons(!multiRow);
- 	layout_ = new QVBoxLayout(this);
- 	layout_->setMargin(0);
- 	layout_->setSpacing(0);
-@@ -55,19 +58,21 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 	downButton_ = new QToolButton(this);
- 	downButton_->setMinimumSize(3,3);
- 	downButton_->setFixedWidth(buttonwidth);
--	downButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-+	downButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- 	menu_ = new QMenu(this);
- 	downButton_->setMenu(menu_);
- 	downButton_->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
- 	connect(menu_, SIGNAL(aboutToShow()), SLOT(menu_aboutToShow()));
- 	connect(menu_, SIGNAL(triggered(QAction*)), SLOT(menu_triggered(QAction*)));
- 	barLayout_->addWidget(downButton_);
-+	barLayout_->setAlignment(downButton_, Qt::AlignBottom);
- 
- 	closeButton_ = new QToolButton(this);
- 	closeButton_->setMinimumSize(3,3);
- 	closeButton_->setFixedWidth(buttonwidth);
--	closeButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-+	closeButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- 	barLayout_->addWidget(closeButton_);
-+	barLayout_->setAlignment(closeButton_, Qt::AlignBottom);
- 	closeButton_->setText("x");
- 	downButton_->setArrowType(Qt::DownArrow);
- 	downButton_->setPopupMode(QToolButton::InstantPopup);
-@@ -180,6 +185,7 @@ void PsiTabWidget::addTab(QWidget *widge
- 		tabBar_->addTab(name);
- 	setLooks();
- 	showPage(currentPage());
-+	tabBar_->layoutTabs();
- }
- 
- void PsiTabWidget::setLooks()
-@@ -190,6 +196,14 @@ void PsiTabWidget::setLooks()
- 	}
- }
- 
-+void PsiTabWidget::resizeEvent(QResizeEvent *event)
-+{
-+	QWidget::resizeEvent(event);
-+	if (tabBar_->multiRow()) {
-+		tabBar_->layoutTabs();
-+	}
-+}
-+
- /**
-  * Selects the page for the specified widget.
-  */
---- psi.orig/src/widgets/psitabwidget.h
-+++ psi/src/widgets/psitabwidget.h
-@@ -22,7 +22,6 @@
- #define PSITABWIDGET_H
- 
- #include <QTabWidget>
--#include <QTabBar>
- #include <QDragEnterEvent>
- #include "psitabbar.h"
- 
-@@ -80,6 +79,9 @@ signals:
- 	// context menu on the blank space will have tab==-1
- 	void tabContextMenu(int tab, QPoint pos, QContextMenuEvent *event);
- 
-+protected:
-+	void resizeEvent(QResizeEvent *event);
-+
- private slots:
- 	void mouseDoubleClickTab(int tab);
- 	void mouseMiddleClickTab(int tab);
-@@ -91,7 +93,7 @@ private slots:
- 
- private:
- 	QVector<QWidget*> widgets_;
--	QTabBar *tabBar_;
-+	PsiTabBar *tabBar_;
- 	QVBoxLayout *layout_;
- 	QHBoxLayout *barLayout_;
- 	QStackedLayout *stacked_;
---- /dev/null
-+++ psi/src/widgets/tabbar.cpp
-@@ -0,0 +1,683 @@
-+/*
-+ * tabbar.cpp
-+ * Copyright (C) 2013-2014  Ivan Romanov <drizt@land.ru>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "tabbar.h"
-+
-+#include <QAbstractButton>
-+#include <QPixmap>
-+#include <QStyleOptionTab>
-+#include <QStylePainter>
-+#include <QMouseEvent>
-+
-+class CloseButton : public QAbstractButton
-+{
-+	Q_OBJECT
-+
-+public:
-+	CloseButton(QWidget *parent = 0);
-+
-+	QSize sizeHint() const;
-+	inline QSize minimumSizeHint() const
-+		{ return sizeHint(); }
-+	void enterEvent(QEvent *event);
-+	void leaveEvent(QEvent *event);
-+	void paintEvent(QPaintEvent *event);
-+};
-+
-+class TabBar::Private
-+{
-+public:
-+	TabBar *q;
-+	Private(TabBar *base)
-+	{
-+		q = base;
-+		tabsClosable = false;
-+		multiRow = false;
-+		balanseCloseButtons();
-+	}
-+
-+	void layoutTabs();
-+	QSize tabSizeHint(QStyleOptionTabV3 tab) const;
-+	void balanseCloseButtons();
-+
-+	QList<QStyleOptionTabV3> hackedTabs;
-+	QList<CloseButton*> closeButtons;
-+	bool tabsClosable;
-+	bool multiRow;
-+};
-+
-+void TabBar::Private::layoutTabs()
-+{
-+	hackedTabs.clear();
-+
-+	QTabBar::ButtonPosition closeSide = (QTabBar::ButtonPosition)q->style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, q);
-+	int barWidth = q->width();
-+	for (int i = 0; i < q->count(); i++) {
-+		QStyleOptionTabV3 tab;
-+		q->initStyleOption(&tab, i);
-+		if (i == 0) {
-+			tab.rect.setLeft(0);
-+		}
-+
-+		tab.position = QStyleOptionTab::Beginning;
-+
-+		if (tabsClosable) {
-+			tab.rect.setWidth(tab.rect.width() + closeButtons.at(i)->size().width());
-+			if (closeSide == QTabBar::LeftSide) {
-+				tab.leftButtonSize = closeButtons.at(i)->size();
-+			}
-+			else {
-+				tab.rightButtonSize = closeButtons.at(i)->size();
-+			}
-+		}
-+
-+		tab.rect.setSize(tabSizeHint(tab));
-+
-+		QStyleOptionTabV3 prevTab;
-+		if (i > 0) {
-+			prevTab = hackedTabs.last();
-+		}
-+
-+		if (i > 0 && prevTab.rect.right() + tab.rect.width() >= barWidth) {
-+			tab.rect.moveTo(0, prevTab.rect.bottom() - 1);
-+			if (prevTab.position == QStyleOptionTab::Middle) {
-+				prevTab.position = QStyleOptionTab::End;
-+			}
-+			else {
-+				prevTab.position = QStyleOptionTab::OnlyOneTab;
-+			}
-+
-+			if (i == q->count() - 1) {
-+				tab.position = QStyleOptionTab::OnlyOneTab;
-+			}
-+
-+			hackedTabsi - 1 = prevTab;
-+		}
-+		else {
-+			if (q->count() == 1) {
-+				tab.position = QStyleOptionTab::OnlyOneTab;
-+			}
-+			else if (i == q->count() - 1) {
-+				tab.position = QStyleOptionTab::End;
-+				tab.rect.moveTo(prevTab.rect.right() + 1, prevTab.rect.top());
-+			}
-+			else if (i > 0) {
-+				tab.position = QStyleOptionTab::Middle;
-+				tab.rect.moveTo(prevTab.rect.right() + 1, prevTab.rect.top());
-+			}
-+		}
-+
-+		hackedTabs << tab;
-+	}
-+
-+	int rowStart = 0;
-+
-+	// stretch filled or last row
-+	for (int i = 0; i < hackedTabs.size(); i++) {
-+		QStyleOptionTab::TabPosition position = hackedTabs.at(i).position;
-+		if (position != QStyleOptionTab::End && position != QStyleOptionTab::OnlyOneTab) {
-+			continue;
-+		}
-+
-+		// stretch factor
-+		double sf = static_cast<float>(barWidth) / hackedTabs.at(i).rect.right();
-+
-+		// don't strech the last row
-+		bool lastRow = i == hackedTabs.size() - 1;
-+		if (lastRow)
-+			sf = qMin(1.5, sf);
-+
-+		for (int j = rowStart; j <= i; j++) {
-+			QStyleOptionTabV3 tab = hackedTabs.at(j);
-+			if (j > rowStart) {
-+				tab.rect.moveLeft(hackedTabs.at(j - 1).rect.right() + 1);
-+			}
-+			if (j < i) {
-+				tab.rect.setWidth(tab.rect.width() * sf);
-+			}
-+			else {
-+				if (!lastRow) {
-+					tab.rect.setRight(barWidth - 1);
-+				}
-+				else {
-+					int width = qMin(static_cast<int>(tab.rect.width() * sf), barWidth - 1);
-+					tab.rect.setWidth(width);
-+				}
-+			}
-+			hackedTabsj = tab;
-+		}
-+
-+#ifdef Q_OS_MAC
-+		// Mac OS X puts tabs on center. We do too.
-+		if (lastRow) {
-+			int left = (barWidth - hackedTabs.at(i).rect.right() - 1) / 2;
-+			if (left) {
-+				for (int j = rowStart; j <= i; j++) {
-+					hackedTabsj.rect.moveLeft(hackedTabs.at(j).rect.left() + left);
-+				}
-+			}
-+		}
-+#endif
-+
-+		rowStart = i + 1;
-+	}
-+
-+	q->setMinimumSize(0, q->sizeHint().height());
-+	q->resize(q->sizeHint());
-+}
-+
-+inline static bool verticalTabs(QTabBar::Shape shape)
-+{
-+	return shape == QTabBar::RoundedWest
-+		   || shape == QTabBar::RoundedEast
-+		   || shape == QTabBar::TriangularWest
-+		   || shape == QTabBar::TriangularEast;
-+}
-+
-+QSize TabBar::Private::tabSizeHint(QStyleOptionTabV3 opt) const
-+{
-+	QSize iconSize = opt.iconSize;
-+	int hframe = q->style()->pixelMetric(QStyle::PM_TabBarTabHSpace, &opt, q);
-+	int vframe = q->style()->pixelMetric(QStyle::PM_TabBarTabVSpace, &opt, q);
-+	const QFontMetrics fm = q->fontMetrics();
-+
-+	int maxWidgetHeight = qMax(opt.leftButtonSize.height(), opt.rightButtonSize.height());
-+	int maxWidgetWidth = qMax(opt.leftButtonSize.width(), opt.rightButtonSize.width());
-+
-+	int widgetWidth = 0;
-+	int widgetHeight = 0;
-+	int padding = 0;
-+	if (!opt.leftButtonSize.isEmpty()) {
-+		padding += 4;
-+		widgetWidth += opt.leftButtonSize.width();
-+		widgetHeight += opt.leftButtonSize.height();
-+	}
-+	if (!opt.rightButtonSize.isEmpty()) {
-+		padding += 4;
-+		widgetWidth += opt.rightButtonSize.width();
-+		widgetHeight += opt.rightButtonSize.height();
-+	}
-+	if (!opt.icon.isNull())
-+		padding += 4;
-+
-+	QSize csz;
-+	if (verticalTabs(q->shape())) {
-+		csz = QSize( qMax(maxWidgetWidth, qMax(fm.height(), iconSize.height())) + vframe,
-+					 fm.size(Qt::TextShowMnemonic, opt.text).width() + iconSize.width() + hframe + widgetHeight + padding);
-+	} else {
-+		csz = QSize(fm.size(Qt::TextShowMnemonic, opt.text).width() + iconSize.width() + hframe
-+					+ widgetWidth + padding,
-+					qMax(maxWidgetHeight, qMax(fm.height(), iconSize.height())) + vframe);
-+	}
-+
-+	QSize retSize = q->style()->sizeFromContents(QStyle::CT_TabBarTab, &opt, csz, q);
-+	return retSize;
-+
-+}
-+
-+void TabBar::Private::balanseCloseButtons()
-+{
-+	if (tabsClosable && multiRow) {
-+		while (closeButtons.isEmpty() || closeButtons.size() < q->count()) {
-+			CloseButton *cb = new CloseButton(q);
-+			closeButtons << cb;
-+			cb->show();
-+			connect(cb, SIGNAL(clicked()), q, SLOT(closeTab()));
-+		}
-+
-+		while (closeButtons.size() > q->count()) {
-+			closeButtons.takeLast()->deleteLater();
-+		}
-+	}
-+	else {
-+		qDeleteAll(closeButtons);
-+		closeButtons.clear();
-+	}
-+}
-+
-+TabBar::TabBar(QWidget *parent)
-+	: QTabBar(parent)
-+{
-+	d = new Private(this);
-+}
-+
-+void TabBar::layoutTabs()
-+{
-+	if (d->multiRow) {
-+		d->layoutTabs();
-+	}
-+	update();
-+}
-+
-+void TabBar::setMultiRow(bool b)
-+{
-+	if (b == d->multiRow) {
-+		return;
-+	}
-+
-+	d->multiRow = b;
-+
-+	if (b) {
-+		d->tabsClosable = QTabBar::tabsClosable();
-+		setElideMode(Qt::ElideNone);
-+		QTabBar::setTabsClosable(false);
-+	}
-+	else {
-+		QTabBar::setTabsClosable(d->tabsClosable);
-+		d->tabsClosable = false;
-+	}
-+
-+	d->balanseCloseButtons();
-+	if (b) {
-+		// setUsesScrollButtons(false);
-+		layoutTabs();
-+	}
-+	else {
-+		d->hackedTabs.clear();
-+		update();
-+	}
-+}
-+
-+void TabBar::setCurrentIndex(int index)
-+{
-+	if (!d->hackedTabs.isEmpty()) {
-+		int prev = currentIndex();
-+		if (prev > -1) {
-+			d->hackedTabsprev.state = QStyle::State_Enabled;
-+
-+			if (prev > 0)
-+				d->hackedTabsprev - 1.selectedPosition = QStyleOptionTab::NotAdjacent;
-+			if (prev + 1 < d->hackedTabs.size())
-+				d->hackedTabsprev + 1.selectedPosition = QStyleOptionTab::NotAdjacent;
-+		}
-+		d->hackedTabsindex.state = QStyle::State_Enabled | QStyle::State_Selected;
-+
-+		if (index > 0)
-+			d->hackedTabsindex - 1.selectedPosition = QStyleOptionTab::NextIsSelected;
-+		if (index + 1 < d->hackedTabs.size())
-+			d->hackedTabsindex + 1.selectedPosition = QStyleOptionTab::PreviousIsSelected;
-+
-+	}
-+	QTabBar::setCurrentIndex(index);
-+}
-+
-+void TabBar::setTabText(int index, const QString & text)
-+{
-+	QTabBar::setTabText(index, text);
-+	layoutTabs();
-+}
-+
-+void TabBar::setTabTextColor(int index, const QColor & color)
-+{
-+	QTabBar::setTabTextColor(index, color);
-+	layoutTabs();
-+}
-+
-+void TabBar::setTabIcon(int index, const QIcon &icon)
-+{
-+	QTabBar::setTabIcon(index, icon);
-+	layoutTabs();
-+}
-+
-+QRect TabBar::tabRect(int index) const
-+{
-+	if (d->multiRow) {
-+		if (index < d->hackedTabs.size() && index >= 0)
-+			return d->hackedTabsindex.rect;
-+		else
-+			return QRect();
-+	}
-+	else {
-+		return QTabBar::tabRect(index);
-+	}
-+}
-+
-+QWidget *TabBar::tabButton(int index, ButtonPosition position) const
-+{
-+	ButtonPosition closeButtonPos = static_cast<ButtonPosition>(style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, this));
-+	if (!d->multiRow || position != closeButtonPos)
-+		return QTabBar::tabButton(index, position);
-+
-+	Q_ASSERT(index < d->closeButtons.size());
-+	return index < d->closeButtons.size() ? d->closeButtonsindex : 0;
-+}
-+
-+bool TabBar::multiRow() const
-+{
-+	return d->multiRow;
-+}
-+
-+QSize TabBar::minimumSizeHint() const
-+{
-+	return QSize(0, sizeHint().height());
-+}
-+
-+QSize TabBar::sizeHint() const
-+{
-+	// use own sizeHint only for single row mode
-+	if (!d->multiRow) {
-+		return QTabBar::sizeHint();
-+	}
-+
-+	QList<QStyleOptionTabV3> tabs = d->hackedTabs;
-+
-+	QRect rect;
-+	for (int i=0; i < tabs.size(); i++) {
-+		rect = rect.united(tabs.at(i).rect);
-+	}
-+
-+	QSize size = rect.size();
-+	size.setWidth(width());
-+	return size;
-+}
-+
-+QSize TabBar::tabSizeHint(int index) const
-+{
-+	// use own sizeHint only for single row mode
-+	if (!d->multiRow) {
-+		return QTabBar::tabSizeHint(index);
-+	}
-+
-+	if (index < 0 || d->hackedTabs.size() <= index) {
-+		return QSize();
-+	}
-+
-+	QStyleOptionTabV3 opt = d->hackedTabs.at(index);
-+	return d->tabSizeHint(opt);
-+}
-+
-+void TabBar::setTabsClosable(bool b)
-+{
-+	if (!d->multiRow) {
-+		QTabBar::setTabsClosable(b);
-+		return;
-+	}
-+
-+	if (d->tabsClosable == b) {
-+		return;
-+	}
-+
-+	d->tabsClosable = b;
-+	d->balanseCloseButtons();
-+	d->layoutTabs();
-+}
-+
-+bool TabBar::tabsClosable() const
-+{
-+	return d->tabsClosable;
-+}
-+
-+// stealed from qtabbar_p.h
-+static void initStyleBaseOption(QStyleOptionTabBarBaseV2 *optTabBase, QTabBar *tabbar, QSize size)
-+{
-+	QStyleOptionTab tabOverlap;
-+	tabOverlap.shape = tabbar->shape();
-+	int overlap = tabbar->style()->pixelMetric(QStyle::PM_TabBarBaseOverlap, &tabOverlap, tabbar);
-+	QWidget *theParent = tabbar->parentWidget();
-+	optTabBase->init(tabbar);
-+	optTabBase->shape = tabbar->shape();
-+	optTabBase->documentMode = tabbar->documentMode();
-+	if (theParent && overlap > 0) {
-+		QRect rect;
-+		switch (tabOverlap.shape) {
-+		case QTabBar::RoundedNorth:
-+		case QTabBar::TriangularNorth:
-+			rect.setRect(0, size.height()-overlap, size.width(), overlap);
-+			break;
-+		case QTabBar::RoundedSouth:
-+		case QTabBar::TriangularSouth:
-+			rect.setRect(0, 0, size.width(), overlap);
-+			break;
-+		case QTabBar::RoundedEast:
-+		case QTabBar::TriangularEast:
-+			rect.setRect(0, 0, overlap, size.height());
-+			break;
-+		case QTabBar::RoundedWest:
-+		case QTabBar::TriangularWest:
-+			rect.setRect(size.width() - overlap, 0, overlap, size.height());
-+			break;
-+		}
-+		optTabBase->rect = rect;
-+	}
-+}
-+
-+void TabBar::paintEvent(QPaintEvent *event)
-+{
-+	// use own painting only for multi row mode
-+	if (!d->multiRow) {
-+		QTabBar::paintEvent(event);
-+		return;
-+	}
-+
-+	QStylePainter p(this);
-+	QList<QStyleOptionTabV3> tabs = d->hackedTabs;
-+
-+	int selected = currentIndex();
-+	if (drawBase()) {
-+		QStyleOptionTabBarBaseV2 optTabBase;
-+		initStyleBaseOption(&optTabBase, this, size());
-+
-+		if (selected >= 0) {
-+			optTabBase.selectedTabRect = tabsselected.rect;
-+		}
-+
-+		for (int i = 0; i < tabs.size(); ++i)
-+			optTabBase.tabBarRect |= tabsi.rect;
-+
-+		p.drawPrimitive(QStyle::PE_FrameTabBarBase, optTabBase);
-+	}
-+
-+	int rowHeight = 0;
-+	if (selected >= 0) {
-+		rowHeight = tabsselected.rect.height();
-+	} else if (tabs.count()) {
-+		rowHeight = tabs0.rect.height();
-+	}
-+
-+	// There is some problems when tabs are painted not in first row.
-+	// Draw on a pixmap like a painting in the first row. Then move image
-+	// to real TabBar widget.
-+	QPixmap pixmap(width(), rowHeight);
-+	pixmap.fill(Qt::transparent);
-+	QStylePainter pp(&pixmap, this);
-+	bool drawSelected = false;
-+
-+	if (shape() == QTabBar::RoundedNorth) {
-+		for (int i = 0; i < tabs.size(); ++i) {
-+			QStyleOptionTabV3 tab = tabsi;
-+			if (i != selected) {
-+				tab.rect.moveBottom(rowHeight - 1);
-+				pp.drawControl(QStyle::CE_TabBarTab, tab);
-+			}
-+			else {
-+				drawSelected = true;
-+			}
-+
-+			if (tab.position == QStyleOptionTab::End || tab.position == QStyleOptionTab::OnlyOneTab) {
-+				if (drawSelected) {
-+					// Draw current tab in the last order
-+					tab = tabsselected;
-+					tab.rect.moveBottom(rowHeight - 1);
-+					pp.drawControl(QStyle::CE_TabBarTab, tab);
-+					drawSelected = false;
-+				}
-+
-+				QRect rect(0, tabsi.rect.top(), width(), rowHeight);
-+				p.drawItemPixmap(rect, Qt::AlignCenter, pixmap);
-+				pixmap.fill(Qt::transparent);
-+			}
-+		}
-+	}
-+	else {
-+		for (int i = tabs.size() - 1; i >= 0; --i) {
-+			QStyleOptionTabV3 tab = tabsi;
-+			if (i != selected) {
-+				tab.rect.moveTop(0);
-+				pp.drawControl(QStyle::CE_TabBarTab, tab);
-+			}
-+			else {
-+				drawSelected = true;
-+			}
-+
-+			if (tab.position == QStyleOptionTab::Beginning || tab.position == QStyleOptionTab::OnlyOneTab) {
-+				if (drawSelected) {
-+					// Draw current tab in the last order
-+					tab = tabsselected;
-+					tab.rect.moveTop(0);
-+					pp.drawControl(QStyle::CE_TabBarTab, tab);
-+					drawSelected = false;
-+				}
-+
-+				QRect rect(0, tabsi.rect.top(), width(), rowHeight);
-+				p.drawItemPixmap(rect, Qt::AlignCenter, pixmap);
-+				pixmap.fill(Qt::transparent);
-+			}
-+		}
-+	}
-+
-+	ButtonPosition closeSide = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, this);
-+	QStyle::SubElement se = (closeSide == LeftSide ? QStyle::SE_TabBarTabLeftButton : QStyle::SE_TabBarTabRightButton);
-+	if (d->tabsClosable) {
-+		for (int i = 0; i < tabs.size(); i++) {
-+			QStyleOptionTabV3 opt;
-+			opt = tabs.at(i);
-+
-+			QRect rect = style()->subElementRect(se, &opt, this);
-+			rect.setTop(rect.top() + opt.rect.top());
-+			QPoint p = rect.topLeft();
-+			d->closeButtons.at(i)->move(p);
-+		}
-+	}
-+}
-+
-+void TabBar::mousePressEvent(QMouseEvent *event)
-+{
-+	if (!d->multiRow) {
-+		QTabBar::mousePressEvent(event);
-+		return;
-+	}
-+
-+	if (event->button() != Qt::LeftButton) {
-+		event->ignore();
-+		return;
-+	}
-+
-+	for (int i = 0; i < count(); i++) {
-+		if (d->hackedTabs.at(i).rect.contains(event->pos())) {
-+			setCurrentIndex(i);
-+			d->layoutTabs();
-+
-+			// QStyleOptionTabV3 tab = d->hackedTabs.at(currentIndex());
-+			// tab.state = QStyle::State_Enabled;
-+			// d->hackedTabscurrentIndex() = tab;
-+			// tab = d->hackedTabs.at(i);
-+			// tab.state = QStyle::State_Selected | QStyle::State_Enabled;
-+			// d->hackedTabsi = tab;
-+			// update();
-+		}
-+	}
-+}
-+
-+void TabBar::tabInserted(int index)
-+{
-+	QTabBar::tabInserted(index);
-+
-+	if (!d->multiRow) {
-+		return;
-+	}
-+
-+	d->balanseCloseButtons();
-+	d->layoutTabs();
-+}
-+
-+void TabBar::tabRemoved(int index)
-+{
-+	QTabBar::tabRemoved(index);
-+
-+	if (!d->multiRow) {
-+		return;
-+	}
-+
-+	d->balanseCloseButtons();
-+	d->layoutTabs();
-+}
-+
-+void TabBar::closeTab()
-+{
-+	CloseButton *cb = qobject_cast<CloseButton*>(sender());
-+	int index = d->closeButtons.indexOf(cb);
-+	emit tabCloseRequested(index);
-+}
-+
-+CloseButton::CloseButton(QWidget *parent)
-+	: QAbstractButton(parent)
-+{
-+	setFocusPolicy(Qt::NoFocus);
-+	setCursor(Qt::ArrowCursor);
-+	setToolTip(tr("Close Tab"));
-+	resize(sizeHint());
-+}
-+
-+QSize CloseButton::sizeHint() const
-+{
-+	ensurePolished();
-+	int width = style()->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, 0, this);
-+	int height = style()->pixelMetric(QStyle::PM_TabCloseIndicatorHeight, 0, this);
-+	return QSize(width, height);
-+}
-+
-+void CloseButton::enterEvent(QEvent *event)
-+{
-+	if (isEnabled())
-+		update();
-+	QAbstractButton::enterEvent(event);
-+}
-+
-+void CloseButton::leaveEvent(QEvent *event)
-+{
-+	if (isEnabled())
-+		update();
-+	QAbstractButton::leaveEvent(event);
-+}
-+
-+void CloseButton::paintEvent(QPaintEvent *)
-+{
-+	QPainter p(this);
-+	QStyleOption opt;
-+	opt.init(this);
-+	opt.state |= QStyle::State_AutoRaise;
-+	if (isEnabled() && underMouse() && !isChecked() && !isDown())
-+		opt.state |= QStyle::State_Raised;
-+	if (isChecked())
-+		opt.state |= QStyle::State_On;
-+	if (isDown())
-+		opt.state |= QStyle::State_Sunken;
-+
-+	if (const TabBar *tb = qobject_cast<const TabBar*>(parent())) {
-+		int index = tb->currentIndex();
-+		QTabBar::ButtonPosition position = static_cast<QTabBar::ButtonPosition>(style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, tb));
-+		if (tb->tabButton(index, position) == this)
-+			opt.state |= QStyle::State_Selected;
-+	}
-+
-+	style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, &p, this);
-+}
-+
-+#include "tabbar.moc"
---- /dev/null
-+++ psi/src/widgets/tabbar.h
-@@ -0,0 +1,62 @@
-+/*
-+ * tabbar.h
-+ * Copyright (C) 2013-2014  Ivan Romanov <drizt@land.ru>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#pragma once
-+
-+#include <QTabBar>
-+
-+class TabBar : public QTabBar
-+{
-+	Q_OBJECT
-+public:
-+	explicit TabBar(QWidget *parent = 0);
-+
-+	void layoutTabs();
-+
-+	void setMultiRow(bool b);
-+	bool multiRow() const;
-+
-+	// reimplemented
-+	QSize minimumSizeHint() const;
-+	QSize sizeHint() const;
-+	QSize tabSizeHint(int index) const;
-+	void setTabsClosable(bool b);
-+	bool tabsClosable() const;
-+	void setCurrentIndex(int index);
-+	void setTabText(int index, const QString &text);
-+	void setTabTextColor(int index, const QColor &color);
-+	void setTabIcon(int index, const QIcon &icon);
-+	QRect tabRect(int index) const;
-+	QWidget *tabButton(int index, ButtonPosition position) const;
-+
-+protected:
-+	// reimplemented
-+	void paintEvent(QPaintEvent *event);
-+	void mousePressEvent(QMouseEvent *event);
-+	void tabInserted(int index);
-+	void tabRemoved(int index);
-+
-+private slots:
-+	void closeTab();
-+
-+private:
-+	class Private;
-+	Private *d;
-+};
---- psi.orig/src/widgets/widgets.pri
-+++ psi/src/widgets/widgets.pri
-@@ -18,8 +18,8 @@ SOURCES += \
- 	$$PWD/psitabbar.cpp \
- 	$$PWD/psiwindowheader.cpp \
- 	$$PWD/actionlineedit.cpp \
--	$$PWD/typeaheadfind.cpp
--
-+	$$PWD/typeaheadfind.cpp \
-+	$$PWD/tabbar.cpp
- 
- HEADERS += \
- 	$$PWD/stretchwidget.h \
-@@ -46,7 +46,8 @@ HEADERS += \
- 	$$PWD/psitabbar.h \
- 	$$PWD/psiwindowheader.h \
- 	$$PWD/actionlineedit.h \
--	$$PWD/typeaheadfind.h
-+	$$PWD/typeaheadfind.h \
-+	$$PWD/tabbar.h
- 
- FORMS += $$PWD/fancypopup.ui \
- 	$$PWD/psiwindowheader.ui

psi-plus-main-20160309.tar.xz/patches/8000-psi-extend-plugins-interface.diff Deleted

@@ -1,4778 +0,0 @@
---- a/iris/src/xmpp/xmpp-im/client.cpp
-+++ b/iris/src/xmpp/xmpp-im/client.cpp
-@@ -619,6 +619,7 @@ void Client::send(const QDomElement &x, bool want_notify)
- 		//printf("bad stanza??\n");
- 		return;
- 	}
-+	emit stanzaElementOutgoing(e);
- 	QString out = s.toString();
- 	//qWarning() << "Out: " << out;
- 	debug(QString("Client: outgoing: \n%1\n").arg(out));
---- a/iris/src/xmpp/xmpp-im/xmpp_client.h
-+++ b/iris/src/xmpp/xmpp-im/xmpp_client.h
-@@ -148,6 +148,7 @@ namespace XMPP
- 		void debugText(const QString &);
- 		void xmlIncoming(const QString &);
- 		void xmlOutgoing(const QString &);
-+		void stanzaElementOutgoing(QDomElement &);
- 		void groupChatJoined(const Jid &);
- 		void groupChatLeft(const Jid &);
- 		void groupChatPresence(const Jid &, const Status &);
---- a/src/applicationinfo.cpp
-+++ b/src/applicationinfo.cpp
-@@ -27,6 +27,7 @@
- 
- #include "psiapplication.h"
- #include "applicationinfo.h"
-+#include "systeminfo.h"
- #include "profiles.h"
- #include "homedirmigration.h"
- #include "activeprofiles.h"
-@@ -82,6 +83,11 @@ QString ApplicationInfo::capsNode()
- 	return PROG_CAPS_NODE;
- }
- 
-+QString ApplicationInfo::osName()
-+{
-+	return SystemInfo::instance()->os();
-+}
-+
- QString ApplicationInfo::IPCName()
- {
- 	return PROG_IPC_NAME;
---- a/src/applicationinfo.h
-+++ b/src/applicationinfo.h
-@@ -19,6 +19,7 @@ public:
- 	static QLatin1String sname();
- 	static QString version();
- 	static QString capsNode();
-+	static QString osName();
- 	static QString IPCName();
- 
- 	// URLs
---- a/src/chatdlg.cpp
-+++ b/src/chatdlg.cpp
-@@ -80,6 +80,10 @@
- #include <windows.h>
- #endif
- 
-+#ifdef PSI_PLUGINS
-+#include "pluginmanager.h"
-+#endif
-+
- #include "psichatdlg.h"
- 
- static const QString geometryOption = "options.ui.chat.size";
-@@ -893,10 +897,26 @@ void ChatDlg::appendMessage(const Message &m, bool local)
- 	}
- 
- 	MessageView mv(MessageView::Message);
--	if (m.containsHTML() && PsiOptions::instance()->getOption("options.html.chat.render").toBool() && !m.html().body().firstChild().isNull()) {
--		mv.setHtml(m.html().toString("span"));
-+
-+	QString body = m.body();
-+	HTMLElement htmlElem;
-+	if (m.containsHTML())
-+		htmlElem = m.html();
-+
-+#ifdef PSI_PLUGINS
-+	QDomElement html = htmlElem.body();
-+
-+	PluginManager::instance()->appendingChatMessage(account(), jid().full(), body, html, local);
-+
-+	if(!html.isNull())
-+		htmlElem.setBody(html);
-+#endif
-+
-+	if (PsiOptions::instance()->getOption("options.html.chat.render").toBool() && !htmlElem.body().isNull()
-+			&& !htmlElem.body().firstChild().isNull()) {
-+		mv.setHtml(htmlElem.toString("span"));
- 	} else {
--		mv.setPlainText(m.body());
-+		mv.setPlainText(body);
- 	}
- 	mv.setMessageId(m.id());
- 	mv.setLocal(local);
---- a/src/chatdlg.h
-+++ b/src/chatdlg.h
-@@ -170,7 +170,11 @@ protected:
- 
- 	void appendMessage(const Message &, bool local = false);
- 	virtual bool isEncryptionEnabled() const;
-+
-+public:
- 	virtual void appendSysMsg(const QString& txt) = 0;
-+
-+protected:
- 	virtual void nicksChanged();
- 
- 	QString whoNick(bool local) const;
---- a/src/common.cpp
-+++ b/src/common.cpp
-@@ -64,6 +64,7 @@
- #include "applicationinfo.h"
- #include "psioptions.h"
- #include "activity.h"
-+#include "tabdlg.h"
- 
- Qt::WindowFlags psi_dialog_flags = (Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
- 
-@@ -428,6 +429,32 @@ void reorderGridLayout(QGridLayout* layout, int maxCols)
- 	}
- }
- 
-+TabbableWidget* findActiveTab()
-+{
-+	QWidget* chat = QApplication::activeWindow();
-+	TabbableWidget* tw = 0;
-+	if(chat) {
-+		TabDlg* td = qobject_cast<TabDlg*>(chat);
-+		if(td) {
-+			tw = td->getCurrentTab();
-+		}
-+		else {
-+			tw = qobject_cast<TabbableWidget*>(chat);
-+			if (!tw) {
-+				QList<TabDlg*> tmp = chat->findChildren<TabDlg*>(); // all-in-one
-+				while(!tmp.isEmpty()) {
-+					TabDlg* td = tmp.takeFirst();
-+					tw = td->getCurrentTab();
-+					if(tw) {
-+						break;
-+					}
-+				}
-+			}
-+		}
-+	}
-+	return tw;
-+}
-+
- #ifdef HAVE_X11
- #include <X11/Xlib.h>
- #include <X11/Xutil.h> // needed for WM_CLASS hinting
---- a/src/common.h
-+++ b/src/common.h
-@@ -30,6 +30,7 @@
- #include <QGridLayout>
- 
- class QMenu;
-+class TabbableWidget;
- 
- #include "statuspreset.h"
- 
-@@ -150,6 +151,7 @@ void clearMenu(QMenu *m); // deletes all items, including submenus, from given Q
- void bringToFront(QWidget *w, bool grabFocus = true);
- void replaceWidget(QWidget *, QWidget *);
- void closeDialogs(QWidget *);
-+TabbableWidget* findActiveTab();
- #ifdef HAVE_X11
- #include <QWidget>
- #include <QX11Info>
---- a/src/contactlistaccountmenu.cpp
-+++ b/src/contactlistaccountmenu.cpp
-@@ -22,6 +22,8 @@
- 
- #include <QPointer>
- 
-+#include "pluginmanager.h"
-+#include "psiiconset.h"
- #include "psiaccount.h"
- #include "contactlistaccountgroup.h"
- #include "accountstatusmenu.h"
-@@ -64,6 +66,7 @@ class ContactListAccountMenu::Private : public QObject
- 	QAction* adminUpdateMotdAction_;
- 	QAction* adminDeleteMotdAction_;
- 	QAction *doGroupChatAction_;
-+	QMenu* pluginsMenu_;
- 
- public:
- 	Private(ContactListAccountMenu* menu, ContactListAccountGroup* _account)
-@@ -166,6 +169,12 @@ public:
- 		menu->addAction(xmlConsoleAction_);
- 		menu->addSeparator();
- 		menu->addAction(modifyAccountAction_);
-+
-+#ifdef PSI_PLUGINS
-+		pluginsMenu_ = menu->addMenu(IconsetFactory::icon("psi/plugins").icon(), tr("Plugins"));
-+		PluginManager::instance()->addAccountMenu(pluginsMenu_, account->account());
-+#endif
-+
- 		adminMenu_ = menu->addMenu(tr("&Admin"));
- 		adminMenu_->addAction(adminOnlineUsersAction_);
- 		adminMenu_->addAction(adminSendServerMessageAction_);
-@@ -235,6 +244,12 @@ private slots:
- 		adminSetMotdAction_->setVisible(newMessageAction_->isVisible());
- 		adminUpdateMotdAction_->setVisible(newMessageAction_->isVisible());
- 		adminDeleteMotdAction_->setVisible(newMessageAction_->isVisible());
-+
-+#ifdef PSI_PLUGINS
-+		if(pluginsMenu_->isEmpty())
-+			pluginsMenu_->menuAction()->setVisible(false);
-+		pluginsMenu_->setEnabled(account->account()->isAvailable() && !pluginsMenu_->isEmpty());
-+#endif
- 	}
- 
- 	void statusChanged(XMPP::Status::Type statusType, bool forceDialog)
---- a/src/groupchatdlg.cpp
-+++ b/src/groupchatdlg.cpp
-@@ -86,6 +86,9 @@
- #include "mucreasonseditor.h"
- #include "mcmdmanager.h"
- #include "lastactivitytask.h"
-+#ifdef PSI_PLUGINS
-+#include "pluginmanager.h"
-+#endif
- #include "psirichtext.h"
- #include "psiwindowheader.h"
- 
-@@ -888,6 +891,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 
- 	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
- 	connect(pa->avatarFactory(), SIGNAL(avatarChanged(Jid)), SLOT(avatarUpdated(Jid)));
-+
-+#ifdef PSI_PLUGINS
-+	PluginManager::instance()->setupGCTab(this, account(), jid().full());
-+#endif
- }
- 
- GCMainDlg::~GCMainDlg()
-@@ -2017,6 +2024,14 @@ void GCMainDlg::setToolbuttons()
- 	PsiOptions *options = PsiOptions::instance();
- 	QStringList actionsNames = options->getOption("options.ui.contactlist.toolbars.m1.actions").toStringList();
- 	foreach (const QString &actionName, actionsNames) {
-+#ifdef PSI_PLUGINS
-+		if (actionName.endsWith("-plugin")) {
-+			QString name = PluginManager::instance()->nameByShortName(actionName.mid(0, actionName.length() - 7));
-+			PluginManager::instance()->addGCToolBarButton(this, ui_.toolbar, account(), jid().full(), name);
-+			continue;
-+		}
-+#endif
-+
- 		// Hack. separator action can be added only once.
- 		if (actionName == "separator") {
- 			ui_.toolbar->addSeparator();
-@@ -2176,6 +2191,12 @@ void GCMainDlg::buildMenu()
- 	d->pm_settings->addAction(d->actions->action("gchat_icon"));
- 	d->pm_settings->addAction(d->act_nick);
- 	d->pm_settings->addAction(d->act_bookmark);
-+#ifdef PSI_PLUGINS
-+	if(!PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m1.visible").toBool()) {
-+		d->pm_settings->addSeparator();
-+		PluginManager::instance()->addGCToolBarButton(this, d->pm_settings, account(), jid().full());
-+	}
-+#endif
- }
- 
- void GCMainDlg::chatEditCreated()
---- a/src/options/opt_plugins.cpp
-+++ b/src/options/opt_plugins.cpp
-@@ -3,12 +3,11 @@
- #include "iconwidget.h"
- #include "pluginmanager.h"
- #include "psioptions.h"
-+#include "psiiconset.h"
- 
- #include <QWhatsThis>
--#include <QCheckBox>
--#include <QComboBox>
--#include <QButtonGroup>
--#include <QRadioButton>
-+#include <QToolButton>
-+#include <QHeaderView>
- 
- #include "ui_opt_plugins.h"
- 
-@@ -23,13 +22,17 @@ public:
- //----------------------------------------------------------------------------
- 
- OptionsTabPlugins::OptionsTabPlugins(QObject *parent)
--: OptionsTab(parent, "plugins", "", tr("Plugins"), tr("Options for Psi plugins"), "psi/plugins")
-+	: OptionsTab(parent, "plugins", "", tr("Plugins"), tr("Options for Psi plugins"), "psi/plugins")
-+	, w(0)
- {
--	w = 0;
- }
- 
- OptionsTabPlugins::~OptionsTabPlugins()
- {
-+	if( infoDialog )
-+		delete(infoDialog);
-+	if( settingsDialog )
-+		delete(settingsDialog);
- }
- 
- QWidget *OptionsTabPlugins::widget()
-@@ -41,117 +44,183 @@ QWidget *OptionsTabPlugins::widget()
- 	OptPluginsUI *d = (OptPluginsUI *)w;
- 
- 	listPlugins();
--
--
--	/*d->ck_messageevents->setWhatsThis(
--		tr("Enables the sending and requesting of message events such as "
--		"'Contact is Typing', ..."));*/
--
--	connect(d->cb_plugins,SIGNAL(currentIndexChanged(int)),SLOT(pluginSelected(int)));
--	connect(d->cb_loadPlugin,SIGNAL(stateChanged(int)),SLOT(loadToggled(int)));
-+	connect(d->tw_Plugins, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*,int)));
- 
- 	return w;
- }
- 
--void OptionsTabPlugins::applyOptions(Options *opt)
-+void OptionsTabPlugins::applyOptions()
- {
--	if ( !w )
--		return;
--
--	OptPluginsUI *d = (OptPluginsUI *)w;
--	Q_UNUSED(d);
--	Q_UNUSED(opt);
- }
- 
--void OptionsTabPlugins::restoreOptions(const Options *opt)
-+void OptionsTabPlugins::restoreOptions()
- {
--	if ( !w )
--		return;
-+}
- 
--	OptPluginsUI *d = (OptPluginsUI *)w;
--	Q_UNUSED(opt);
--	Q_UNUSED(d);
-+bool OptionsTabPlugins::stretchable() const
-+{
-+	return true;
- }
- 
-+
- void OptionsTabPlugins::listPlugins()
- {
--  	if ( !w )
-+	if ( !w )
- 		return;
- 
- 	OptPluginsUI *d = (OptPluginsUI *)w;
- 
--	d->cb_plugins->clear();
-+	d->tw_Plugins->clear();
- 
- 	PluginManager *pm=PluginManager::instance();
- 
--	QStringList plugins=pm->availablePlugins();
--		foreach (QString plugin, plugins){
--		d->cb_plugins->addItem(plugin);
-+	QStringList plugins = pm->availablePlugins();
-+	plugins.sort();
-+	const QSize buttonSize = QSize(21,21);
-+	foreach ( const QString& plugin, plugins ){
-+		QIcon icon = pm->icon(plugin);
-+		bool enabled = pm->isEnabled(plugin);
-+		const QString path = pm->pathToPlugin(plugin);
-+		QString toolTip = tr("Plugin Path:\n%1").arg(path);
-+		Qt::CheckState state = enabled ? Qt::Checked : Qt::Unchecked;
-+		QTreeWidgetItem *item = new QTreeWidgetItem(d->tw_Plugins, QTreeWidgetItem::Type);
-+		item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-+		item->setText(C_NAME, plugin);
-+		item->setText(C_VERSION, pm->version(plugin));
-+		item->setTextAlignment(C_VERSION, Qt::AlignHCenter);
-+		item->setToolTip(C_NAME, toolTip);
-+		item->setCheckState(C_NAME, state);
-+		if ( !enabled ) {
-+			icon = QIcon(icon.pixmap(icon.availableSizes().at(0), QIcon::Disabled));
-+		}
-+		item->setIcon(C_NAME,icon);
-+		QString shortName = PluginManager::instance()->shortName(plugin);
-+
-+		QToolButton *aboutbutton = new QToolButton(d->tw_Plugins);
-+		aboutbutton->setIcon(QIcon(IconsetFactory::iconPixmap("psi/info")));
-+		aboutbutton->resize(buttonSize);
-+		aboutbutton->setObjectName("ab_" + shortName);
-+		aboutbutton->setToolTip(tr("Show information about plugin"));
-+		connect(aboutbutton, SIGNAL(clicked()), this, SLOT(showPluginInfo()));
-+		d->tw_Plugins->setItemWidget(item, C_ABOUT, aboutbutton);
-+
-+		QToolButton *settsbutton = new QToolButton(d->tw_Plugins);
-+		settsbutton->setIcon(QIcon(IconsetFactory::iconPixmap("psi/options")));
-+		settsbutton->resize(buttonSize);
-+		settsbutton->setObjectName("sb_" + shortName);
-+		settsbutton->setToolTip(tr("Open plugin settings dialog"));
-+		connect(settsbutton, SIGNAL(clicked()), this, SLOT(settingsClicked()));
-+		settsbutton->setEnabled(enabled);
-+		d->tw_Plugins->setItemWidget(item, C_SETTS, settsbutton);
-+	}
-+	if ( d->tw_Plugins->topLevelItemCount() > 0 ) {
-+#ifdef HAVE_QT5
-+		d->tw_Plugins->header()->setSectionResizeMode(C_NAME, QHeaderView::Stretch);
-+#else
-+		d->tw_Plugins->header()->setResizeMode(C_NAME, QHeaderView::Stretch);
-+#endif
-+		d->tw_Plugins->resizeColumnToContents(C_VERSION);
-+		d->tw_Plugins->resizeColumnToContents(C_ABOUT);
-+		d->tw_Plugins->resizeColumnToContents(C_SETTS);
- 	}
--	pluginSelected(0);
- }
- 
--void OptionsTabPlugins::loadToggled(int state)
-+void OptionsTabPlugins::itemChanged(QTreeWidgetItem *item, int column)
- {
--	Q_UNUSED(state);
-+	Q_UNUSED(column);
- 	if ( !w )
- 		return;
--
- 	OptPluginsUI *d = (OptPluginsUI *)w;
-+	bool enabled = item->checkState(C_NAME) == Qt::Checked;
-+	d->tw_Plugins->setCurrentItem(item);
- 
-+	PluginManager *pm = PluginManager::instance();
-+	QString name = item->text(C_NAME);
- 	QString option=QString("%1.%2")
- 		.arg(PluginManager::loadOptionPrefix)
--		.arg(PluginManager::instance()->shortName(d->cb_plugins->currentText()));
--	bool value=d->cb_loadPlugin->isChecked();
--	PsiOptions::instance()->setOption(option, value);
-+		.arg(pm->shortName(name));
-+	PsiOptions::instance()->setOption(option, enabled);
-+
-+	d->tw_Plugins->blockSignals(true); //Block signalls to change item elements
-+	d->tw_Plugins->itemWidget(item, C_SETTS)->setEnabled(enabled);
-+	QIcon icon = pm->icon(name);
-+	if ( !enabled ) {
-+		icon = QIcon(icon.pixmap(icon.availableSizes().at(0), QIcon::Disabled));
-+	}
-+	item->setIcon(C_NAME, icon);
-+	d->tw_Plugins->blockSignals(false); //Release signals blocking
- }
- 
--void OptionsTabPlugins::pluginSelected(int index)
-+void OptionsTabPlugins::showPluginInfo()
- {
--	Q_UNUSED(index);
--  	if ( !w )
-+	if ( !w || !sender()->inherits("QToolButton") )
-+		return;
-+	OptPluginsUI *d = (OptPluginsUI *)w;
-+	QToolButton *btn = static_cast<QToolButton*>(sender());
-+	const QPoint coords(btn->x(),btn->y());
-+	d->tw_Plugins->setCurrentItem(d->tw_Plugins->itemAt(coords));
-+	if ( d->tw_Plugins->selectedItems().size() > 0 ) {
-+		if( infoDialog )
-+			delete(infoDialog);
-+
-+		infoDialog = new QDialog(d);
-+		ui_.setupUi(infoDialog);
-+		QString name = d->tw_Plugins->currentItem()->text(C_NAME);
-+		infoDialog->setWindowTitle(QString("%1 %2").arg(infoDialog->windowTitle()).arg(name));
-+		infoDialog->setWindowIcon(QIcon(IconsetFactory::iconPixmap("psi/logo_128")));
-+		ui_.te_info->setText(PluginManager::instance()->pluginInfo(name));
-+		infoDialog->setAttribute(Qt::WA_DeleteOnClose);
-+		infoDialog->show();
-+	}
-+}
-+
-+void OptionsTabPlugins::settingsClicked()
-+{
-+	if ( !w || !sender()->inherits("QToolButton") )
- 		return;
- 
- 	OptPluginsUI *d = (OptPluginsUI *)w;
--	d->le_location->setText(tr("No plugin selected."));
--	d->cb_loadPlugin->setEnabled(false);
--	delete d->pluginOptions;
--	d->pluginOptions = new QLabel(tr("This plugin has no user configurable options"));
--
--	if ( d->cb_plugins->count() > 0 ) {
--		QString pluginName=d->cb_plugins->currentText();
--		d->le_location->setText(PluginManager::instance()->pathToPlugin( pluginName ));
--		d->cb_loadPlugin->setEnabled(true);
-+	QToolButton *btn = static_cast<QToolButton*>(sender());
-+	const QPoint coords(btn->x(),btn->y());
-+	d->tw_Plugins->setCurrentItem(d->tw_Plugins->itemAt(coords));
-+	if ( d->tw_Plugins->selectedItems().size() > 0 ) {
-+		const QString pluginName = d->tw_Plugins->currentItem()->text(C_NAME);
-+		const QString shortName = PluginManager::instance()->shortName(pluginName);
-+		const QString geometryOption = QString("plugins.options.%1.dialog-size").arg(shortName);
- 		QWidget* pluginOptions = PluginManager::instance()->optionsWidget( pluginName );
--		d->cb_plugins->setEnabled(true);
--
--		QString option=QString("%1.%2")
--			.arg(PluginManager::loadOptionPrefix)
--			.arg(PluginManager::instance()->shortName(pluginName));
--		int value=PsiOptions::instance()->getOption(option, false).toBool();
--		if (value)
--			value=Qt::Checked;
--		else
--			value=Qt::Unchecked;
--		d->cb_loadPlugin->setChecked(value);
--
--		d->vboxLayout1->removeWidget(d->pluginOptions);
--		delete d->pluginOptions;
--		d->pluginOptions=NULL;
--		if (pluginOptions)
--		{
--			d->pluginOptions = pluginOptions;
--			d->pluginOptions->setParent(d);
--			qWarning("Showing Plugin options");
--		}
--		else
--		{
--			d->pluginOptions = new QLabel(tr("This plugin has no user configurable options"),d);
--			qWarning("Plugin has no options");
--		}
-+		PluginManager::instance()->restoreOptions( pluginName );
-+		pluginOptions->setParent(d);
-+
-+		if( settingsDialog )
-+			delete(settingsDialog);
-+
-+		settingsDialog = new AdvancedWidget<QDialog>(d);
-+		settsUi_.setupUi(settingsDialog);
-+		settingsDialog->setWindowIcon(QIcon(IconsetFactory::iconPixmap("psi/logo_128")));
-+		settingsDialog->setWindowTitle(tr("Settings of %1").arg(pluginName));
-+		settsUi_.verticalLayout->insertWidget(0, pluginOptions);
-+		connectSignalsToWidget(pluginOptions, this, SLOT(onDataChanged()));
-+		connect(settsUi_.buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(onSettingsOk()));
-+		connect(settsUi_.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(onSettingsOk()));
-+		settsUi_.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
-+		settingsDialog->setGeometryOptionPath(geometryOption);
-+		settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
-+		settingsDialog->show();
-+	}
-+}
- 
--		d->vboxLayout1->addWidget(d->pluginOptions);
--		//d->pluginOptions->show();
--		//d->updateGeometry();
-+void OptionsTabPlugins::onSettingsOk()
-+{
-+	if ( !w )
-+		return;
-+	OptPluginsUI *d = (OptPluginsUI *)w;
-+	if ( d->tw_Plugins->currentItem()->isSelected() ) {
-+		PluginManager::instance()->applyOptions( d->tw_Plugins->currentItem()->text(C_NAME) );
- 	}
-+	settsUi_.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
-+}
-+
-+void OptionsTabPlugins::onDataChanged()
-+{
-+	settsUi_.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true);
- }
---- a/src/options/opt_plugins.h
-+++ b/src/options/opt_plugins.h
-@@ -2,6 +2,11 @@
- #define OPT_PLUGINS_H
- 
- #include "optionstab.h"
-+#include "advwidget.h"
-+#include "ui_plugininfodialog.h"
-+#include "ui_pluginsettsdialog.h"
-+#include <QPointer>
-+#include <QTreeWidgetItem>
- 
- class QWidget;
- class Options;
-@@ -9,22 +14,35 @@ class Options;
- class OptionsTabPlugins : public OptionsTab
- {
- 	Q_OBJECT
-+	enum ColumnName {
-+		C_NAME = 0,
-+		C_VERSION = 1,
-+		C_ABOUT = 2,
-+		C_SETTS = 3
-+	};
- public:
- 	OptionsTabPlugins(QObject *parent);
- 	~OptionsTabPlugins();
- 
- 	QWidget *widget();
--	void applyOptions(Options *opt);
--	void restoreOptions(const Options *opt);
-+	void applyOptions();
-+	void restoreOptions();
-+	bool stretchable() const;
- 
- private:
- 	QWidget *w;
--	QWidget *pluginWidget;
-+	QPointer<QDialog> infoDialog;
-+	QPointer<AdvancedWidget<QDialog> > settingsDialog;
-+	Ui::PluginInfoDialog ui_;
-+	Ui::PluginSettingsDialog settsUi_;
- 
- private slots:
- 	void listPlugins();
--	void pluginSelected(int index);
--	void loadToggled(int state);
-+	void showPluginInfo();
-+	void itemChanged(QTreeWidgetItem *item, int column);
-+	void settingsClicked();
-+	void onSettingsOk();
-+	void onDataChanged();
- };
- 
- #endif
---- a/src/options/opt_plugins.ui
-+++ b/src/options/opt_plugins.ui
-@@ -1,133 +1,98 @@
--<ui version="4.0" >
-- <author></author>
-- <comment></comment>
-- <exportmacro></exportmacro>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-  <class>OptPlugins</class>
-- <widget class="QWidget" name="OptPlugins" >
--  <property name="geometry" >
-+ <widget class="QWidget" name="OptPlugins">
-+  <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
--    <width>362</width>
-+    <width>411</width>
-     <height>400</height>
-    </rect>
-   </property>
--  <property name="windowTitle" >
-+  <property name="windowTitle">
-    <string>OptPluginsUI</string>
-   </property>
--  <layout class="QVBoxLayout" >
--   <property name="margin" >
--    <number>9</number>
-+  <layout class="QVBoxLayout" stretch="0">
-+   <property name="bottomMargin">
-+    <number>3</number>
-    </property>
--   <property name="spacing" >
--    <number>6</number>
--   </property>
--   <item>
--    <widget class="QLabel" name="TextLabel2" >
--     <property name="text" >
--      <string>Plugin Name:</string>
--     </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="QComboBox" name="cb_plugins" >
--     <property name="enabled" >
--      <bool>false</bool>
--     </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="QLabel" name="label" >
--     <property name="text" >
--      <string>Plugin Location:</string>
--     </property>
--    </widget>
--   </item>
--   <item>
--    <widget class="QLineEdit" name="le_location" >
--     <property name="enabled" >
--      <bool>false</bool>
--     </property>
--     <property name="text" >
--      <string>No plugin selected</string>
--     </property>
--    </widget>
--   </item>
-    <item>
--    <layout class="QHBoxLayout" >
--     <property name="margin" >
--      <number>0</number>
--     </property>
--     <property name="spacing" >
--      <number>6</number>
--     </property>
-+    <layout class="QVBoxLayout" name="mainLayout">
-      <item>
--      <widget class="QCheckBox" name="cb_loadPlugin" >
--       <property name="enabled" >
-+      <widget class="QTreeWidget" name="tw_Plugins">
-+       <property name="layoutDirection">
-+        <enum>Qt::LeftToRight</enum>
-+       </property>
-+       <property name="horizontalScrollBarPolicy">
-+        <enum>Qt::ScrollBarAlwaysOff</enum>
-+       </property>
-+       <property name="editTriggers">
-+        <set>QAbstractItemView::NoEditTriggers</set>
-+       </property>
-+       <property name="showDropIndicator" stdset="0">
-         <bool>false</bool>
-        </property>
--       <property name="text" >
--        <string>Load this plugin</string>
-+       <property name="alternatingRowColors">
-+        <bool>true</bool>
-        </property>
--      </widget>
--     </item>
--     <item>
--      <spacer>
--       <property name="orientation" >
--        <enum>Qt::Horizontal</enum>
-+       <property name="rootIsDecorated">
-+        <bool>false</bool>
-        </property>
--       <property name="sizeHint" >
--        <size>
--         <width>40</width>
--         <height>20</height>
--        </size>
-+       <property name="itemsExpandable">
-+        <bool>false</bool>
-        </property>
--      </spacer>
--     </item>
--    </layout>
--   </item>
--   <item>
--    <spacer>
--     <property name="orientation" >
--      <enum>Qt::Vertical</enum>
--     </property>
--     <property name="sizeHint" >
--      <size>
--       <width>20</width>
--       <height>40</height>
--      </size>
--     </property>
--    </spacer>
--   </item>
--   <item>
--    <layout class="QVBoxLayout" >
--     <property name="margin" >
--      <number>0</number>
--     </property>
--     <property name="spacing" >
--      <number>6</number>
--     </property>
--     <item>
--      <widget class="QWidget" name="pluginOptions" />
-+       <property name="expandsOnDoubleClick">
-+        <bool>false</bool>
-+       </property>
-+       <attribute name="headerVisible">
-+        <bool>false</bool>
-+       </attribute>
-+       <attribute name="headerDefaultSectionSize">
-+        <number>100</number>
-+       </attribute>
-+       <attribute name="headerMinimumSectionSize">
-+        <number>21</number>
-+       </attribute>
-+       <attribute name="headerStretchLastSection">
-+        <bool>false</bool>
-+       </attribute>
-+       <column>
-+        <property name="text">
-+         <string>Plugin Name</string>
-+        </property>
-+        <property name="whatsThis">
-+         <string>Available plugins</string>
-+        </property>
-+        <property name="textAlignment">
-+         <set>AlignHCenter|AlignVCenter|AlignCenter</set>
-+        </property>
-+       </column>
-+       <column>
-+        <property name="text">
-+         <string>Version</string>
-+        </property>
-+        <property name="textAlignment">
-+         <set>AlignHCenter|AlignVCenter|AlignCenter</set>
-+        </property>
-+       </column>
-+       <column>
-+        <property name="text">
-+         <string>A</string>
-+        </property>
-+       </column>
-+       <column>
-+        <property name="text">
-+         <string>S</string>
-+        </property>
-+       </column>
-+      </widget>
-      </item>
-     </layout>
-    </item>
--   <item>
--    <spacer>
--     <property name="orientation" >
--      <enum>Qt::Vertical</enum>
--     </property>
--     <property name="sizeHint" >
--      <size>
--       <width>20</width>
--       <height>40</height>
--      </size>
--     </property>
--    </spacer>
--   </item>
-   </layout>
-  </widget>
-- <layoutdefault spacing="6" margin="11" />
-+ <layoutdefault spacing="6" margin="11"/>
-  <resources/>
-  <connections/>
- </ui>
---- a/src/options/options.pri
-+++ b/src/options/options.pri
-@@ -79,7 +79,9 @@ FORMS += \
- 	$$PWD/opt_iconset_roster.ui \
- 	$$PWD/opt_general_groupchat.ui \
- 	$$PWD/opt_shortcuts.ui \
--	$$PWD/opt_statuspep.ui
-+	$$PWD/opt_statuspep.ui \
-+	$$PWD/plugininfodialog.ui \
-+	$$PWD/pluginsettsdialog.ui
- 
- psi_plugins {
- 	FORMS += $$PWD/opt_plugins.ui
---- a/src/options/optionsdlg.cpp
-+++ b/src/options/optionsdlg.cpp
-@@ -200,6 +200,7 @@ private slots:
- 
- 	//void addWidgetChangedSignal(QString widgetName, QCString signal);
- 	void connectDataChanged(QWidget *);
-+	void connectSignalsToWidget(QWidget *, QObject *, const char *);
- 
- public:
- 	OptionsDlg *dlg;
-@@ -240,6 +241,9 @@ OptionsDlg::Private::Private(OptionsDlg *d, PsiCon *_psi)
- 		//connect(opttab, SIGNAL(addWidgetChangedSignal(QString, QCString)), SLOT(addWidgetChangedSignal(QString, QCString)));
- 		connect(opttab, SIGNAL(noDirty(bool)), SLOT(noDirtySlot(bool)));
- 		connect(opttab, SIGNAL(connectDataChanged(QWidget *)), SLOT(connectDataChanged(QWidget *)));
-+		connect(opttab,
-+			SIGNAL(connectSignalsToWidget(QWidget*,QObject*,const char*)),
-+			SLOT(connectSignalsToWidget(QWidget*,QObject*,const char*)));
- 
- 		if ( opttab->id().isEmpty() )
- 			continue;
-@@ -448,6 +452,11 @@ void OptionsDlg::Private::enableCommonWidgets(bool enable)
- 
- void OptionsDlg::Private::connectDataChanged(QWidget *widget)
- {
-+	connectSignalsToWidget(widget, this, SLOT(dataChanged()));
-+}
-+
-+void OptionsDlg::Private::connectSignalsToWidget(QWidget *widget, QObject *object, const char *slot)
-+{
- 	foreach(QWidget* w, widget->findChildren<QWidget*>()) {
- 		QVariant isOption = w->property("isOption");
- 		if (isOption.isValid() && !isOption.toBool()) {
-@@ -455,8 +464,8 @@ void OptionsDlg::Private::connectDataChanged(QWidget *widget)
- 		}
- 		QMap<QString, QByteArray>::Iterator it2 = changedMap.find( w->metaObject()->className() );
- 		if ( it2 != changedMap.end() ) {
--			disconnect(w, changedMapw->metaObject()->className(), this, SLOT(dataChanged()));
--			connect(w, changedMapw->metaObject()->className(), SLOT(dataChanged()));
-+			disconnect(w, changedMapw->metaObject()->className(), object, slot);
-+			connect(w, changedMapw->metaObject()->className(), object, slot);
- 		}
- 	}
- }
---- a/src/options/optionstab.cpp
-+++ b/src/options/optionstab.cpp
-@@ -241,6 +241,9 @@ void MetaOptionsTab::addTab(OptionsTab *tab)
- 	//connect(tab, SIGNAL(addWidgetChangedSignal(QString, QCString)), SIGNAL(addWidgetChangedSignal(QString, QCString)));
- 	connect(tab, SIGNAL(noDirty(bool)), SIGNAL(noDirty(bool)));
- 	connect(tab, SIGNAL(connectDataChanged(QWidget *)), SIGNAL(connectDataChanged(QWidget *)));
-+	connect(tab,
-+		SIGNAL(connectSignalsToWidget(QWidget*,QObject*,const char*)),
-+		SIGNAL(connectSignalsToWidget(QWidget*,QObject*,const char*)));
- 
- 	tabs.append(tab);
- }
-@@ -262,6 +265,9 @@ QWidget *MetaOptionsTab::widget()
- 
- 	connect(w, SIGNAL(connectDataChanged(QWidget *)), SIGNAL(connectDataChanged(QWidget *)));
- 	connect(w, SIGNAL(noDirty(bool)), SIGNAL(noDirty(bool)));
-+	connect(w,
-+		SIGNAL(connectSignalsToWidget(QWidget*,QObject*,const char*)),
-+		SIGNAL(connectSignalsToWidget(QWidget*,QObject*,const char*)));
- 
- 	foreach(OptionsTab* tab, tabs) {
- 		t->addTab(tab);
---- a/src/options/optionstab.h
-+++ b/src/options/optionstab.h
-@@ -36,6 +36,7 @@ signals:
- 	//void addWidgetChangedSignal(QString widgetName, QCString signal);
- 	void noDirty(bool);
- 	void connectDataChanged(QWidget *);
-+	void connectSignalsToWidget(QWidget *, QObject *, const char *);
- 
- public slots:
- 	virtual void setData(PsiCon *, QWidget *parentDialog);
-new file mode 100644
-index 0000000..1523c3e
---- /dev/null
-+++ b/src/options/plugininfodialog.ui
-@@ -0,0 +1,96 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>PluginInfoDialog</class>
-+ <widget class="QDialog" name="PluginInfoDialog">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>400</width>
-+    <height>300</height>
-+   </rect>
-+  </property>
-+  <property name="sizePolicy">
-+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-+    <horstretch>0</horstretch>
-+    <verstretch>0</verstretch>
-+   </sizepolicy>
-+  </property>
-+  <property name="minimumSize">
-+   <size>
-+    <width>400</width>
-+    <height>300</height>
-+   </size>
-+  </property>
-+  <property name="maximumSize">
-+   <size>
-+    <width>400</width>
-+    <height>300</height>
-+   </size>
-+  </property>
-+  <property name="windowTitle">
-+   <string>About</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <widget class="QTextEdit" name="te_info">
-+     <property name="sizePolicy">
-+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-+       <horstretch>0</horstretch>
-+       <verstretch>0</verstretch>
-+      </sizepolicy>
-+     </property>
-+     <property name="readOnly">
-+      <bool>true</bool>
-+     </property>
-+     <property name="acceptRichText">
-+      <bool>true</bool>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="pb_close">
-+       <property name="text">
-+        <string>Close</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>pb_close</sender>
-+   <signal>released()</signal>
-+   <receiver>PluginInfoDialog</receiver>
-+   <slot>close()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>347</x>
-+     <y>276</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>199</x>
-+     <y>149</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+</ui>
-new file mode 100644
---- /dev/null
-+++ b/src/options/pluginsettsdialog.ui
-@@ -0,0 +1,64 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>PluginSettingsDialog</class>
-+ <widget class="QDialog" name="PluginSettingsDialog">
-+  <property name="windowModality">
-+   <enum>Qt::WindowModal</enum>
-+  </property>
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>266</width>
-+    <height>37</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>SettingsDialog</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <widget class="QDialogButtonBox" name="buttonBox">
-+     <property name="standardButtons">
-+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>accepted()</signal>
-+   <receiver>PluginSettingsDialog</receiver>
-+   <slot>accept()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>248</x>
-+     <y>254</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>157</x>
-+     <y>274</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>rejected()</signal>
-+   <receiver>PluginSettingsDialog</receiver>
-+   <slot>reject()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>316</x>
-+     <y>260</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>286</x>
-+     <y>274</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+</ui>
---- a/src/pluginhost.cpp
-+++ b/src/pluginhost.cpp
-@@ -6,17 +6,52 @@
- #include "pluginhost.h"
- 
- #include <QPluginLoader>
--
-+#include <QWidget>
-+#include <QSplitter>
-+#include <QAction>
-+#include <QByteArray>
-+#include <QDomElement>
-+#include <QKeySequence>
-+#include <QObject>
-+#include <QRegExp>
-+#include <QString>
-+#include <QStringList>
-+#include <QTextEdit>
- //#include "xmpp_message.h"
- #include "psioptions.h"
-+#include "psiaccount.h"
-+#include "chatdlg.h"
-+#include "globalshortcut/globalshortcutmanager.h"
-+#include "grepshortcutkeydialog.h"
- #include "pluginmanager.h"
- #include "psiplugin.h"
-+#include "applicationinfo.h"
- #include "stanzasender.h"
- #include "stanzafilter.h"
- #include "iqfilter.h"
- #include "iqnamespacefilter.h"
- #include "eventfilter.h"
- #include "optionaccessor.h"
-+#include "shortcutaccessor.h"
-+#include "iconfactoryaccessor.h"
-+#include "activetabaccessor.h"
-+#include "groupchatdlg.h"
-+#include "tabmanager.h"
-+#include "popupaccessor.h"
-+#include "applicationinfoaccessor.h"
-+#include "accountinfoaccessor.h"
-+#include "toolbariconaccessor.h"
-+#include "gctoolbariconaccessor.h"
-+#include "widgets/iconaction.h"
-+#include "menuaccessor.h"
-+#include "contactstateaccessor.h"
-+#include "plugininfoprovider.h"
-+#include "psiaccountcontroller.h"
-+#include "eventcreator.h"
-+#include "contactinfoaccessor.h"
-+#include "soundaccessor.h"
-+#include "textutil.h"
-+#include "chattabaccessor.h"
- 
- /**
-  * \brief Constructs a host/wrapper for a plugin.
-@@ -32,12 +67,16 @@
-  */
- PluginHost::PluginHost(PluginManager* manager, const QString& pluginFile)
- 	: manager_(manager)
--	, file_(pluginFile)
- 	, plugin_(0)
-+	, file_(pluginFile)
-+	, priority_(PsiPlugin::PriorityNormal)
- 	, loader_(0)
-+	, iconset_(0)
-+	, valid_(false)
- 	, connected_(false)
- 	, enabled_(false)
--	, valid_(false)
-+	, hasInfo_(false)
-+	, infoString_(QString())
- {
- 	load();	// reads plugin name, etc
- 	unload();
-@@ -107,6 +146,26 @@ const QString& PluginHost::version() const
- }
- 
- /**
-+ * \brief Returns plugin priority.
-+ *
-+ * Data is available also when plugin is not loaded.
-+ */
-+int PluginHost::priority() const
-+{
-+	return priority_;
-+}
-+
-+/**
-+ * \brief Returns plugin icon.
-+ *
-+ * Data is available also when plugin is not loaded.
-+ */
-+const QIcon& PluginHost::icon() const
-+{
-+	return icon_;
-+}
-+
-+/**
-  * \brief Returns plugin options widget.
-  *
-  * Always returns null if plugin is not currently loaded.
-@@ -136,21 +195,29 @@ QWidget* PluginHost::optionsWidget() const
-  */
- bool PluginHost::load()
- {
--  	qDebug() << "Loading Plugin " << file_;
-+#ifndef PLUGINS_NO_DEBUG
-+	qDebug() << "Loading Plugin " << file_;
-+#endif
- 	if (plugin_) {
--		qWarning() << QString("Plugin %1 was already loaded.").arg(file_);
-+#ifndef PLUGINS_NO_DEBUG
-+		qDebug() << QString("Plugin %1 was already loaded.").arg(file_);
-+#endif
- 	}
- 	else {
- 		if (!loader_) {
- 			loader_ = new QPluginLoader(file_);
-+			//loader_->setLoadHints(QLibrary::ResolveAllSymbolsHint);
- 		}
- 
- 		QObject* plugin = loader_->instance();
- 		if (!loader_->isLoaded()) {
- 			delete loader_;
-+			loader_ = 0;
- 		}
- 		else if (plugin) {
-+#ifndef PLUGINS_NO_DEBUG
- 			qDebug("Trying to load plugin");
-+#endif
- 			//Check it's the right sort of plugin
- 			PsiPlugin* psiPlugin = qobject_cast<PsiPlugin*>(plugin);
- 			if (psiPlugin) {
-@@ -161,6 +228,15 @@ bool PluginHost::load()
- 				name_ = psiPlugin->name();
- 				shortName_ = psiPlugin->shortName();
- 				version_ = psiPlugin->version();
-+				priority_ = psiPlugin->priority();
-+				icon_ = QIcon(psiPlugin->icon());
-+				hasToolBarButton_ = qobject_cast<ToolbarIconAccessor*>(plugin_) ? true : false;
-+				hasGCToolBarButton_ = qobject_cast<GCToolbarIconAccessor*>(plugin_) ? true : false;
-+				PluginInfoProvider *pip = qobject_cast<PluginInfoProvider*>(plugin_);
-+				if (pip) {
-+					hasInfo_ = true;
-+					infoString_ = pip->pluginInfo();
-+				}
- 			} else  {
- 				qWarning("Attempted to load %s, but it is not a valid plugin.", qPrintable(file_));
- 				if (loader_->isLoaded()) {
-@@ -168,6 +244,8 @@ bool PluginHost::load()
- 					loader_->unload();
- 				}
- 				delete loader_;
-+				loader_ = 0;
-+				valid_ = false;
- 			}
- 		}
- 	}
-@@ -187,20 +265,24 @@ bool PluginHost::load()
-  */
- bool PluginHost::unload()
- {
--	return false; // TODO(mck): loading plugin again after unloading fails for some reason
--	              //            so I disabled unloading for now.
--
- 	if (plugin_ && disable()) {
-+#ifndef PLUGINS_NO_DEBUG
-+		qDebug("Try to unload plugin %s", qPrintable(name_));
-+#endif
- 		if (!loader_) {
- 			qWarning("Plugin %s's loader wasn't found when trying to unload", qPrintable(name_));
- 			return false;
- 		}
- 		else if (loader_->unload()) {
--	  		//if we're done with the plugin completely and it's unloaded
--	  		// we can delete the loader;
-+			//if we're done with the plugin completely and it's unloaded
-+			// we can delete the loader;
- 			delete plugin_;
- 			delete loader_;
- 			plugin_ = 0;
-+			loader_ = 0;
-+			delete iconset_;
-+			iconset_ = 0;
-+			connected_ = false;
- 		}
- 	}
- 	return plugin_ == 0;
-@@ -231,26 +313,135 @@ bool PluginHost::enable()
- {
- 	if (!enabled_ && load()) {
- 		if (!connected_) {
-+#ifndef PLUGINS_NO_DEBUG
- 			qDebug() << "connecting plugin " << name_;
-+#endif
- 
- 			StanzaSender* s = qobject_cast<StanzaSender*>(plugin_);
- 			if (s) {
-+#ifndef PLUGINS_NO_DEBUG
- 				qDebug("connecting stanza sender");
-+#endif
- 				s->setStanzaSendingHost(this);
- 			}
- 
- 			IqFilter* f = qobject_cast<IqFilter*>(plugin_);
- 			if (f) {
-+#ifndef PLUGINS_NO_DEBUG
- 				qDebug("connecting iq filter");
-+#endif
- 				f->setIqFilteringHost(this);
- 			}
- 
- 			OptionAccessor* o = qobject_cast<OptionAccessor*>(plugin_);
- 			if (o) {
-+#ifndef PLUGINS_NO_DEBUG
- 				qDebug("connecting option accessor");
-+#endif
- 				o->setOptionAccessingHost(this);
- 			}
- 
-+			ShortcutAccessor* sa = qobject_cast<ShortcutAccessor*>(plugin_);
-+			if (sa) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting shortcut accessor");
-+#endif
-+				sa->setShortcutAccessingHost(this);
-+			}
-+			PopupAccessor* pa = qobject_cast<PopupAccessor*>(plugin_);
-+			if (pa) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting popup accessor");
-+#endif
-+				pa->setPopupAccessingHost(this);
-+			}
-+
-+			IconFactoryAccessor* ia = qobject_cast<IconFactoryAccessor*>(plugin_);
-+			if (ia) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting iconfactory accessor");
-+#endif
-+				ia->setIconFactoryAccessingHost(this);
-+			}
-+			ActiveTabAccessor* ta = qobject_cast<ActiveTabAccessor*>(plugin_);
-+			if (ta) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting activetab accessor");
-+#endif
-+				ta->setActiveTabAccessingHost(this);
-+			}
-+			ApplicationInfoAccessor* aia = qobject_cast<ApplicationInfoAccessor*>(plugin_);
-+			if (aia) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting applicationinfo accessor");
-+#endif
-+				aia->setApplicationInfoAccessingHost(this);
-+			}
-+			AccountInfoAccessor* ai = qobject_cast<AccountInfoAccessor*>(plugin_);
-+			if (ai) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting accountinfo accessor");
-+#endif
-+				ai->setAccountInfoAccessingHost(this);
-+			}
-+			ToolbarIconAccessor *tia = qobject_cast<ToolbarIconAccessor*>(plugin_);
-+			if (tia) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("load toolbaricon param");
-+#endif
-+				buttons_ = tia->getButtonParam();
-+			}
-+			GCToolbarIconAccessor *gtia = qobject_cast<GCToolbarIconAccessor*>(plugin_);
-+			if (gtia) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("load gctoolbaricon param");
-+#endif
-+				gcbuttons_ = gtia->getGCButtonParam();
-+			}
-+			MenuAccessor *ma = qobject_cast<MenuAccessor*>(plugin_);
-+			if (ma) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("load menu actions param");
-+#endif
-+				accMenu_ = ma->getAccountMenuParam();
-+				contactMenu_ = ma->getContactMenuParam();
-+			}
-+			ContactStateAccessor *csa = qobject_cast<ContactStateAccessor*>(plugin_);
-+			if (csa) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting contactstate accessor");
-+#endif
-+				csa->setContactStateAccessingHost(this);
-+			}
-+			PsiAccountController *pac = qobject_cast<PsiAccountController*>(plugin_);
-+			if (pac) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connectint psiaccount controller");
-+#endif
-+				pac->setPsiAccountControllingHost(this);
-+			}
-+			EventCreator *ecr = qobject_cast<EventCreator*>(plugin_);
-+			if (ecr) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connectint event creator");
-+#endif
-+				ecr->setEventCreatingHost(this);
-+			}
-+			ContactInfoAccessor *cia = qobject_cast<ContactInfoAccessor*>(plugin_);
-+			if (cia) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting contactinfo accessor");
-+#endif
-+				cia->setContactInfoAccessingHost(this);
-+			}
-+			SoundAccessor *soa = qobject_cast<SoundAccessor*>(plugin_);
-+			if(soa) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("connecting sound accessor");
-+#endif
-+				soa->setSoundAccessingHost(this);
-+			}
-+
- 			connected_ = true;
- 		}
- 
-@@ -271,7 +462,7 @@ bool PluginHost::enable()
- bool PluginHost::disable()
- {
- 	if (enabled_) {
--		enabled_ = qobject_cast<PsiPlugin*>(plugin_)->disable();
-+		enabled_ = !qobject_cast<PsiPlugin*>(plugin_)->disable();
- 	}
- 	return !enabled_;
- }
-@@ -356,6 +547,16 @@ bool PluginHost::incomingXml(int account, const QDomElement &e)
- }
- 
- 
-+bool PluginHost::outgoingXml(int account, QDomElement &e)
-+{
-+	bool handled = false;
-+	StanzaFilter *ef = qobject_cast<StanzaFilter*>(plugin_);
-+	if (ef && ef->outgoingStanza(account, e)) {
-+		handled = true;
-+	}
-+	return handled;
-+}
-+
- //-- for EventFilter ------------------------------------------------
- 
- /**
-@@ -365,13 +566,12 @@ bool PluginHost::incomingXml(int account, const QDomElement &e)
-  * this will call its processEvent() handler.
-  * Handler may then modify the event and may cause the event to be
-  * silently discarded.
-- * TODO: modification doesn't work
-  *
-  * \param account Identifier of the PsiAccount responsible
-  * \param e Event XML
-  * \return Continue processing the event; true if the stanza should be silently discarded.
-  */
--bool PluginHost::processEvent(int account, const QDomElement& e)
-+bool PluginHost::processEvent(int account, QDomElement& e)
- {
- 	bool handled = false;
- 	EventFilter *ef = qobject_cast<EventFilter*>(plugin_);
-@@ -406,6 +606,23 @@ bool PluginHost::processMessage(int account, const QString& jidFrom, const QStri
- 	return handled;
- }
- 
-+bool PluginHost::processOutgoingMessage(int account, const QString& jidTo, QString& body, const QString& type, QString& subject)
-+{
-+	bool handled = false;
-+	EventFilter *ef = qobject_cast<EventFilter*>(plugin_);
-+	if (ef && ef->processOutgoingMessage(account, jidTo, body, type, subject)) {
-+		handled = true;
-+	}
-+	return handled;
-+}
-+
-+void PluginHost::logout(int account)
-+{
-+	EventFilter *ef = qobject_cast<EventFilter*>(plugin_);
-+	if (ef) {
-+		ef->logout(account);
-+	}
-+}
- 
- //-- StanzaSender ---------------------------------------------------
- 
-@@ -456,7 +673,8 @@ void PluginHost::sendMessage(int account, const QString& to, const QString& body
- 	//manager_->sendXml(account, m.toStanza(...).toString());
- 
- 	//TODO(mck): yeah, that's sick..
--	manager_->sendXml(account, QString("<message to='%1' type='%4'><subject>%3</subject><body>%2</body></message>").arg(to).arg(body).arg(subject).arg(type));
-+	manager_->sendXml(account, QString("<message to='%1' type='%4'><subject>%3</subject><body>%2</body></message>")
-+			  .arg(escape(to)).arg(escape(body)).arg(escape(subject)).arg(escape(type)));
- 
- }
- 
-@@ -471,6 +689,10 @@ QString PluginHost::uniqueId(int account)
- 	return manager_->uniqueId(account);
- }
- 
-+QString PluginHost::escape(const QString &str)
-+{
-+	return TextUtil::escape(str);
-+}
- 
- //-- IqFilter -------------------------------------------------------
- 
-@@ -494,7 +716,9 @@ QString PluginHost::uniqueId(int account)
- void PluginHost::addIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filter)
- {
- 	if (iqNsFilters_.values(ns).contains(filter)) {
--		qWarning("pluginmanager: blocked attempt to register the same filter again");
-+#ifndef PLUGINS_NO_DEBUG
-+		qDebug("pluginmanager: blocked attempt to register the same filter again");
-+#endif
- 	} else {
- 		iqNsFilters_.insert(ns, filter);
- 	}
-@@ -519,9 +743,13 @@ void PluginHost::addIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filt
-  */
- void PluginHost::addIqNamespaceFilter(const QRegExp &ns, IqNamespaceFilter *filter)
- {
-+#ifndef PLUGINS_NO_DEBUG
- 	qDebug("add nsx");
-+#endif
- 	if (iqNsxFilters_.values(ns).contains(filter)) {
--		qWarning("pluginmanager: blocked attempt to register the same filter again");
-+#ifndef PLUGINS_NO_DEBUG
-+		qDebug("pluginmanager: blocked attempt to register the same filter again");
-+#endif
- 	} else {
- 		iqNsxFilters_.insert(ns, filter);
- 	}
-@@ -570,9 +798,8 @@ void PluginHost::setPluginOption( const QString& option, const QVariant& value)
- 	//
- 	//if (!plugin)
- 	//	return;
--	//QString pluginName = plugin->name();
--	//QString optionKey=QString("%1.%2.%3").arg(pluginOptionPrefix).arg(shortNames_pluginName).arg(option);
--	//PsiOptions::instance()->setOption(optionKey,value);
-+	QString optionKey=QString("%1.%2.%3").arg(PluginManager::pluginOptionPrefix).arg(shortName()).arg(option);
-+	PsiOptions::instance()->setOption(optionKey, value);
- }
- 
- /**
-@@ -585,9 +812,11 @@ void PluginHost::setPluginOption( const QString& option, const QVariant& value)
-  * \param  option Option to set
-  * \param value Return value
-  */
--QVariant PluginHost::getPluginOption(const QString& option)
-+QVariant PluginHost::getPluginOption(const QString &option, const QVariant &defValue)
- {
--	return QVariant();	// TODO(mck)
-+	QString pluginName = name();
-+	QString optionKey=QString("%1.%2.%3").arg(PluginManager::pluginOptionPrefix).arg(shortName()).arg(option);
-+	return PsiOptions::instance()->getOption(optionKey, defValue);
- }
- 
- /**
-@@ -616,6 +845,478 @@ QVariant PluginHost::getGlobalOption(const QString& option)
- 	return PsiOptions::instance()->getOption(option);
- }
- 
-+void PluginHost::optionChanged(const QString& option)
-+{
-+	OptionAccessor *oa = qobject_cast<OptionAccessor*>(plugin_);
-+	if(oa)
-+		oa->optionChanged(option);
-+}
-+
-+void PluginHost::applyOptions()
-+{
-+	PsiPlugin* pp = qobject_cast<PsiPlugin*>(plugin_);
-+	if(pp)
-+		pp->applyOptions();
-+}
-+
-+void PluginHost::restoreOptions()
-+{
-+	PsiPlugin* pp = qobject_cast<PsiPlugin*>(plugin_);
-+	if(pp)
-+		pp->restoreOptions();
-+}
-+
-+
-+/**
-+ * Shortcut accessing host
-+ */
-+void PluginHost::setShortcuts()
-+{
-+	ShortcutAccessor *sa = qobject_cast<ShortcutAccessor*>(plugin_);
-+	if (sa) {
-+		sa->setShortcuts();
-+	}
-+}
-+
-+void PluginHost::connectShortcut(const QKeySequence& shortcut, QObject *receiver, const char* slot)
-+{
-+	GlobalShortcutManager::instance()->connect(shortcut, receiver, slot);
-+}
-+
-+void PluginHost::disconnectShortcut(const QKeySequence& shortcut, QObject *receiver, const char* slot)
-+{
-+	GlobalShortcutManager::instance()->disconnect(shortcut, receiver, slot);
-+}
-+
-+void PluginHost::requestNewShortcut(QObject *receiver, const char* slot)
-+{
-+	GrepShortcutKeyDialog* grep = new GrepShortcutKeyDialog();
-+	connect(grep, SIGNAL(newShortcutKey(QKeySequence)), receiver, slot);
-+	grep->show();
-+}
-+
-+/**
-+ * IconFactory accessing host
-+ */
-+QIcon PluginHost::getIcon(const QString& name)
-+{
-+	return IconsetFactory::icon(name).icon();
-+}
-+
-+void PluginHost::addIcon(const QString& name, const QByteArray& ba)
-+{
-+	QPixmap pm;
-+	pm.loadFromData(ba);
-+	PsiIcon icon;
-+	icon.setImpix(pm);
-+	icon.setName(name);
-+	if (!iconset_) {
-+		iconset_ = new Iconset();
-+	}
-+	iconset_->setIcon(name,icon);
-+	iconset_->addToFactory();
-+}
-+
-+QTextEdit* PluginHost::getEditBox()
-+{
-+	QTextEdit* ed = 0;
-+	TabbableWidget* tw = findActiveTab();
-+	if(tw) {
-+		QWidget* chatEditProxy = tw->findChild<QWidget*>("mle");
-+		if(chatEditProxy) {
-+			ed = (QTextEdit *)chatEditProxy->children().at(1);
-+		}
-+	}
-+
-+	return ed;
-+}
-+
-+QString PluginHost::getJid()
-+{
-+	QString jid;
-+	TabbableWidget* tw = findActiveTab();
-+	if(tw) {
-+		jid = tw->jid().full();
-+	}
-+
-+	return jid;
-+}
-+
-+QString PluginHost::getYourJid()
-+{
-+	QString jid;
-+	TabbableWidget* tw = findActiveTab();
-+	if(tw) {
-+		jid = tw->account()->jid().full();
-+	}
-+
-+	return jid;
-+}
-+
-+/**
-+ * ApplicationInfo accessing host
-+ */
-+Proxy PluginHost::getProxyFor(const QString &obj)
-+{
-+	Proxy prx;
-+	ProxyItem it = ProxyManager::instance()->getItemForObject(obj);
-+	prx.type = it.type;
-+	prx.host = it.settings.host;
-+	prx.port = it.settings.port;
-+	prx.user = it.settings.user;
-+	prx.pass = it.settings.pass;
-+	return prx;
-+}
-+
-+QString PluginHost::appName()
-+{
-+	return ApplicationInfo::name();
-+}
-+
-+QString PluginHost::appVersion()
-+{
-+	return ApplicationInfo::version();
-+}
-+
-+QString PluginHost::appCapsNode()
-+{
-+	return ApplicationInfo::capsNode();
-+}
-+
-+QString PluginHost::appCapsVersion()
-+{
-+	return ApplicationInfo::capsVersion();
-+}
-+
-+QString PluginHost::appOsName()
-+{
-+	return ApplicationInfo::osName();
-+}
-+
-+QString PluginHost::appHomeDir(ApplicationInfoAccessingHost::HomedirType type)
-+{
-+	return ApplicationInfo::homeDir((ApplicationInfo::HomedirType)type);
-+}
-+
-+QString PluginHost::appResourcesDir()
-+{
-+	return ApplicationInfo::resourcesDir();
-+}
-+
-+QString PluginHost::appLibDir()
-+{
-+	return ApplicationInfo::libDir();
-+}
-+
-+QString PluginHost::appProfilesDir(ApplicationInfoAccessingHost::HomedirType type)
-+{
-+	return ApplicationInfo::profilesDir((ApplicationInfo::HomedirType)type);
-+}
-+
-+QString PluginHost::appHistoryDir()
-+{
-+	return ApplicationInfo::historyDir();
-+}
-+
-+QString PluginHost::appCurrentProfileDir(ApplicationInfoAccessingHost::HomedirType type)
-+{
-+	return ApplicationInfo::currentProfileDir((ApplicationInfo::HomedirType)type);
-+}
-+
-+QString PluginHost::appVCardDir()
-+{
-+	return ApplicationInfo::vCardDir();
-+}
-+
-+//AccountInfoAcsessingHost
-+QString PluginHost::getStatus(int account)
-+{
-+	return manager_->getStatus(account);
-+}
-+
-+QString PluginHost::getStatusMessage(int account)
-+{
-+	return manager_->getStatusMessage(account);
-+}
-+
-+QString PluginHost::proxyHost(int account)
-+{
-+	return manager_->proxyHost(account);
-+}
-+
-+int PluginHost::proxyPort(int account)
-+{
-+	return manager_->proxyPort(account);
-+}
-+
-+QString PluginHost::proxyUser(int account)
-+{
-+	return manager_->proxyUser(account);
-+}
-+
-+QString PluginHost::proxyPassword(int account)
-+{
-+	return manager_->proxyPassword(account);
-+}
-+
-+QStringList PluginHost::getRoster(int account)
-+{
-+	return manager_->getRoster(account);
-+}
-+
-+QString PluginHost::getJid(int account)
-+{
-+	return manager_->getJid(account);
-+}
-+
-+QString PluginHost::getId(int account)
-+{
-+	return manager_->getId(account);
-+}
-+
-+QString PluginHost::getName(int account)
-+{
-+	return manager_->getName(account);
-+}
-+
-+int PluginHost::findOnlineAccountForContact(const QString &jid) const
-+{
-+	return manager_->findOnlineAccountForContact(jid);
-+}
-+
-+bool PluginHost::setActivity(int account, const QString& Jid, QDomElement xml)
-+{
-+	return manager_->setActivity(account, Jid, xml);
-+}
-+
-+bool PluginHost::setMood(int account, const QString& Jid, QDomElement xml)
-+{
-+	return manager_->setMood(account, Jid, xml);
-+}
-+bool PluginHost::setTune(int account, const QString& Jid, QString tune)
-+{
-+	return manager_->setTune(account, Jid, tune);
-+}
-+
-+void PluginHost::addToolBarButton(QObject* parent, QWidget* toolbar, int account, const QString& contact)
-+{
-+	ToolbarIconAccessor *ta = qobject_cast<ToolbarIconAccessor*>(plugin_);
-+	if (ta) {
-+		if(!buttons_.isEmpty()) {
-+			for (int i = 0; i < buttons_.size(); ++i) {
-+				QVariantHash param = buttons_.at(i);
-+				QString th = param.value("tooltip").value<QString>();
-+				IconAction *button = new IconAction(th, param.value("icon").value<QString>(), th, 0, parent);
-+				connect(button, SIGNAL(triggered()),param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toLatin1());
-+				toolbar->addAction(button);
-+			}
-+		}
-+		QAction *act = ta->getAction(parent, account, contact);
-+		if(act) {
-+			act->setObjectName(shortName_);
-+			toolbar->addAction(act);
-+		}
-+	}
-+}
-+
-+bool PluginHost::hasToolBarButton()
-+{
-+	return hasToolBarButton_;
-+}
-+
-+void PluginHost::addGCToolBarButton(QObject* parent, QWidget* toolbar, int account, const QString& contact)
-+{
-+	GCToolbarIconAccessor *ta = qobject_cast<GCToolbarIconAccessor*>(plugin_);
-+	if (ta) {
-+		if(!gcbuttons_.isEmpty()) {
-+			for (int i = 0; i < gcbuttons_.size(); ++i) {
-+				QVariantHash param = gcbuttons_.at(i);
-+				QString th = param.value("tooltip").value<QString>();
-+				IconAction *button = new IconAction(th, param.value("icon").value<QString>(), th, 0, parent);
-+				connect(button, SIGNAL(triggered()),param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toLatin1());
-+				toolbar->addAction(button);
-+			}
-+		}
-+		QAction *act = ta->getGCAction(parent, account, contact);
-+		if(act)
-+			toolbar->addAction(act);
-+	}
-+}
-+
-+bool PluginHost::hasGCToolBarButton()
-+{
-+	return hasGCToolBarButton_;
-+}
-+
-+void PluginHost::initPopup(const QString& text, const QString& title, const QString& icon, int type)
-+{
-+	manager_->initPopup(text, title, icon, type);
-+}
-+
-+void PluginHost::initPopupForJid(int account, const QString &jid, const QString &text, const QString &title, const QString &icon, int type)
-+{
-+	manager_->initPopupForJid(account, jid, text, title, icon, type);
-+}
-+
-+int PluginHost::registerOption(const QString& name, int initValue, const QString& path)
-+{
-+	return manager_->registerOption(name, initValue, path);
-+}
-+
-+void PluginHost::unregisterOption(const QString &name)
-+{
-+	manager_->unregisterOption(name);
-+}
-+
-+int PluginHost::popupDuration(const QString& name)
-+{
-+	return manager_->popupDuration(name);
-+}
-+
-+void PluginHost::setPopupDuration(const QString& name, int value)
-+{
-+	manager_->setPopupDuration(name, value);
-+}
-+
-+void PluginHost::addAccountMenu(QMenu *menu, int account)
-+{
-+	MenuAccessor *ma = qobject_cast<MenuAccessor*>(plugin_);
-+	if(ma) {
-+		if( !accMenu_.isEmpty()) {
-+			for (int i = 0; i < accMenu_.size(); ++i) {
-+				QVariantHash param = accMenu_.at(i);
-+				IconAction *act = new IconAction(param.value("name").value<QString>(), menu, param.value("icon").value<QString>());
-+				act->setProperty("account", QVariant(account));
-+				connect(act, SIGNAL(triggered()), param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toLatin1());
-+				menu->addAction(act);
-+			}
-+		}
-+		QAction *act = ma->getAccountAction(menu, account);
-+		if(act)
-+			menu->addAction(act);
-+	}
-+}
-+
-+void PluginHost::addContactMenu(QMenu *menu, int account, const QString& jid)
-+{
-+	MenuAccessor *ma = qobject_cast<MenuAccessor*>(plugin_);
-+	if(ma) {
-+		if(!contactMenu_.isEmpty()) {
-+			for (int i = 0; i < contactMenu_.size(); ++i) {
-+				QVariantHash param = contactMenu_.at(i);
-+				IconAction *act = new IconAction(param.value("name").value<QString>(), menu, param.value("icon").value<QString>());
-+				act->setProperty("account", QVariant(account));
-+				act->setProperty("jid", QVariant(jid));
-+				connect(act, SIGNAL(triggered()), param.value("reciver").value<QObject *>(), param.value("slot").value<QString>().toLatin1());
-+				menu->addAction(act);
-+			}
-+		}
-+		QAction *act = ma->getContactAction(menu, account, jid);
-+		if(act)
-+			menu->addAction(act);
-+	}
-+}
-+
-+void PluginHost::setupChatTab(QWidget* tab, int account, const QString& contact)
-+{
-+	ChatTabAccessor *cta = qobject_cast<ChatTabAccessor*>(plugin_);
-+	if(cta) {
-+		cta->setupChatTab(tab, account, contact);
-+	}
-+}
-+
-+void PluginHost::setupGCTab(QWidget* tab, int account, const QString& contact)
-+{
-+	ChatTabAccessor *cta = qobject_cast<ChatTabAccessor*>(plugin_);
-+	if(cta) {
-+		cta->setupGCTab(tab, account, contact);
-+	}
-+}
-+
-+bool PluginHost::appendingChatMessage(int account, const QString &contact,
-+				      QString &body, QDomElement &html, bool local)
-+{
-+	ChatTabAccessor *cta = qobject_cast<ChatTabAccessor*>(plugin_);
-+	if(cta) {
-+		return cta->appendingChatMessage(account, contact, body, html, local);
-+	}
-+	return false;
-+}
-+
-+bool PluginHost::isSelf(int account, const QString& jid)
-+{
-+	return manager_->isSelf(account, jid);
-+}
-+
-+bool PluginHost::isAgent(int account, const QString& jid)
-+{
-+	return manager_->isAgent(account, jid);
-+}
-+
-+bool PluginHost::inList(int account, const QString& jid)
-+{
-+	return manager_->inList(account, jid);
-+}
-+
-+bool PluginHost::isPrivate(int account, const QString& jid)
-+{
-+	return manager_->isPrivate(account, jid);
-+}
-+
-+bool PluginHost::isConference(int account, const QString& jid)
-+{
-+	return manager_->isConference(account, jid);
-+}
-+
-+QString PluginHost::name(int account, const QString& jid)
-+{
-+	return manager_->name(account, jid);
-+}
-+
-+QString PluginHost::status(int account, const QString& jid)
-+{
-+	return manager_->status(account, jid);
-+}
-+
-+QString PluginHost::statusMessage(int account, const QString& jid)
-+{
-+	return manager_->statusMessage(account, jid);
-+}
-+
-+QStringList PluginHost::resources(int account, const QString& jid)
-+{
-+	return manager_->resources(account, jid);
-+}
-+
-+bool PluginHost::hasInfoProvider()
-+{
-+	return hasInfo_;
-+}
-+
-+QString PluginHost::pluginInfo()
-+{
-+	return infoString_;
-+}
-+
-+void PluginHost::setStatus(int account, const QString& status, const QString& statusMessage)
-+{
-+	manager_->setStatus(account, status, statusMessage);
-+}
-+
-+bool PluginHost::appendSysMsg(int account, const QString& jid, const QString& message)
-+{
-+	return manager_->appendSysMsg(account, jid, message);
-+}
-+
-+void PluginHost::createNewEvent(int account, const QString& jid, const QString& descr, QObject *receiver, const char* slot)
-+{
-+	manager_->createNewEvent(account, jid, descr, receiver, slot);
-+}
-+
-+void PluginHost::playSound(const QString &fileName)
-+{
-+	soundPlay(fileName);
-+}
- 
- //-- helpers --------------------------------------------------------
- 
---- a/src/pluginhost.h
-+++ b/src/pluginhost.h
-@@ -10,10 +10,28 @@
- #include <QVariant>
- #include <QRegExp>
- #include <QMultiMap>
-+#include <QPointer>
-+#include <QTextEdit>
- 
-+#include "applicationinfo.h"
-+#include "userlist.h"
-+#include "iconset.h"
- #include "stanzasendinghost.h"
- #include "iqfilteringhost.h"
- #include "optionaccessinghost.h"
-+#include "shortcutaccessinghost.h"
-+#include "iconfactoryaccessinghost.h"
-+#include "activetabaccessinghost.h"
-+#include "applicationinfoaccessinghost.h"
-+#include "accountinfoaccessinghost.h"
-+#include "tabdlg.h"
-+#include "tabbablewidget.h"
-+#include "popupaccessinghost.h"
-+#include "contactstateaccessinghost.h"
-+#include "psiaccountcontrollinghost.h"
-+#include "eventcreatinghost.h"
-+#include "contactinfoaccessinghost.h"
-+#include "soundaccessinghost.h"
- 
- class QWidget;
- class QPluginLoader;
-@@ -21,10 +39,14 @@ class QPluginLoader;
- class PluginManager;
- class IqNamespaceFilter;
- 
--class PluginHost: public QObject, public StanzaSendingHost, public IqFilteringHost, public OptionAccessingHost
-+class PluginHost: public QObject, public StanzaSendingHost, public IqFilteringHost, public OptionAccessingHost, public ShortcutAccessingHost, public IconFactoryAccessingHost,
-+	public ActiveTabAccessingHost, public ApplicationInfoAccessingHost, public AccountInfoAccessingHost, public PopupAccessingHost, public ContactStateAccessingHost
-+	, public PsiAccountControllingHost, public EventCreatingHost, public ContactInfoAccessingHost, public SoundAccessingHost
- {
- 	Q_OBJECT
--	Q_INTERFACES(StanzaSendingHost IqFilteringHost OptionAccessingHost);
-+	Q_INTERFACES(StanzaSendingHost IqFilteringHost OptionAccessingHost ShortcutAccessingHost IconFactoryAccessingHost
-+		ActiveTabAccessingHost ApplicationInfoAccessingHost AccountInfoAccessingHost PopupAccessingHost ContactStateAccessingHost
-+		PsiAccountControllingHost EventCreatingHost ContactInfoAccessingHost SoundAccessingHost)
- 
- public:
- 	PluginHost(PluginManager* manager, const QString& pluginFile);
-@@ -38,6 +60,8 @@ public:
- 	const QString& name() const;
- 	const QString& shortName() const;
- 	const QString& version() const;
-+	int priority() const;
-+	const QIcon& icon() const;
- 
- 	// loading
- 	bool load();
-@@ -51,16 +75,20 @@ public:
- 
- 	// for StanzaFilter and IqNamespaceFilter
- 	bool incomingXml(int account, const QDomElement& e);
-+	bool outgoingXml(int account, QDomElement &e);
- 
- 	// for EventFilter
--	bool processEvent(int account, const QDomElement& e);
-+	bool processEvent(int account, QDomElement& e);
- 	bool processMessage(int account, const QString& jidFrom, const QString& body, const QString& subject);
-+	bool processOutgoingMessage(int account, const QString& jidTo, QString& body, const QString& type, QString& subject);
-+	void logout(int account);
- 
- 	// StanzaSendingHost
- 	void sendStanza(int account, const QDomElement& xml);
- 	void sendStanza(int account, const QString& xml);
- 	void sendMessage(int account, const QString& to, const QString& body, const QString& subject, const QString& type);
- 	QString uniqueId(int account);
-+	QString escape(const QString &str);
- 
- 	// IqFilteringHost
- 	void addIqNamespaceFilter(const QString& ns, IqNamespaceFilter* filter);
-@@ -70,25 +98,137 @@ public:
- 
- 	// OptionAccessingHost
- 	void setPluginOption(const QString& option, const QVariant& value);
--	QVariant getPluginOption(const QString& option);
-+	QVariant getPluginOption(const QString &option, const QVariant &defValue = QVariant::Invalid);
- 	void setGlobalOption(const QString& option, const QVariant& value);
- 	QVariant getGlobalOption(const QString& option);
-+	void optionChanged(const QString& option);
-+
-+	// ShortcutAccessingHost
-+	void setShortcuts();
-+	void connectShortcut(const QKeySequence& shortcut, QObject *receiver, const char* slot) ;
-+	void disconnectShortcut(const QKeySequence& shortcut, QObject *receiver, const char* slot);
-+	void requestNewShortcut(QObject *receiver, const char* slot);
-+
-+	// IconFacrotyAccessingHost
-+	QIcon getIcon(const QString& name);
-+	void addIcon(const QString& name, const QByteArray& icon);
-+
-+	//ActiveTabHost
-+	QTextEdit* getEditBox();
-+	QString getJid();
-+	QString getYourJid();
-+
-+	//ApplicationInfoAccessingHost
-+	Proxy getProxyFor(const QString &obj);
-+	QString appName();
-+	QString appVersion();
-+	QString appCapsNode();
-+	QString appCapsVersion();
-+	QString appOsName();
-+	QString appHomeDir(HomedirType type);
-+	QString appResourcesDir();
-+	QString appLibDir();
-+	QString appProfilesDir(HomedirType type);
-+	QString appHistoryDir();
-+	QString appCurrentProfileDir(HomedirType type);
-+	QString appVCardDir();
-+
-+	//AccountInfoAcsessingHost
-+	QString getStatus(int account);
-+	QString getStatusMessage(int account);
-+	QString proxyHost(int account);
-+	int proxyPort(int account);
-+	QString proxyUser(int account);
-+	QString proxyPassword(int account);
-+	QString getJid(int account);
-+	QString getId(int account);
-+	QString getName(int account);
-+	QStringList getRoster(int account);
-+	int findOnlineAccountForContact(const QString &jid) const;
-+
-+	//ContactInfoAccessingHost
-+	bool isSelf(int account, const QString& jid);
-+	bool isAgent(int account, const QString& jid);
-+	bool inList(int account, const QString& jid);
-+	bool isPrivate(int account, const QString& jid);
-+	bool isConference(int account, const QString& jid);
-+	QString name(int account, const QString& jid);
-+	QString status(int account, const QString& jid);
-+	QString statusMessage(int account, const QString& jid);
-+	QStringList resources(int account, const QString& jid);
-+
-+	//ContactStateAccessor
-+	bool setActivity(int account, const QString& Jid, QDomElement xml);
-+	bool setMood(int account, const QString& Jid, QDomElement xml);
-+	bool setTune(int account, const QString& Jid, QString tune);
-+
-+	//PopupAccessingHost
-+	void initPopup(const QString& text, const QString& title, const QString& icon, int type);
-+	void initPopupForJid(int account, const QString& jid, const QString& text, const QString& title, const QString& icon, int type);
-+	int registerOption(const QString& name, int initValue = 5, const QString& path = QString());
-+	int popupDuration(const QString& name);
-+	void setPopupDuration(const QString& name, int value);
-+	void unregisterOption(const QString& name);
-+
-+	void addToolBarButton(QObject* parent, QWidget* toolbar, int account, const QString& contact);
-+	bool hasToolBarButton();
-+
-+	void addGCToolBarButton(QObject* parent, QWidget* toolbar, int account, const QString& contact);
-+	bool hasGCToolBarButton();
-+
-+	void addAccountMenu(QMenu *menu, int account);
-+	void addContactMenu(QMenu *menu, int account, const QString& jid);
-+
-+	//ChatTabAccessor
-+	void setupChatTab(QWidget* tab, int account, const QString& contact);
-+
-+	// GCTabAccessor
-+	void setupGCTab(QWidget* tab, int account, const QString& contact);
-+
-+	bool appendingChatMessage(int account, const QString& contact,
-+				  QString& body, QDomElement& html, bool local);
-+
-+	void applyOptions();
-+	void restoreOptions();
-+
-+	QString pluginInfo();
-+	bool hasInfoProvider();
-+
-+	void setStatus(int account, const QString& status, const QString& statusMessage);
-+
-+	bool appendSysMsg(int account, const QString& jid, const QString& message);
-+
-+	void createNewEvent(int account, const QString& jid, const QString& descr, QObject *receiver, const char* slot);
-+
-+	void playSound(const QString& fileName);
- 
- private:
- 	PluginManager* manager_;
--	QObject* plugin_;
-+	QPointer<QObject> plugin_;
- 	QString file_;
- 	QString name_;
- 	QString shortName_;
- 	QString version_;
-+	int priority_;
-+	QIcon icon_;
- 	QPluginLoader* loader_;
-+	Iconset* iconset_;
-+	bool hasToolBarButton_;
-+	bool hasGCToolBarButton_;
- 
- 	bool valid_;
- 	bool connected_;
- 	bool enabled_;
-+	bool hasInfo_;
-+	QString infoString_;
- 
- 	QMultiMap<QString, IqNamespaceFilter*> iqNsFilters_;
- 	QMultiMap<QRegExp, IqNamespaceFilter*> iqNsxFilters_;
-+	QList< QVariantHash > buttons_;
-+	QList< QVariantHash > gcbuttons_;
-+
-+	QList< QVariantHash > accMenu_;
-+	QList< QVariantHash > contactMenu_;
- 
- 	bool loadPlugin(QObject* pluginObject);
- 
---- a/src/pluginmanager.cpp
-+++ b/src/pluginmanager.cpp
-@@ -8,7 +8,7 @@
- #include <QtCore>
- #include <QtCrypto>
- #include <QPluginLoader>
--#include <QDebug>
-+#include <QLabel>
- 
- #include "xmpp_client.h"
- #include "xmpp_task.h"
-@@ -18,6 +18,8 @@
- #include "psioptions.h"
- 
- #include "pluginhost.h"
-+#include "psicon.h"
-+#include "psicontact.h"
- #include "psiplugin.h"
- #include "psiaccount.h"
- #include "stanzafilter.h"
-@@ -26,10 +28,14 @@
- #include "iqnamespacefilter.h"
- #include "eventfilter.h"
- #include "optionaccessor.h"
-+#include "avatars.h"
-+#include "psiiconset.h"
-+#include "popupmanager.h"
-+
-+#include "chatdlg.h"
- 
- 
- //TODO(mck)
--// - make sure PluginManager works correctly when changing profiles
- // - use native separators when displaying file path
- 
- 
-@@ -80,10 +86,9 @@ PluginManager* PluginManager::instance()
-  * Default constructor. Locates all plugins, sets watchers on those directories to
-  * locate new ones and loads those enabled in the config.
-  */
--PluginManager::PluginManager() : QObject(NULL)
-+PluginManager::PluginManager() : QObject(NULL), psi_(0)
- {
- 	updatePluginsList();
--	loadEnabledPlugins();
- 	foreach (QString path, pluginDirs()) {
- 		QCA::DirWatch *dw = new QCA::DirWatch(path, this);
- 		connect(dw, SIGNAL(changed()), SLOT(dirsChanged()));
-@@ -92,38 +97,74 @@ PluginManager::PluginManager() : QObject(NULL)
- 	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), this, SLOT(optionChanged(const QString&)));
- }
- 
-+void PluginManager::initNewSession(PsiCon *psi)
-+{
-+	psi_ = psi;
-+	clients_.clear();
-+	accountIds_.clear();
-+	loadEnabledPlugins();
-+}
-+
- /**
-  * Updates list of known plugins by reading all plugin directories
-+ * and returns the list of new plugins
-  */
--void PluginManager::updatePluginsList()
-+QList<PluginHost*> PluginManager::updatePluginsList()
- {
--	foreach (QString d, pluginDirs()) {
-+	QList<PluginHost*> newPlugins;
-+
-+	foreach (const QString& d, pluginDirs()) {
- 		QDir dir(d);
--		foreach (QString file, dir.entryList()) {
-+		foreach (QString file, dir.entryList(QDir::Files)) {
- 			file = dir.absoluteFilePath(file);
--			qWarning("Found plugin: %s", qPrintable(file));
--			if (!pluginByFile_.contains(file)) {
--				PluginHost* host = new PluginHost(this, file);
--				if (host->isValid()) {
--					hosts_host->name() = host;
--					pluginByFile_file = host;
-+			if (QLibrary::isLibrary(file)) {
-+#ifndef PLUGINS_NO_DEBUG
-+				qDebug("Found plugin: %s", qPrintable(file));
-+#endif
-+				if (!pluginByFile_.contains(file)) {
-+					PluginHost* host = new PluginHost(this, file);
-+					if (host->isValid() && !hosts_.contains(host->name())) {
-+						hosts_host->name() = host;
-+						pluginByFile_file = host;
-+						newPlugins.append(host);
-+						if (host->priority() == PsiPlugin::PriorityHighest || !pluginsByPriority_.size()) {
-+							pluginsByPriority_.push_front(host);
-+						} else {
-+							// find position for insertion
-+							int i = pluginsByPriority_.size();
-+							while (i && host->priority() > pluginsByPriority_i - 1->priority()) {
-+								i--;
-+							}
-+							pluginsByPriority_.insert(i, host);
-+						}
-+					}
-+				} else {
-+#ifndef PLUGINS_NO_DEBUG
-+					qDebug("Which we already knew about");
-+#endif
- 				}
--			} else {
--				qWarning("Which we already knew about");
- 			}
- 		}
- 	}
-+
-+	return newPlugins;
- }
- 
- /**
-  * This slot is executed when the contents of a plugin directory changes
-  * It causes the available plugin list to be refreshed.
-- *
-- * TODO: it should also load the plugins if they're on the autoload list
-  */
- void PluginManager::dirsChanged()
- {
--	updatePluginsList();
-+	foreach(PluginHost* plugin, updatePluginsList()) {
-+		loadPluginIfEnabled(plugin);
-+	}
-+}
-+
-+void PluginManager::accountDestroyed()
-+{
-+	PsiAccount* pa = static_cast<PsiAccount*>(sender());
-+	accountIds_.removeAccount(pa);
- }
- 
- /**
-@@ -132,14 +173,27 @@ void PluginManager::dirsChanged()
-  */
- void PluginManager::loadEnabledPlugins()
- {
-+#ifndef PLUGINS_NO_DEBUG
- 	qDebug("Loading enabled plugins");
--	foreach (PluginHost* plugin, hosts_.values()) {
--		QString option = QString("%1.%2").arg(loadOptionPrefix).arg(plugin->shortName());
--		if (PsiOptions::instance()->getOption(option).toBool()) {
--			qWarning("Plugin %s is enabled in config: loading", qPrintable(plugin->shortName()));
--			plugin->load();
--			plugin->enable();
--		}
-+#endif
-+	foreach (PluginHost* plugin, pluginsByPriority_) {
-+		loadPluginIfEnabled(plugin);
-+	}
-+}
-+
-+void PluginManager::loadPluginIfEnabled(PluginHost *plugin)
-+{
-+	const QString option = QString("%1.%2").arg(loadOptionPrefix).arg(plugin->shortName());
-+	QVariant load = PsiOptions::instance()->getOption(option);
-+	if(!load.isValid()) {
-+		PsiOptions::instance()->setOption(option, false);
-+		load = QVariant(false);
-+	}
-+	if (load.toBool()) {
-+#ifndef PLUGINS_NO_DEBUG
-+		qDebug("Plugin %s is enabled in config: loading", qPrintable(plugin->shortName()));
-+#endif
-+		plugin->enable();
- 	}
- }
- 
-@@ -150,9 +204,21 @@ void PluginManager::loadEnabledPlugins()
-  */
- void PluginManager::optionChanged(const QString& option)
- {
--	//QString("%1.%2").arg(loadOptionPrefix).arg(shortNames_plugin);
--
--	//TODO(mck): implement this... for now, enabling/disabling requires psi restart
-+	bool pluginOpt = option.startsWith(loadOptionPrefix);
-+	const QString shortName = option.split(".").last();
-+	foreach (PluginHost* plugin, pluginByFile_.values()) {
-+		plugin->optionChanged(option);
-+		if(pluginOpt && plugin->shortName() == shortName) {
-+			if(PsiOptions::instance()->getOption(option).toBool()) {
-+				plugin->enable();
-+			}
-+			else {
-+				if(optionsWidget_)
-+					delete optionsWidget_;
-+				plugin->unload();
-+			}
-+		}
-+	}
- }
- 
- /**
-@@ -160,7 +226,9 @@ void PluginManager::optionChanged(const QString& option)
-  */
- void PluginManager::loadAllPlugins()
- {
-+#ifndef PLUGINS_NO_DEBUG
- 	qDebug("Loading all plugins");
-+#endif
-   	//Any static (compiled in) plugins we happen to have
- 	/*foreach( QObject* plugin, QPluginLoader::staticInstances() ) {
- 		loadPlugin( plugin );
-@@ -180,25 +248,34 @@ void PluginManager::loadAllPlugins()
-  */
- bool PluginManager::unloadAllPlugins()
- {
-+#ifndef PLUGINS_NO_DEBUG
- 	qDebug("Unloading all plugins");
-+#endif
- 	bool ok = true;
- 	foreach (PluginHost* plugin, hosts_.values()) {
--		if (!plugin->disable()) {
--			ok = false;
--		} else if (plugin->unload()) {
-+		if (!plugin->unload()) {
- 			ok = false;
- 		}
- 	}
- 	return ok;
- }
- 
-+bool PluginManager::isEnabled(const QString& plugin) const
-+{
-+	bool enabled = false;
-+	if (hosts_.contains(plugin)) {
-+		enabled = hosts_plugin->isEnabled();
-+	}
-+	return enabled;
-+}
-+
- /**
-  * Find the file which provides the named plugin. If the named plugin is not
-  * known, an empty string is provided.
-  * \param plugin Name of the plugin.
-  * \return Path to the plugin file.
-  */
--QString PluginManager::pathToPlugin(const QString& plugin)
-+QString PluginManager::pathToPlugin(const QString& plugin) const
- {
- 	QString path;
- 	if (hosts_.contains(plugin)) {
-@@ -213,7 +290,7 @@ QString PluginManager::pathToPlugin(const QString& plugin)
-  * \param plugin Name of the plugin.
-  * \return Path to the plugin file.
-  */
--QString PluginManager::shortName(const QString& plugin)
-+QString PluginManager::shortName(const QString& plugin) const
- {
- 	QString name;
- 	if (hosts_.contains(plugin)) {
-@@ -222,10 +299,31 @@ QString PluginManager::shortName(const QString& plugin)
- 	return name;
- }
- 
-+QString PluginManager::nameByShortName(const QString& shortName) const
-+{
-+	QString name;
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		if (host->shortName() == shortName) {
-+			name = host->name();
-+			break;
-+		}
-+	}
-+	return name;
-+}
-+
-+QString PluginManager::version(const QString& plugin) const
-+{
-+	QString name;
-+	if (hosts_.contains(plugin)) {
-+		name = hosts_plugin->version();
-+	}
-+	return name;
-+}
-+
- /**
-  * Returns a list of available plugin names found in all plugin directories.
-  */
--QStringList PluginManager::availablePlugins()
-+QStringList PluginManager::availablePlugins() const
- {
- 	return hosts_.keys();
- }
-@@ -238,13 +336,33 @@ QStringList PluginManager::availablePlugins()
-  */
- QWidget* PluginManager::optionsWidget(const QString& plugin)
- {
--	QWidget* widget = 0;
-+	if(optionsWidget_) {
-+		delete optionsWidget_;
-+	}
-+
- 	if (hosts_.contains(plugin)) {
--		widget = hosts_plugin->optionsWidget();
--	} else {
-+		optionsWidget_ = hosts_plugin->optionsWidget();
-+	}
-+
-+	if(!optionsWidget_) {
-+#ifndef PLUGINS_NO_DEBUG
- 		qWarning("Attempting to get options for %s which doesn't exist", qPrintable(plugin));
-+#endif
-+		optionsWidget_ = new QLabel(tr("This plugin has no user configurable options"));
-+	}
-+	return optionsWidget_;
-+}
-+
-+/**
-+ * \brief Give each plugin the opportunity to set shortcuts
-+ *
-+ * Each plugin can set its own global shortcuts
-+ */
-+void PluginManager::setShortcuts()
-+{
-+	foreach (PluginHost* host, pluginByFile_.values()) {
-+		host->setShortcuts();
- 	}
--	return widget;
- }
- 
- /**
-@@ -257,11 +375,11 @@ QWidget* PluginManager::optionsWidget(const QString& plugin)
-  * \param event Incoming event
-  * \return Continue processing the event; true if the event should be silently discarded.
-  */
--bool PluginManager::processMessage(const PsiAccount* account, const QString& jidFrom, const QString& body, const QString& subject)
-+bool PluginManager::processMessage(PsiAccount* account, const QString& jidFrom, const QString& body, const QString& subject)
- {
- 	bool handled = false;
--	foreach (PluginHost* host, hosts_.values()) {
--		if (host->processMessage(accountIds_account, jidFrom, body, subject)) {
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		if (host->processMessage(accountIds_.id(account), jidFrom, body, subject)) {
- 			handled = true;
- 			break;
- 		}
-@@ -279,11 +397,12 @@ bool PluginManager::processMessage(const PsiAccount* account, const QString& jid
-  * \param event Incoming event
-  * \return Continue processing the event; true if the event should be silently discarded.
-  */
--bool PluginManager::processEvent(const PsiAccount* account, QDomElement& event)
-+bool PluginManager::processEvent(PsiAccount* account, QDomElement& event)
- {
- 	bool handled = false;
--	foreach (PluginHost* host, hosts_.values()) {
--		if (host->processEvent(accountIds_account, event)) {
-+	const int acc_id = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		if (host->processEvent(acc_id, event)) {
- 			handled = true;
- 			break;
- 		}
-@@ -292,6 +411,43 @@ bool PluginManager::processEvent(const PsiAccount* account, QDomElement& event)
- }
- 
- /**
-+ * process an outgoing message
-+ */
-+bool PluginManager::processOutgoingMessage(PsiAccount* account, const QString& jidTo, QString& body, const QString& type, QString& subject)
-+{
-+	bool handled = false;
-+	const int acc_id = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginByFile_.values()) {
-+		if (host->processOutgoingMessage(acc_id, jidTo, body, type, subject)) {
-+			handled = true;
-+			break;
-+		}
-+	}
-+	return handled;
-+}
-+
-+void PluginManager::processOutgoingStanza(PsiAccount* account, QDomElement &stanza)
-+{
-+	const int acc_id = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginByFile_.values()) {
-+		if (host->outgoingXml(acc_id, stanza)) {
-+			break;
-+		}
-+	}
-+}
-+
-+/**
-+ * Notify to plugins that an account will go offline now.
-+ */
-+void PluginManager::logout(PsiAccount* account)
-+{
-+	const int acc_id = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginByFile_.values()) {
-+		host->logout(acc_id);
-+	}
-+}
-+
-+/**
-  * \brief Give each plugin the opportunity to process the incoming xml
-  *
-  * Each plugin is passed the xml in turn using various filter interfaces
-@@ -306,7 +462,7 @@ bool PluginManager::processEvent(const PsiAccount* account, QDomElement& event)
- bool PluginManager::incomingXml(int account, const QDomElement &xml)
- {
- 	bool handled = false;
--	foreach (PluginHost* host, hosts_.values()) {
-+	foreach (PluginHost* host, pluginsByPriority_) {
- 		if (host->incomingXml(account, xml)) {
- 			handled = true;
- 			break;
-@@ -342,7 +498,7 @@ void PluginManager::sendXml(int account, const QString& xml)
-  * \param account Identifier of the PsiAccount responsible
-  * \return Unique ID to be used for when sending a stanza
-  */
--QString PluginManager::uniqueId(int account)
-+QString PluginManager::uniqueId(int account) const
- {
- 	QString id;
- 	if (account < clients_.size()) {
-@@ -351,15 +507,301 @@ QString PluginManager::uniqueId(int account)
- 	return id;
- }
- 
-+QString PluginManager::getStatus(int account) const
-+{
-+	Status S;
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(pa)
-+		S = pa->status();
-+	return S.typeString();
-+}
-+
-+QString PluginManager::getStatusMessage(int account) const
-+{
-+	Status S;
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(pa)
-+			S = pa->status();
-+	return S.status();
-+}
-+
-+static inline const QString getProxyId(PsiAccount* pa)
-+{
-+	return pa->accountOptions().proxyID;
-+}
-+
-+QString PluginManager::proxyHost(int account) const
-+{
-+	QString host;
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(pa)
-+		host = ProxyManager::instance()->getItem(getProxyId(pa)).settings.host;
-+	return host;
-+}
-+
-+int PluginManager::proxyPort(int account) const
-+{
-+	int port = -1;
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(pa)
-+		port = ProxyManager::instance()->getItem(getProxyId(pa)).settings.port;
-+	return port;
-+}
-+
-+QString PluginManager::proxyUser(int account) const
-+{
-+	QString user;
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(pa)
-+		user = ProxyManager::instance()->getItem(getProxyId(pa)).settings.user;
-+	return user;
-+}
-+
-+QString PluginManager::proxyPassword(int account) const
-+{
-+	QString pass;
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(pa)
-+		pass = ProxyManager::instance()->getItem(getProxyId(pa)).settings.pass;
-+	return pass;
-+}
-+
-+QStringList PluginManager::getRoster(int account) const
-+{
-+	QStringList list;
-+	list << "-1";
-+	if (accountIds_.isValidRange(account)) {
-+		list.clear();
-+		PsiAccount *pa = accountIds_.account(account);
-+		if(pa) {
-+			QList<PsiContact*> roster = pa->contactList();
-+			for(int i = 0; i < roster.size(); i++) {
-+				list.push_back(roster.at(i)->jid().bare());
-+			}
-+		}
-+	}
-+	return list;
-+}
-+
-+QString PluginManager::getJid(int account) const
-+{
-+	QString Jid = "-1";
-+	if (accountIds_.isValidRange(account)) {
-+		Jid.clear();
-+		PsiAccount *pa = accountIds_.account(account);
-+		if(pa)
-+			Jid = pa->jid().bare();
-+	}
-+	return Jid;
-+}
-+
-+QString PluginManager::getId(int account) const
-+{
-+	QString id = "-1";
-+	if (accountIds_.isValidRange(account)) {
-+		id.clear();
-+		PsiAccount *pa = accountIds_.account(account);
-+		if(pa)
-+			id = pa->id();
-+	}
-+	return id;
-+}
-+
-+QString PluginManager::getName(int account) const
-+{
-+	QString nm;
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(pa)
-+		nm = pa->name();
-+	return nm;
-+}
-+
-+int PluginManager::findOnlineAccountForContact(const QString &jid) const
-+{
-+	Jid j(jid);
-+	for (int acc_id = 0; accountIds_.isValidRange(acc_id); ++acc_id) {
-+		PsiAccount *pa = accountIds_.account(acc_id);
-+		if (pa && pa->isAvailable() && pa->findContact(j))
-+			return acc_id;
-+	}
-+	return -1;
-+}
-+
-+bool PluginManager::setActivity(int account, const QString& jid, QDomElement xml)
-+{
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(!pa)
-+		return false;
-+
-+	XMPP::Jid userJid(jid);
-+	UserListItem *item =  pa->userList()->find(userJid);
-+
-+	if(!item)
-+		return false;
-+
-+	Activity act = Activity();
-+	if(!xml.isNull())
-+		act = Activity(xml);
-+	item->setActivity(act);
-+	return true;
-+}
-+
-+bool PluginManager::setMood(int account, const QString& jid, QDomElement xml)
-+{
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(!pa)
-+		return false;
-+
-+	XMPP::Jid userJid(jid);
-+	UserListItem *item =  pa->userList()->find(userJid);
-+
-+	if(!item)
-+		return false;
-+
-+	Mood mood = Mood();
-+	if(!xml.isNull())
-+		mood = Mood(xml);
-+	item->setMood(mood);
-+	return true;
-+}
-+
-+bool PluginManager::setTune(int account, const QString& jid, const QString& tune)
-+{
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(!pa)
-+		return false;
-+
-+	XMPP::Jid userJid(jid);
-+	UserListItem *item =  pa->userList()->find(userJid);
-+
-+	if(!item)
-+		return false;
-+
-+	item->setTune(tune);
-+	return true;
-+}
-+
-+void PluginManager::initPopup(const QString& text, const QString& title, const QString& icon, int type)
-+{
-+	const PsiIcon* ico = IconsetFactory::iconPtr(icon);
-+	psi_->popupManager()->doPopup(0, Jid(), ico, title, 0, 0, text, true, (PopupManager::PopupType)type);
-+}
-+
-+void PluginManager::initPopupForJid(int account, const QString &jid, const QString &text, const QString &title, const QString &icon, int type)
-+{
-+	XMPP::Jid j(jid);
-+	const PsiIcon* ico = IconsetFactory::iconPtr(icon);
-+	PsiAccount * pa = accountIds_.account(account);
-+	if(pa) {
-+		UserListItem *i = pa->findFirstRelevant(j);
-+		PsiIcon *statusIco = PsiIconset::instance()->statusPtr(i);
-+		const QPixmap pix = pa->avatarFactory()->getAvatar(j);
-+		psi_->popupManager()->doPopup(pa, j, ico, title, &pix, statusIco, text, true, (PopupManager::PopupType)type);
-+		return;
-+	}
-+	psi_->popupManager()->doPopup(0, Jid(), ico, title, 0, 0, text, true, (PopupManager::PopupType)type);
-+}
-+
-+int PluginManager::registerOption(const QString& name, int initValue, const QString& path)
-+{
-+	return psi_->popupManager()->registerOption(name, initValue, path);
-+}
-+
-+void PluginManager::unregisterOption(const QString &name)
-+{
-+	psi_->popupManager()->unregisterOption(name);
-+}
-+
-+int PluginManager::popupDuration(const QString& name) const
-+{
-+	return psi_->popupManager()->value(name);
-+}
-+
-+void PluginManager::setPopupDuration(const QString& name, int value)
-+{
-+	psi_->popupManager()->setValue(name, value);
-+}
-+
-+void PluginManager::addAccountMenu(QMenu *menu, PsiAccount* account)
-+{
-+	int i = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		host->addAccountMenu(menu, i);
-+	}
-+}
-+
-+void PluginManager::addContactMenu(QMenu* menu, PsiAccount *account, QString jid)
-+{
-+	int i = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		host->addContactMenu(menu, i, jid);
-+	}
-+}
-+
-+void PluginManager::setupChatTab(QWidget *tab, PsiAccount *account, const QString& contact)
-+{
-+	int i = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		host->setupChatTab(tab, i, contact);
-+	}
-+}
-+
-+void PluginManager::setupGCTab(QWidget *tab, PsiAccount *account, const QString& contact)
-+{
-+	int i = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		host->setupGCTab(tab, i, contact);
-+	}
-+}
-+
-+bool PluginManager::appendingChatMessage(PsiAccount *account, const QString &contact,
-+					 QString &body, QDomElement &html, bool local)
-+{
-+	bool handled = false;
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		if (host->appendingChatMessage(accountIds_.id(account), contact, body, html, local)) {
-+			handled = true;
-+			break;
-+		}
-+	}
-+	return handled;
-+}
-+
-+bool PluginManager::hasInfoProvider(const QString& plugin) const
-+{
-+	if (hosts_.contains(plugin))
-+		return hosts_plugin->hasInfoProvider();
-+
-+	return false;
-+}
-+
-+QString PluginManager::pluginInfo(const QString& plugin) const
-+{
-+	QString info;
-+	if (hosts_.contains(plugin))
-+		info = hosts_plugin->pluginInfo();
-+	return info;
-+}
-+
-+QIcon PluginManager::icon(const QString& plugin) const
-+{
-+	QIcon icon;
-+	if (hosts_.contains(plugin)) {
-+		icon = hosts_plugin->icon();
-+	}
-+
-+	return icon;
-+}
-+
- /**
-  * Tells the plugin manager about an XMPP::Client and the owning PsiAccount
-  */
--void PluginManager::addAccount(const PsiAccount* account, XMPP::Client* client)
-+void PluginManager::addAccount(PsiAccount* account, XMPP::Client* client)
- {
- 	clients_.append(client);
--	const int id = clients_.size() - 1;
--	accountIds_account = id;
-+	const int id = accountIds_.appendAccount(account);
- 	new StreamWatcher(client->rootTask(), this, id);
-+	connect(account, SIGNAL(accountDestroyed()), this, SLOT(accountDestroyed()));
- }
- 
- /**
-@@ -372,6 +814,225 @@ bool PluginManager::verifyStanza(const QString& stanza)
- 	return true;
- }
- 
-+void PluginManager::applyOptions(const QString& plugin)
-+{
-+	if (hosts_.contains(plugin)) {
-+		hosts_plugin->applyOptions();
-+	}
-+}
-+
-+void PluginManager::restoreOptions(const QString& plugin)
-+{
-+	if (hosts_.contains(plugin)) {
-+		hosts_plugin->restoreOptions();
-+	}
-+}
-+
-+void PluginManager::addToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact, const QString& plugin)
-+{
-+	const int acc_id = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		if (plugin.isEmpty() || (host->name() == plugin)) {
-+			host->addToolBarButton(parent,toolbar, acc_id, contact);
-+		}
-+	}
-+}
-+
-+bool PluginManager::hasToolBarButton(const QString& plugin) const
-+{
-+	return hosts_plugin->hasToolBarButton();
-+}
-+
-+void PluginManager::addGCToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact, const QString& plugin)
-+{
-+	const int acc_id = accountIds_.id(account);
-+	foreach (PluginHost* host, pluginsByPriority_) {
-+		if (plugin.isEmpty() || (host->name() == plugin)) {
-+			host->addGCToolBarButton(parent,toolbar, acc_id, contact);
-+		}
-+	}
-+}
-+
-+bool PluginManager::hasGCToolBarButton(const QString& plugin) const
-+{
-+	return hosts_plugin->hasGCToolBarButton();
-+}
-+
-+void PluginManager::setStatus(int account, const QString& status, const QString& statusMessage)
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		XMPP::Status s(status, statusMessage);
-+		acc->setStatus(s, false, true);
-+	}
-+}
-+
-+bool PluginManager::appendSysMsg(int account, const QString& jid, const QString& message)
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		XMPP::Jid j (jid);
-+		ChatDlg *chatDlg = acc->findChatDialogEx(j);
-+		if(!chatDlg) {
-+			chatDlg = acc->findChatDialog(j, false);
-+		}
-+		if(chatDlg) {
-+			chatDlg->appendSysMsg(message);
-+			return true;
-+		}
-+	}
-+	return false;
-+}
-+
-+
-+void PluginManager::createNewEvent(int account, const QString &jid, const QString &descr, QObject *receiver, const char *slot)
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		acc->createNewPluginEvent(jid, descr, receiver, slot);
-+	}
-+}
-+
-+bool PluginManager::isSelf(int account, const QString& jid) const
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		PsiContact *pc = acc->findContact(XMPP::Jid(jid));
-+		if(pc)
-+			return pc->isSelf();
-+	}
-+	return false;
-+}
-+
-+bool PluginManager::isAgent(int account, const QString& jid) const
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		PsiContact *pc = acc->findContact(XMPP::Jid(jid));
-+		if(pc)
-+			return pc->isAgent();
-+	}
-+	return false;
-+}
-+
-+bool PluginManager::inList(int account, const QString& jid) const
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		PsiContact *pc = acc->findContact(XMPP::Jid(jid));
-+		if(pc)
-+			return pc->inList();
-+	}
-+	return false;
-+}
-+
-+bool PluginManager::isPrivate(int account, const QString& jid) const
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		PsiContact *pc = acc->findContact(XMPP::Jid(jid));
-+		if(pc)
-+			return pc->isPrivate();
-+	}
-+	return false;
-+}
-+
-+bool PluginManager::isConference(int account, const QString& jid) const
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		PsiContact *pc = acc->findContact(XMPP::Jid(jid));
-+		if(pc)
-+			return pc->isConference();
-+	}
-+	return false;
-+}
-+
-+QString PluginManager::name(int account, const QString& jid) const
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		PsiContact *pc = acc->findContact(XMPP::Jid(jid));
-+		if(pc)
-+			return pc->name();
-+	}
-+	return QString();
-+}
-+
-+QString PluginManager::status(int account, const QString& jid) const
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		PsiContact *pc = acc->findContact(XMPP::Jid(jid));
-+		if(pc)
-+			return pc->status().typeString();
-+	}
-+	return QString();
-+}
-+
-+QString PluginManager::statusMessage(int account, const QString& jid) const
-+{
-+	PsiAccount *acc = accountIds_.account(account);
-+	if(acc) {
-+		PsiContact *pc = acc->findContact(XMPP::Jid(jid));
-+		if(pc)
-+			return pc->status().status();
-+	}
-+	return QString();
-+}
-+
-+QStringList PluginManager::resources(int account, const QString& jid) const
-+{
-+	QStringList l;
-+	PsiAccount *pa = accountIds_.account(account);
-+	if(pa) {
-+		UserListItem *u = pa->findFirstRelevant(XMPP::Jid(jid));
-+		if(u) {
-+			QMutableListIterator<UserResource> i(u->userResourceList());
-+			while (i.hasNext()) {
-+				l.push_back(i.next().name());
-+			}
-+		}
-+	}
-+	return l;
-+}
-+
-+int AccountIds::appendAccount(PsiAccount *acc)
-+{
-+	int id = -1;
-+	if (acc) {
-+		id = id_keys.size();
-+		id_keysid = acc;
-+		acc_keysacc = id;
-+	}
-+	return id;
-+}
-+
-+void AccountIds::removeAccount(PsiAccount *acc)
-+{
-+	int id = acc_keys.value(acc, -1);
-+	if (id != -1) {
-+		acc_keys.remove(acc);
-+		id_keysid = 0;
-+	}
-+}
-+
-+void AccountIds::clear()
-+{
-+	acc_keys.clear();
-+	id_keys.clear();
-+}
-+
-+PsiAccount *AccountIds::account(int id) const
-+{
-+	return id_keys.value(id, 0);
-+}
-+
-+int AccountIds::id(PsiAccount *acc) const
-+{
-+	return acc_keys.value(acc, -1);
-+}
-+
- PluginManager* PluginManager::instance_ = NULL;
- const QString PluginManager::loadOptionPrefix = "plugins.auto-load";
- const QString PluginManager::pluginOptionPrefix = "plugins.options";
---- a/src/pluginmanager.h
-+++ b/src/pluginmanager.h
-@@ -11,12 +11,16 @@
- #include <QMap>
- #include <QHash>
- #include <QDomElement>
-+#include <QMenu>
- 
- class QPluginLoader;
- 
- class PsiAccount;
- class PsiPlugin;
- class PluginHost;
-+class PsiCon;
-+
-+#define PLUGINS_NO_DEBUG
- 
- namespace XMPP {
- 	class Client;
-@@ -26,6 +30,20 @@ namespace QCA {
- 	class DirWatch;
- }
- 
-+class AccountIds
-+{
-+public:
-+	int appendAccount(PsiAccount *acc);
-+	void removeAccount(PsiAccount *acc);
-+	void clear();
-+	bool isValidRange(int id) const { return id_keys.contains(id); }
-+	PsiAccount *account(int id) const;
-+	int id(PsiAccount *acc) const;
-+
-+private:
-+	QHash<PsiAccount *, int> acc_keys;
-+	QHash<int, PsiAccount *> id_keys;
-+};
- 
- class PluginManager : public QObject
- {
-@@ -33,29 +51,58 @@ class PluginManager : public QObject
- 
- public:
- 	static PluginManager* instance();
-+	void initNewSession(PsiCon *psi);
- 
--	QStringList availablePlugins();
-+	QStringList availablePlugins() const;
- 
--	void addAccount(const PsiAccount* account, XMPP::Client* client);
-+	void addAccount(PsiAccount* account, XMPP::Client* client);
- 
- 	void loadEnabledPlugins();
- 	bool unloadAllPlugins();
- 
--	QString pathToPlugin(const QString& plugin);
--	QString shortName(const QString& plugin);
-+	bool isEnabled(const QString& plugin) const;
-+	QString pathToPlugin(const QString& plugin) const;
-+	QString shortName(const QString& plugin) const;
-+	QString nameByShortName(const QString& shortName) const;
-+	QString version(const QString& plugin) const;
- 	QWidget* optionsWidget(const QString& plugin);
- 
--	bool processEvent(const PsiAccount* account, QDomElement& eventXml);
--	bool processMessage(const PsiAccount* account, const QString& jidFrom, const QString& body, const QString& subject);
-+	void setShortcuts();
-+
-+	bool processEvent(PsiAccount* account, QDomElement& eventXml);
-+	bool processMessage(PsiAccount* account, const QString& jidFrom, const QString& body, const QString& subject);
-+	bool processOutgoingMessage(PsiAccount* account, const QString& jidTo, QString& body, const QString& type, QString& subject);
-+	void processOutgoingStanza(PsiAccount* account, QDomElement &stanza);
-+	void logout(PsiAccount* account);
-+
-+	void applyOptions(const QString& plugin);
-+	void restoreOptions(const QString& plugin);
-+	void addToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact, const QString& plugin = "");
-+	bool hasToolBarButton(const QString& plugin) const;
-+	void addGCToolBarButton(QObject* parent, QWidget* toolbar, PsiAccount* account, const QString& contact, const QString& plugin = "");
-+	bool hasGCToolBarButton(const QString& plugin) const;
-+	void addAccountMenu(QMenu *menu, PsiAccount* account);
-+	void addContactMenu(QMenu *menu, PsiAccount* account, QString jid);
-+
-+	void setupChatTab(QWidget *tab, PsiAccount* account, const QString& contact);
-+	void setupGCTab(QWidget *tab, PsiAccount* account, const QString& contact);
-+	bool appendingChatMessage(PsiAccount* account, const QString& contact,
-+				  QString& body, QDomElement& html, bool local);
-+
-+	QString pluginInfo(const QString& plugin) const;
-+	bool hasInfoProvider(const QString& plugin) const;
-+	QIcon icon(const QString& plugin) const;
- 
- 	static const QString loadOptionPrefix;
- 	static const QString pluginOptionPrefix;
- 
- private:
- 	PluginManager();
-+	PsiCon *psi_;
- 	void loadAllPlugins();
- 	bool verifyStanza(const QString& stanza);
--	void updatePluginsList();
-+	QList<PluginHost*> updatePluginsList();
-+	void loadPluginIfEnabled(PluginHost* plugin);
- 
- 	static PluginManager* instance_;
- 
-@@ -63,26 +110,71 @@ private:
- 	QVector<XMPP::Client*> clients_;
- 
- 	//account, account id
--	QHash<const PsiAccount*, int> accountIds_;
-+	AccountIds accountIds_;
- 
- 	//name, host
--	QHash<QString, PluginHost*> hosts_;
-+	QMap<QString, PluginHost*> hosts_;
- 	//file, host
--	QHash<QString, PluginHost*> pluginByFile_;
-+	QMap<QString, PluginHost*> pluginByFile_;
-+	//sorted by priority
-+	QList<PluginHost*> pluginsByPriority_;
- 
- 
- 	QList<QCA::DirWatch*> dirWatchers_;
- 
-+	// Options widget provides by plugin on opt_plugins
-+	QPointer<QWidget> optionsWidget_;
-+
- 	class StreamWatcher;
- 	bool incomingXml(int account, const QDomElement &eventXml);
- 	void sendXml(int account, const QString& xml);
--	QString uniqueId(int account);
-+	QString uniqueId(int account) const;
-+
-+	QString getStatus(int account) const;
-+	QString getStatusMessage(int account) const;
-+	QString proxyHost(int account) const;
-+	int proxyPort(int account) const;
-+	QString proxyUser(int account) const;
-+	QString proxyPassword(int account) const;
-+	QStringList getRoster(int account) const;
-+	QString getJid(int account) const;
-+	QString getId(int account) const;
-+	QString getName(int account) const;
-+	int findOnlineAccountForContact(const QString &jid) const;
-+
-+	bool isSelf(int account, const QString& jid) const;
-+	bool isAgent(int account, const QString& jid) const;
-+	bool inList(int account, const QString& jid) const;
-+	bool isPrivate(int account, const QString& jid) const;
-+	bool isConference(int account, const QString& jid) const;
-+	QString name(int account, const QString& jid) const;
-+	QString status(int account, const QString& jid) const;
-+	QString statusMessage(int account, const QString& jid) const;
-+	QStringList resources(int account, const QString& jid) const;
-+
-+	bool setActivity(int account, const QString& Jid, QDomElement xml);
-+	bool setMood(int account, const QString& Jid, QDomElement xml);
-+	bool setTune(int account, const QString& Jid, const QString& tune);
-+
-+	void initPopup(const QString& text, const QString& title, const QString& icon, int type);
-+	void initPopupForJid(int account, const QString& jid, const QString& text, const QString& title, const QString& icon, int tipe);
-+	int registerOption(const QString& name, int initValue = 5, const QString& path = QString());
-+	void unregisterOption(const QString& name);
-+	int popupDuration(const QString& name) const;
-+	void setPopupDuration(const QString& name, int value);
-+
-+	void setStatus(int account, const QString& status, const QString& statusMessage);
-+
-+	bool appendSysMsg(int account, const QString& jid, const QString& message);
-+
-+	void createNewEvent(int account, const QString& jid, const QString& descr, QObject *receiver, const char* slot);
- 
- 	friend class PluginHost;
- 
- private slots:
- 	void dirsChanged();
- 	void optionChanged(const QString& option);
-+	void accountDestroyed();
- };
- 
- #endif
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/accountinfoaccessinghost.h
-@@ -0,0 +1,27 @@
-+#ifndef ACCOUNTINFOACCESSINGHOST_H
-+#define ACCOUNTINFOACCESSINGHOST_H
-+
-+class QString;
-+class QStringList;
-+
-+class AccountInfoAccessingHost
-+{
-+public:
-+	virtual ~AccountInfoAccessingHost() {}
-+
-+	virtual QString getStatus(int account) = 0;
-+	virtual QString getStatusMessage(int account) = 0;
-+	virtual QString proxyHost(int account) = 0;
-+	virtual int proxyPort(int account) = 0;
-+	virtual QString proxyUser(int account) = 0;
-+	virtual QString proxyPassword(int account) = 0;
-+	virtual QString getJid(int account) = 0;  //if account out of range return "-1"
-+	virtual QString getId(int account) = 0;  //if account out of range return "-1"
-+	virtual QString getName(int account) = 0;  //if account out of range return ""
-+	virtual QStringList getRoster(int account) = 0; //if account out of range return List with one element, value "-1"
-+	virtual int findOnlineAccountForContact(const QString &jid) const = 0; //gets all accounts and searches for specified contact in them. return -1 if account is not found
-+};
-+
-+Q_DECLARE_INTERFACE(AccountInfoAccessingHost, "org.psi-im.AccountInfoAccessingHost/0.1");
-+
-+#endif // ACCOUNTINFOACCESSINGHOST_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/accountinfoaccessor.h
-@@ -0,0 +1,18 @@
-+#ifndef ACCOUNTINFOACCESSOR_H
-+#define ACCOUNTINFOACCESSOR_H
-+
-+class AccountInfoAccessingHost;
-+
-+class AccountInfoAccessor
-+{
-+public:
-+	virtual ~AccountInfoAccessor() {}
-+
-+	virtual void setAccountInfoAccessingHost(AccountInfoAccessingHost* host) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(AccountInfoAccessor, "org.psi-im.AccountInfoAccessor/0.1");
-+
-+
-+#endif // ACCOUNTINFOACCESSOR_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/activetabaccessinghost.h
-@@ -0,0 +1,18 @@
-+#ifndef ACTIVETABACCESSINGHOST_H
-+#define ACTIVETABACCESSINGHOST_H
-+
-+class QString;
-+class QTextEdit;
-+
-+class ActiveTabAccessingHost
-+{
-+public:
-+	virtual ~ActiveTabAccessingHost() {}
-+
-+	virtual QTextEdit* getEditBox() = 0;
-+	virtual QString getJid() = 0;
-+	virtual QString getYourJid() = 0; //return full jid of your account for active tab
-+};
-+
-+Q_DECLARE_INTERFACE(ActiveTabAccessingHost, "org.psi-im.ActiveTabAccessingHost/0.1");
-+#endif // ACTIVETABACCESSINGHOST_H
-new file mode 100644
-index 0000000..278fbdc
---- /dev/null
-+++ b/src/plugins/include/activetabaccessor.h
-@@ -0,0 +1,17 @@
-+#ifndef ACTIVETABACCESSOR_H
-+#define ACTIVETABACCESSOR_H
-+
-+class ActiveTabAccessingHost;
-+
-+class ActiveTabAccessor
-+{
-+public:
-+	virtual ~ActiveTabAccessor() {}
-+
-+	virtual void setActiveTabAccessingHost(ActiveTabAccessingHost* host) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(ActiveTabAccessor, "org.psi-im.ActiveTabAccessor/0.1");
-+
-+#endif // ACTIVETABACCESSOR_H
-new file mode 100644
-index 0000000..61b8fbd
---- /dev/null
-+++ b/src/plugins/include/applicationinfoaccessinghost.h
-@@ -0,0 +1,45 @@
-+#ifndef APPLICATIONINFOACCESSINGHOST_H
-+#define APPLICATIONINFOACCESSINGHOST_H
-+
-+class QString;
-+
-+struct Proxy {
-+	QString type;
-+	QString host;
-+	int port;
-+	QString user;
-+	QString pass;
-+};
-+
-+class ApplicationInfoAccessingHost
-+{
-+public:
-+	enum HomedirType {
-+		ConfigLocation,
-+		DataLocation,
-+		CacheLocation
-+	};
-+	virtual ~ApplicationInfoAccessingHost() {}
-+
-+	// Version info
-+	virtual QString appName() = 0;
-+	virtual QString appVersion() = 0;
-+	virtual QString appCapsNode() = 0;
-+	virtual QString appCapsVersion() = 0;
-+	virtual QString appOsName() = 0;
-+
-+	// Directories
-+	virtual QString appHomeDir(HomedirType type) = 0;
-+	virtual QString appResourcesDir() = 0;
-+	virtual QString appLibDir() = 0;
-+	virtual QString appProfilesDir(HomedirType type) = 0;
-+	virtual QString appHistoryDir() = 0;
-+	virtual QString appCurrentProfileDir(HomedirType type) = 0;
-+	virtual QString appVCardDir() = 0;
-+
-+	virtual Proxy getProxyFor(const QString& obj) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(ApplicationInfoAccessingHost, "org.psi-im.ApplicationInfoAccessingHost/0.1");
-+
-+#endif // APPLICATIONINFOACCESSINGHOST_H
-new file mode 100644
-index 0000000..0ddde3b
---- /dev/null
-+++ b/src/plugins/include/applicationinfoaccessor.h
-@@ -0,0 +1,17 @@
-+#ifndef APPLICATIONINFOACCESSOR_H
-+#define APPLICATIONINFOACCESSOR_H
-+
-+class ApplicationInfoAccessingHost;
-+
-+class ApplicationInfoAccessor
-+{
-+public:
-+	virtual ~ApplicationInfoAccessor() {}
-+
-+	virtual void setApplicationInfoAccessingHost(ApplicationInfoAccessingHost* host) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(ApplicationInfoAccessor, "org.psi-im.ApplicationInfoAccessor/0.1");
-+
-+#endif // APPLICATIONINFOACCESSOR_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/chattabaccessor.h
-@@ -0,0 +1,22 @@
-+#ifndef CHATTABACCESSOR_H
-+#define CHATTABACCESSOR_H
-+
-+class QWidget;
-+class QString;
-+class QDomElement;
-+
-+class ChatTabAccessor
-+{
-+public:
-+	virtual ~ChatTabAccessor() {}
-+
-+	virtual void setupChatTab(QWidget* tab, int account, const QString& contact) = 0;
-+	virtual void setupGCTab(QWidget* tab, int account, const QString& contact) = 0;
-+
-+	virtual bool appendingChatMessage(int account, const QString& contact,
-+					  QString& body, QDomElement& html, bool local) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(ChatTabAccessor, "org.psi-im.ChatTabAccessor/0.1")
-+
-+#endif // CHATTABACCESSOR_H
-new file mode 100644
-index 0000000..867bdbf
---- /dev/null
-+++ b/src/plugins/include/contactinfoaccessinghost.h
-@@ -0,0 +1,27 @@
-+#ifndef CONTACTINFOACCESSINGHOST_H
-+#define CONTACTINFOACCESSINGHOST_H
-+
-+class QString;
-+class QStringList;
-+
-+class ContactInfoAccessingHost
-+{
-+public:
-+	virtual ~ContactInfoAccessingHost() {}
-+
-+	// Note that all this methods are checking full jid (with resource)
-+	// So for normal contacts is preferable to use bare jid in queries
-+	virtual bool isSelf(int account, const QString& jid) = 0;
-+	virtual bool isAgent(int account, const QString& jid) = 0;
-+	virtual bool inList(int account, const QString& jid) = 0;
-+	virtual bool isPrivate(int account, const QString& jid) = 0;
-+	virtual bool isConference(int account, const QString& jid) = 0;
-+	virtual QString name(int account, const QString& jid) = 0;
-+	virtual QString status(int account, const QString& jid) = 0;
-+	virtual QString statusMessage(int account, const QString& jid) = 0;
-+	virtual QStringList resources(int account, const QString& jid) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(ContactInfoAccessingHost, "org.psi-im.ContactInfoAccessingHost/0.1");
-+
-+#endif // CONTACTINFOACCESSINGHOST_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/contactinfoaccessor.h
-@@ -0,0 +1,18 @@
-+#ifndef CONTACTINFOACCESSOR_H
-+#define CONTACTINFOACCESSOR_H
-+
-+class ContactInfoAccessingHost;
-+
-+class ContactInfoAccessor
-+{
-+public:
-+	virtual ~ContactInfoAccessor() {}
-+
-+	virtual void setContactInfoAccessingHost(ContactInfoAccessingHost* host) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(ContactInfoAccessor, "org.psi-im.ContactInfoAccessor/0.1");
-+
-+
-+#endif // CONTACTINFOACCESSOR_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/contactstateaccessinghost.h
-@@ -0,0 +1,19 @@
-+#ifndef CONTACTSTATEACCESSINGHOST_H
-+#define CONTACTSTATEACCESSINGHOST_H
-+
-+class QDomElement;
-+class QString;
-+
-+class ContactStateAccessingHost
-+{
-+public:
-+	virtual ~ContactStateAccessingHost() {}
-+
-+	virtual bool setActivity(int account, const QString& Jid, QDomElement xml) = 0;
-+	virtual bool setMood(int account, const QString& Jid, QDomElement xml) = 0;
-+	virtual bool setTune(int account, const QString& Jid, QString tune) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(ContactStateAccessingHost, "org.psi-im.ContactStateAccessingHost/0.2");
-+
-+#endif // CONTACTSTATEACCESSINGHOST_H
-new file mode 100644
-index 0000000..321e06e
---- /dev/null
-+++ b/src/plugins/include/contactstateaccessor.h
-@@ -0,0 +1,18 @@
-+#ifndef CONTACTSTATEACCESSOR_H
-+#define CONTACTSTATEACCESSOR_H
-+
-+class ContactStateAccessingHost;
-+
-+class ContactStateAccessor
-+{
-+public:
-+	virtual ~ContactStateAccessor() {}
-+
-+	virtual void setContactStateAccessingHost(ContactStateAccessingHost* host) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(ContactStateAccessor, "org.psi-im.ContactStateAccessor/0.2");
-+
-+
-+#endif // CONTACTSTATEACCESSOR_H
-new file mode 100644
-index 0000000..673763e
---- /dev/null
-+++ b/src/plugins/include/eventcreatinghost.h
-@@ -0,0 +1,16 @@
-+#ifndef EVENTCREATINGHOST_H
-+#define EVENTCREATINGHOST_H
-+
-+class QObject;
-+class QString;
-+
-+class EventCreatingHost
-+{
-+public:
-+	virtual ~EventCreatingHost() {}
-+
-+	virtual void createNewEvent(int account, const QString& jid, const QString& descr, QObject *receiver, const char* slot) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(EventCreatingHost, "org.psi-im.EventCreatingHost/0.1");
-+#endif
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/eventcreator.h
-@@ -0,0 +1,17 @@
-+#ifndef EVENTCREATOR_H
-+#define EVENTCREATOR_H
-+
-+class EventCreatingHost;
-+
-+class EventCreator
-+{
-+public:
-+	virtual ~EventCreator() {}
-+
-+	virtual void setEventCreatingHost(EventCreatingHost* host) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(EventCreator, "org.psi-im.EventCreator/0.1");
-+
-+#endif
---- a/src/plugins/include/eventfilter.h
-+++ b/src/plugins/include/eventfilter.h
-@@ -1,7 +1,8 @@
- #ifndef EVENTFILTER_H
- #define EVENTFILTER_H
- 
--#include <QDomElement>
-+class QDomElement;
-+class QString;
- 
- class EventFilter
- {
-@@ -10,8 +11,10 @@ public:
- 
- 	// true = handled, don't pass to next handler
- 
--    virtual bool processEvent(int account, const QDomElement& e) = 0;
-+	virtual bool processEvent(int account, QDomElement& e) = 0;
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) = 0;
-+	virtual bool processOutgoingMessage(int account, const QString& fromJid, QString& body, const QString& type, QString& subject) = 0;
-+	virtual void logout(int account) = 0;
- };
- 
- Q_DECLARE_INTERFACE(EventFilter, "org.psi-im.EventFilter/0.1");
-new file mode 100644
-index 0000000..38fd75c
---- /dev/null
-+++ b/src/plugins/include/gctoolbariconaccessor.h
-@@ -0,0 +1,22 @@
-+#ifndef GCTOOLBARICONACCESSOR_H
-+#define GCTOOLBARICONACCESSOR_H
-+
-+#include <QList>
-+#include <QVariantHash>
-+
-+class QObject;
-+class QAction;
-+class QString;
-+
-+class GCToolbarIconAccessor
-+{
-+public:
-+	virtual ~GCToolbarIconAccessor() {}
-+
-+	virtual QList < QVariantHash > getGCButtonParam() = 0;
-+	virtual QAction* getGCAction(QObject* parent, int account, const QString& contact) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(GCToolbarIconAccessor, "org.psi-im.GCToolbarIconAccessor/0.1");
-+
-+#endif // GCTOOLBARICONACCESSOR_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/iconfactoryaccessinghost.h
-@@ -0,0 +1,17 @@
-+#ifndef ICONFACTORYACCESSINGHOST_H
-+#define ICONFACTORYACCESSINGHOST_H
-+
-+class QByteArray;
-+class QString;
-+
-+class IconFactoryAccessingHost
-+{
-+public:
-+	virtual ~IconFactoryAccessingHost() {}
-+
-+	virtual void addIcon(const QString& name, const QByteArray& icon) = 0;
-+	virtual QIcon getIcon(const QString& name) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(IconFactoryAccessingHost, "org.psi-im.IconFactoryAccessingHost/0.1");
-+#endif // ICONFACTORYACCESSINGHOST_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/iconfactoryaccessor.h
-@@ -0,0 +1,17 @@
-+#ifndef ICONFACTORYACCESSOR_H
-+#define ICONFACTORYACCESSOR_H
-+
-+class IconFactoryAccessingHost;
-+
-+class IconFactoryAccessor
-+{
-+public:
-+	virtual ~IconFactoryAccessor() {}
-+
-+	virtual void setIconFactoryAccessingHost(IconFactoryAccessingHost* host) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(IconFactoryAccessor, "org.psi-im.IconFactoryAccessor/0.1");
-+
-+#endif // ICONFACTORYACCESSOR_H
---- a/src/plugins/include/iqfilteringhost.h
-+++ b/src/plugins/include/iqfilteringhost.h
-@@ -1,8 +1,8 @@
- #ifndef IQFILTERINGHOST_H
- #define IQFILTERINGHOST_H
- 
--#include <QString>
--#include <QRegExp>
-+class QString;
-+class QRegExp;
- 
- class IqNamespaceFilter;
- 
---- a/src/plugins/include/iqnamespacefilter.h
-+++ b/src/plugins/include/iqnamespacefilter.h
-@@ -1,7 +1,7 @@
- #ifndef IQNAMESPACEFILTER_H
- #define IQNAMESPACEFILTER_H
- 
--#include <QDomElement>
-+class QDomElement;
- 
- class IqNamespaceFilter
- {
-new file mode 100644
-index 0000000..c788e9d
---- /dev/null
-+++ b/src/plugins/include/menuaccessor.h
-@@ -0,0 +1,25 @@
-+#ifndef MENUACCESSOR_H
-+#define MENUACCESSOR_H
-+
-+#include <QList>
-+#include <QVariantHash>
-+
-+class QObject;
-+class QAction;
-+class QString;
-+
-+class MenuAccessor
-+{
-+public:
-+	virtual ~MenuAccessor() {}
-+
-+	virtual QList < QVariantHash > getAccountMenuParam() = 0;
-+	virtual QList < QVariantHash > getContactMenuParam() = 0;
-+	virtual QAction* getContactAction(QObject* parent, int account, const QString& contact) = 0;
-+	virtual QAction* getAccountAction(QObject* parent, int account) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(MenuAccessor, "org.psi-im.MenuAccessor/0.1");
-+
-+#endif
---- a/src/plugins/include/optionaccessinghost.h
-+++ b/src/plugins/include/optionaccessinghost.h
-@@ -1,8 +1,8 @@
- #ifndef OPTIONACCESSINGHOST_H
- #define OPTIONACCESSINGHOST_H
- 
--#include <QDomElement>
--#include <QVariant>
-+class QString;
-+class QVariant;
- 
- class OptionAccessingHost
- {
-@@ -10,7 +10,7 @@ public:
- 	virtual ~OptionAccessingHost() {}
- 
- 	virtual void setPluginOption(const QString& option, const QVariant& value) = 0;
--	virtual QVariant getPluginOption(const QString& option) = 0;
-+	virtual QVariant getPluginOption(const QString &option, const QVariant &defValue = QVariant::Invalid) = 0;
- 
- 	virtual void setGlobalOption(const QString& option, const QVariant& value) = 0;
- 	virtual QVariant getGlobalOption(const QString& option) = 0;
---- a/src/plugins/include/optionaccessor.h
-+++ b/src/plugins/include/optionaccessor.h
-@@ -1,8 +1,7 @@
- #ifndef OPTIONACCESSOR_H
- #define OPTIONACCESSOR_H
- 
--#include <QDomElement>
--//#include <QString>
-+class QString;
- 
- class OptionAccessingHost;
- 
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/plugininfoprovider.h
-@@ -0,0 +1,18 @@
-+#ifndef PLUGININFOPROVIDER_H
-+#define PLUGININFOPROVIDER_H
-+
-+class QString;
-+
-+class PluginInfoProvider
-+{
-+public:
-+	virtual ~PluginInfoProvider() {}
-+
-+	virtual QString pluginInfo() = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(PluginInfoProvider, "org.psi-im.PluginInfoProvider/0.1");
-+
-+
-+#endif // PLUGININFOPROVIDER_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/popupaccessinghost.h
-@@ -0,0 +1,21 @@
-+#ifndef POPUPACCESSINGHOST_H
-+#define POPUPACCESSINGHOST_H
-+
-+class QString;
-+
-+class PopupAccessingHost
-+{
-+public:
-+	virtual ~PopupAccessingHost() {}
-+
-+	virtual void initPopup(const QString& text, const QString& title, const QString& icon = "psi/headline", int type = 0) = 0;
-+	virtual void initPopupForJid(int account, const QString& jid, const QString& text, const QString& title, const QString& icon = "psi/headline", int type = 0) = 0;
-+	virtual int registerOption(const QString& name, int initValue = 5, const QString& path = QString()) = 0;
-+	virtual int popupDuration(const QString& name) = 0;
-+	virtual void setPopupDuration(const QString& name, int value) = 0;
-+	virtual void unregisterOption(const QString& name) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(PopupAccessingHost, "org.psi-im.PopupAccessingHost/0.1");
-+
-+#endif
-new file mode 100644
-index 0000000..0fdd81c
---- /dev/null
-+++ b/src/plugins/include/popupaccessor.h
-@@ -0,0 +1,16 @@
-+#ifndef POPUPACCESSOR_H
-+#define POPUPACCESSOR_H
-+
-+class PopupAccessingHost;
-+
-+class PopupAccessor
-+{
-+public:
-+	virtual ~PopupAccessor() {}
-+
-+	virtual void setPopupAccessingHost(PopupAccessingHost* host) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(PopupAccessor, "org.psi-im.PopupAccessor/0.1");
-+
-+#endif // POPUPACCESSOR_H
-new file mode 100644
-index 0000000..107342f
---- /dev/null
-+++ b/src/plugins/include/psiaccountcontroller.h
-@@ -0,0 +1,18 @@
-+#ifndef PSIACCOUNTCONTROLLER_H
-+#define PSIACCOUNTCONTROLLER_H
-+
-+class PsiAccountControllingHost;
-+
-+class PsiAccountController
-+{
-+public:
-+	virtual ~PsiAccountController() {}
-+
-+	virtual void setPsiAccountControllingHost(PsiAccountControllingHost* host) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(PsiAccountController, "org.psi-im.PsiAccountController/0.1");
-+
-+
-+#endif // PSIACCOUNTCONTROLLER_H
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/psiaccountcontrollinghost.h
-@@ -0,0 +1,18 @@
-+#ifndef PSIACCOUNTCONTROLLINGHOST_H
-+#define PSIACCOUNTCONTROLLINGHOST_H
-+
-+class QString;
-+
-+class PsiAccountControllingHost
-+{
-+public:
-+	virtual ~PsiAccountControllingHost() {}
-+
-+	virtual void setStatus(int account, const QString& status, const QString& statusMessage) = 0;
-+
-+	virtual bool appendSysMsg(int account, const QString& jid, const QString& message) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(PsiAccountControllingHost, "org.psi-im.PsiAccountControllingHost/0.1");
-+
-+#endif // PSIACCOUNTCONTROLLINGHOST_H
---- a/src/plugins/include/psiplugin.h
-+++ b/src/plugins/include/psiplugin.h
-@@ -37,8 +37,29 @@ class QWidget;
- class PsiPlugin
- {
- public:
-+	// Priorities allows plugins to make processing more ordered. For example
-+	// some plugins may require process stanzas as early as possible, others
-+	// may want to do some work at the end. So here here are 5 levels of
-+	// priority which plugin may choose from. If plugin is not aware about
-+	// priority then Normal will be choosed for it.
-+	// While writing plugins its desirable to think twice before choosing
-+	// Lowest or Highest priority, since your plugin may be not the only which
-+	// need it. Think about for example stopspam plugin which is known to be
-+	// highest prioroty blocker/processor. Are you writing stopspam? If not
-+	// choose High if you want something more then Normal.
-+	enum Priority
-+	{
-+		PriorityLowest	= 0, // always in the end. last loaded Lowest plugin moves other Lowest to Low side
-+		PriorityLow		= 1,
-+		PriorityNormal	= 2, // default
-+		PriorityHigh	= 3,
-+		PriorityHighest	= 4, // always in the start. last loaded Highest plugin moves others to High side
-+	};
-+
- 	virtual ~PsiPlugin() {}
- 
-+	virtual Priority priority() { return PriorityNormal; }
-+
- 	/**
- 	 * \brief Plugin Name
- 	 * The full name of the plugin.
-@@ -72,7 +93,7 @@ public:
- 	 *
- 	 * TODO: make sure this is really deleted, etc
- 	 */
--	virtual QWidget* options() const = 0;
-+	virtual QWidget* options() = 0;
- 
- 	/**
- 	 * \brief Enable plugin
-@@ -87,8 +108,12 @@ public:
- 	 */
- 	virtual bool disable() = 0;
- 
-+	virtual void applyOptions() = 0;
-+	virtual void restoreOptions() = 0;
-+
-+	virtual QPixmap icon() const = 0;
- };
- 
--Q_DECLARE_INTERFACE(PsiPlugin, "org.psi-im.PsiPlugin/0.3");
-+Q_DECLARE_INTERFACE(PsiPlugin, "org.psi-im.PsiPlugin/0.4");
- 
- #endif
-new file mode 100644
-index 0000000..7687eba
---- /dev/null
-+++ b/src/plugins/include/shortcutaccessinghost.h
-@@ -0,0 +1,20 @@
-+#ifndef SHORTCUTACCESSINGHOST_H
-+#define SHORTCUTACCESSINGHOST_H
-+
-+class QObject;
-+class QKeySequence;
-+
-+class ShortcutAccessingHost
-+{
-+public:
-+	virtual ~ShortcutAccessingHost() {}
-+
-+	virtual void connectShortcut(const QKeySequence& shortcut, QObject *receiver, const char* slot) = 0;
-+	virtual void disconnectShortcut(const QKeySequence& shortcut, QObject *receiver, const char* slot) = 0;
-+	virtual void requestNewShortcut(QObject *receiver, const char* slot) = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(ShortcutAccessingHost, "org.psi-im.ShortcutAccessingHost/0.1");
-+
-+#endif
-new file mode 100644
-index 0000000..c082c1b
---- /dev/null
-+++ b/src/plugins/include/shortcutaccessor.h
-@@ -0,0 +1,18 @@
-+#ifndef SHORTCUTACCESSOR_H
-+#define SHORTCUTACCESSOR_H
-+
-+class ShortcutAccessingHost;
-+
-+class ShortcutAccessor
-+{
-+public:
-+	virtual ~ShortcutAccessor() {}
-+
-+	virtual void setShortcutAccessingHost(ShortcutAccessingHost* host) = 0;
-+	virtual void setShortcuts() = 0;
-+
-+};
-+
-+Q_DECLARE_INTERFACE(ShortcutAccessor, "org.psi-im.ShortcutAccessor/0.1");
-+
-+#endif
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/soundaccessinghost.h
-@@ -0,0 +1,16 @@
-+#ifndef SOUNDACCESSINGHOST_H
-+#define SOUNDACCESSINGHOST_H
-+
-+class QString;
-+
-+class SoundAccessingHost
-+{
-+public:
-+	virtual ~SoundAccessingHost() {}
-+
-+	virtual void playSound(const QString& fileName) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(SoundAccessingHost, "org.psi-im.SoundAccessingHost/0.1");
-+
-+#endif
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/soundaccessor.h
-@@ -0,0 +1,16 @@
-+#ifndef SOUNDACCESSOR_H
-+#define SOUNDACCESSOR_H
-+
-+class SoundAccessingHost;
-+
-+class SoundAccessor
-+{
-+public:
-+	virtual ~SoundAccessor() {}
-+
-+	virtual void setSoundAccessingHost(SoundAccessingHost* host) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(SoundAccessor, "org.psi-im.SoundAccessor/0.1");
-+
-+#endif
---- a/src/plugins/include/stanzafilter.h
-+++ b/src/plugins/include/stanzafilter.h
-@@ -1,7 +1,7 @@
- #ifndef STANZAFILTER_H
- #define STANZAFILTER_H
- 
--#include <QDomElement>
-+class QDomElement;
- 
- class StanzaFilter
- {
-@@ -10,7 +10,8 @@ public:
- 
- 	// true = handled, don't pass to next handler
- 
--    virtual bool incomingStanza(int account, const QDomElement& xml) = 0;
-+	virtual bool incomingStanza(int account, const QDomElement& xml) = 0;
-+	virtual bool outgoingStanza(int account, QDomElement &xml) = 0;
- };
- 
- Q_DECLARE_INTERFACE(StanzaFilter, "org.psi-im.StanzaFilter/0.1");
---- a/src/plugins/include/stanzasendinghost.h
-+++ b/src/plugins/include/stanzasendinghost.h
-@@ -1,8 +1,8 @@
- #ifndef STANZASENDINGHOST_H
- #define STANZASENDINGHOST_H
- 
--#include <QDomElement>
--#include <QString>
-+class QDomElement;
-+class QString;
- 
- class StanzaSendingHost
- {
-@@ -15,6 +15,7 @@ public:
- 	virtual void sendMessage(int account, const QString& to, const QString& body, const QString& subject, const QString& type) = 0;
- 
- 	virtual QString uniqueId(int account) = 0;
-+	virtual QString escape(const QString& str) = 0;
- };
- 
- Q_DECLARE_INTERFACE(StanzaSendingHost, "org.psi-im.StanzaSendingHost/0.1");
-new file mode 100644
---- /dev/null
-+++ b/src/plugins/include/toolbariconaccessor.h
-@@ -0,0 +1,22 @@
-+#ifndef TOOLBARICONACCESSOR_H
-+#define TOOLBARICONACCESSOR_H
-+
-+#include <QList>
-+#include <QVariantHash>
-+
-+class QObject;
-+class QAction;
-+class QString;
-+
-+class ToolbarIconAccessor
-+{
-+public:
-+	virtual ~ToolbarIconAccessor() {}
-+
-+	virtual QList < QVariantHash > getButtonParam() = 0;
-+	virtual QAction* getAction(QObject* parent, int account, const QString& contact) = 0;
-+};
-+
-+Q_DECLARE_INTERFACE(ToolbarIconAccessor, "org.psi-im.ToolbarIconAccessor/0.1");
-+
-+#endif // TOOLBARICONACCESSOR_H
---- a/src/plugins/plugins.pri
-+++ b/src/plugins/plugins.pri
-@@ -10,5 +10,31 @@ HEADERS += \
- 	$$PWD/include/iqfilteringhost.h \
- 	$$PWD/include/eventfilter.h \
- 	$$PWD/include/optionaccessor.h \
--	$$PWD/include/optionaccessinghost.h
--
-+	$$PWD/include/optionaccessinghost.h \
-+	$$PWD/include/popupaccessor.h \
-+	$$PWD/include/popupaccessinghost.h \
-+	$$PWD/include/shortcutaccessor.h \
-+	$$PWD/include/shortcutaccessinghost.h\
-+	$$PWD/include/iconfactoryaccessor.h \
-+	$$PWD/include/iconfactoryaccessinghost.h\
-+	$$PWD/include/activetabaccessor.h \
-+	$$PWD/include/activetabaccessinghost.h \
-+	$$PWD/include/applicationinfoaccessor.h \
-+	$$PWD/include/applicationinfoaccessinghost.h \
-+	$$PWD/include/accountinfoaccessor.h \
-+	$$PWD/include/accountinfoaccessinghost.h\
-+	$$PWD/include/gctoolbariconaccessor.h \
-+	$$PWD/include/toolbariconaccessor.h \
-+	$$PWD/include/menuaccessor.h \
-+	$$PWD/include/contactstateaccessor.h \
-+	$$PWD/include/contactstateaccessinghost.h \
-+	$$PWD/include/plugininfoprovider.h \
-+	$$PWD/include/psiaccountcontroller.h\
-+	$$PWD/include/psiaccountcontrollinghost.h \
-+	$$PWD/include/eventcreatinghost.h \
-+	$$PWD/include/eventcreator.h \
-+	$$PWD/include/contactinfoaccessor.h \
-+	$$PWD/include/contactinfoaccessinghost.h \
-+	$$PWD/include/soundaccessor.h \
-+	$$PWD/include/soundaccessinghost.h \
-+	$$PWD/include/chattabaccessor.h
---- a/src/psi_profiles.cpp
-+++ b/src/psi_profiles.cpp
-@@ -45,6 +45,9 @@
- #ifdef HAVE_PGPUTIL
- #include "pgputil.h"
- #endif
-+#ifdef PSI_PLUGINS
-+#include "pluginmanager.h"
-+#endif
- 
- using namespace XMPP;
- using namespace XMLHelper;
-@@ -1361,6 +1364,13 @@ void OptionsMigration::lateMigration()
- 	// Add default chat and groupchat toolbars
- 	if (PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.name").toString() != "Chat") {
- 		QStringList pluginsKeys;
-+#ifdef PSI_PLUGINS
-+		PluginManager *pm = PluginManager::instance();
-+		QStringList plugins = pm->availablePlugins();
-+		foreach (const QString &plugin, plugins) {
-+			pluginsKeys << pm->shortName(plugin) + "-plugin";
-+		}
-+#endif
- 		ToolbarPrefs chatToolbar;
- 		chatToolbar.on = PsiOptions::instance()->getOption("options.ui.chat.central-toolbar").toBool();
- 		PsiOptions::instance()->removeOption("options.ui.chat.central-toolbar");
---- a/src/psiaccount.cpp
-+++ b/src/psiaccount.cpp
-@@ -782,6 +782,13 @@ public slots:
- 		xmlRingbufWrite = (xmlRingbufWrite + 1) % xmlRingbuf.count();
- 	}
- 
-+	void client_stanzaElementOutgoing(QDomElement &s)
-+	{
-+#ifdef PSI_PLUGINS
-+		PluginManager::instance()->processOutgoingStanza(account, s);
-+#endif
-+	}
-+
- 	void pm_proxyRemoved(QString proxykey)
- 	{
- 		if (acc.proxyID == proxykey) acc.proxyID = "";
-@@ -1137,6 +1144,11 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, TabManage
- 
- 	// create XMPP::Client
- 	d->client = new Client;
-+
-+	// Plugins
-+#ifdef PSI_PLUGINS
-+	PluginManager::instance()->addAccount(this, d->client);
-+#endif
- 	d->client->setOSName(SystemInfo::instance()->os());
- 	d->client->setClientName(ApplicationInfo::name());
- 	d->client->setClientVersion(ApplicationInfo::version());
-@@ -1181,6 +1193,7 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, TabManage
- 	connect(d->client, SIGNAL(endImportRoster()), SIGNAL(endBulkContactUpdate()));
- 	connect(d->client, SIGNAL(xmlIncoming(const QString &)), d, SLOT(client_xmlIncoming(const QString &)));
- 	connect(d->client, SIGNAL(xmlOutgoing(const QString &)), d, SLOT(client_xmlOutgoing(const QString &)));
-+	connect(d->client, SIGNAL(stanzaElementOutgoing(QDomElement &)), d, SLOT(client_stanzaElementOutgoing(QDomElement &)));
- 
- 	// Privacy manager
- 	d->privacyManager = new PsiPrivacyManager(d->account, d->client->rootTask());
-@@ -1238,11 +1251,6 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, TabManage
- 	d->rcLeaveMucServer =0;
- 	setRCEnabled(PsiOptions::instance()->getOption("options.external-control.adhoc-remote-control.enable").toBool());
- 
--	// Plugins
--#ifdef PSI_PLUGINS
--	PluginManager::instance()->addAccount(this, d->client);
--#endif
--
- 	//Idle server
- 	if(PsiOptions::instance()->getOption("options.service-discovery.last-activity").toBool()) {
- 		new IdleServer(this, d->client->rootTask());
-@@ -1788,6 +1796,9 @@ void PsiAccount::logout(bool fast, const Status &s)
- 	if(!isActive())
- 		return;
- 
-+#ifdef PSI_PLUGINS
-+	PluginManager::instance()->logout(this);
-+#endif
- 	clearCurrentConnectionError();
- 
- 	d->stopReconnect();
-@@ -4658,6 +4669,22 @@ void PsiAccount::dj_sendMessage(const Message &m, bool log)
- 			nm.setNick(nick());
- 		}
- 	}
-+	
-+#ifdef PSI_PLUGINS
-+	if (!nm.body().isEmpty()) {
-+		QString body = nm.body();
-+		QString subject = nm.subject();
-+
-+		if(PluginManager::instance()->processOutgoingMessage(this, nm.to().full(), body, nm.type(), subject))
-+			return;
-+		if (body != nm.body()) {
-+			nm.setBody(body);
-+		}
-+		if (subject != nm.subject()) {
-+			nm.setSubject(subject);
-+		}
-+	}
-+#endif
- 
- 	// GSOC: stream management
- 	// check whether message came from a ChatDlg
-@@ -4950,6 +4977,15 @@ static bool messageListContainsEvent(const QList<PsiEvent::Ptr>& messageList, co
- 	return false;
- }
- 
-+#ifdef PSI_PLUGINS
-+void PsiAccount::createNewPluginEvent(const QString &jid, const QString &descr, QObject *receiver, const char *slot)
-+{
-+	PluginEvent::Ptr pe(new PluginEvent(jid, descr, this));
-+	connect(pe.data(), SIGNAL(activated(QString)), receiver, slot);
-+	handleEvent(pe, IncomingStanza);
-+}
-+#endif
-+
- // handle an incoming event
- void PsiAccount::handleEvent(const PsiEvent::Ptr &e, ActivationType activationType)
- {
-@@ -4995,12 +5031,13 @@ void PsiAccount::handleEvent(const PsiEvent::Ptr &e, ActivationType activationTy
- 	e->setJid(j);
- 
- #ifdef PSI_PLUGINS
--	QDomElement eXml = e->toXml(new QDomDocument());
-+	QDomDocument doc;
-+	QDomElement eXml = e->toXml(&doc);
- 	if (PluginManager::instance()->processEvent(this, eXml)) {
--		delete e;
- 		return;
-+	} else {
-+		e->fromXml(psi(),this, &eXml);
- 	}
--	//FIXME(KIS): must now cause the event to be recreated from this xml or such. Horrid.
- #endif
- 
- 	if (d->psi->filterEvent(this, e)) {
-@@ -5045,7 +5082,6 @@ void PsiAccount::handleEvent(const PsiEvent::Ptr &e, ActivationType activationTy
- 		//if ( !ul.isEmpty() )
- 		//	ulItem=ul.first();
- 		if (PluginManager::instance()->processMessage(this, e->from().full(), m.body(), m.subject())) {
--			delete e;
- 			return;
- 		}
- 		//PluginManager::instance()->message(this,e->from(),ulItem,((MessageEvent*)e)->message().body());
-@@ -5243,6 +5279,13 @@ void PsiAccount::handleEvent(const PsiEvent::Ptr &e, ActivationType activationTy
- 		}
- #endif
- 	}
-+#ifdef PSI_PLUGINS
-+	else if (e->type() == PsiEvent::Plugin) {
-+		soundType = eSystem;
-+		doPopup = true;
-+		popupType = PopupManager::AlertHeadline;
-+	}
-+#endif
- 	else {
- 		putToQueue = false;
- 		doPopup = false;
-@@ -5262,7 +5305,16 @@ void PsiAccount::handleEvent(const PsiEvent::Ptr &e, ActivationType activationTy
- 		    (popupType == PopupManager::AlertAvCall    && o->getOption("options.ui.notifications.passive-popups.incoming-message").toBool()) ||
- 		    (popupType == PopupManager::AlertComposing && o->getOption("options.ui.notifications.passive-popups.composing").toBool()))
- 		{
--			psi()->popupManager()->doPopup(this, popupType, j, r, u, e, false);
-+#ifdef PSI_PLUGINS
-+			if(e->type() != PsiEvent::Plugin) {
-+#endif
-+				psi()->popupManager()->doPopup(this, popupType, j, r, u, e, false);
-+#ifdef PSI_PLUGINS
-+ 			}
-+ 			else {
-+				psi()->popupManager()->doPopup(this, j, IconsetFactory::iconPtr("psi/headline"), tr("Headline"), 0, 0, e->description(), false, popupType);
-+			}
-+#endif
- 		}
- 		emit startBounce();
- 	}
-@@ -5429,6 +5481,10 @@ void PsiAccount::queueEvent(const PsiEvent::Ptr &e, ActivationType activationTyp
- 		else if (e->type() == PsiEvent::File) {
- 			doPopup = PsiOptions::instance()->getOption("options.ui.file-transfer.auto-popup").toBool();
- 		}
-+#ifdef PSI_PLUGINS
-+		else if (e->type() == PsiEvent::Plugin)
-+			doPopup = false;
-+#endif
- 		else {
- 			doPopup = PsiOptions::instance()->getOption("options.ui.message.auto-popup").toBool();
- 		}
-@@ -5451,6 +5507,18 @@ void PsiAccount::openNextEvent(const UserListItem& u, ActivationType activationT
- 	PsiEvent::Ptr e = d->eventQueue->peek(u.jid());
- 	if(!e)
- 		return;
-+#ifdef PSI_PLUGINS
-+	if(e->type() == PsiEvent::Plugin) {
-+		PluginEvent::Ptr pe = e.staticCast<PluginEvent>();
-+		pe->activate();
-+		eventQueue()->dequeue(e);
-+		queueChanged();
-+		UserListItem *u = e->account()->find(e->jid());
-+		if(u)
-+			e->account()->cpUpdate(*u);
-+		return;
-+	}
-+#endif
- 
- 	psi()->processEvent(e, activationType);
- }
---- a/src/psiaccount.h
-+++ b/src/psiaccount.h
-@@ -250,6 +250,10 @@ public:
- 	};
- 	void playSound(SoundType onevent);
- 
-+#ifdef PSI_PLUGINS
-+	void createNewPluginEvent(const QString& jid, const QString& descr, QObject *receiver, const char* slot);
-+#endif
-+
- 	QStringList hiddenChats(const Jid &) const;
- 
- 	int sendMessageEncrypted(const Message &);
---- a/src/psiactionlist.cpp
-+++ b/src/psiactionlist.cpp
-@@ -28,6 +28,9 @@
- 
- #include "iconset.h"
- #include "psioptions.h"
-+#ifdef PSI_PLUGINS
-+#include "pluginmanager.h"
-+#endif
- 
- #include "mainwin_p.h"
- 
-@@ -507,6 +510,23 @@ void PsiActionList::Private::createGroupchat()
- 
- void PsiActionList::Private::addPluginsActions(ActionsType type)
- {
-+#ifdef PSI_PLUGINS
-+	PluginManager *pm = PluginManager::instance();
-+	QStringList plugins = pm->availablePlugins();
-+	ActionList *actions = new ActionList(tr("Plugins"), type, false);
-+	foreach (const QString &plugin, plugins) {
-+		if ((type == Actions_Chat      && !pm->hasToolBarButton(plugin)) ||
-+			(type == Actions_Groupchat && !pm->hasGCToolBarButton(plugin))) {
-+
-+			continue;
-+		}
-+
-+		IconAction *action = new IconAction(plugin, "", plugin, 0, this);
-+		action->setIcon(pm->icon(plugin));
-+		actions->addAction(pm->shortName(plugin) + "-plugin", action);
-+	}
-+	list->addList(actions);
-+#endif
- }
- 
- void PsiActionList::Private::optionsChanged()
---- a/src/psichatdlg.cpp
-+++ b/src/psichatdlg.cpp
-@@ -49,6 +49,9 @@
- #include "avcall/avcall.h"
- #include "actionlist.h"
- #include "psiactionlist.h"
-+#ifdef PSI_PLUGINS
-+#include "pluginmanager.h"
-+#endif
- 
- #define MCMDCHAT		"http://psi-im.org/ids/mcmd#chatmain"
- 
-@@ -277,6 +280,9 @@ void PsiChatDlg::initUi()
- 		throbber_icon = (PsiIcon *)IconsetFactory::iconPtr("psi/throbber");
- 	}
- 	unacked_messages = 0;
-+#ifdef PSI_PLUGINS
-+	PluginManager::instance()->setupChatTab(this, account(), jid().full());
-+#endif
- }
- 
- void PsiChatDlg::verticalSplitterMoved(int, int)
-@@ -429,6 +435,14 @@ void PsiChatDlg::updateToolbuttons()
- 			continue;
- 		}
- 
-+#ifdef PSI_PLUGINS
-+		if (actionName.endsWith("-plugin")) {
-+			QString name = PluginManager::instance()->nameByShortName(actionName.mid(0, actionName.length() - 7));
-+			PluginManager::instance()->addToolBarButton(this, ui_.toolbar, account(), jid().full(), name);
-+			continue;
-+		}
-+#endif
-+
- 		// Hack. separator action can be added only once.
- 		if (actionName == "separator") {
- 			ui_.toolbar->addSeparator();
-@@ -895,6 +909,12 @@ void PsiChatDlg::buildMenu()
- 
- 	pm_settings_->addAction(actions_->action("chat_info"));
- 	pm_settings_->addAction(actions_->action("chat_history"));
-+#ifdef PSI_PLUGINS
-+	if(!PsiOptions::instance()->getOption("options.ui.contactlist.toolbars.m0.visible").toBool()) {
-+		pm_settings_->addSeparator();
-+		PluginManager::instance()->addToolBarButton(this, pm_settings_, account(), jid().full());
-+	}
-+#endif
- }
- 
- void PsiChatDlg::updateCounter()
---- a/src/psicon.cpp
-+++ b/src/psicon.cpp
-@@ -597,7 +597,7 @@ bool PsiCon::init()
- 
- #ifdef PSI_PLUGINS
- 	// Plugin Manager
--	PluginManager::instance();
-+	PluginManager::instance()->initNewSession(this);
- #endif
- 
- 	// Global shortcuts
-@@ -743,7 +743,9 @@ void PsiCon::deinit()
- 	// save profile
- 	if(d->contactList)
- 		d->saveProfile(acc);
--
-+#ifdef PSI_PLUGINS
-+	PluginManager::instance()->unloadAllPlugins();
-+#endif
- 	GlobalShortcutManager::clear();
- 
- 	DesktopUtil::unsetUrlHandler("xmpp");
-@@ -763,6 +765,9 @@ void PsiCon::setShortcuts()
- #ifdef YAPSI
- 	ShortcutManager::connect("global.filter-contacts", d->mainwin, SLOT(filterContacts()));
- #endif
-+#ifdef PSI_PLUGINS
-+	PluginManager::instance()->setShortcuts();
-+#endif
- }
- 
- PsiContactList* PsiCon::contactList() const
-@@ -1321,7 +1326,14 @@ void PsiCon::openUri(const QUrl &uri)
- 	// authority
- 	PsiAccount *pa = 0;
- 	//if (uri.authority().isEmpty()) {
--		pa = d->contactList->defaultAccount();
-+		TabbableWidget* tw = findActiveTab();
-+		if (tw) {
-+			pa = tw->account();
-+		}
-+		if (!pa) {
-+			pa = d->contactList->defaultAccount();
-+		}
-+
- 		if (!pa) {
- 			QMessageBox::critical(0, tr("Error"), QString("You need to have an account configured and enabled to open URIs (links)."));
- 			return;
---- a/src/psicontactmenu.cpp
-+++ b/src/psicontactmenu.cpp
-@@ -39,6 +39,7 @@
- #include "statusdlg.h"
- #include "xmpp_tasks.h"
- #include "avcall/avcall.h"
-+#include "pluginmanager.h"
- #ifdef HAVE_PGPUTIL
- #include "pgputil.h"
- #endif
-@@ -455,6 +456,11 @@ public:
- 			}
- 			menu_->addSeparator();
- 			menu_->addAction(sendFileAction_);
-+
-+#ifdef PSI_PLUGINS
-+			PluginManager::instance()->addContactMenu(menu, contact_->account(), contact_->jid().full());
-+#endif
-+
- 			menu_->addMenu(inviteToGroupchatMenu_);
- 			menu_->addSeparator();
- 			mngMenu_ = menu_->addMenu(IconsetFactory::icon("psi/manageContact").icon(), tr("Manage &Contact"));
---- a/src/psievent.cpp
-+++ b/src/psievent.cpp
-@@ -208,6 +208,49 @@ void PsiEvent::setId(int id)
- }
- #endif
- 
-+
-+#ifdef PSI_PLUGINS
-+//----------------------------------------------------------------------------
-+// PluginEvent
-+//----------------------------------------------------------------------------
-+PluginEvent::PluginEvent(const QString& jid, const QString& descr, PsiAccount *acc)
-+	: PsiEvent(acc)
-+	, descr_(descr)
-+{
-+	from_ = XMPP::Jid(jid);
-+}
-+
-+PluginEvent::~PluginEvent()
-+{
-+
-+}
-+
-+int PluginEvent::type() const
-+{
-+	return Plugin;
-+}
-+
-+XMPP::Jid PluginEvent::from() const
-+{
-+	return from_;
-+}
-+
-+void PluginEvent::setFrom(const XMPP::Jid &j)
-+{
-+	from_ = j;
-+}
-+
-+void PluginEvent::activate()
-+{
-+	emit activated(from_.full());
-+}
-+
-+QString PluginEvent::description() const
-+{
-+	return descr_;
-+}
-+#endif
-+
- //----------------------------------------------------------------------------
- // MessageEvent
- //----------------------------------------------------------------------------
---- a/src/psievent.h
-+++ b/src/psievent.h
-@@ -64,6 +64,10 @@ public:
- 		//Status
- 		HttpAuth,
- 		AvCallType
-+#ifdef PSI_PLUGINS
-+		,Plugin
-+#endif
-+
- 	};
- 	virtual int type() const = 0;
- 
-@@ -108,6 +112,32 @@ private:
- #endif
- };
- 
-+
-+#ifdef PSI_PLUGINS
-+class PluginEvent : public PsiEvent
-+{
-+	Q_OBJECT
-+public:
-+	PluginEvent(const QString& jid, const QString& descr, PsiAccount *acc);
-+	~PluginEvent();
-+
-+	typedef QSharedPointer<PluginEvent> Ptr;
-+	int type() const;
-+	XMPP::Jid from() const;
-+	virtual void setFrom(const XMPP::Jid &j);
-+	virtual QString description() const;
-+	void activate();
-+
-+signals:
-+	void activated(QString);
-+
-+private:
-+	XMPP::Jid from_;
-+	QString descr_;
-+};
-+#endif
-+
-+
- // normal, chat, error, headline, etc
- class MessageEvent : public PsiEvent
- {
---- a/src/psioptions.cpp
-+++ b/src/psioptions.cpp
-@@ -31,6 +31,9 @@
- #include "statuspreset.h"
- #include "psitoolbar.h"
- #include "common.h"
-+#ifdef PSI_PLUGINS
-+#include "pluginmanager.h"
-+#endif
- using namespace XMPP;
- 
- // ----------------------------------------------------------------------------
-@@ -182,6 +185,13 @@ bool PsiOptions::newProfile()
- 
- 	{
- 		QStringList pluginsKeys;
-+#ifdef PSI_PLUGINS
-+		PluginManager *pm = PluginManager::instance();
-+		QStringList plugins = pm->availablePlugins();
-+		foreach (const QString &plugin, plugins) {
-+			pluginsKeys << pm->shortName(plugin) + "-plugin";
-+		}
-+#endif
- 		ToolbarPrefs chatToolbar;
- 		chatToolbar.on = true;
- 		chatToolbar.name = "Chat";
---- a/src/tabs/tabdlg.cpp
-+++ b/src/tabs/tabdlg.cpp
-@@ -921,3 +921,8 @@ void TabDlg::updateVSplitters(int log, int chat)
- 		w->setVSplitterPosition(log, chat);
- 	}
- }
-+
-+TabbableWidget* TabDlg::getCurrentTab() const
-+{
-+	return dynamic_cast<TabbableWidget*>(tabWidget_->currentPage());
-+}
---- a/src/tabs/tabdlg.h
-+++ b/src/tabs/tabdlg.h
-@@ -88,6 +88,7 @@ public:
- 	void setTabBarShownForSingles(bool enabled); // default enabled
- 	void setSimplifiedCaptionEnabled(bool enabled); // default disabled
- 	void setTabIcon(QWidget *,const QIcon &);
-+	TabbableWidget* getCurrentTab() const;
- 
- protected:
- 	void setShortcuts();

psi-plus-main-20160309.tar.xz/patches/9970-psiplus-join-to-support-muc.diff Deleted

@@ -1,46 +0,0 @@
-Entering 'iris'
-Entering 'src/libpsi'
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -1096,7 +1096,7 @@ void MainWin::actOnlineHomeActivated ()
- 
- void MainWin::actOnlineForumActivated ()
- {
--	DesktopUtil::openUrl("http://forum.psi-im.org");
-+	DesktopUtil::openUrl("http://forum.psi-plus.com");
- }
- 
- void MainWin::actJoinPsiMUCActivated()
-@@ -1106,12 +1106,12 @@ void MainWin::actJoinPsiMUCActivated()
- 		return;
- 	}
- 
--	account->actionJoin("psi@conference.psi-im.org");
-+	account->actionJoin("psi-dev@conference.jabber.ru");
- }
- 
- void MainWin::actBugReportActivated ()
- {
--	DesktopUtil::openUrl("http://forum.psi-im.org/forum/2");
-+	DesktopUtil::openUrl("http://code.google.com/p/psi-dev/wiki/issues?tm=3");
- }
- 
- void MainWin::actAboutActivated ()
---- psi.orig/src/psiactionlist.cpp
-+++ psi/src/psiactionlist.cpp
-@@ -386,11 +386,11 @@ void PsiActionList::Private::createMainW
- 		IconAction *actOnlineHome = new IconAction (tr("Home Page (Online)"), tr("&Home Page (Online)"), 0, this);
- 		actOnlineHome->setWhatsThis (tr("Home Page (Online)"));
- 
--		IconAction *actOnlineForum = new IconAction (tr("Psi Forum (Online)"), tr("Psi &Forum (Online)"), 0, this);
--		actOnlineForum->setWhatsThis (tr("Psi Forum (Online)"));
-+		IconAction *actOnlineForum = new IconAction (tr("Psi+ Forum (Online)"), tr("Psi+ &Forum (Online)"), 0, this);
-+		actOnlineForum->setWhatsThis (tr("Psi+ Forum (Online)"));
- 
--		IconAction *actPsiMUC = new IconAction (tr("Join Psi Discussion Room (Online)"), tr("&Join Psi Discussion Room (Online)"), 0, this);
--		actOnlineHome->setWhatsThis (tr("Join Psi Discussion Room (Online)"));
-+		IconAction *actPsiMUC = new IconAction (tr("Join Psi+ Discussion Room (Online)"), tr("&Join Psi+ Discussion Room (Online)"), 0, this);
-+		actOnlineHome->setWhatsThis (tr("Join Psi+ Discussion Room (Online)"));
- 
- 		IconAction *actBugReport = new IconAction (tr("Report a Bug (Online)"), tr("Report a &Bug (Online)"), 0, this);
- 		actBugReport->setWhatsThis (tr("Report a Bug (Online)"));

psi-plus-main-20160309.tar.xz/patches/9980-psi-search-for-psimedia-in-all-plugins-dirs.diff Deleted

@@ -1,62 +0,0 @@
---- psi.orig/src/applicationinfo.cpp
-+++ psi/src/applicationinfo.cpp
-@@ -134,6 +134,17 @@ QStringList ApplicationInfo::dataDirs()
- 	return  dirs;
- }
- 
-+QStringList ApplicationInfo::pluginDirs()
-+{
-+	QStringList l;
-+	l += resourcesDir() + "/plugins";
-+	l += homeDir(ApplicationInfo::DataLocation) + "/plugins";
-+#if defined(Q_OS_UNIX)
-+	l += libDir() + "/plugins";
-+#endif
-+	return l;
-+}
-+
- QString ApplicationInfo::getCertificateStoreSaveDir()
- {
- 	QDir certsave(homeDir(DataLocation) + "/certs");
---- psi.orig/src/applicationinfo.h
-+++ psi/src/applicationinfo.h
-@@ -40,6 +40,7 @@ public:
- 	static QStringList getCertificateStoreDirs();
- 	static QString getCertificateStoreSaveDir();
- 	static QStringList dataDirs();
-+	static QStringList pluginDirs();
- 
- 	// Namespaces
- 	static QString optionsNS();
---- psi.orig/src/avcall/avcall.cpp
-+++ psi/src/avcall/avcall.cpp
-@@ -117,7 +117,11 @@ static void ensureLoaded()
- 			pluginFile = findPlugin("../Plugins", "gstprovider");
- 			resourcePath = QCoreApplication::applicationDirPath() + "/../Frameworks/gstreamer-0.10";
- #else
--			pluginFile = findPlugin(ApplicationInfo::libDir() + "/plugins", "gstprovider");
-+			foreach(const QString& path, ApplicationInfo::pluginDirs()) {
-+				pluginFile = findPlugin(path, "gstprovider");
-+				if(!pluginFile.isEmpty())
-+					break;
-+			}
- #endif
- 		}
- 
---- psi.orig/src/pluginmanager.cpp
-+++ psi/src/pluginmanager.cpp
-@@ -60,13 +60,7 @@ public:
-  */
- static QStringList pluginDirs()
- {
--	QStringList l;
--	l += ApplicationInfo::resourcesDir() + "/plugins";
--	l += ApplicationInfo::homeDir(ApplicationInfo::DataLocation) + "/plugins";
--#if defined(Q_OS_UNIX)
--	l += ApplicationInfo::libDir() + "/plugins";
--#endif
--	return l;
-+	return ApplicationInfo::pluginDirs();
- }
- 
- /**

psi-plus-main-20160309.tar.xz/patches/9990-psiplus-aboutdlg.diff Deleted

@@ -1,115 +0,0 @@
---- psi.orig/src/aboutdlg.cpp
-+++ psi/src/aboutdlg.cpp
-@@ -71,6 +71,52 @@ AboutDlg::AboutDlg(QWidget* parent)
- 			   tr("Developer"));
- 	ui_.te_authors->setText( authors );
- 
-+	// fill in About Psi+ tab...
-+	QString psiplus;
-+	psiplus += details(QString::fromUtf8("Psi+ Project"),
-+			   "", "psi-dev@conference.jabber.ru", "http://psi-dev.googlecode.com/",
-+			   tr("Active project members are presents below:"));
-+	psiplus += details(QString::fromUtf8("zet"),
-+			   "vladimir.shelukhin@gmail.com", "", "",
-+			   tr("Founder, Patcher and MS Windows Packager"));
-+	psiplus += details(QString::fromUtf8("rion"),
-+			   "rion4ik@gmail.com", "", "",
-+			   tr("Founder and Lead Patcher"));
-+	psiplus += details(QString::fromUtf8("majik"),
-+			   "maksim.maj@gmail.com", "", "",
-+			   tr("Founder, Designer and Patcher"));
-+	psiplus += details(QString::fromUtf8("Dealer_WeARE"),
-+			   "wadealer@gmail.com", "", "",
-+			   tr("Lead Patcher and Plugins Writer; Mac OS X Packager"));
-+	psiplus += details(QString::fromUtf8("liuch"),
-+			   "", "", "",
-+			   tr("Patcher and Plugins Writer"));
-+	psiplus += details(QString::fromUtf8("tehnick"),
-+			  "tehnick-8@mail.ru", "", "",
-+			  tr("Language coordinator; Debian Packager"));
-+	psiplus += details(QString::fromUtf8("KukuRuzo"),
-+			   "", "", "",
-+			   tr("Patcher and Plugins Writer"));
-+	psiplus += details(QString::fromUtf8("taurus"),
-+			   "", "", "",
-+			   tr("Patcher, Plugins Writer and Fedora Packager"));
-+	psiplus += details(QString::fromUtf8("ivan1986"),
-+			   "", "", "",
-+			   tr("Patcher and Ubuntu Packager"));
-+	psiplus += details(QString::fromUtf8("nexor (aka zerkalica)"),
-+			   "", "", "",
-+			   tr("Ubuntu Packager"));
-+	psiplus += details(QString::fromUtf8("Flint (aka Флинт)"),
-+			   "", "", "",
-+			   tr("Mandriva Linux Packager"));
-+	psiplus += details(QString::fromUtf8("ivan101"),
-+			   "ivan101@users.sourceforge.net", "", "",
-+			   tr("Patcher and Russian localization"));
-+	psiplus += details(QString::fromUtf8("Z_God"),
-+			   "", "", "",
-+			   tr("Psimedia Patcher and Wiki English localization"));
-+	ui_.te_psiplus->setText( psiplus );
-+
- 	// fill in Thanks To tab...
- 	QString thanks;
- 	thanks += details(QString::fromUtf8("Frederik Schwarzer"),
-@@ -182,7 +228,7 @@ QString AboutDlg::details( QString name,
- 	if ( !email.isEmpty() )
- 		ret += nbsp + "E-mail: " + "<a href=\"mailto:" + email + "\">" + email + "</a><br>\n";
- 	if ( !jabber.isEmpty() )
--		ret += nbsp + "XMPP: " + "<a href=\"xmpp:" + jabber + "\">" + jabber + "</a><br>\n";
-+		ret += nbsp + "XMPP: " + "<a href=\"xmpp:" + jabber + "?join\">" + jabber + "</a><br>\n";
- 	if ( !www.isEmpty() )
- 		ret += nbsp + "WWW: " + "<a href=\"" + www + "\">" + www + "</a><br>\n";
- 	if ( !desc.isEmpty() )
---- psi.orig/src/about.ui
-+++ psi/src/about.ui
-@@ -8,12 +8,12 @@
-    <rect>
-     <x>0</x>
-     <y>0</y>
--    <width>504</width>
-+    <width>625</width>
-     <height>320</height>
-    </rect>
-   </property>
-   <property name="windowTitle" >
--   <string>About Psi</string>
-+   <string>About</string>
-   </property>
-   <layout class="QVBoxLayout" >
-    <property name="margin" >
-@@ -39,7 +39,7 @@
-         <enum>QFrame::Plain</enum>
-        </property>
-        <property name="psiIconName" stdset="0" >
--        <string>psi/logo_48</string>
-+        <string>psi/psiplus_logo</string>
-        </property>
-       </widget>
-      </item>
-@@ -221,7 +221,23 @@ Copyright © 2001-2014 The Psi Team.&lt;
-        </item>
-       </layout>
-      </widget>
--    </widget>
-+     <widget class="QWidget" name="tab_psiplus" >
-+      <attribute name="title" >
-+       <string>About Psi+</string>
-+      </attribute>
-+      <layout class="QVBoxLayout" >
-+       <property name="margin" >
-+        <number>9</number>
-+       </property>
-+       <property name="spacing" >
-+        <number>6</number>
-+       </property>
-+       <item>
-+        <widget class="PsiTextView" name="te_psiplus" />
-+       </item>
-+      </layout>
-+     </widget>
-+	 </widget>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" >

psi-plus-main-20160309.tar.xz/patches/9998-psi-plus-migrate-old-home.diff Deleted

psi-plus-main-20160309.tar.xz/patches/9999-psiplus-application-info.diff Deleted

@@ -1,136 +0,0 @@
---- a/certs/README
-+++ b/certs/README
-@@ -4,7 +4,7 @@ Please use PSIDATADIR/certs for local additions.
- 
- Default value of PSIDATADIR:
-   Linux, MacOS X and other Unices
--     ~/.psi/ 
-+     ~/.local/share/psi+/
-   Windows NT, 2000, XP and Server 2003
-      %UserProfile%\PsiData\ (usually C:\Documents and Settings\username\PsiData )
-   Windows 95, 98 and Me
---- a/psi.desktop
-+++ b/psi.desktop
-@@ -5,11 +5,11 @@ Type=Application
- Name=Psi+
- GenericName=XMPP Client
- Comment=Communicate over the XMPP network
--Icon=psi
--Exec=psi %U
-+Icon=psi-plus
-+Exec=psi-plus %U
- MimeType=x-scheme-handler/xmpp;
- Terminal=false
--StartupWMClass=Psi
-+StartupWMClass=Psi-plus
- Categories=Network;InstantMessaging;Qt;
- Keywords=XMPP;Jabber;Chat;InstantMessaging;
- 
---- a/qcm/conf.qcm
-+++ b/qcm/conf.qcm
-@@ -81,8 +81,8 @@ public:
- 		psiGenerateFile(sourceDir + "/.qmake.cache.in", ".qmake.cache", vars);
- 
- #ifndef Q_OS_WIN
--		conf->addExtra(QString("PSI_LIBDIR=%1/psi").arg(conf->getenv("LIBDIR")));
--		conf->addExtra(QString("PSI_DATADIR=%1/psi").arg(conf->getenv("DATADIR")));
-+		conf->addExtra(QString("PSI_LIBDIR=%1/psi-plus").arg(conf->getenv("LIBDIR")));
-+		conf->addExtra(QString("PSI_DATADIR=%1/psi-plus").arg(conf->getenv("DATADIR")));
- #endif
- 
- 		QDir(".").mkdir("src");
-@@ -90,8 +90,8 @@ public:
- 		if ( file.open(QIODevice::WriteOnly | QIODevice::Text) ) {
- 			QTextStream stream( &file );
- #ifndef Q_OS_WIN
--			stream << "#define PSI_LIBDIR \"" << conf->getenv("LIBDIR") << "/psi\"" << endl;
--			stream << "#define PSI_DATADIR \"" << conf->getenv("DATADIR") << "/psi\"" << endl;
-+			stream << "#define PSI_LIBDIR \"" << conf->getenv("LIBDIR") << "/psi-plus\"" << endl;
-+			stream << "#define PSI_DATADIR \"" << conf->getenv("DATADIR") << "/psi-plus\"" << endl;
- #endif
- 			stream << "#define PSI_VERSION \"" << version << "\"" << endl;
- 		}
---- a/src/applicationinfo.cpp
-+++ b/src/applicationinfo.cpp
-@@ -42,12 +42,12 @@
- //
- // PROG_SNAME - read as small name, system name, soname, short name, fs name
- 
--#define PROG_NAME "Psi"
--#define PROG_SNAME "psi"
-+#define PROG_NAME "Psi+"
-+#define PROG_SNAME "psi+"
- #define PROG_VERSION PSI_VERSION
- //#define PROG_VERSION "0.15-dev" " (" __DATE__ ")" //CVS Builds are dated
- //#define PROG_VERSION "0.15";
--#define PROG_CAPS_NODE "http://psi-im.org"
-+#define PROG_CAPS_NODE "http://psi-dev.googlecode.com/caps"
- #define PROG_IPC_NAME "org.psi-im.Psi"	// must not contain '\\' character on Windows
- #define PROG_OPTIONS_NS "http://psi-im.org/options"
- #define PROG_STORAGE_NS "http://psi-im.org/storage"
---- a/src/homedirmigration.ui
-+++ b/src/homedirmigration.ui
-@@ -43,7 +43,7 @@ p, li { white-space: pre-wrap; }
- &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
- p, li { white-space: pre-wrap; }
- &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Serif'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
--&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;Copy the existing profile to the new directory required to run Psi. The old profile will not be removed. You can remove it manually later.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:medium; font-weight:600; color:#1a1a1a;&quot;&gt;(Recommended)&lt;/span&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;Copy the existing profile to the new directory required to run Psi+. The old profile will not be removed. You can remove it manually later.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:medium; font-weight:600; color:#1a1a1a;&quot;&gt;(Recommended)&lt;/span&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <property name="text">
-       <string>Import Psi profile</string>
-@@ -74,7 +74,7 @@ p, li { white-space: pre-wrap; }
- &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
- p, li { white-space: pre-wrap; }
- &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Serif'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
--&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;Create a new Psi profile. The old profile will not be removed, but you will be unable to choose it.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:medium; font-weight:600; color:#1a1a1a;&quot;&gt;(Not recommended)&lt;/span&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;Create a new Psi+ profile. The old profile will not be removed, but you will be unable to choose it.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:medium; font-weight:600; color:#1a1a1a;&quot;&gt;(Not recommended)&lt;/span&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <property name="text">
-       <string>Create new profile</string>
---- a/src/plugins/psiplugin.pri
-+++ b/src/plugins/psiplugin.pri
-@@ -14,7 +14,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
-   DEFINES += HAVE_QT5
- }
- 
--target.path = $$(HOME)/.local/share/Psi/plugins
-+target.path = $$(HOME)/.local/share/psi+/plugins
- INSTALLS += target
- 
- include(plugins.pri)
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -4,7 +4,7 @@
- 
- # Configuration
- TEMPLATE = app
--TARGET   = psi
-+TARGET   = psi-plus
- CONFIG  += qt thread x11
- DESTDIR  = $$top_builddir
- 
-@@ -43,17 +43,17 @@ unix {
- 
- 	# icons and desktop files
- 	dt.path=$$PREFIX/share/applications/
--	dt.files = ../psi.desktop
-+	dt.extra = cp -f ../psi.desktop $(INSTALL_ROOT)$$dt.path/psi-plus.desktop
- 	icon1.path=$$PREFIX/share/icons/hicolor/16x16/apps
--	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
-+	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi-plus.png
- 	icon2.path=$$PREFIX/share/icons/hicolor/32x32/apps
--	icon2.extra = cp -f ../iconsets/system/default/psiplus/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
-+	icon2.extra = cp -f ../iconsets/system/default/psiplus/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi-plus.png
- 	icon3.path=$$PREFIX/share/icons/hicolor/48x48/apps
--	icon3.extra = cp -f ../iconsets/system/default/psiplus/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
-+	icon3.extra = cp -f ../iconsets/system/default/psiplus/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi-plus.png
- 	icon4.path=$$PREFIX/share/icons/hicolor/64x64/apps
--	icon4.extra = cp -f ../iconsets/system/default/psiplus/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
-+	icon4.extra = cp -f ../iconsets/system/default/psiplus/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi-plus.png
- 	icon5.path=$$PREFIX/share/icons/hicolor/128x128/apps
--	icon5.extra = cp -f ../iconsets/system/default/psiplus/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
-+	icon5.extra = cp -f ../iconsets/system/default/psiplus/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi-plus.png
- 	INSTALLS += dt icon1 icon2 icon3 icon4 icon5
- }
-

psi-plus-main-20160309.tar.xz/patches/dev Deleted

psi-plus-main-20160309.tar.xz/patches/dev/0460-psi-plugins-fixes.patch Deleted

@@ -1,182 +0,0 @@
---- git.temp.orig/src/plugins/generic/antievil/antievil.cpp
-+++ git.temp/src/plugins/generic/antievil/antievil.cpp
-@@ -42,7 +42,7 @@ public:
- 		return "0.1";
- 	}
- 
--	virtual QWidget* options() const
-+	virtual QWidget* options()
- 	{
- 		return 0;
- 	}
-@@ -92,6 +92,13 @@ public:
- 		return blocked;
- 	}
- 
-+	virtual bool incomingStanza(int account, QDomElement& stanza)
-+	{
-+		Q_UNUSED(account)
-+		Q_UNUSED(stanza)
-+		return false;
-+	}
-+
- 
- 	//-- StanzaSender ----------------------------------------
- 
-@@ -100,6 +107,9 @@ public:
- 		stanzaSender = host;
- 	}
- 
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
-+
- 
- private:
- 	StanzaSendingHost* stanzaSender;
---- git.temp.orig/src/plugins/generic/consoledump/consoledumpplugin.cpp
-+++ git.temp/src/plugins/generic/consoledump/consoledumpplugin.cpp
-@@ -39,9 +39,11 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) ;
-@@ -72,7 +74,7 @@ QString ConsoleDumpPlugin::version() con
- 	return "0.1";
- }
- 
--QWidget* ConsoleDumpPlugin::options() const
-+QWidget* ConsoleDumpPlugin::options()
- {
- 	return 0;
- }
---- git.temp.orig/src/plugins/generic/echo/echoplugin.cpp
-+++ git.temp/src/plugins/generic/echo/echoplugin.cpp
-@@ -44,12 +44,12 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
- 	// EventFilter
--    virtual bool processEvent(int account, const QDomElement& e);
-+	virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject);
- 
- 	// StanzaSender
-@@ -59,7 +59,8 @@ public:
- 	virtual void setOptionAccessingHost(OptionAccessingHost* host);
- 	virtual void optionChanged(const QString& option);
- 
--
-+	virtual void applyOptions();
-+	virtual void restoreOptions();
- 
- private:
- 	bool enabled;
-@@ -91,7 +92,7 @@ QString EchoPlugin::version() const
- 	return "0.1";
- }
- 
--QWidget* EchoPlugin::options() const
-+QWidget* EchoPlugin::options()
- {
- 	return 0;
- }
-@@ -160,6 +161,4 @@ void EchoPlugin::optionChanged(const QSt
- {
- 	Q_UNUSED(option);
- }
--
--
- #include "echoplugin.moc"
---- git.temp.orig/src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.cpp
-+++ git.temp/src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.cpp
-@@ -44,7 +44,7 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
-@@ -52,6 +52,8 @@ public:
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject);
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
- private slots:
- 	void stopGame();
-@@ -95,7 +97,7 @@ QString NoughtsAndCrossesPlugin::version
- 	return "0.1";
- }
- 
--QWidget* NoughtsAndCrossesPlugin::options() const
-+QWidget* NoughtsAndCrossesPlugin::options()
- {
- 	return 0;
- }
---- git.temp.orig/src/plugins/generic/null/nullplugin.cpp
-+++ git.temp/src/plugins/generic/null/nullplugin.cpp
-@@ -34,9 +34,11 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- };
- 
- Q_EXPORT_PLUGIN(NullPlugin);
-@@ -56,7 +58,7 @@ QString NullPlugin::version() const
- 	return "0.1";
- }
- 
--QWidget* NullPlugin::options() const
-+QWidget* NullPlugin::options()
- {
- 	return 0;
- }
---- git.temp.orig/src/plugins/generic/urlwatcher/urlwatcherplugin.cpp
-+++ git.temp/src/plugins/generic/urlwatcher/urlwatcherplugin.cpp
-@@ -44,12 +44,14 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) ;
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
- private:
- 	bool enabled_;
-@@ -107,7 +109,7 @@ QString URLWatcherPlugin::version() cons
- 	return "0.2";
- }
- 
--QWidget* URLWatcherPlugin::options() const
-+QWidget* URLWatcherPlugin::options()
- {
- 	return 0;
- }

psi-plus-main-20160309.tar.xz/patches/dev/fix_historydb_qt5.diff Deleted

@@ -1,70 +0,0 @@
---- git.orig/qcm/qjson.qcm
-+++ git/qcm/qjson.qcm
-@@ -104,6 +104,7 @@ public:
- 	QString shortname() const { return "qjson"; }
- 	bool exec()
- 	{
-+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- 		// get the build mode
- #ifdef QC_BUILDMODE
- 		bool release = qc_buildmode_release;
-@@ -158,5 +159,8 @@ public:
- 		}
- 
- 		return false;
-+#else
-+		return true;
-+#endif
- 	}
- };
---- git.orig/src/eventdb.cpp
-+++ git/src/eventdb.cpp
-@@ -30,9 +30,14 @@
- #include <QDateTime>
- #include <QSqlError>
- #include <QSqlDriver>
-+#ifndef HAVE_QT5
- #include <qjson/parser.h>
- #include "qjson/serializer.h"
--
-+#else
-+#include <QJsonArray>
-+#include <QJsonDocument>
-+#include <QJsonObject>
-+#endif
- #include "common.h"
- #include "applicationinfo.h"
- #include "psievent.h"
-@@ -1388,8 +1393,14 @@ bool EDBSqLite::appendEvent(const QStrin
- 					urlList.append(QVariant(urlItem));
- 				}
- 			xepList"jabber:x:oob" = QVariant(urlList);
-+#ifndef HAVE_QT5
- 			QJson::Serializer serializer;
- 			extraData = QString::fromUtf8(serializer.serialize(xepList));
-+#else
-+			QJsonDocument doc(QJsonObject::fromVariantMap(xepList));
-+			extraData = QString::fromUtf8(doc.toBinaryData());
-+#endif
-+
- 		}
- 		query->bindValue(":extra_data", extraData);
- 	}
-@@ -1430,9 +1441,17 @@ PsiEvent::Ptr EDBSqLite::getEvent(const
- 		m.setSpooled(true);
- 		QString extraStr = record.value("extra_data").toString();
- 		if (!extraStr.isEmpty()) {
-+#ifndef HAVE_QT5
- 			QJson::Parser parser;
-+#endif
- 			bool fOk;
-+#ifndef HAVE_QT5
- 			QVariantMap extraData = parser.parse(extraStr.toUtf8(), &fOk).toMap();
-+#else
-+			QJsonDocument doc = QJsonDocument::fromJson(extraStr.toUtf8());
-+			fOk = !doc.isNull();
-+			QVariantMap extraData = doc.object().toVariantMap();
-+#endif
- 			if (fOk) {
- 				foreach (const QVariant &urlItem, extraData"jabber:x:oob".toList()) {
- 					QVariantList itemList = urlItem.toList();

psi-plus-main-20160309.tar.xz/patches/dev/iris_jingle.patch Deleted

@@ -1,1516 +0,0 @@
-diff --git a/include/iris/jingle.h b/include/iris/jingle.h
-new file mode 100644
-index 0000000..7355178
---- /dev/null
-+++ b/include/iris/jingle.h
-@@ -0,0 +1 @@
-+#include "../../src/xmpp/xmpp-im/jingle.h"
-diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
-index d1d33be..9fd001d 100644
---- a/src/xmpp/jid/jid.cpp
-+++ b/src/xmpp/jid/jid.cpp
-@@ -18,7 +18,6 @@
-  *
-  */
- 
--//#undef IRIS_XMPP_JID_DEPRECATED
- #include "xmpp/jid/jid.h"
- 
- #include <QCoreApplication>
-diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
-index 591cca2..fba722d 100644
---- a/src/xmpp/jid/jid.h
-+++ b/src/xmpp/jid/jid.h
-@@ -23,12 +23,6 @@
- 
- #include <QString>
- 
--#ifdef IRIS_XMPP_JID_DEPRECATED
--#define IRIS_XMPP_JID_DECL_DEPRECATED Q_DECL_DEPRECATED
--#else
--#define IRIS_XMPP_JID_DECL_DEPRECATED
--#endif
--
- namespace XMPP 
- {
- 	class Jid
-diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
-index fe51eb7..7a66aff 100644
---- a/src/xmpp/xmpp-core/protocol.cpp
-+++ b/src/xmpp/xmpp-core/protocol.cpp
-@@ -57,18 +57,6 @@ static QString printArray(const QByteArray &a)
- 	return s;
- }
- 
--// firstChildElement
--//
--// Get an element's first child element
--static QDomElement firstChildElement(const QDomElement &e)
--{
--	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
--		if(n.isElement())
--			return n.toElement();
--	}
--	return QDomElement();
--}
--
- //----------------------------------------------------------------------------
- // Version
- //----------------------------------------------------------------------------
-@@ -298,7 +286,7 @@ void BasicProtocol::extractStreamError(const QDomElement &e)
- 	QString text;
- 	QDomElement appSpec;
- 
--	QDomElement t = firstChildElement(e);
-+	QDomElement t = e.firstChildElement();
- 	if(t.isNull() || t.namespaceURI() != NS_STREAMS) {
- 		// probably old-style error
- 		errCond = -1;
-@@ -1453,7 +1441,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
- 				return true;
- 			}
- 			else if(e.tagName() == "failure") {
--				QDomElement t = firstChildElement(e);
-+				QDomElement t = e.firstChildElement();
- 				if(t.isNull() || t.namespaceURI() != NS_SASL)
- 					errCond = -1;
- 				else
-diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
-index 99b4c01..2dba0a6 100644
---- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
-+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
-@@ -53,6 +53,8 @@ using namespace XMPP;
- 	both type/condition and code.
- 	Error text in output XML is always presented in XMPP-style only.
- 
-+	WARNING: XEP-0086 is DEPRECATED. but this class is still very handy.
-+
- 	All functions will always try to guess missing information based on mappings defined in the JEP.
- */
- 
-@@ -319,23 +321,21 @@ bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
- 	type = Private::stringToErrorType(e.attribute("type"));
- 
- 	// condition
--	QDomNodeList nl = e.childNodes();
- 	QDomElement t;
- 	condition = -1;
--	int n;
--	for(n = 0; n < nl.count(); ++n) {
--		QDomNode i = nl.item(n);
--		t = i.toElement();
--		if(!t.isNull()) {
--			// FIX-ME: this shouldn't be needed
--			if(t.namespaceURI() == NS_STANZAS || t.attribute("xmlns") == NS_STANZAS) {
--				condition = Private::stringToErrorCond(t.tagName());
--				if (condition != -1)
--					break;
--			}
-+	for (t = e.firstChildElement(); !t.isNull(); t = t.nextSiblingElement()) {
-+		// FIX-ME: this shouldn't be needed
-+		if(t.namespaceURI() == NS_STANZAS || t.attribute("xmlns") == NS_STANZAS) {
-+			condition = Private::stringToErrorCond(t.tagName());
-+			if (condition != -1)
-+				if (condition == Redirect) {
-+					text = t.text().trimmed();
-+				}
-+				break;
- 		}
- 	}
- 
-+
- 	// code
- 	originalCode = e.attribute("code").toInt();
- 
-@@ -352,19 +352,19 @@ bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
- 	}
- 
- 	// text
--	t = e.elementsByTagNameNS(NS_STANZAS, "text").item(0).toElement();
--	if(!t.isNull())
--		text = t.text().trimmed();
--	else
--		text = e.text().trimmed();
-+	if (condition != Redirect) {
-+		t = e.elementsByTagNameNS(NS_STANZAS, "text").item(0).toElement();
-+		if(!t.isNull())
-+			text = t.text().trimmed();
-+		else
-+			text = e.text().trimmed();
-+	}
- 
- 	// appspec: find first non-standard namespaced element
- 	appSpec = QDomElement();
--	nl = e.childNodes();
--	for(n = 0; n < nl.count(); ++n) {
--		QDomNode i = nl.item(n);
--		if(i.isElement() && i.namespaceURI() != NS_STANZAS) {
--			appSpec = i.toElement();
-+	for (t = e.firstChildElement(); !t.isNull(); t = t.nextSiblingElement()) {
-+		if(t.namespaceURI() != NS_STANZAS) {
-+			appSpec = t;
- 			break;
- 		}
- 	}
-@@ -396,6 +396,9 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
- 	errElem.setAttribute("type", stype);
- 	errElem.appendChild(t = doc.createElementNS(NS_STANZAS, scond));
- 	t.setAttribute("xmlns", NS_STANZAS);	// FIX-ME: this shouldn't be needed
-+	if (condition == Redirect) {
-+		t.appendChild(doc.createTextNode(text));
-+	}
- 
- 	// old code
- 	int scode = code();
-@@ -403,7 +406,7 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
- 		errElem.setAttribute("code", scode);
- 
- 	// text
--	if(!text.isEmpty()) {
-+	if(!text.isEmpty() && condition != Redirect) {
- 		t = doc.createElementNS(NS_STANZAS, "text");
- 		t.setAttribute("xmlns", NS_STANZAS);	// FIX-ME: this shouldn't be needed
- 		t.appendChild(doc.createTextNode(text));
-diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
-index aa077a4..ba88e2d 100644
---- a/src/xmpp/xmpp-im/client.cpp
-+++ b/src/xmpp/xmpp-im/client.cpp
-@@ -70,14 +70,14 @@
- //!  \endcode
- 
- #include <stdarg.h>
--#include <qobject.h>
-+#include <QObject>
- #include <QMap>
--#include <qtimer.h>
--#include <qpointer.h>
--//Added by qt3to4:
-+#include <QTimer>
-+#include <QPointer>
- #include <QList>
- #include "xmpp_tasks.h"
- #include "xmpp_xmlcommon.h"
-+#include "jingle.h"
- #include "s5b.h"
- #include "xmpp_ibb.h"
- #include "xmpp_bitsofbinary.h"
-@@ -139,6 +139,7 @@ public:
- 
- 	LiveRoster roster;
- 	ResourceList resourceList;
-+	Jingle::Manager *jingleman;
- 	S5BManager *s5bman;
- 	IBBManager *ibbman;
- 	BoBManager *bobman;
-@@ -167,6 +168,8 @@ Client::Client(QObject *par)
- 
- 	d->stream = 0;
- 
-+	d->jingleman = new Jingle::Manager(this);
-+
- 	d->s5bman = new S5BManager(this);
- 	connect(d->s5bman, SIGNAL(incomingReady()), SLOT(s5b_incomingReady()));
- 
-@@ -251,6 +254,11 @@ FileTransferManager *Client::fileTransferManager() const
- 	return d->ftman;
- }
- 
-+Jingle::Manager *Client::jingleManager() const
-+{
-+	return d->jingleman;
-+}
-+
- S5BManager *Client::s5bManager() const
- {
- 	return d->s5bman;
-diff --git a/src/xmpp/xmpp-im/filetransfer.cpp b/src/xmpp/xmpp-im/filetransfer.cpp
-index 88edce6..8d6984a 100644
---- a/src/xmpp/xmpp-im/filetransfer.cpp
-+++ b/src/xmpp/xmpp-im/filetransfer.cpp
-@@ -33,18 +33,6 @@
- 
- using namespace XMPP;
- 
--// firstChildElement
--//
--// Get an element's first child element
--static QDomElement firstChildElement(const QDomElement &e)
--{
--	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
--		if(n.isElement())
--			return n.toElement();
--	}
--	return QDomElement();
--}
--
- //----------------------------------------------------------------------------
- // FileTransfer
- //----------------------------------------------------------------------------
-@@ -625,7 +613,7 @@ bool JT_FT::take(const QDomElement &x)
- 		return false;
- 
- 	if(x.attribute("type") == "result") {
--		QDomElement si = firstChildElement(x);
-+		QDomElement si = x.firstChildElement();
- 		if(si.attribute("xmlns") != "http://jabber.org/protocol/si" || si.tagName() != "si") {
- 			setError(900, "");
- 			return true;
-@@ -764,7 +752,7 @@ bool JT_PushFT::take(const QDomElement &e)
- 	if(e.attribute("type") != "set")
- 		return false;
- 
--	QDomElement si = firstChildElement(e);
-+	QDomElement si = e.firstChildElement();
- 	if(si.attribute("xmlns") != "http://jabber.org/protocol/si" || si.tagName() != "si")
- 		return false;
- 	if(si.attribute("profile") != "http://jabber.org/protocol/si/profile/file-transfer")
-diff --git a/src/xmpp/xmpp-im/jingle.cpp b/src/xmpp/xmpp-im/jingle.cpp
-new file mode 100644
-index 0000000..e8fbbd8
---- /dev/null
-+++ b/src/xmpp/xmpp-im/jingle.cpp
-@@ -0,0 +1,161 @@
-+/*
-+ * jingle.cpp - "Jingle" session management
-+ * Copyright (C) 2003  Justin Karneges, rion
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "jingle.h"
-+#include "xmpp_xmlcommon.h"
-+#include "im.h"
-+
-+namespace XMPP {
-+namespace Jingle {
-+
-+//------------------------------------------------------------------------
-+// Session
-+//------------------------------------------------------------------------
-+Session::Session(Manager *manager, const QString &sid, const Jid &peer)
-+	: QObject(manager)
-+	, _sid(sid)
-+	, _peer(peer)
-+{
-+
-+}
-+
-+//------------------------------------------------------------------------
-+// Transport
-+//------------------------------------------------------------------------
-+Transport::Transport(Client *client) : QObject(client) { }
-+
-+
-+//------------------------------------------------------------------------
-+// Manager
-+//------------------------------------------------------------------------
-+class Manager::Private
-+{
-+public:
-+	QScopedPointer<Tasks::JT_Push> pushTask;
-+	QHash<QString, Session::Ptr> sessions;
-+	Jid redirectTo;
-+
-+	QHash<QString, QSharedPointer<Tasks::DescriptionFactory> > descrFactories;
-+	QHash<QString, QSharedPointer<Tasks::TransportFactory> > transportFactories;
-+	QHash<QString, QSharedPointer<Tasks::DetailedReasonFactory> > reasonHandlers;
-+	QHash<QString, QSharedPointer<Tasks::SecurityFactory> > securityLayers;
-+};
-+
-+Manager::Manager(XMPP::Client *client)
-+	: QObject(client)
-+	, d(new Manager::Private)
-+{
-+	d->pushTask.reset(new Tasks::JT_Push(client->rootTask()));
-+	connect(d->pushTask.data(),
-+			SIGNAL(incomingRequest(const XMPP::Jid &from, const QString &iq_id, Tasks::Envelope::Ptr envelope)),
-+			SLOT(pushTaskIncomingRequest(const XMPP::Jid &from, const QString &iq_id, Tasks::Envelope::Ptr envelope)));
-+}
-+
-+Manager::~Manager()
-+{
-+
-+}
-+
-+void Manager::setRedirection(const Jid &to)
-+{
-+	d->redirectTo = to;
-+}
-+
-+void Manager::registerApp(const QString &ns, Tasks::DescriptionFactory *app)
-+{
-+	d->descrFactories.insert(ns, QSharedPointer<Tasks::DescriptionFactory>(app));
-+}
-+
-+void Manager::registerTransport(const QString &ns, Tasks::TransportFactory *transport)
-+{
-+	d->transportFactories.insert(ns, QSharedPointer<Tasks::TransportFactory>(transport));
-+}
-+
-+void Manager::registerSecurity(const QString &ns, Tasks::SecurityFactory *security)
-+{
-+	d->securityLayers.insert(ns, QSharedPointer<Tasks::SecurityFactory>(security));
-+}
-+
-+void Manager::registerDetailedReason(const QString &ns, Tasks::DetailedReasonFactory *r)
-+{
-+	d->reasonHandlers.insert(ns, QSharedPointer<Tasks::DetailedReasonFactory>(r));
-+}
-+
-+Tasks::Xmlable* Manager::descriptionFromXml(const QDomElement &e)
-+{
-+	QSharedPointer<Tasks::DescriptionFactory> df = d->descrFactories.value(e.namespaceURI());
-+	return df.isNull() ? 0 : df->descriptionFromXml(e);
-+}
-+
-+Tasks::Xmlable* Manager::transportFromXml(const QDomElement &e)
-+{
-+	QSharedPointer<Tasks::TransportFactory> transport = d->transportFactories.value(e.namespaceURI());
-+	return transport.isNull() ? 0 : transport->transportFromXml(e);
-+}
-+
-+Tasks::Xmlable* Manager::securityFromXml(const QDomElement &e)
-+{
-+	QSharedPointer<Tasks::SecurityFactory> sec = d->securityLayers.value(e.namespaceURI());
-+	return sec.isNull() ? 0 : sec->securityFromXml(e);
-+}
-+
-+Tasks::Xmlable* Manager::detailedReasonFromXml(const QDomElement &e)
-+{
-+	QSharedPointer<Tasks::DetailedReasonFactory> dr = d->reasonHandlers.value(e.namespaceURI());
-+	return dr.isNull() ? 0 : dr->detailedReasonFromXml(e);
-+}
-+
-+void Manager::pushTaskIncomingRequest(const XMPP::Jid &from, const QString &iq_id,
-+									  Tasks::Envelope::Ptr envelope)
-+{
-+	if (envelope->action == Tasks::Envelope::SessionInitiate) {
-+		if (!d->redirectTo.isNull()) {
-+			d->pushTask->respondError(from, iq_id, Stanza::Error::Redirect, d->redirectTo.full());
-+			return;
-+		}
-+		if (d->sessions.count() >= MaxSessions) {
-+			d->pushTask->respondError(from, iq_id, Stanza::Error::ResourceConstraint);
-+			return;
-+		}
-+		Session::Ptr session = d->sessions.value(envelope->sid);
-+		if (!session.isNull()) {
-+			d->pushTask->respondError(from, iq_id, Stanza::Error::Conflict);
-+			return;
-+		}
-+		if (envelope->contentList.isEmpty()) {
-+			d->pushTask->respondError(from, iq_id, Stanza::Error::BadRequest);
-+			return;
-+		}
-+		// more checks on conflicts should be done in jingle applications (ft, rtp etc)
-+		Jid initiator = envelope->initiator.isNull()? from : envelope->initiator;
-+
-+		d->pushTask->respondSuccess(from, iq_id);
-+		session = Session::Ptr(new Session(this, envelope->sid, initiator));
-+		d->sessions.insert(envelope->sid, session);
-+//		foreach (Content::Ptr c, envelope->contentList) {
-+
-+//		}
-+	}
-+}
-+
-+
-+
-+} // namespace Jingle
-+} // namespace XMPP
-diff --git a/src/xmpp/xmpp-im/jingle.h b/src/xmpp/xmpp-im/jingle.h
-new file mode 100644
-index 0000000..96bc519
---- /dev/null
-+++ b/src/xmpp/xmpp-im/jingle.h
-@@ -0,0 +1,133 @@
-+/*
-+ * jingle.h - "Jingle" session management
-+ * Copyright (C) 2003  Justin Karneges, rion
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef JINGLE_H
-+#define JINGLE_H
-+
-+#include <QObject>
-+
-+#include "jingle_task.h"
-+
-+namespace XMPP {
-+namespace Jingle {
-+
-+const char* JINGLE_NS = "urn:xmpp:jingle:1";
-+class Manager;
-+
-+// examples: ft, rtp, wb etc
-+class App : public QObject
-+{
-+	Q_OBJECT
-+	Q_DISABLE_COPY(App)
-+
-+public:
-+
-+
-+};
-+
-+// examples: s5b, ibb, ice-udp etc
-+class Transport : public QObject
-+{
-+	Q_OBJECT
-+	Q_DISABLE_COPY(Transport)
-+
-+public:
-+	Transport(Client *client);
-+
-+};
-+
-+// base class for all jingle security managers
-+class Security : public QObject
-+{
-+	Q_OBJECT
-+	Q_DISABLE_COPY(Security)
-+
-+public:
-+
-+};
-+
-+
-+class Session : public QObject
-+{
-+	Q_OBJECT
-+	Q_DISABLE_COPY(Session)
-+
-+public:
-+	typedef QSharedPointer<Session> Ptr;
-+
-+	Session(Manager *manager, const QString &sid, const Jid &peer);
-+
-+
-+	inline const QString &sid() const { return _sid; }
-+	inline const Jid &peer() const { return _peer; }
-+
-+private:
-+	QString _sid;
-+	Jid _peer;
-+};
-+
-+class Manager : public QObject
-+{
-+    Q_OBJECT
-+
-+	friend class Tasks::Content;
-+	friend class Tasks::Reason;
-+
-+	static const int MaxSessions = 1000; //1000? just to have some limit
-+
-+public:
-+	explicit Manager(XMPP::Client *client = 0);
-+	~Manager();
-+
-+	void setRedirection(const Jid &to);
-+
-+	void registerApp(const QString &ns, Tasks::DescriptionFactory *app);
-+	void registerTransport(const QString &ns, Tasks::TransportFactory *transport);
-+	void registerSecurity(const QString &ns, Tasks::SecurityFactory *security);
-+	void registerDetailedReason(const QString &ns, Tasks::DetailedReasonFactory *r);
-+
-+private:
-+
-+	Tasks::Xmlable* descriptionFromXml(const QDomElement &e);
-+	Tasks::Xmlable* transportFromXml(const QDomElement &e);
-+	Tasks::Xmlable* securityFromXml(const QDomElement &e);
-+	Tasks::Xmlable* detailedReasonFromXml(const QDomElement &e);
-+
-+signals:
-+
-+public slots:
-+
-+private slots:
-+	void pushTaskIncomingRequest(const XMPP::Jid &from, const QString &iq_id, Tasks::Envelope::Ptr envelope);
-+
-+private:
-+	class Private;
-+	QScopedPointer<Private> d;
-+};
-+
-+
-+
-+
-+
-+
-+} // namespace Jingle
-+} // namespace XMPP
-+
-+#endif // JINGLE_H
-diff --git a/src/xmpp/xmpp-im/jingle_task.cpp b/src/xmpp/xmpp-im/jingle_task.cpp
-new file mode 100644
-index 0000000..12e6442
---- /dev/null
-+++ b/src/xmpp/xmpp-im/jingle_task.cpp
-@@ -0,0 +1,450 @@
-+/*
-+ * jingle_task.cpp - "Jingle" support classes
-+ * Copyright (C) 2011  Justin Karneges, rion
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "jingle_task.h"
-+#include "jingle.h"
-+#include "xmpp_xmlcommon.h"
-+#include "im.h"
-+
-+namespace XMPP {
-+namespace Jingle {
-+namespace Tasks {
-+
-+//------------------------------------------------------------------------
-+// Reason
-+//------------------------------------------------------------------------
-+
-+Reason::CondEntry Reason::CondTable =
-+{
-+	{ "alternative-session",      Reason::AlternativeSession },
-+	{ "busy",                     Reason::Busy },
-+	{ "cancel",                   Reason::Cancel },
-+	{ "connectivity-error",       Reason::ConnectivityError },
-+	{ "decline",                  Reason::Decline },
-+	{ "expired",                  Reason::Expired },
-+	{ "failed-application",       Reason::FailedApplication },
-+	{ "failed-transport",         Reason::FailedTransport },
-+	{ "general-error",            Reason::GeneralError },
-+	{ "gone",                     Reason::Gone },
-+	{ "incompatible-parameters",  Reason::IncompatibleParameters },
-+	{ "media-error",              Reason::MediaError },
-+	{ "security-error",           Reason::SecurityError },
-+	{ "success",                  Reason::Success },
-+	{ "timeout",                  Reason::Timeout },
-+	{ "unsupported-applications", Reason::UnsupportedApplications },
-+	{ "unsupported-transports",   Reason::UnsupportedTransports },
-+};
-+
-+Reason* Reason::fromXml(const QDomElement &e, Client *client)
-+{
-+	if(e.tagName() != QLatin1String("reason"))
-+		return NULL;
-+
-+	bool valid = false;
-+	Condition condition = (Condition)-1;
-+	QString text;
-+	QSharedPointer<Xmlable> detailed;
-+
-+	for (QDomElement c = e.firstChildElement(); !c.isNull(); c = c.nextSiblingElement()) {
-+		if (c.tagName() == QLatin1String("text")) {
-+			text = c.text();
-+		}
-+		else if (!c.namespaceURI().isEmpty()) {
-+			detailed = QSharedPointer<Xmlable>(client->jingleManager()->detailedReasonFromXml(c));
-+			if (detailed.isNull()) {
-+				return NULL;
-+			}
-+		}
-+		else {
-+			for(int n = 0; sizeof(CondTable) / sizeof(CondEntry); ++n) {
-+				if(c.tagName() == QLatin1String(CondTablen.str)) {
-+					condition = CondTablen.cond;
-+					valid = true;
-+					break;
-+				}
-+			}
-+		}
-+	}
-+
-+	if (valid) {
-+		return new Reason(condition, text, detailed);
-+	}
-+
-+	return NULL;
-+}
-+
-+QDomElement Reason::toXml(QDomDocument *doc) const
-+{
-+	for(int n = 0; sizeof(CondTable) / sizeof(CondEntry); ++n) {
-+		if(CondTablen.cond == condition) {
-+			QDomElement e = doc->createElement(QLatin1String("reason"));
-+			e.appendChild(doc->createElement(QLatin1String(CondTablen.str)));
-+			if (!text.isEmpty()) {
-+				e.appendChild(textTag(doc, QLatin1String("text"), text));
-+			}
-+			if (!detailed.isNull()) {
-+				e.appendChild(detailed->toXml(doc));
-+			}
-+			return e;
-+		}
-+	}
-+	return QDomElement();
-+}
-+
-+//------------------------------------------------------------
-+// Content
-+//------------------------------------------------------------
-+Content::Content(Creator creator, const QString &name,
-+							 Xmlable *description, Xmlable *transport)
-+	: creator(creator)
-+	, name(name)
-+	, senders(SendersBoth)
-+	, disposition(QLatin1String("session"))
-+	, description(description)
-+	, transport(transport)
-+{
-+
-+}
-+
-+void Content::setSecurity(Xmlable *security_)
-+{
-+	security.reset(security_);
-+}
-+
-+Content* Content::fromXml(QDomElement content, XMPP::Client *client)
-+{
-+	QString name;
-+	QString disposition = QLatin1String("session");
-+	Creator creator;
-+	Senders senders = SendersBoth;
-+	Xmlable *description = 0, *transport = 0, *security = 0;
-+
-+	name = content.attribute(QLatin1String("name"));
-+	QDomElement descriptionEl = content.elementsByTagName(QLatin1String("description")).at(0).toElement();
-+	QDomElement transportEl = content.elementsByTagName(QLatin1String("transport")).at(0).toElement();
-+	QDomElement securityEl = content.elementsByTagName(QLatin1String("security")).at(0).toElement();
-+	if (name.isEmpty() || descriptionEl.isNull() || transportEl.isNull()) {
-+		return NULL;
-+	}
-+	QString creatorStr = content.attribute(QLatin1String("name"));
-+	if (creatorStr == QLatin1String("initiator")) {
-+		creator = CreatorInitiator;
-+	}
-+	else if (creatorStr == QLatin1String("responder")) {
-+		creator = CreatorResponder;
-+	}
-+	else {
-+		return NULL;
-+	}
-+	QString sendersStr = content.attribute(QLatin1String("senders"));
-+	if (sendersStr == QLatin1String("initiator")) {
-+		senders = SendersInitiator;
-+	}
-+	else if (sendersStr == QLatin1String("none")) {
-+		senders = SendersNone;
-+	}
-+	else if (sendersStr == QLatin1String("responder")) {
-+		senders = SendersResponder;
-+	}
-+	else if (sendersStr == QLatin1String("both")) {
-+		senders = SendersBoth;
-+	}
-+	else {
-+		return NULL;
-+	}
-+	disposition = content.attribute(QLatin1String("disposition"));
-+	description = client->jingleManager()->descriptionFromXml(descriptionEl);
-+	transport = client->jingleManager()->transportFromXml(transportEl);
-+	if (!securityEl.isNull()) {
-+		security = client->jingleManager()->securityFromXml(securityEl);
-+		// if security == 0 then then its unsupported? just ignore it atm
-+		// according to xtls draft responder may omit security when unsupported.
-+	}
-+	Content *c = new Content(creator, name, description, transport);
-+	c->setSecurity(security);
-+	c->senders = senders;
-+	c->disposition = disposition;
-+	return c;
-+}
-+
-+QDomElement Content::toXml(QDomDocument *doc) const
-+{
-+	QString creatorStr;
-+	QString sendersStr;
-+
-+	switch (creator) {
-+	case CreatorInitiator:
-+		creatorStr = QLatin1String("initiator");
-+		break;
-+	case CreatorResponder:
-+		creatorStr = QLatin1String("responder");
-+		break;
-+	}
-+	if (creatorStr.isEmpty() || name.isEmpty() || description.isNull() || transport.isNull()) {
-+		qDebug("invalid jingle content");
-+		return QDomElement();
-+	}
-+
-+	switch (senders) {
-+		case SendersNone:
-+			sendersStr = QLatin1String("none");
-+			break;
-+
-+		case SendersInitiator:
-+			sendersStr = QLatin1String("initiator");
-+			break;
-+
-+		case SendersResponder:
-+			sendersStr = QLatin1String("responder");
-+			break;
-+
-+		case SendersBoth:
-+		default:
-+			break;
-+	}
-+
-+	QDomElement content = doc->createElement(QLatin1String("content"));
-+	content.setAttribute(QLatin1String("creator"), creatorStr);
-+	content.setAttribute(QLatin1String("name"), name);
-+	if (disposition != QLatin1String("session")) {
-+		content.setAttribute(QLatin1String("disposition"), disposition);
-+	}
-+	if (!sendersStr.isEmpty()) {
-+		content.setAttribute(QLatin1String("senders"), senders);
-+	}
-+
-+	content.appendChild(description->toXml(doc));
-+	content.appendChild(transport->toXml(doc));
-+	if (!security.isNull()) {
-+		content.appendChild(security->toXml(doc));
-+	}
-+	return content;
-+}
-+
-+
-+//----------------------------------------------------------------------------
-+// Envelope
-+//----------------------------------------------------------------------------
-+Envelope::ActionEntry Envelope::actionTable = {
-+	{ "content-accept",		Envelope::ContentAccept },
-+	{ "content-add",		Envelope::ContentAdd },
-+	{ "content-modify",		Envelope::ContentModify },
-+	{ "content-reject",		Envelope::ContentReject },
-+	{ "content-remove",		Envelope::ContentRemove },
-+	{ "description-info",	Envelope::DescriptionInfo },
-+	{ "security-info",		Envelope::SecurityInfo },
-+	{ "session-accept",		Envelope::SessionAccept },
-+	{ "session-info",		Envelope::SessionInfo },
-+	{ "session-initiate",	Envelope::SessionInitiate },
-+	{ "session-terminate",	Envelope::SessionTerminate },
-+	{ "transport-accept",	Envelope::TransportAccept },
-+	{ "transport-info",		Envelope::TransportInfo },
-+	{ "transport-reject",	Envelope::TransportReject },
-+	{ "transport-replace",	Envelope::TransportReplace }
-+};
-+
-+
-+Envelope::Ptr Envelope::fromXml(QDomElement &e, Client *client)
-+{
-+	QString actionStr = e.attribute(QLatin1String("action"));
-+	Action action;
-+	QString sid = e.attribute(QLatin1String("sid"));
-+
-+	bool found = false;
-+	for (unsigned int i = 0; i < sizeof(actionTable) / sizeof(ActionEntry); i++) {
-+		if (actionStr == actionTablei.str) {
-+			found = true;
-+			action = actionTablei.action;
-+			break;
-+		}
-+	}
-+	if (!found || sid.isEmpty()) {
-+		return Envelope::Ptr();
-+	}
-+	Envelope::Ptr envelope(new Envelope(action, sid));
-+
-+	QDomElement re = e.firstChildElement(QLatin1String("reason"));
-+	if(!re.isNull()) {
-+		envelope->reason = QSharedPointer<Reason>(Reason::fromXml(re, client));
-+		if (envelope->reason.isNull()) {
-+			return Envelope::Ptr();
-+		}
-+	}
-+	for(QDomElement ce = e.firstChildElement(QLatin1String("content"));
-+		!e.isNull(); e = e.nextSiblingElement(QLatin1String("content"))) {
-+
-+		Content::Ptr c(Content::fromXml(ce, client));
-+		if (c.isNull()) {
-+			return Envelope::Ptr();
-+		}
-+		envelope->contentList += c;
-+	}
-+	if (!e.attribute(QLatin1String("initiator")).isEmpty()) {
-+		envelope->initiator = Jid(e.attribute(QLatin1String("initiator")));
-+		if (envelope->initiator.isNull()) {
-+			return Envelope::Ptr();
-+		}
-+	}
-+	if (!e.attribute(QLatin1String("responder")).isEmpty()) {
-+		envelope->responder = Jid(e.attribute(QLatin1String("responder")));
-+		if (envelope->responder.isNull()) {
-+			return Envelope::Ptr();
-+		}
-+	}
-+	return envelope;
-+}
-+
-+QDomElement Envelope::toXml(QDomDocument *doc) const
-+{
-+	QDomElement query = doc->createElementNS(QLatin1String(JINGLE_NS), QLatin1String("jingle"));
-+	//query.setAttribute("xmlns", JINGLE_NS);
-+	for (unsigned int i = 0; i < sizeof(actionTable) / sizeof(ActionEntry); i++) {
-+		if (actionTablei.action == action) {
-+			query.setAttribute(QLatin1String("action"), QLatin1String(actionTablei.str));
-+			break;
-+		}
-+	}
-+
-+	if(!initiator.isNull())
-+		query.setAttribute(QLatin1String("initiator"), initiator.full());
-+	if(!responder.isNull())
-+		query.setAttribute(QLatin1String("responder"), responder.full());
-+	query.setAttribute(QLatin1String("sid"), sid);
-+
-+	if(action != SessionTerminate) {
-+		// for session terminate, there is no content list, just
-+		//   a reason for termination
-+		foreach(const Content::Ptr &c, contentList) {
-+			QDomElement content = c->toXml(doc);
-+			query.appendChild(content);
-+		}
-+	}
-+	if (!reason.isNull()) {
-+		query.appendChild(reason->toXml(doc));
-+	}
-+	return query;
-+}
-+
-+void Envelope::setReason(Reason::Condition cond, const QString &text)
-+{
-+	reason = QSharedPointer<Reason>(new Reason(cond, text));
-+}
-+
-+void Envelope::setReason(Reason::Condition cond, Xmlable *detailed)
-+{
-+	reason = QSharedPointer<Reason>(new Reason(cond, "", QSharedPointer<Xmlable>(detailed)));
-+}
-+
-+
-+
-+//----------------------------------------------------------------------------
-+// JT
-+//----------------------------------------------------------------------------
-+JT::JT(XMPP::Task *parent) :
-+	XMPP::Task(parent)
-+{
-+}
-+
-+JT::~JT()
-+{
-+}
-+
-+void JT::request(const XMPP::Jid &to, const Envelope &envelope)
-+{
-+	to_ = to;
-+	iq_ = createIQ(doc(), QLatin1String("set"), to.full(), id());
-+	iq_.appendChild(envelope.toXml(client()->doc()));
-+}
-+
-+void JT::onGo()
-+{
-+	send(iq_);
-+}
-+
-+bool JT::take(const QDomElement &x)
-+{
-+	if(!iqVerify(x, to_, id()))
-+		return false;
-+
-+	if(x.attribute("type") == QLatin1String("result"))
-+		setSuccess();
-+	else
-+		setError(x);
-+
-+	return true;
-+}
-+
-+//----------------------------------------------------------------------------
-+// JT_Push
-+//----------------------------------------------------------------------------
-+JT_Push::JT_Push(XMPP::Task *parent) :
-+	XMPP::Task(parent)
-+{
-+}
-+
-+JT_Push::~JT_Push()
-+{
-+}
-+
-+void JT_Push::respondSuccess(const XMPP::Jid &to, const QString &id)
-+{
-+	QDomElement iq = createIQ(doc(), QLatin1String("result"), to.full(), id);
-+	send(iq);
-+}
-+
-+void JT_Push::respondError(const XMPP::Jid &to, const QString &id,
-+						   Stanza::Error::ErrorCond cond, const QString &str)
-+{
-+	QDomElement iq = createIQ(doc(), QLatin1String("error"), to.full(), id);
-+	Stanza::Error error(Stanza::Error::Cancel, cond, str);
-+	iq.appendChild(error.toXml(*client()->doc(), client()->stream().baseNS()));
-+	send(iq);
-+}
-+
-+bool JT_Push::take(const QDomElement &e)
-+{
-+	if(e.tagName() != QLatin1String("iq") || e.attribute("type") != QLatin1String("set")) {
-+		return false;
-+	}
-+
-+	QDomElement je = e.firstChildElement(QLatin1String("jingle"));
-+	if (je.isNull() || je.namespaceURI() != QLatin1String(JINGLE_NS)) {
-+		return false;
-+	}
-+
-+	XMPP::Jid from = e.attribute(QLatin1String("from"));
-+	QString iq_id = e.attribute(QLatin1String("id"));
-+
-+	Envelope::Ptr envelope = Envelope::fromXml(je, client());
-+	if (!envelope) {
-+		respondError(from, iq_id, Stanza::Error::BadRequest);
-+	}
-+	else {
-+		emit incomingRequest(from, iq_id, envelope);
-+	}
-+
-+	return true;
-+}
-+
-+
-+
-+} // Task
-+} // Jingle
-+} // XMPP
-diff --git a/src/xmpp/xmpp-im/jingle_task.h b/src/xmpp/xmpp-im/jingle_task.h
-new file mode 100644
-index 0000000..da21534
---- /dev/null
-+++ b/src/xmpp/xmpp-im/jingle_task.h
-@@ -0,0 +1,246 @@
-+/*
-+ * jingle_task.h - "Jingle" support classes
-+ * Copyright (C) 2011  Justin Karneges, rion
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef JINGLE_TASK_H
-+#define JINGLE_TASK_H
-+
-+
-+#include <QObject>
-+#include <QDomElement>
-+#include <QSharedPointer>
-+#include <QHash>
-+
-+#include "xmpp_task.h"
-+#include "xmpp_stanza.h"
-+#include "xmpp/jid/jid.h"
-+
-+namespace XMPP {
-+namespace Jingle {
-+namespace Tasks {
-+
-+// INTERFACES
-+class Xmlable
-+{
-+public:
-+	virtual QDomElement toXml(QDomDocument *doc) const = 0;
-+};
-+
-+class DescriptionFactory
-+{
-+public:
-+	virtual Xmlable* descriptionFromXml(const QDomElement &) = 0;
-+};
-+
-+class TransportFactory
-+{
-+public:
-+	virtual Xmlable* transportFromXml(const QDomElement &) = 0;
-+};
-+
-+class DetailedReasonFactory
-+{
-+public:
-+	virtual Xmlable* detailedReasonFromXml(const QDomElement &) { return 0; };
-+};
-+
-+class SecurityFactory
-+{
-+public:
-+	virtual Xmlable* securityFromXml(const QDomElement &) { return 0; };
-+};
-+// END OF INTERFACES
-+
-+class Content : public Xmlable
-+{
-+public:
-+	typedef QSharedPointer<Content> Ptr;
-+
-+	enum Creator {
-+		CreatorInitiator,
-+		CreatorResponder
-+	};
-+
-+	enum Senders {
-+		SendersNone,
-+		SendersInitiator,
-+		SendersResponder,
-+		SendersBoth
-+	};
-+
-+	Content(Creator creator, const QString &name,
-+				  Xmlable *description, Xmlable *transport);
-+
-+	void setSecurity(Xmlable *security_);
-+
-+	static Content* fromXml(QDomElement content, Client *client);
-+	QDomElement toXml(QDomDocument *doc) const;
-+
-+	Creator creator;
-+	QString name;
-+	Senders senders;
-+	QString disposition;
-+
-+	QScopedPointer<Xmlable> description;
-+	QScopedPointer<Xmlable> transport;
-+	QScopedPointer<Xmlable> security;
-+};
-+
-+class Reason : public Xmlable
-+{
-+public:
-+	enum Condition
-+	{
-+		AlternativeSession,
-+		Busy,
-+		Cancel,
-+		ConnectivityError,
-+		Decline,
-+		Expired,
-+		FailedApplication,
-+		FailedTransport,
-+		GeneralError,
-+		Gone,
-+		IncompatibleParameters,
-+		MediaError,
-+		SecurityError,
-+		Success,
-+		Timeout,
-+		UnsupportedApplications,
-+		UnsupportedTransports
-+	};
-+
-+	Condition condition;
-+	QString text;
-+	QSharedPointer<Xmlable> detailed;
-+
-+	Reason(Condition condition = (Condition)-1, const QString &text = QString(),
-+		   QSharedPointer<Xmlable> detailed = QSharedPointer<Xmlable>())
-+		: condition(condition)
-+		, text(text)
-+		, detailed(detailed)
-+	{
-+	}
-+
-+	static Reason* fromXml(const QDomElement &e, Client *client);
-+	QDomElement toXml(QDomDocument *doc) const;
-+
-+private:
-+	struct CondEntry
-+	{
-+		const char *str;
-+		Condition cond;
-+	};
-+
-+	static CondEntry CondTable;
-+};
-+
-+class Envelope : public Xmlable
-+{
-+public:
-+	typedef QSharedPointer<Envelope> Ptr;
-+
-+	enum Action {
-+		ContentAccept,
-+		ContentAdd,
-+		ContentModify,
-+		ContentReject,
-+		ContentRemove,
-+		DescriptionInfo,
-+		SecurityInfo,
-+		SessionAccept,
-+		SessionInfo,
-+		SessionInitiate,
-+		SessionTerminate,
-+		TransportAccept,
-+		TransportInfo,
-+		TransportReject,
-+		TransportReplace
-+	};
-+
-+	Envelope(Action action, const QString &sid)
-+		: action(action)
-+		, sid(sid)
-+	{}
-+
-+	static Envelope::Ptr fromXml(QDomElement &e, Client *client);
-+	QDomElement toXml(QDomDocument *doc) const;
-+	void setReason(Reason::Condition, const QString &text = QString());
-+	void setReason(Reason::Condition, Xmlable *detailed);
-+
-+	Action action;
-+	Jid initiator;
-+	Jid responder;
-+	QString sid;
-+
-+	QList<Content::Ptr> contentList;
-+
-+	QSharedPointer<Reason> reason;
-+
-+private:
-+	struct ActionEntry
-+	{
-+		const char *str;
-+		Action action;
-+	};
-+	static ActionEntry actionTable;
-+};
-+
-+class JT : public XMPP::Task
-+{
-+	Q_OBJECT
-+
-+public:
-+	JT(XMPP::Task *parent);
-+	~JT();
-+
-+	void request(const XMPP::Jid &to, const Envelope &envelope);
-+
-+	virtual void onGo();
-+	virtual bool take(const QDomElement &x);
-+
-+private:
-+	QDomElement iq_;
-+	XMPP::Jid to_;
-+};
-+
-+class JT_Push : public XMPP::Task
-+{
-+	Q_OBJECT
-+
-+public:
-+	JT_Push(XMPP::Task *parent);
-+	~JT_Push();
-+
-+	void respondSuccess(const XMPP::Jid &to, const QString &id);
-+	void respondError(const XMPP::Jid &to, const QString &id,
-+					  Stanza::Error::ErrorCond cond, const QString &str = QString());
-+
-+	virtual bool take(const QDomElement &e);
-+
-+signals:
-+	void incomingRequest(const XMPP::Jid &from, const QString &iq_id, Envelope::Ptr envelope);
-+};
-+
-+
-+} // namespace Task
-+} // namespace Jingle
-+} // namespace XMPP
-+
-+#endif
-diff --git a/src/xmpp/xmpp-im/jingle_transport_iceudp.cpp b/src/xmpp/xmpp-im/jingle_transport_iceudp.cpp
-new file mode 100644
-index 0000000..f6782b6
---- /dev/null
-+++ b/src/xmpp/xmpp-im/jingle_transport_iceudp.cpp
-@@ -0,0 +1,124 @@
-+/*
-+ * jingle_tranport_iceudp.cpp - "Jingle" transport ICE-UDP
-+ * Copyright (C) 2011  rion
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+#include <QHostAddress>
-+#include "jingle_transport_iceudp.h"
-+#include "xmpp_xmlcommon.h"
-+#include "ice176.h"
-+#include "xmpp_client.h"
-+
-+namespace XMPP {
-+namespace Jingle {
-+
-+const char *ICEUDP_NS = "urn:xmpp:jingle:transports:ice-udp:1";
-+
-+class ICEUDPTransport : public Tasks::Xmlable
-+{
-+public:
-+	ICEUDPTransport(const QString &pwd, const QString &ufrag,
-+					const QList<Ice176::Candidate> &canidates = QList<Ice176::Candidate>())
-+		: pwd(pwd)
-+		, ufrag(ufrag)
-+		, canidates(canidates)
-+	{
-+
-+	}
-+
-+	QDomElement toXml(QDomDocument *doc) const
-+	{
-+		QDomElement transport = doc->createElementNS(ICEUDP_NS, "transport");
-+		if (canidates.count()) {
-+			if (ufrag.isEmpty()) {
-+				return QDomElement();
-+			}
-+			transport.setAttribute("pwd", pwd);
-+			transport.setAttribute("ufrag", ufrag);
-+			foreach (const Ice176::Candidate &c, canidates) {
-+				QDomElement e = doc->createElement("candidate");
-+				e.setAttribute("component", QString::number(c.component));
-+				e.setAttribute("foundation", c.foundation);
-+				e.setAttribute("generation", QString::number(c.generation));
-+				if(!c.id.isEmpty()) {
-+					e.setAttribute("id", c.id);
-+				}
-+				e.setAttribute("ip", c.ip.toString());
-+				if(c.network != -1) {
-+					e.setAttribute("network", QString::number(c.network));
-+				}
-+				else {
-+					e.setAttribute("network", QString::number(0));
-+				}
-+				e.setAttribute("port", QString::number(c.port));
-+				e.setAttribute("priority", QString::number(c.priority));
-+				e.setAttribute("protocol", c.protocol);
-+				if(!c.rel_addr.isNull()) {
-+					e.setAttribute("rel-addr", c.rel_addr.toString());
-+				}
-+				if(c.rel_port != -1) {
-+					e.setAttribute("rel-port", QString::number(c.rel_port));
-+				}
-+				e.setAttribute("type", c.type);
-+				transport.appendChild(e);
-+			}
-+		}
-+		return transport;
-+	}
-+
-+	static ICEUDPTransport* fromXml(const QDomElement &e) {
-+		QList<Ice176::Candidate> canidates;
-+		for (QDomElement n = e.firstChildElement("candidate"); !n.isNull(); n = n.nextSiblingElement("candidate")) {
-+			XMPP::Ice176::Candidate c;
-+			c.component = e.attribute("component").toInt();
-+			c.foundation = e.attribute("foundation");
-+			c.generation = e.attribute("generation").toInt();
-+			c.id = e.attribute("id");
-+			c.ip = QHostAddress(e.attribute("ip"));
-+			c.network = e.attribute("network").toInt();
-+			c.port = e.attribute("port").toInt();
-+			c.priority = e.attribute("priority").toInt();
-+			c.protocol = e.attribute("protocol");
-+			c.rel_addr = QHostAddress(e.attribute("rel-addr"));
-+			c.rel_port = e.attribute("rel-port").toInt();
-+			c.type = e.attribute("type");
-+			canidates.append(c);
-+		}
-+		return new ICEUDPTransport(e.attribute("pwd"), e.attribute("ufrag"), canidates);
-+	}
-+
-+	QString pwd;
-+	QString ufrag;
-+	QList<Ice176::Candidate> canidates;
-+};
-+
-+//--------------------------------------------------------------------------
-+// ICEUDPTransportManager
-+//--------------------------------------------------------------------------
-+ICEUDPTransportManager::ICEUDPTransportManager(Client *client)
-+	: Transport(client)
-+{
-+	client->jingleManager()->registerTransport(ICEUDP_NS, this);
-+}
-+
-+Tasks::Xmlable* ICEUDPTransportManager::transportFromXml(const QDomElement &e)
-+{
-+	return ICEUDPTransport::fromXml(e);
-+}
-+
-+} // Jingle
-+} // XMPP
-diff --git a/src/xmpp/xmpp-im/jingle_transport_iceudp.h b/src/xmpp/xmpp-im/jingle_transport_iceudp.h
-new file mode 100644
-index 0000000..23c8eff
---- /dev/null
-+++ b/src/xmpp/xmpp-im/jingle_transport_iceudp.h
-@@ -0,0 +1,42 @@
-+/*
-+ * jingle_tranport_iceudp.h - "Jingle" transport ICE-UDP
-+ * Copyright (C) 2011  rion
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef JINGLE_TRANSPORT_ICEUDP
-+#define JINGLE_TRANSPORT_ICEUDP
-+
-+#include "jingle.h"
-+
-+namespace XMPP {
-+	class Client;
-+
-+namespace Jingle {
-+
-+class ICEUDPTransportManager : public Transport, Tasks::TransportFactory
-+{
-+	ICEUDPTransportManager(Client *client);
-+
-+	Tasks::Xmlable* transportFromXml(const QDomElement &);
-+};
-+
-+} // Jingle
-+} // XMPP
-+
-+
-+#endif
-diff --git a/src/xmpp/xmpp-im/xmpp_client.h b/src/xmpp/xmpp-im/xmpp_client.h
-index 63dc054..d8cc546 100644
---- a/src/xmpp/xmpp-im/xmpp_client.h
-+++ b/src/xmpp/xmpp-im/xmpp_client.h
-@@ -32,6 +32,9 @@ class QDomElement;
- class QDomDocument;
- class ByteStream;
- namespace XMPP {
-+namespace Jingle {
-+	class Manager;
-+}
- 	class ClientStream;
- 	class Features;
- 	class FileTransferManager;
-@@ -117,6 +120,7 @@ namespace XMPP
- 		const Features& extension(const QString& ext) const;
- 		QStringList extensions() const;
- 		
-+		Jingle::Manager *jingleManager() const;
- 		S5BManager *s5bManager() const;
- 		IBBManager *ibbManager() const;
- 		BoBManager *bobManager() const;
-diff --git a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
-index 4569127..dcfca3d 100644
---- a/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
-+++ b/src/xmpp/xmpp-im/xmpp_xmlcommon.cpp
-@@ -208,7 +208,6 @@ XDomNodeList childElementsByTagNameNS(const QDomElement &e, const QString &nsURI
- 	return out;
- }
- 
--
- /**
-  * \brief create a new IQ stanza
-  * \param doc 
-diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri
-index 8948fb7..596d80d 100644
---- a/src/xmpp/xmpp.pri
-+++ b/src/xmpp/xmpp.pri
-@@ -37,6 +37,9 @@ HEADERS += \
- 	$$PWD/xmpp-im/xmpp_discoinfotask.h \
- 	$$PWD/xmpp-im/xmpp_xmlcommon.h \
- 	$$PWD/xmpp-im/xmpp_vcard.h \
-+	$$PWD/xmpp-im/jingle.h \
-+	$$PWD/xmpp-im/jingle_task.h \
-+	$$PWD/xmpp-im/jingle_transport_iceudp.h \
- 	$$PWD/xmpp-im/xmpp_bytestream.h \
- 	$$PWD/xmpp-im/s5b.h \
- 	$$PWD/xmpp-im/xmpp_ibb.h \
-@@ -91,6 +94,9 @@ SOURCES += \
- 	$$PWD/xmpp-im/xmpp_task.cpp \
- 	$$PWD/xmpp-im/xmpp_tasks.cpp \
- 	$$PWD/xmpp-im/xmpp_xmlcommon.cpp \
-+	$$PWD/xmpp-im/jingle.cpp \
-+	$$PWD/xmpp-im/jingle_task.cpp \
-+	$$PWD/xmpp-im/jingle_transport_iceudp.cpp \
- 	$$PWD/xmpp-im/xmpp_vcard.cpp \
- 	$$PWD/xmpp-im/xmpp_bytestream.cpp \
- 	$$PWD/xmpp-im/s5b.cpp \

psi-plus-main-20160309.tar.xz/patches/dev/psi-fix-muc-contacts-bank.diff Deleted

@@ -1,635 +0,0 @@
---- git.temp.orig/iris/src/xmpp/xmpp-im/client.cpp
-+++ git.temp/iris/src/xmpp/xmpp-im/client.cpp
-@@ -407,6 +407,26 @@ QString Client::groupChatNick(const QStr
- 	return QString();
- }
- 
-+bool Client::groupchatExist(const Jid &j) const
-+{
-+	if (j.resource().isEmpty()) {
-+		foreach (const GroupChat &gc, d->groupChatList) {
-+			if (gc.j.compare(j, false))
-+				return true;
-+		}
-+	}
-+	return false;
-+}
-+
-+QStringList Client::groupchats() const
-+{
-+	QStringList lst;
-+	foreach (const GroupChat &gc, d->groupChatList)
-+		//if (gc.status == GroupChat::Connected)
-+			lst.append(gc.j.bare());
-+	return lst;
-+}
-+
- /*void Client::start()
- {
- 	if(d->stream->old()) {
---- git.temp.orig/iris/src/xmpp/xmpp-im/xmpp_client.h
-+++ git.temp/iris/src/xmpp/xmpp-im/xmpp_client.h
-@@ -132,6 +132,8 @@ namespace XMPP
- 		void groupChatLeave(const QString &host, const QString &room, const QString &statusStr = QString());
- 		void groupChatLeaveAll(const QString &statusStr = QString());
- 		QString groupChatNick(const QString &host, const QString &room) const;
-+		bool groupchatExist(const Jid &j) const;
-+		QStringList groupchats() const;
- 
- 	signals:
- 		void activated();
---- git.temp.orig/src/chatdlg.cpp
-+++ git.temp/src/chatdlg.cpp
-@@ -115,6 +115,9 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
- 		}
- 	}
- 
-+	if (account()->isGCContact(jid))
-+		account()->gcContactIncRef(jid);
-+
- 	// Message events
- 	contactChatState_ = XMPP::StateNone;
- 	lastChatState_ = XMPP::StateNone;
-@@ -164,6 +167,8 @@ void ChatDlg::init()
- 
- ChatDlg::~ChatDlg()
- {
-+	if (account()->isGCContact(jid()))
-+		account()->gcContactDecRef(jid());
- 	account()->dialogUnregister(this);
- }
- 
-@@ -442,12 +447,11 @@ void ChatDlg::ensureTabbedCorrectly()
- 
- void ChatDlg::updateContact(const Jid &j, bool fromPresence)
- {
--	if (account()->groupchats().contains(j.full()))
-+	if (account()->client()->groupchatExist(j))
- 		return;
- 	// if groupchat, only update if the resource matches
--	if (account()->findGCContact(j) && !jid().compare(j)) {
-+	if (account()->isGCContact(j) && !jid().compare(j))
- 		return;
--	}
- 
- 	if (jid().compare(j, false)) {
- 		QList<UserListItem*> ul = account()->findRelevant(j);
---- git.temp.orig/src/infodlg.cpp
-+++ git.temp/src/infodlg.cpp
-@@ -223,8 +223,7 @@ InfoDlg::InfoDlg(int type, const Jid &j,
- 	}
- 
- 	// fake UserListItem used when displaying groupchat contact
--	GCContact *gcc = pa->findGCContact(j);
--	if (gcc) {
-+	if (pa->isGCContact(j)) {
- 		d->userListItem = new UserListItem(false);
- 		d->userListItem->setJid(j);
- 		d->userListItem->setName(j.resource());
---- git.temp.orig/src/mucmanager.cpp
-+++ git.temp/src/mucmanager.cpp
-@@ -614,3 +614,98 @@ void MUCManager::destroy_finished()
- 		emit destroy_error(t->statusCode(), t->statusString());
- 	}
- }
-+
-+// -----------------------------------------------------------------------------
-+
-+MUCContactList::MUCContactList()
-+{
-+}
-+
-+MUCContactList::~MUCContactList()
-+{
-+	qDeleteAll(mclist);
-+}
-+
-+bool MUCContactList::contains(const Jid &j) const
-+{
-+	if (j.resource().isEmpty())
-+		return false;
-+	return mclist.contains(j.full());
-+}
-+
-+void MUCContactList::mucLeave(const Jid &j)
-+{
-+	QStringList keys_ = mclist.keys();
-+	foreach (const QString &s, keys_) {
-+		const Jid cj = Jid(s);
-+		if (j.isEmpty() || j.compare(cj, false)) {
-+			Status s = status(cj);
-+			s.setType(Status::Offline);
-+			setStatus(cj, s);
-+		}
-+	}
-+}
-+
-+void MUCContactList::incRef(const Jid &j)
-+{
-+	if (j.resource().isEmpty())
-+		return;
-+
-+	MUCContact *mc = mclist.value(j.full());
-+	if (!mc) {
-+		mc = new MUCContact;
-+		mc->refcount = 1;
-+		mc->status = Status();
-+		mclistj.full() = mc;
-+	}
-+	else
-+		++mc->refcount;
-+}
-+
-+void MUCContactList::decRef(const Jid &j)
-+{
-+	if (j.resource().isEmpty())
-+		return;
-+
-+	MUCContact *mc = mclist.value(j.full());
-+	if (mc && --mc->refcount == 0) {
-+			mclist.remove(j.full());
-+			delete mc;
-+	}
-+}
-+
-+Status MUCContactList::status(const Jid &j) const
-+{
-+	MUCContact *mc = mclist.value(j.full());
-+	if (mc)
-+		return mc->status;
-+	return Status();
-+}
-+
-+void MUCContactList::setStatus(const Jid &j, Status s)
-+{
-+	MUCContact *mc = mclist.value(j.full());
-+	if (mc) {
-+		bool turn = (s.isAvailable() != mc->status.isAvailable());
-+		mc->status = s;
-+		if (turn) {
-+			if (s.isAvailable())
-+				incRef(j);
-+			else
-+				decRef(j);
-+		}
-+	}
-+	else if (s.isAvailable()) {
-+		incRef(j);
-+		mclist.value(j.full())->status = s;
-+	}
-+}
-+
-+QList<Jid> MUCContactList::jids() const
-+{
-+	QList<Jid> jl;
-+	foreach (const QString &s, mclist.keys()) {
-+		jl.append(Jid(s));
-+	}
-+	return jl;
-+}
---- git.temp.orig/src/mucmanager.h
-+++ git.temp/src/mucmanager.h
-@@ -25,6 +25,7 @@
- 
- #include "xmpp_muc.h"
- #include "xmpp_jid.h"
-+#include "xmpp_status.h"
- 
- class QString;
- namespace XMPP {
-@@ -124,4 +125,26 @@ private:
- 	Jid room_;
- };
- 
-+class MUCContactList
-+{
-+public:
-+	MUCContactList();
-+	~MUCContactList();
-+	bool contains(const Jid &j) const;
-+	void mucLeave(const Jid &j);
-+	void incRef(const Jid &j);
-+	void decRef(const Jid &j);
-+	Status status(const Jid &j) const;
-+	void setStatus(const Jid &j, Status s);
-+	QList<Jid> jids() const;
-+
-+private:
-+	struct MUCContact
-+	{
-+		Status status;
-+		int refcount;
-+	};
-+	QHash<QString, MUCContact*> mclist;
-+};
-+
- #endif
---- git.temp.orig/src/psiaccount.cpp
-+++ git.temp/src/psiaccount.cpp
-@@ -86,6 +86,7 @@
- #ifdef GROUPCHAT
- #include "groupchatdlg.h"
- #endif
-+#include "mucmanager.h"
- #include "statusdlg.h"
- #include "infodlg.h"
- #include "adduserdlg.h"
-@@ -222,12 +223,6 @@ static AdvancedConnector::Proxy convert_
- 	return p;
- }
- 
--struct GCContact
--{
--	Jid jid;
--	Status status;
--};
--
- //----------------------------------------------------------------------------
- // BlockTransportPopup -- blocks popups on transport status changes
- //----------------------------------------------------------------------------
-@@ -431,6 +426,7 @@ public:
- 		, pepManager(0)
- 		, bookmarkManager(0)
- 		, httpAuthManager(0)
-+		, gcbank(0)
- 		, conn(0)
- 		, stream(0)
- 		, tls(0)
-@@ -523,8 +519,7 @@ public:
- 	// HttpAuth
- 	HttpAuthManager* httpAuthManager;
- 
--	QList<GCContact*> gcbank;
--	QStringList groupchats;
-+	MUCContactList *gcbank;
- 
- 	QPointer<AdvancedConnector> conn;
- 	QPointer<ClientStream> stream;
-@@ -1239,6 +1234,9 @@ PsiAccount::PsiAccount(const UserAccount
- 	d->httpAuthManager = new HttpAuthManager(d->client->rootTask());
- 	connect(d->httpAuthManager, SIGNAL(confirmationRequest(const PsiHttpAuthRequest &)), SLOT(incomingHttpAuthRequest(const PsiHttpAuthRequest &)));
- 
-+	// MUC contacts list
-+	d->gcbank = new MUCContactList();
-+
- 	// Time server
- 	new TimeServer(d->client->rootTask());
- 	d->client->addExtension("e-time", QStringList("urn:xmpp:time"));
-@@ -1412,6 +1410,14 @@ PsiAccount::~PsiAccount()
- 
- 	qDeleteAll(d->userList);
- 	d->userList.clear();
-+
-+	delete d->selfContact;
-+	foreach (PsiContact *pc, d->contacts) {
-+		pc->disconnect();
-+		delete pc;
-+	}
-+	d->contacts.clear();
-+	delete d->gcbank;
- 
- 	d->contactList->unlink(this);
- 	delete d;
-@@ -2897,7 +2903,7 @@ void PsiAccount::processIncomingMessage(
- 	if( m.messageReceipt() == ReceiptRequest && !m.id().isEmpty() &&
- 		PsiOptions::instance()->getOption("options.ui.notifications.send-receipts").toBool()) {
- 		UserListItem *u;
--		if(j.compare(d->self.jid(), false) || groupchats().contains(j.bare()) || (!d->loginStatus.isInvisible() && (u = d->userList.find(j)) && (u->subscription().type() == Subscription::To || u->subscription().type() == Subscription::Both))) {
-+		if(j.compare(d->self.jid(), false) || client()->groupchatExist(j.bare()) || (!d->loginStatus.isInvisible() && (u = d->userList.find(j)) && (u->subscription().type() == Subscription::To || u->subscription().type() == Subscription::Both))) {
- 			Message tm(m.from());
- 			tm.setMessageReceiptId(m.id());
- 			tm.setMessageReceipt(ReceiptReceived);
-@@ -3677,8 +3683,7 @@ void PsiAccount::simulateRosterOffline()
- 		}
- 	}
- 
--	while (!d->gcbank.isEmpty())
--		delete d->gcbank.takeFirst();
-+	d->gcbank->mucLeave(Jid());
- 
- 	emit endBulkContactUpdate();
- }
-@@ -3807,16 +3812,13 @@ void PsiAccount::itemPublished(const Jid
- 
- Jid PsiAccount::realJid(const Jid &j) const
- {
--	GCContact *c = findGCContact(j);
--	if (c) {
--		if (c->status.hasMUCItem()) {
--			return c->status.mucItem().jid();
--		} else {
--			return Jid();
--		}
--	} else {
--		return j;
-+	if (isGCContact(j)) {
-+		Status s = d->gcbank->status(j);
-+		if (s.hasMUCItem())
-+			return s.mucItem().jid();
-+		return Jid();
- 	}
-+	return j;
- }
- 
- QList<UserListItem*> PsiAccount::findRelevant(const Jid &j) const
-@@ -3837,7 +3839,7 @@ QList<UserListItem*> PsiAccount::findRel
- 			} else {
- 				// skip status changes from muc participants
- 				// if the MUC somehow got into userList.
--				if (!j.resource().isEmpty() && d->groupchats.contains(j.bare())) continue;
-+				if (!j.resource().isEmpty() && isGCContact(j)) continue;
- 			}
- 			list.append(u);
- 		}
-@@ -4216,7 +4218,7 @@ void PsiAccount::actionDefault(const Jid
- 
- 	if(d->eventQueue->count(u->jid()) > 0)
- 		openNextEvent(*u, UserAction);
--	else if (groupchats().contains(j.full()))
-+	else if (client()->groupchatExist(j))
- 	{
- 		TabbableWidget *tab = findDialog<TabbableWidget*>(Jid(j.full()));
- 		if(tab) {
-@@ -4346,7 +4348,7 @@ void PsiAccount::actionHistoryBox(PsiEve
- 
- void PsiAccount::actionOpenChat(const Jid &j, const QString & body)
- {
--	UserListItem *u = (findGCContact(j)) ? find(j) : find(j.bare());
-+	UserListItem *u = (isGCContact(j)) ? find(j) : find(j.bare());
- 	if(!u) {
- 		qWarning("%s not in userlist\n", qPrintable(j.full()));
- 		return;
-@@ -4395,8 +4397,7 @@ void PsiAccount::actionOpenChat2(const J
- 	else {
- 		// this can happen if the contact is not in the roster at all
- 
--		GCContact *c = findGCContact(j);
--		if(c) {
-+		if (isGCContact(j)) {
- 			// if the contact is from a groupchat, use invokeGCChat
- 			invokeGCChat(j);
- 			return;
-@@ -4485,7 +4486,7 @@ void PsiAccount::actionInfo(const Jid &_
- {
- 	bool useCache = true;
- 	Jid j;
--	if(findGCContact(_j)) {
-+	if (isGCContact(_j)) {
- 		useCache = false;
- 		j = _j;
- 	}
-@@ -4760,7 +4761,7 @@ void PsiAccount::dj_sendMessage(const Me
- 
- 	// don't log groupchat, private messages, or encrypted messages
- 	if(log) {
--		if(m.type() != "groupchat" && m.xencrypted().isEmpty() && !findGCContact(m.to())) {
-+		if(m.type() != "groupchat" && m.xencrypted().isEmpty() && !isGCContact(m.to())) {
- 			MessageEvent *me = new MessageEvent(m, this);
- 			me->setOriginLocal(true);
- 			me->setTimeStamp(QDateTime::currentDateTime());
-@@ -5052,7 +5053,7 @@ void PsiAccount::handleEvent(PsiEvent* e
- 	QList<UserListItem*> ul = findRelevant(e->from());
- 	if(ul.isEmpty()) {
- 		// if groupchat, then we want the full JID
--		if(findGCContact(e->from())) {
-+		if(isGCContact(e->from())) {
- 			j = e->from();
- 		}
- 		else {
-@@ -5101,7 +5102,7 @@ void PsiAccount::handleEvent(PsiEvent* e
- 
- 			// don't log private messages
- 			if (!found &&
--				!findGCContact(e->from()) &&
-+				!isGCContact(e->from()) &&
- 				!(e->type() == PsiEvent::Message &&
- 				  ((MessageEvent *)e)->message().body().isEmpty()))
- 			{
-@@ -5412,19 +5413,18 @@ UserListItem* PsiAccount::addUserListIte
- 	u->setInList(false);
- 	u->setAvatarFactory(avatarFactory());
- 	u->setName(nick);
--	u->setConference(groupchats().contains(jid.full()));
-+	u->setConference(client()->groupchatExist(jid));
- 
- 	// is it a private groupchat?
- 	Jid j = u->jid();
--	GCContact *c = findGCContact(j);
--	if(c) {
-+	if (isGCContact(j)) {
- 		u->setName(j.resource());
- 		u->setPrivate(true);
- 
- 		// make a resource so the contact appears online
- 		UserResource ur;
- 		ur.setName(j.resource());
--		ur.setStatus(c->status);
-+		ur.setStatus(d->gcbank->status(j));
- 		u->userResourceList().append(ur);
- 	}
- 
-@@ -5466,8 +5466,6 @@ void PsiAccount::addMucItem(const Jid& j
- 		d->removeEntry(jid);
- 		d->userList.removeAll(u);
- 	}
--	if (!d->groupchats.contains(jid.bare()))
--		d->groupchats += jid.bare();
- 	addUserListItem(jid.bare(), "");
- }
- 
-@@ -5855,7 +5853,6 @@ void PsiAccount::groupChatSetStatus(cons
- void PsiAccount::groupChatLeave(const QString &host, const QString &room)
- {
- 	Jid j(room + '@' + host);
--	d->groupchats.removeAll(j.bare());
- 	d->client->groupChatLeave(host, room, PsiOptions::instance()->getOption("options.muc.leave-status-message").toString());
- 	UserListItem *u = find(j);
- 	if (u) {
-@@ -5864,28 +5861,29 @@ void PsiAccount::groupChatLeave(const QS
- 	}
- }
- 
--GCContact *PsiAccount::findGCContact(const Jid &j) const
-+bool PsiAccount::isGCContact(const Jid &j) const
- {
--	foreach(GCContact *c, d->gcbank) {
--		if(c->jid.compare(j))
--			return c;
--	}
--	return 0;
-+	return d->gcbank->contains(j);
- }
- 
- Status PsiAccount::gcContactStatus(const Jid &j)
- {
--	GCContact *c = findGCContact(j);
--	if (c) {
--		return c->status;
--	} else {
--		return Status();
--	}
-+	return d->gcbank->status(j);
-+}
-+
-+void PsiAccount::gcContactIncRef(const Jid &j)
-+{
-+	d->gcbank->incRef(j);
-+}
-+
-+void PsiAccount::gcContactDecRef(const Jid &j)
-+{
-+	d->gcbank->decRef(j);
- }
- 
- QStringList PsiAccount::groupchats() const
- {
--	return d->groupchats;
-+	return client()->groupchats();
- }
- 
- void PsiAccount::client_groupChatJoined(const Jid &j)
-@@ -5919,24 +5917,17 @@ void PsiAccount::client_groupChatJoined(
- void PsiAccount::client_groupChatLeft(const Jid &j)
- {
- 	// remove all associated groupchat contacts from the bank
--	for(QList<GCContact*>::Iterator it = d->gcbank.begin(); it != d->gcbank.end(); ) {
--		GCContact *c = *it;
--
-+	foreach (const Jid &cj, d->gcbank->jids()) {
- 		// contact from this room?
--		if(!c->jid.compare(j, false)) {
--			++it;
--			continue;
--		}
--		UserListItem *u = find(c->jid);
--		if(!u) {
--			++it;
--			continue;
-+		if (cj.compare(j, false)) {
-+			UserListItem *u = find(cj);
-+			if (u) {
-+				simulateContactOffline(u);
-+			}
- 		}
- 
--		simulateContactOffline(u);
--		it = d->gcbank.erase(it);
--		delete c;
- 	}
-+	d->gcbank->mucLeave(j.bare());
- }
- 
- void PsiAccount::client_groupChatPresence(const Jid &j, const Status &s)
-@@ -5946,13 +5937,9 @@ void PsiAccount::client_groupChatPresenc
- 	if(!w)
- 		return;
- 
--	GCContact *c = findGCContact(j);
--	if(!c) {
--		c = new GCContact;
--		c->jid = j;
--		c->status = s;
--		d->gcbank.append(c);
--	}
-+	if (!s.isAvailable())
-+		d->gcbank->incRef(j);
-+	d->gcbank->setStatus(j, s);
- 
- 	w->presence(j.resource(), s);
- 
-@@ -5965,6 +5952,9 @@ void PsiAccount::client_groupChatPresenc
- 		client_resourceAvailable(j, r);
- 	else
- 		client_resourceUnavailable(j, j.resource());
-+
-+	if (!s.isAvailable())
-+		d->gcbank->decRef(j);
- #endif
- }
- 
-@@ -6449,8 +6439,7 @@ void PsiAccount::setReceipts(bool b)
- 
- void PsiAccount::invokeGCMessage(const Jid &j)
- {
--	GCContact *c = findGCContact(j);
--	if(!c)
-+	if (!isGCContact(j))
- 		return;
- 
- 	// create dummy item, open chat, then destroy item.  HORRIBLE HACK!
-@@ -6464,7 +6448,7 @@ void PsiAccount::invokeGCMessage(const J
- 	// make a resource so the contact appears online
- 	UserResource ur;
- 	ur.setName(j.resource());
--	ur.setStatus(c->status);
-+	ur.setStatus(d->gcbank->status(j));
- 	u->userResourceList().append(ur);
- 
- 	d->userList.append(u);
-@@ -6475,8 +6464,7 @@ void PsiAccount::invokeGCMessage(const J
- 
- void PsiAccount::invokeGCChat(const Jid &j)
- {
--	GCContact *c = findGCContact(j);
--	if(!c)
-+	if (!isGCContact(j))
- 		return;
- 
- 	// create dummy item, open chat, then destroy item.  HORRIBLE HACK!
-@@ -6491,7 +6479,7 @@ void PsiAccount::invokeGCChat(const Jid
- 	// make a resource so the contact appears online
- 	UserResource ur;
- 	ur.setName(j.resource());
--	ur.setStatus(c->status);
-+	ur.setStatus(d->gcbank->status(j));
- 	u->userResourceList().append(ur);
- 
- 	d->userList.append(u);
---- git.temp.orig/src/psiaccount.h
-+++ git.temp/src/psiaccount.h
-@@ -95,9 +95,6 @@ class QIcon;
- class WbManager;
- #endif
- 
--// sick sick remove this someday please!
--struct GCContact;
--
- class AvCallManager;
- 
- class PsiAccount : public QObject
-@@ -258,9 +255,10 @@ public:
- 
- 	int sendMessageEncrypted(const Message &);
- 
--	// sucks sucks sucks sucks sucks sucks sucks
--	GCContact *findGCContact(const Jid &j) const;
-+	bool isGCContact(const Jid &j) const;
- 	XMPP::Status gcContactStatus(const Jid &j);
-+	void gcContactIncRef(const Jid &j);
-+	void gcContactDecRef(const Jid &j);
- 	QStringList groupchats() const;
- 
- 	void toggleSecurity(const Jid &, bool);
---- git.temp.orig/src/psicontact.cpp
-+++ git.temp/src/psicontact.cpp
-@@ -167,6 +167,8 @@ PsiContact::PsiContact(const UserListIte
- 	d->account_ = account;
- 	if (d->account_) {
- 		connect(d->account_->avatarFactory(), SIGNAL(avatarChanged(const Jid&)), SLOT(avatarChanged(const Jid&)));
-+		if (d->account_->isGCContact(u.jid()))
-+			d->account_->gcContactIncRef(u.jid());
- 	}
- 	connect(VCardFactory::instance(), SIGNAL(vcardChanged(const Jid&)), SLOT(vcardChanged(const Jid&)));
- 	update(u);
-@@ -185,6 +187,11 @@ PsiContact::PsiContact()
-  */
- PsiContact::~PsiContact()
- {
-+	if (account()) {
-+		const Jid &j = userListItem().jid();
-+		if (account()->isGCContact(j))
-+			account()->gcContactDecRef(j);
-+	}
- 	d->isValid_ = false;
- 	emit destroyed(this);
- 	delete d;

psi-plus-main-20160309.tar.xz/patches/dev/psi-fix-win32-Qt5.patch Deleted

psi-plus-main-20160309.tar.xz/patches/dev/psi-nested-groups.diff Deleted

@@ -1,1767 +0,0 @@
---- git.temp.orig/options/default.xml
-+++ git.temp/options/default.xml
-@@ -275,6 +275,7 @@ QLineEdit#le_status_text {
- 						<margin type="int">0</margin>
- 					</avatar>
- 				</roster-avatar-frame>
-+				<default-groups-delimiter comment="Default nested groups delimiter will be used if no delimiter on the server" type="QString">::</default-groups-delimiter>
- 			</contactlist>
- 			<menu comment="Options for the menu">
- 				<account comment="Options for the account-specific menu">
---- git.temp.orig/src/accountmodify.ui
-+++ git.temp/src/accountmodify.ui
-@@ -7,7 +7,7 @@
-     <x>0</x>
-     <y>0</y>
-     <width>765</width>
--    <height>475</height>
-+    <height>522</height>
-    </rect>
-   </property>
-   <property name="windowTitle">
-@@ -1043,6 +1043,63 @@ When you enable this option you will not
-         </widget>
-        </item>
-        <item>
-+        <layout class="QHBoxLayout" name="horizontalLayout_2">
-+         <item>
-+          <widget class="QLabel" name="label_3">
-+           <property name="text">
-+            <string>Nested groups delimiter: </string>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="QLineEdit" name="le_groupsdelimiter">
-+           <property name="sizePolicy">
-+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-+             <horstretch>0</horstretch>
-+             <verstretch>0</verstretch>
-+            </sizepolicy>
-+           </property>
-+           <property name="maximumSize">
-+            <size>
-+             <width>64</width>
-+             <height>16777215</height>
-+            </size>
-+           </property>
-+           <property name="readOnly">
-+            <bool>true</bool>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <spacer name="horizontalSpacer">
-+           <property name="orientation">
-+            <enum>Qt::Horizontal</enum>
-+           </property>
-+           <property name="sizeHint" stdset="0">
-+            <size>
-+             <width>40</width>
-+             <height>20</height>
-+            </size>
-+           </property>
-+          </spacer>
-+         </item>
-+         <item>
-+          <widget class="QPushButton" name="pb_groupsdelimiter">
-+           <property name="text">
-+            <string>Change...</string>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="QPushButton" name="pb_disablegroupsdelimiter">
-+           <property name="text">
-+            <string>Disable</string>
-+           </property>
-+          </widget>
-+         </item>
-+        </layout>
-+       </item>
-+       <item>
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-@@ -1123,8 +1180,8 @@ When you enable this option you will not
-    <slot>reject()</slot>
-    <hints>
-     <hint type="sourcelabel">
--     <x>346</x>
--     <y>439</y>
-+     <x>355</x>
-+     <y>512</y>
-     </hint>
-     <hint type="destinationlabel">
-      <x>523</x>
---- git.temp.orig/src/accountmodifydlg.cpp
-+++ git.temp/src/accountmodifydlg.cpp
-@@ -35,6 +35,7 @@
- #include "psicontactlist.h"
- #include "iconaction.h"
- #include "actionlineedit.h"
-+#include "userlist.h"
- 
- AccountModifyDlg::AccountModifyDlg(PsiCon *_psi, QWidget *parent)
- :QDialog(parent)
-@@ -223,6 +224,12 @@ void AccountModifyDlg::init()
- 	pb_removeBlock->hide();
- 	pb_addBlock->hide();
- 
-+	// Misc
-+	connect(pb_groupsdelimiter, SIGNAL(clicked()), SLOT(miscChangeGroupsDelimiter()));
-+	connect(pb_disablegroupsdelimiter, SIGNAL(clicked()), SLOT(miscDisableGroupsDelimiter()));
-+	if (pa && pa->userList())
-+		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
-+
- 	// QWhatsThis helpers
- 	cb_plain->setWhatsThis(
- 		tr("Normally, Psi logs in using the <i>digest</i> authentication "
-@@ -504,6 +511,22 @@ void AccountModifyDlg::removeStunHost()
- 	cb_stunHost->setCurrentIndex(0);
- }
- 
-+void AccountModifyDlg::miscChangeGroupsDelimiter()
-+{
-+	if (pa) {
-+		pa->changeGroupsDelimiter();
-+		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
-+	}
-+}
-+
-+void AccountModifyDlg::miscDisableGroupsDelimiter()
-+{
-+	if (pa) {
-+		pa->disableGroupsDelimiter();
-+		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
-+	}
-+}
-+
- void AccountModifyDlg::save()
- {
- 	/*if(pa && le_name->text().isEmpty()) {
---- git.temp.orig/src/accountmodifydlg.h
-+++ git.temp/src/accountmodifydlg.h
-@@ -57,6 +57,8 @@ private slots:
- 	void detailsChangePW();
- 
- 	void removeStunHost();
-+	void miscChangeGroupsDelimiter();
-+	void miscDisableGroupsDelimiter();
- 
- 	void save();
- 
---- git.temp.orig/src/contactlistaccountgroup.cpp
-+++ git.temp/src/contactlistaccountgroup.cpp
-@@ -30,14 +30,13 @@
- #include "contactlistgroupcache.h"
- 
- ContactListAccountGroup::ContactListAccountGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount* account)
--	: ContactListNestedGroup(model, parent, QString())
-+	: ContactListNestedGroup(model, parent, account, QString())
- 	, isRoot_(!account)
--	, account_(account)
- {
--	if (account_) {
-+	if (account) {
- 		model->groupCache()->addGroup(this);
--		connect(account_, SIGNAL(destroyed(QObject*)), SLOT(accountUpdated()));
--		connect(account_, SIGNAL(updatedAccount()), SLOT(accountUpdated()));
-+		connect(account, SIGNAL(destroyed(QObject*)), SLOT(accountUpdated()));
-+		connect(account, SIGNAL(updatedAccount()), SLOT(accountUpdated()));
- 	}
- }
- 
-@@ -57,11 +56,6 @@ void ContactListAccountGroup::clearGroup
- 	ContactListNestedGroup::clearGroup();
- }
- 
--PsiAccount* ContactListAccountGroup::account() const
--{
--	return account_;
--}
--
- ContactListModel::Type ContactListAccountGroup::type() const
- {
- 	return ContactListModel::AccountType;
-@@ -140,7 +134,7 @@ void ContactListAccountGroup::accountUpd
- 
- 	model()->updatedItem(root->findGroup(this));
- 
--	if (account_.isNull() || !account_->enabled()) {
-+	if (!account() || !account()->enabled()) {
- 		clearGroup();
- 		root->removeAccount(this);
- 	}
-@@ -148,8 +142,8 @@ void ContactListAccountGroup::accountUpd
- 
- const QString& ContactListAccountGroup::displayName() const
- {
--	if (account_) {
--		return account_->name();
-+	if (account()) {
-+		return account()->name();
- 	}
- 
- 	static QString emptyName;
-@@ -163,8 +157,8 @@ QString ContactListAccountGroup::compari
- 
- QString ContactListAccountGroup::internalGroupName() const
- {
--	if (account_) {
--		return account_->id();
-+	if (account()) {
-+		return account()->id();
- 	}
- 
- 	return QString();
---- git.temp.orig/src/contactlistaccountgroup.h
-+++ git.temp/src/contactlistaccountgroup.h
-@@ -34,7 +34,6 @@ public:
- 	ContactListAccountGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount* account);
- 	~ContactListAccountGroup();
- 
--	PsiAccount* account() const;
- 	ContactListAccountGroup* findAccount(PsiAccount* account) const;
- 
- 	// reimplemented
-@@ -63,7 +62,6 @@ private slots:
- 
- private:
- 	bool isRoot_;
--	QPointer<PsiAccount> account_;
- 	QList<ContactListAccountGroup*> accounts_;
- };
- 
---- git.temp.orig/src/contactlistdragmodel.cpp
-+++ git.temp/src/contactlistdragmodel.cpp
-@@ -23,6 +23,7 @@
- #include <QtAlgorithms>
- #include <QTimer>
- 
-+#include "userlist.h"
- #include "psioptions.h"
- #include "psiaccount.h"
- #include "contactlistgroup.h"
-@@ -296,7 +297,7 @@ bool ContactListDragModel::supportsMimeD
- 		if (group) {
- 			ContactListItemProxy* item2 = itemProxy(parent);
- 			ContactListGroup* group2 = item2 ? item2->parent() : 0;
--			if (group2 && group2->fullName().startsWith(group->fullName() + ContactListGroup::groupDelimiter())) {
-+			if (group2 && group2->fullName().startsWith(group->fullName() + group2->groupsDelimiter())) {
- 				return false;
- 			}
- 		}
-@@ -340,22 +341,18 @@ void ContactListDragModel::addOperations
- 		for (int i = 0; i < group->itemsCount(); ++i) {
- 			ContactListItemProxy* itemProxy = group->item(i);
- 			PsiContact* contact = 0;
--#ifdef CONTACTLIST_NESTED_GROUPS
- 			ContactListGroup* childGroup = 0;
--#endif
- 			if ((contact = dynamic_cast<PsiContact*>(itemProxy->item()))) {
- 				operations->addOperation(contact,
- 										 sourceOperationsForContactGroup(currentGroupName, contact),
- 										 destinationOperationsForContactGroup(newGroupName, contact));
- 			}
--#ifdef CONTACTLIST_NESTED_GROUPS
--#error needs testing
-+			// #error needs testing
- 			else if ((childGroup = dynamic_cast<ContactListGroup*>(itemProxy->item()))) {
--				QString theName = childGroup->fullName().split(ContactListGroup::groupDelimiter()).last();
--				QString newName = (newGroupName.isEmpty() ? "" : newGroupName + ContactListGroup::groupDelimiter()) + theName;
-+				QString theName = childGroup->toNestedGroups(childGroup->fullName()).last();
-+				QString newName = (newGroupName.isEmpty() ? "" : newGroupName + childGroup->groupsDelimiter()) + theName;
- 				addOperationsForGroupRename(childGroup->fullName(), newName, operations);
- 			}
--#endif
- 		}
- 	}
- }
-@@ -382,7 +379,9 @@ bool ContactListDragModel::dropMimeData(
- 
- 	foreach(ContactListModelSelection::Group group, selection.groups()) {
- 		QString parentGroupName = getDropGroupName(parent);
--		if (parentGroupName.startsWith(group.fullName + ContactListGroup::groupDelimiter())) {
-+		bool hasDelimiter = account(parent)->userList()->hasGroupsDelimiter();
-+		QString delimiter = account(parent)->userList()->groupsDelimiter();
-+		if (parentGroupName.startsWith(group.fullName + delimiter)) {
- 			qWarning("Dropping group to its descendant is not supported ('%s' -> '%s')", qPrintable(group.fullName), qPrintable(parentGroupName));
- 			continue;
- 		}
-@@ -391,8 +390,8 @@ bool ContactListDragModel::dropMimeData(
- 			continue;
- 
- 		// TODO: unify these two lines with the ones in operationsForGroupRename
--		QString theName = group.fullName.split(ContactListGroup::groupDelimiter()).last();
--		QString newName = (parentGroupName.isEmpty() ? "" : parentGroupName + ContactListGroup::groupDelimiter()) + theName;
-+		QString theName = group.fullName.split(hasDelimiter ? delimiter : "").last();
-+		QString newName = (parentGroupName.isEmpty() ? "" : parentGroupName + delimiter) + theName;
- 		if (newName == group.fullName)
- 			continue;
- 
-@@ -422,37 +421,17 @@ void ContactListDragModel::renameGroup(C
- 	Q_ASSERT(group);
- 	ContactListModelOperationList operations(ContactListModelOperationList::Move);
- 
--	QStringList name = group->fullName().split(ContactListGroup::groupDelimiter());
-+	QStringList name = group->toNestedGroups(group->fullName());
- 	if (name.isEmpty())
- 		return;
- 	name.takeLast();
- 	if (!newName.isEmpty())
- 		name << newName;
--	addOperationsForGroupRename(group->fullName(), name.join(ContactListGroup::groupDelimiter()), &operations);
-+	addOperationsForGroupRename(group->fullName(), group->fromNestedGroups(name), &operations);
- 
- 	performContactOperations(operations, Operation_GroupRename);
- }
- 
--QString ContactListDragModel::processContactSetGroupName(const QString& groupName) const
--{
--	if (accountsEnabled()) {
--		QStringList split = groupName.split(ContactListGroup::groupDelimiter());
--		split.takeFirst();
--		return split.join(ContactListGroup::groupDelimiter());
--	}
--
--	return groupName;
--}
--
--QStringList ContactListDragModel::processContactSetGroupNames(const QStringList& groups) const
--{
--	QStringList result;
--	foreach(const QString& g, groups) {
--		result << processContactSetGroupName(g);
--	}
--	return result;
--}
--
- QStringList ContactListDragModel::processContactGetGroupNames(PsiContact* contact) const
- {
- 	QStringList groups;
-@@ -504,7 +483,7 @@ void ContactListDragModel::performContac
- 			}
- 		}
- 
--		psiContact->setGroups(processContactSetGroupNames(groups));
-+		psiContact->setGroups(groups);
- 	}
- 
- 	contactOperationsPerformed(operations, operationType, groupContactCount);
-@@ -532,7 +511,7 @@ QList<PsiContact*> ContactListDragModel:
- 		QStringList groups = psiContact->groups();
- 
- 		foreach(ContactListModelOperationList::Operation op, contactOperation.operations) {
--			groups.removeAll(processContactSetGroupName(op.groupFrom));
-+			groups.removeAll(op.groupFrom);
- 		}
- 
- 		if (!groupsEnabled()) {
-@@ -562,8 +541,9 @@ QList<PsiContact*> ContactListDragModel:
- 				continue;
- 
- 			QStringList groups = it.value();
-+
- 			if (!groups.isEmpty())
--				psiContact->setGroups(processContactSetGroupNames(groups));
-+				psiContact->setGroups(groups);
- 			else
- 				psiContact->remove();
- 		}
---- git.temp.orig/src/contactlistdragmodel.h
-+++ git.temp/src/contactlistdragmodel.h
-@@ -113,8 +113,6 @@ protected:
- 	virtual QString getDropGroupName(const QModelIndex& parent) const;
- 	virtual void contactOperationsPerformed(const ContactListModelOperationList& operations, OperationType operationType, const QHash<ContactListGroup*, int>& groupContactCount);
- 
--	QString processContactSetGroupName(const QString& groupName) const;
--	QStringList processContactSetGroupNames(const QStringList& groups) const;
- 	QStringList processContactGetGroupNames(PsiContact* contact) const;
- 	QString sourceOperationsForContactGroup(const QString& groupName, PsiContact* contact) const;
- 	QString destinationOperationsForContactGroup(const QString& groupName, PsiContact* contact) const;
---- git.temp.orig/src/contactlistgroup.cpp
-+++ git.temp/src/contactlistgroup.cpp
-@@ -28,17 +28,17 @@
- #include "psicontact.h"
- #include "contactlistgroupstate.h"
- #include "contactlistgroupcache.h"
-+#include "psiaccount.h"
-+#include "userlist.h"
- #ifdef YAPSI
- #include "fakegroupcontact.h"
- #endif
- 
--static QString GROUP_DELIMITER = "::";
--
- /**
-  * Flat group class.
-  */
--ContactListGroup::ContactListGroup(ContactListModel* model, ContactListGroup* parent)
--	: ContactListItem()
-+ContactListGroup::ContactListGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount *account)
-+	: ContactListItem(account)
- 	, model_(model)
- 	, parent_(parent)
- 	, updateOnlineContactsTimer_(0)
-@@ -76,35 +76,61 @@ QString ContactListGroup::internalGroupN
- 
- QString ContactListGroup::fullName() const
- {
--	QStringList name;
-+	QStringList nestedGroups;
- 	const ContactListGroup* group = this;
- 	while (group) {
--		if (!group->internalGroupName().isEmpty())
--			name.prepend(group->internalGroupName());
-+		if (!group->internalGroupName().isEmpty() && group->type() != ContactListModel::AccountType)
-+			nestedGroups.prepend(group->internalGroupName());
- 		group = group->parent();
- 	}
--	return name.join(groupDelimiter());
-+	return fromNestedGroups(nestedGroups);
-+}
-+
-+bool ContactListGroup::hasGroupsDelimiter() const
-+{
-+	return account() ? account()->userList()->hasGroupsDelimiter() : false;
-+}
-+
-+QString ContactListGroup::groupsDelimiter() const
-+{
-+	return account() ? account()->userList()->groupsDelimiter() : "";
- }
- 
--const QString& ContactListGroup::groupDelimiter()
-+QStringList ContactListGroup::toNestedGroups(const QString &group) const
- {
--	return GROUP_DELIMITER;
-+	QStringList nestedGroups;
-+	if (hasGroupsDelimiter())
-+		nestedGroups = group.split(groupsDelimiter());
-+	else
-+		nestedGroups << group;
-+	return nestedGroups;
- }
- 
--void ContactListGroup::setGroupDelimiter(const QString& str)
-+QString ContactListGroup::fromNestedGroups(const QStringList &nestedGroups) const
- {
--	GROUP_DELIMITER = str;
-+	QString group;
-+	if (hasGroupsDelimiter()) {
-+		group = nestedGroups.join(groupsDelimiter());
-+	}
-+	else {
-+		group = nestedGroups.join("");
-+	}
-+	return group;
- }
- 
--QString ContactListGroup::sanitizeGroupName(const QString& name) const
-+QString ContactListGroup::sanitizeGroupName(const QString &name) const
- {
--	return name.split(groupDelimiter(), QString::SkipEmptyParts).join(groupDelimiter());
-+	if (!hasGroupsDelimiter()) {
-+		return name;
-+	}
-+
-+	return name.split(groupsDelimiter(), QString::SkipEmptyParts).join(groupsDelimiter());
- }
- 
- QStringList ContactListGroup::sanitizeGroupNames(const QStringList& names) const
- {
- 	QStringList sanitized;
--	foreach(QString name, names) {
-+	foreach(const QString &name, names) {
- 		sanitized.append(sanitizeGroupName(name));
- 	}
- 	return sanitized;
-@@ -420,6 +446,7 @@ void ContactListGroup::updateOnlineConta
- 		onlineContactsCount_ = onlineContactsCount;
- 		totalContactsCount_ = totalContactsCount;
- 		if (parent()) {
-+			parent()->updateOnlineContactsFlag();
- 			model()->updatedItem(parent()->findGroup(this));
- 		}
- 	}
-@@ -477,7 +504,7 @@ void ContactListGroup::contactsHelper(QL
- 	foreach(ContactListItemProxy* item, items_) {
- 		ContactListGroup* group = dynamic_cast<ContactListGroup*>(item->item());
- 		if (group)
--			contactsHelper(contacts);
-+			group->contactsHelper(contacts);
- 	}
- }
- 
---- git.temp.orig/src/contactlistgroup.h
-+++ git.temp/src/contactlistgroup.h
-@@ -38,7 +38,7 @@ class ContactListGroup : public ContactL
- {
- 	Q_OBJECT
- public:
--	ContactListGroup(ContactListModel* model, ContactListGroup* parent);
-+	ContactListGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount *account);
- 	~ContactListGroup();
- 
- 	ContactListItemProxy* item(int index) const;
-@@ -80,8 +80,13 @@ public:
- 	virtual ContactListItemMenu* contextMenu(ContactListModel* model);
- 	virtual bool compare(const ContactListItem* other) const;
- 
--	static const QString& groupDelimiter();
--	static void setGroupDelimiter(const QString&);
-+	bool hasGroupsDelimiter() const;
-+	QString groupsDelimiter() const;
-+
-+	QStringList toNestedGroups(const QString &group) const;
-+	QString fromNestedGroups(const QStringList &nestedGroups) const;
-+
-+	// static void setGroupsDelimiter(const QString&);
- 	QString sanitizeGroupName(const QString&) const;
- 	QStringList sanitizeGroupNames(const QStringList& names) const;
- 
---- git.temp.orig/src/contactlistgroupstate.cpp
-+++ git.temp/src/contactlistgroupstate.cpp
-@@ -19,6 +19,7 @@
-  */
- 
- #include "contactlistgroupstate.h"
-+#include "contactlistgroup.h"
- 
- #include <QTimer>
- #include <QStringList>
-@@ -28,6 +29,8 @@
- #include "contactlistgroup.h"
- #include "psioptions.h"
- #include "xmpp_xmlcommon.h"
-+#include "psiaccount.h"
-+#include "userlist.h"
- 
- static const QString groupStateOptionPath = "options.main-window.contact-list.group-state.%1";
- 
-@@ -147,8 +150,17 @@ QStringList ContactListGroupState::group
- 	}
- 
- 	if (result.isEmpty()) {
--		for (int len = 1; len < parentName.count() + 1; ++len)
--			result += QStringList(parentName.mid(0, len)).join(ContactListGroup::groupDelimiter());
-+		ContactListItemProxy *itemProxy = model->modelIndexToItemProxy(parent);
-+		if (itemProxy) {
-+			ContactListGroup *groupItem = qobject_cast<ContactListGroup*>(itemProxy->item());
-+			QString groupsDelimiter;
-+			if (groupItem && groupItem->hasGroupsDelimiter()) {
-+				groupsDelimiter = groupItem->groupsDelimiter();
-+			}
-+
-+			for (int len = 1; len < parentName.count() + 1; ++len)
-+				result += QStringList(parentName.mid(0, len)).join(groupsDelimiter);
-+		}
- 	}
- 
- 	return result;
---- git.temp.orig/src/contactlistitem.cpp
-+++ git.temp/src/contactlistitem.cpp
-@@ -21,15 +21,32 @@
- #include "contactlistitem.h"
- 
- #include "psicontact.h"
-+#include "psiaccount.h"
- 
--ContactListItem::ContactListItem(QObject* parent)
-+class ContactListItem::Private
-+{
-+public:
-+	Private();
-+	bool editing;
-+	PsiAccount *account;
-+};
-+
-+ContactListItem::Private::Private()
-+	: editing(false)
-+	, account(0)
-+{
-+}
-+
-+ContactListItem::ContactListItem(PsiAccount *account, QObject* parent)
- 	: QObject(parent)
--	, editing_(false)
-+	, d(new ContactListItem::Private)
- {
-+	d->account = account;
- }
- 
- ContactListItem::~ContactListItem()
- {
-+	delete d;
- }
- 
- bool ContactListItem::isEditable() const
-@@ -90,15 +107,20 @@ QString ContactListItem::comparisonName(
- 
- bool ContactListItem::editing() const
- {
--	return editing_;
-+	return d->editing;
- }
- 
- void ContactListItem::setEditing(bool editing)
- {
--	editing_ = editing;
-+	d->editing = editing;
- }
- 
- const QString& ContactListItem::displayName() const
- {
- 	return name();
- }
-+
-+PsiAccount *ContactListItem::account() const
-+{
-+	return d->account;
-+}
---- git.temp.orig/src/contactlistitem.h
-+++ git.temp/src/contactlistitem.h
-@@ -27,11 +27,12 @@
- #include "contactlistmodel.h"
- 
- class ContactListItemMenu;
-+class PsiAccount;
- 
- class ContactListItem : public QObject
- {
- public:
--	ContactListItem(QObject* parent = 0);
-+	ContactListItem(PsiAccount *account, QObject* parent = 0);
- 	virtual ~ContactListItem();
- 
- 	virtual ContactListModel::Type type() const = 0;
-@@ -58,8 +59,11 @@ public:
- 	virtual bool editing() const;
- 	virtual void setEditing(bool editing);
- 
-+	PsiAccount *account() const;
-+
- private:
--	bool editing_;
-+	class Private;
-+	Private *d;
- };
- 
- #endif
---- git.temp.orig/src/contactlistitemproxy.cpp
-+++ git.temp/src/contactlistitemproxy.cpp
-@@ -19,19 +19,41 @@
-  */
- 
- #include "contactlistitemproxy.h"
--
- #include "contactlistgroup.h"
- #include "contactlistmodel.h"
- 
-+#include <QPointer>
-+
-+class ContactListItemProxy::Private
-+{
-+public:
-+	QPointer<ContactListItem> item;
-+	QPointer<ContactListGroup> parent;
-+};
-+
- ContactListItemProxy::ContactListItemProxy(ContactListGroup* parent, ContactListItem* item)
--	: item_(item)
--	, parent_(parent)
-+	: d(new ContactListItemProxy::Private)
- {
- 	Q_ASSERT(item);
- 	Q_ASSERT(parent);
-+
-+	d->item = item;
-+	d->parent = parent;
-+
- 	parent->model()->contactListItemProxyCreated(this);
- }
- 
- ContactListItemProxy::~ContactListItemProxy()
- {
-+	delete d;
-+}
-+
-+ContactListItem *ContactListItemProxy::item() const
-+{
-+	return d->item;
-+}
-+
-+ContactListGroup *ContactListItemProxy::parent() const
-+{
-+	return d->parent;
- }
---- git.temp.orig/src/contactlistitemproxy.h
-+++ git.temp/src/contactlistitemproxy.h
-@@ -22,7 +22,6 @@
- #define CONTACTLISTITEMPROXY_H
- 
- #include <QObject>
--#include <QPointer>
- 
- class ContactListItem;
- class ContactListGroup;
-@@ -33,12 +32,12 @@ public:
- 	ContactListItemProxy(ContactListGroup* parent, ContactListItem* item);
- 	~ContactListItemProxy();
- 
--	ContactListItem* item() const { return item_; }
--	ContactListGroup* parent() const { return parent_; }
-+	ContactListItem *item() const;
-+	ContactListGroup *parent() const;
- 
- private:
--	QPointer<ContactListItem> item_;
--	QPointer<ContactListGroup> parent_;
-+	class Private;
-+	Private *d;
- };
- 
- #endif
---- git.temp.orig/src/contactlistmodel.cpp
-+++ git.temp/src/contactlistmodel.cpp
-@@ -68,6 +68,7 @@ ContactListModel::ContactListModel(PsiCo
- 	connect(updater_, SIGNAL(contactGroupsChanged(PsiContact*)), SLOT(contactGroupsChanged(PsiContact*)));
- 	connect(updater_, SIGNAL(beginBulkContactUpdate()), SLOT(beginBulkUpdate()));
- 	connect(updater_, SIGNAL(endBulkContactUpdate()), SLOT(endBulkUpdate()));
-+	connect(updater_, SIGNAL(groupsDelimiterChanged()), SLOT(invalidateLayout()));
- 	connect(contactList_, SIGNAL(destroying()), SLOT(destroyingContactList()));
- 	connect(contactList_, SIGNAL(showOfflineChanged(bool)), SIGNAL(showOfflineChanged()));
- 	connect(contactList_, SIGNAL(showHiddenChanged(bool)), SIGNAL(showHiddenChanged()));
-@@ -118,9 +119,9 @@ ContactListGroup* ContactListModel::crea
- 		return new ContactListAccountGroup(this, 0, 0);
- 
- 	if (!groupsEnabled_)
--		return new ContactListGroup(this, 0);
-+		return new ContactListGroup(this, 0, 0);
- 
--	return new ContactListNestedGroup(this, 0, QString());
-+	return new ContactListNestedGroup(this, 0, 0, QString());
- }
- 
- bool ContactListModel::groupsEnabled() const
-@@ -645,10 +646,24 @@ bool ContactListModel::setData(const QMo
- 			//}
- 		}
- 		else if ((group = dynamic_cast<ContactListGroup*>(item->item()))) {
-+			bool hasGroupsDelimiter = group->hasGroupsDelimiter();
-+			QString groupsDelimiter = group->groupsDelimiter();
- 			if (name.isEmpty()) {
- 				QMessageBox::information(0, tr("Error"), tr("You can't set a blank group name."));
- 				return false;
- 			}
-+			else if (hasGroupsDelimiter && name.startsWith(groupsDelimiter)) {
-+				QMessageBox::information(0, tr("Error"), tr("You can't use delimiter in the begin of group name."));
-+				return false;
-+			}
-+			else if (hasGroupsDelimiter && name.endsWith(groupsDelimiter)) {
-+				QMessageBox::information(0, tr("Error"), tr("You can't use delimiter in the end of group name."));
-+				return false;
-+			}
-+			else if (hasGroupsDelimiter && name.split(groupsDelimiter).contains("")) {
-+				QMessageBox::information(0, tr("Error"), tr("You can't use repeating delimiter in the group name."));
-+				return false;
-+			}
- 			// else {
- 				// // make sure we don't have it already
- 				// if (group->account()->groupList().contains(name)) {
-@@ -850,7 +865,7 @@ PsiAccount* ContactListModel::account(co
- {
- 	ContactListItemProxy* item = itemProxy(index);
- 	if (item) {
--		PsiContact* contact = dynamic_cast<PsiContact*>(item->item());
-+		ContactListItem *contact = item->item();
- 		if (contact)
- 			return contact->account();
- 	}
---- git.temp.orig/src/contactlistmodel.h
-+++ git.temp/src/contactlistmodel.h
-@@ -27,13 +27,14 @@
- #include <QHash>
- #include <QPointer>
- 
-+#include "contactlistitemproxy.h"
-+
- class PsiAccount;
- class PsiContact;
- class PsiContactList;
- class ContactListItem;
- class ContactListGroup;
- class ContactListAccountGroup;
--class ContactListItemProxy;
- class ContactListGroupState;
- class ContactListGroupCache;
- class ContactListModelUpdater;
-@@ -116,7 +117,6 @@ public:
- 
- 	virtual PsiContactList* contactList() const;
- 
--	void invalidateLayout();
- 	ContactListItemProxy* modelIndexToItemProxy(const QModelIndex& index) const;
- 	QModelIndex itemProxyToModelIndex(ContactListItemProxy* item) const;
- 	QModelIndex itemProxyToModelIndex(ContactListItemProxy* item, int index) const;
-@@ -195,6 +195,7 @@ signals:
- public slots:
- 	void expanded(const QModelIndex&);
- 	void collapsed(const QModelIndex&);
-+	void invalidateLayout();
- 
- protected slots:
- 	void addContact(PsiContact*);
---- git.temp.orig/src/contactlistmodelupdater.cpp
-+++ git.temp/src/contactlistmodelupdater.cpp
-@@ -42,6 +42,7 @@ ContactListModelUpdater::ContactListMode
- 	connect(contactList_, SIGNAL(removedContact(PsiContact*)), SLOT(removeContact(PsiContact*)));
- 	connect(contactList_, SIGNAL(beginBulkContactUpdate()), SLOT(beginBulkUpdate()));
- 	connect(contactList_, SIGNAL(endBulkContactUpdate()), SLOT(endBulkUpdate()));
-+	connect(contactList_, SIGNAL(groupsDelimiterChanged()), SIGNAL(groupsDelimiterChanged()));
- }
- 
- ContactListModelUpdater::~ContactListModelUpdater()
---- git.temp.orig/src/contactlistmodelupdater.h
-+++ git.temp/src/contactlistmodelupdater.h
-@@ -51,6 +51,7 @@ signals:
- 	void contactAnim(PsiContact*);
- 	void contactUpdated(PsiContact*);
- 	void contactGroupsChanged(PsiContact*);
-+	void groupsDelimiterChanged();
- 
- 	void beginBulkContactUpdate();
- 	void endBulkContactUpdate();
---- git.temp.orig/src/contactlistnestedgroup.cpp
-+++ git.temp/src/contactlistnestedgroup.cpp
-@@ -26,8 +26,8 @@
- #include "contactlistitemproxy.h"
- #include "contactlistspecialgroup.h"
- 
--ContactListNestedGroup::ContactListNestedGroup(ContactListModel* model, ContactListGroup* parent, QString name)
--	: ContactListGroup(model, parent)
-+ContactListNestedGroup::ContactListNestedGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount *account, QString name)
-+	: ContactListGroup(model, parent, account)
- {
- 	quietSetName(name);
- }
-@@ -82,12 +82,8 @@ void ContactListNestedGroup::addContact(
- 			ContactListGroup::addContact(contact, contactGroups);
- 		}
- 		else {
--			QStringList nestedGroups;
--#ifdef CONTACTLIST_NESTED_GROUPS
--			nestedGroups = groupName.split(groupDelimiter());
--#else
--			nestedGroups += groupName;
--#endif
-+			QStringList nestedGroups = toNestedGroups(sanitizeGroupName(groupName));
-+
- 			if (!name().isEmpty()) {
- 				QString firstPart = nestedGroups.takeFirst();
- 				Q_ASSERT(firstPart == name());
-@@ -97,13 +93,13 @@ void ContactListNestedGroup::addContact(
- 
- 			ContactListGroup* group = findGroup(nestedGroups.first());
- 			if (!group) {
--				group = new ContactListNestedGroup(model(), this, nestedGroups.first());
-+				group = new ContactListNestedGroup(model(), this, contact->account(), nestedGroups.first());
- 				addGroup(group);
- CL_DEBUG("ContactListNextedGroup(%x)::addContact: %s", this, qPrintable(group->fullName()));
- 			}
- 
- 			QStringList moreGroups;
--			moreGroups << nestedGroups.join(groupDelimiter());
-+			moreGroups << fromNestedGroups(nestedGroups);
- 			group->addContact(contact, moreGroups);
- 		}
- 	}
-@@ -172,11 +168,8 @@ void ContactListNestedGroup::contactGrou
- 		}
- 
- 		QStringList split;
--#ifdef CONTACTLIST_NESTED_GROUPS
--		split = group.split(groupDelimiter());
--#else
--		split += group;
--#endif
-+		split = toNestedGroups(group);
-+
- 		if (!name().isEmpty()) {
- 			QString firstPart = split.takeFirst();
- 			// hmm, probably should continue as the data should be invalid
-@@ -202,14 +195,10 @@ void ContactListNestedGroup::contactGrou
- 		QStringList mergedGroupNames;
- 		foreach(QStringList i, splitGroupNames)
- 			if (!i.isEmpty() && i.first() == split.first())
--				mergedGroupNames += i.join(groupDelimiter());
-+				mergedGroupNames += fromNestedGroups(i);
- 
- 		foreach(QString i, mergedGroupNames) {
--#ifdef CONTACTLIST_NESTED_GROUPS
--			splitGroupNames.removeAll(i.split(groupDelimiter()));
--#else
--			splitGroupNames.removeAll(QStringList() << i);
--#endif
-+			splitGroupNames.removeAll(toNestedGroups(i));
- 		}
- 
- 		group->contactGroupsChanged(contact, mergedGroupNames);
-@@ -249,7 +238,7 @@ CL_DEBUG("ContactListNextedGroup(%x)::co
- 			fullGroupName << name();
- 		fullGroupName += split;
- 		QStringList tmp;
--		tmp << fullGroupName.join(groupDelimiter());
-+		tmp << fromNestedGroups(fullGroupName);
- 		addContact(contact, tmp);
- 	}
- 
-@@ -269,14 +258,14 @@ CL_DEBUG("ContactListNextedGroup(%x)::co
- #else
- 	QStringList newNestedGroups = fullName().isEmpty()
- 	                              ? contactGroups
--	                              : contactGroups.filter(QRegExp(QString("^%1($|%2)").arg(fullName(), groupDelimiter())));
-+	                              : contactGroups.filter(QRegExp(QString("^%1($|%2)").arg(fullName(), groupsDelimiter())));
- 
- 	QStringList directChildren;
- 	foreach(QString nnGroup, newNestedGroups) {
--		QString unqualifiedName = nnGroup.mid(QString(fullName().isEmpty() ? "" : fullName() + groupDelimiter()).length());
-+		QString unqualifiedName = nnGroup.mid(QString(fullName().isEmpty() ? "" : fullName() + groupsDelimiter()).length());
- 		if (!unqualifiedName.isEmpty()) {
- 			// direct children!
--			directChildren << QString(name().isEmpty() ? "" : name() + groupDelimiter()) + unqualifiedName;
-+			directChildren << QString(name().isEmpty() ? "" : name() + groupsDelimiter()) + unqualifiedName;
- 		}
- 	}
- 
---- git.temp.orig/src/contactlistnestedgroup.h
-+++ git.temp/src/contactlistnestedgroup.h
-@@ -27,7 +27,7 @@ class ContactListNestedGroup : public Co
- {
- 	Q_OBJECT
- public:
--	ContactListNestedGroup(ContactListModel* model, ContactListGroup* parent, QString name);
-+	ContactListNestedGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount *account, QString name);
- 	~ContactListNestedGroup();
- 
- 	virtual bool canContainSpecialGroups() const;
---- git.temp.orig/src/contactlistspecialgroup.cpp
-+++ git.temp/src/contactlistspecialgroup.cpp
-@@ -24,7 +24,7 @@
- #include <QStringList>
- 
- ContactListSpecialGroup::ContactListSpecialGroup(ContactListModel* model, ContactListGroup* parent, ContactListGroup::SpecialType type)
--	: ContactListNestedGroup(model, parent, QString())
-+	: ContactListNestedGroup(model, parent, 0, QString())
- 	, specialType_(type)
- {
- 	name_ = QString::fromUtf8("☣special_group_");
---- /dev/null
-+++ git.temp/src/creategroup.ui
-@@ -0,0 +1,159 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>CreateGroupDlg</class>
-+ <widget class="QDialog" name="CreateGroupDlg">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>360</width>
-+    <height>250</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Create New Group</string>
-+  </property>
-+  <layout class="QVBoxLayout" name="verticalLayout">
-+   <item>
-+    <widget class="QLabel" name="label">
-+     <property name="text">
-+      <string>Choose parent group: </string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QTreeWidget" name="twGroups">
-+     <attribute name="headerVisible">
-+      <bool>false</bool>
-+     </attribute>
-+     <column>
-+      <property name="text">
-+       <string notr="true">1</string>
-+      </property>
-+     </column>
-+    </widget>
-+   </item>
-+   <item>
-+    <widget class="QLabel" name="label_2">
-+     <property name="text">
-+      <string>Enter the new group name:</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <widget class="QLineEdit" name="lneGroupName"/>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnAddGroup">
-+       <property name="text">
-+        <string>Add</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <widget class="QDialogButtonBox" name="buttonBox">
-+     <property name="orientation">
-+      <enum>Qt::Horizontal</enum>
-+     </property>
-+     <property name="standardButtons">
-+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-+     </property>
-+    </widget>
-+   </item>
-+  </layout>
-+ </widget>
-+ <tabstops>
-+  <tabstop>buttonBox</tabstop>
-+ </tabstops>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>accepted()</signal>
-+   <receiver>CreateGroupDlg</receiver>
-+   <slot>accept()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>227</x>
-+     <y>222</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>157</x>
-+     <y>249</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>buttonBox</sender>
-+   <signal>rejected()</signal>
-+   <receiver>CreateGroupDlg</receiver>
-+   <slot>reject()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>295</x>
-+     <y>228</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>286</x>
-+     <y>249</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnAddGroup</sender>
-+   <signal>clicked()</signal>
-+   <receiver>CreateGroupDlg</receiver>
-+   <slot>addGroup()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>313</x>
-+     <y>180</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>361</x>
-+     <y>166</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>lneGroupName</sender>
-+   <signal>textChanged(QString)</signal>
-+   <receiver>CreateGroupDlg</receiver>
-+   <slot>checkGroupName()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>149</x>
-+     <y>188</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>356</x>
-+     <y>126</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>twGroups</sender>
-+   <signal>currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)</signal>
-+   <receiver>CreateGroupDlg</receiver>
-+   <slot>checkGroupName()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>94</x>
-+     <y>78</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>360</x>
-+     <y>72</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+ <slots>
-+  <slot>checkGroupName()</slot>
-+  <slot>addGroup()</slot>
-+ </slots>
-+</ui>
---- /dev/null
-+++ git.temp/src/creategroupdlg.cpp
-@@ -0,0 +1,207 @@
-+/*
-+ * creategroupdlg.cpp
-+ * Copyright (C) 2014  Ivan Romanov <drizt@land.ru>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "ui_creategroup.h"
-+#include "creategroupdlg.h"
-+#include "psicontact.h"
-+#include "userlist.h"
-+#include "psiaccount.h"
-+
-+#include <QPushButton>
-+#include <QTreeWidgetItem>
-+#include <QList>
-+#include <QRegExp>
-+
-+class CreateGroupDlg::Private
-+{
-+public:
-+	CreateGroupDlg *q;
-+	Ui::CreateGroupDlg *ui;
-+	PsiContact *contact;
-+
-+	QString fullGroupName()
-+	{
-+		QStringList groupNameList;
-+		groupNameList << ui->lneGroupName->text();
-+
-+		QTreeWidgetItem *item = ui->twGroups->currentItem();
-+		if (item != ui->twGroups->topLevelItem(0)) {
-+			while (item != 0) {
-+				groupNameList.prepend(item->text(0));
-+				item = item->parent();
-+			}
-+		}
-+
-+		QString groupsDelimiter = contact->account()->userList()->groupsDelimiter();
-+
-+		return groupNameList.join(groupsDelimiter);
-+	}
-+};
-+
-+CreateGroupDlg::CreateGroupDlg(PsiContact *contact, QWidget *parent)
-+	: QDialog(parent)
-+	, d(new CreateGroupDlg::Private)
-+{
-+	d->q = this;
-+	d->ui = new Ui::CreateGroupDlg;
-+	d->ui->setupUi(this);
-+	d->ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-+	d->ui->btnAddGroup->setEnabled(false);
-+	d->contact = contact;
-+
-+	// Fill groups tree
-+	bool hasGroupsDelimiter = d->contact->account()->userList()->hasGroupsDelimiter();
-+
-+	QList<QTreeWidgetItem *> items;
-+	items << new QTreeWidgetItem((QTreeWidget*)0, QStringList(tr("<None>")));
-+
-+	// Show only <None> if no delimiter
-+	if (hasGroupsDelimiter) {
-+		QString groupsDelimiter = d->contact->account()->userList()->groupsDelimiter();
-+		QStringList groupList = d->contact->account()->groupList();
-+		groupList.removeAll("");
-+		groupList.removeAll(PsiContact::hiddenGroupName());
-+		foreach (const QString &groupName, groupList) {
-+			QStringList subGroupList = groupName.split(groupsDelimiter);
-+
-+			QTreeWidgetItem *parentItem = 0;
-+			foreach (const QString &subGroupName, subGroupList) {
-+				QList<QTreeWidgetItem*> children;
-+				if (parentItem) {
-+					for (int i = 0; i < parentItem->childCount(); i++)
-+						children << parentItem->child(i);
-+				}
-+				else {
-+					children = items;
-+				}
-+
-+				bool needCreateItem = true;
-+
-+				for (int i = 0; i < children.length(); i++) {
-+					if (children.at(i)->text(0) == subGroupName) {
-+						parentItem = children.at(i);
-+						needCreateItem = false;
-+						break;
-+					}
-+				}
-+
-+				if (needCreateItem) {
-+					parentItem = new QTreeWidgetItem(parentItem, QStringList(subGroupName));
-+					items << parentItem;
-+				}
-+			}
-+		}
-+	}
-+	d->ui->twGroups->insertTopLevelItems(0, items);
-+	d->ui->twGroups->setCurrentItem(items.at(0));
-+	d->ui->lneGroupName->setFocus();
-+}
-+
-+CreateGroupDlg::~CreateGroupDlg()
-+{
-+	delete d->ui;
-+	delete d;
-+}
-+
-+void CreateGroupDlg::accept()
-+{
-+	QDialog::accept();
-+	d->contact->setGroups(QStringList() << d->fullGroupName());
-+}
-+
-+void CreateGroupDlg::checkGroupName()
-+{
-+	bool ok;
-+	QString groupName = d->fullGroupName();
-+
-+	// Subgroup name can't be empty
-+	ok = !d->ui->lneGroupName->text().isEmpty();
-+
-+	QString groupsDelimiter = d->contact->account()->userList()->groupsDelimiter();
-+	bool hasGroupsDelimiter = d->contact->account()->userList()->hasGroupsDelimiter();
-+	QString subGroupName = d->ui->lneGroupName->text();
-+
-+	// Subgroup name can't start or end with delimiter
-+	// or has repeated delimiters
-+	if (hasGroupsDelimiter &&
-+		(subGroupName.split(groupsDelimiter)).contains("")) {
-+
-+		ok = false;
-+	}
-+
-+	// Contact is not added to this group
-+	if (ok) {
-+		ok = !d->contact->userListItem().groups().contains(groupName);
-+	}
-+
-+	d->ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok);
-+
-+	// Can't create subgroup if no delimiter
-+	if (ok) {
-+		ok = hasGroupsDelimiter;
-+	}
-+
-+	// Can't create subgroup with delimiter
-+	if (ok) {
-+		ok = !subGroupName.contains(groupsDelimiter);
-+	}
-+
-+	// No such subgroup
-+	if (ok) {
-+		QTreeWidgetItem *item = d->ui->twGroups->currentItem();
-+		QList<QTreeWidgetItem*> children;
-+
-+		if (item == d->ui->twGroups->topLevelItem(0)) {
-+			for (int i = 1; i < d->ui->twGroups->topLevelItemCount(); i++)
-+				children << d->ui->twGroups->topLevelItem(i);
-+		}
-+		else {
-+			for (int i = 0; i < item->childCount(); i++)
-+				children << item->child(i);
-+		}
-+
-+		for (int i = 0; i < children.length(); i++) {
-+			if (children.at(i)->text(0) == subGroupName) {
-+				ok = false;
-+				break;
-+			}
-+		}
-+	}
-+	d->ui->btnAddGroup->setEnabled(ok);
-+}
-+
-+void CreateGroupDlg::addGroup()
-+{
-+	QTreeWidgetItem *item = d->ui->twGroups->currentItem();
-+	QString subGroupName = d->ui->lneGroupName->text();
-+
-+	if (item == d->ui->twGroups->topLevelItem(0)) {
-+		item = 0;
-+		item = new QTreeWidgetItem(item, QStringList(subGroupName));
-+		d->ui->twGroups->addTopLevelItem(item);
-+	}
-+	else {
-+		item = new QTreeWidgetItem(item, QStringList(subGroupName));
-+	}
-+	d->ui->twGroups->setCurrentItem(item);
-+
-+	d->ui->lneGroupName->setText("");
-+	d->ui->lneGroupName->setFocus();
-+}
---- /dev/null
-+++ git.temp/src/creategroupdlg.h
-@@ -0,0 +1,46 @@
-+/*
-+ * creategroupdlg.h
-+ * Copyright (C) 2014  Ivan Romanov <drizt@land.ru>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef CREATEGROUPDLG_H
-+#define CREATEGROUPDLG_H
-+
-+#include <QDialog>
-+
-+class PsiContact;
-+
-+class CreateGroupDlg : public QDialog
-+{
-+	Q_OBJECT
-+
-+public:
-+	CreateGroupDlg(PsiContact *contact, QWidget *parent = 0);
-+	~CreateGroupDlg();
-+
-+public slots:
-+	void accept();
-+	void checkGroupName();
-+	void addGroup();
-+
-+private:
-+	class Private;
-+	Private *d;
-+};
-+
-+#endif // CREATEGROUPDLG_H
---- git.temp.orig/src/psi_profiles.cpp
-+++ git.temp/src/psi_profiles.cpp
-@@ -302,6 +302,8 @@ void UserAccount::fromOptions(OptionsTre
- 		allow_plain = XMPP::ClientStream::NoAllowPlain;
- 	}
- 
-+	roster.setGroupsDelimiter(o->getOption(base + ".roster-cache-groups-delimiter").toString());
-+
- 	QStringList rosterCache = o->getChildOptionNames(base + ".roster-cache", true, true);
- 	foreach(QString rbase, rosterCache) {
- 		RosterItem ri;
-@@ -439,6 +441,8 @@ void UserAccount::toOptions(OptionsTree
- 			qFatal("unknown allow_plain enum value in UserAccount::toOptions");
- 	}
- 
-+	o->setOption(base + ".roster-cache-groups-delimiter", roster.groupsDelimiter());
-+
- 	int idx = 0;
- 	foreach(RosterItem ri, roster) {
- 		QString rbase = base + ".roster-cache.a" + QString::number(idx++);
---- git.temp.orig/src/psiaccount.cpp
-+++ git.temp/src/psiaccount.cpp
-@@ -23,7 +23,6 @@
-  *
-  */
- 
--
- #include <QFileDialog>
- #include <QSet>
- #include <QInputDialog>
-@@ -1100,6 +1099,8 @@ PsiAccount::PsiAccount(const UserAccount
- 	d->voiceCaller = 0;
- 	d->blockTransportPopupList = new BlockTransportPopupList();
- 
-+	d->userList.setGroupsDelimiter(acc.roster.groupsDelimiter());
-+
- 	v_isActive = false;
- 	isDisconnecting = false;
- 	notifyOnlineOk = false;
-@@ -1168,6 +1169,7 @@ PsiAccount::PsiAccount(const UserAccount
- 	//connect(d->client, SIGNAL(sslCertReady(const QSSLCert &)), SLOT(client_sslCertReady(const QSSLCert &)));
- 	//connect(d->client, SIGNAL(closeFinished()), SLOT(client_closeFinished()));
- 	//connect(d->client, SIGNAL(authFinished(bool, int, const QString &)), SLOT(client_authFinished(bool, int, const QString &)));
-+	connect(d->client, SIGNAL(rosterGroupsDelimiterRequestFinished(const QString &)), SLOT(client_rosterRequestGroupsDelimiterFinished(const QString &)));
- 	connect(d->client, SIGNAL(rosterRequestFinished(bool, int, const QString &)), SLOT(client_rosterRequestFinished(bool, int, const QString &)));
- 	connect(d->client, SIGNAL(rosterItemAdded(const RosterItem &)), SLOT(client_rosterItemAdded(const RosterItem &)));
- 	connect(d->client, SIGNAL(rosterItemAdded(const RosterItem &)), SLOT(client_rosterItemUpdated(const RosterItem &)));
-@@ -1508,6 +1510,7 @@ const UserAccount & PsiAccount::userAcco
- 	// save the roster and pgp key bindings
- 	d->acc.roster.clear();
- 	d->acc.keybind.clear();
-+	d->acc.roster.setGroupsDelimiter(d->userList.groupsDelimiter());
- 	foreach(UserListItem* u, d->userList) {
- 		if(u->inList())
- 			d->acc.roster += *u;
-@@ -2321,6 +2324,24 @@ int PsiAccount::currentConnectionErrorCo
- 	return d->currentConnectionErrorCondition;
- }
- 
-+void PsiAccount::client_rosterRequestGroupsDelimiterFinished(const QString &groupsDelimiter)
-+{
-+	if (!groupsDelimiter.isEmpty()) {
-+		d->userList.setGroupsDelimiter(groupsDelimiter);
-+	}
-+	else {
-+		QString defaultGroupsDelimiter = PsiOptions::instance()->getOption("options.ui.contactlist.default-groups-delimiter").toString();
-+
-+		// Not empty delimiter can be set in options before login. Need to reset it in any case.
-+		d->userList.setGroupsDelimiter(defaultGroupsDelimiter);
-+
-+		// Prevent excessed iq
-+		if (!defaultGroupsDelimiter.isEmpty()) {
-+			actionSetGroupsDelimiter(defaultGroupsDelimiter);
-+		}
-+	}
-+}
-+
- void PsiAccount::client_rosterRequestFinished(bool success, int, const QString &)
- {
- 	if(success) {
-@@ -3474,6 +3495,35 @@ void PsiAccount::doDisco()
- 	actionDisco(d->jid.domain(), "");
- }
- 
-+void PsiAccount::changeGroupsDelimiter()
-+{
-+	if (!checkConnected()) {
-+		return;
-+	}
-+
-+	bool ok = false;
-+	QString delimiter = d->account->userList()->groupsDelimiter();
-+	delimiter = QInputDialog::getText(0,
-+									  tr("Nested Groups Delimiter"),
-+									  tr("Set a new delimiter of nested groups"),
-+									  QLineEdit::Normal,
-+									  delimiter,
-+									  &ok);
-+	if (!ok)
-+		return;
-+
-+	actionSetGroupsDelimiter(delimiter);
-+}
-+
-+void PsiAccount::disableGroupsDelimiter()
-+{
-+	if (!checkConnected()) {
-+		return;
-+	}
-+
-+	actionSetGroupsDelimiter("e");
-+}
-+
- void PsiAccount::actionDisco(const Jid &j, const QString &node)
- {
- 	DiscoDlg *w = new DiscoDlg(this, j, node);
-@@ -3512,6 +3562,18 @@ void PsiAccount::featureActivated(QStrin
- 	}
- }
- 
-+void PsiAccount::actionSetGroupsDelimiter(const QString &groupsDelimiter)
-+{
-+	if (d->userList.groupsDelimiter() != groupsDelimiter) {
-+		d->userList.setGroupsDelimiter(groupsDelimiter);
-+		emit groupsDelimiterChanged();
-+	}
-+
-+	JT_Roster *r = new JT_Roster(d->client->rootTask());
-+	r->setGroupsDelimiter(groupsDelimiter);
-+	r->go(true);
-+}
-+
- void PsiAccount::actionManageBookmarks()
- {
- 	BookmarkManageDlg *dlg = findDialog<BookmarkManageDlg*>();
---- git.temp.orig/src/psiaccount.h
-+++ git.temp/src/psiaccount.h
-@@ -207,6 +207,8 @@ public:
- 	void changePW();
- 	void changeStatus(int, bool forceDialog = false);
- 	void doDisco();
-+	void changeGroupsDelimiter();
-+	void disableGroupsDelimiter();
- 
- 	void showXmlConsole();
- 	void openAddUserDlg();
-@@ -302,6 +304,7 @@ signals:
- 	void encryptedMessageSent(int, bool, int, const QString &);
- 	void enabledChanged();
- 	void startBounce();
-+	void groupsDelimiterChanged();
- 
- public slots:
- 	void setStatus(const XMPP::Status &, bool withPriority = false, bool isManualStatus = false);
-@@ -391,6 +394,7 @@ public slots:
- 	void actionUnsetAvatar();
- 	void actionQueryVersion(const Jid& j);
- 	void featureActivated(QString feature, Jid jid, QString node);
-+	void actionSetGroupsDelimiter(const QString &groupsDelimiter);
- 
- 	void actionAssignKey(const Jid &);
- 	void actionUnassignKey(const Jid &);
-@@ -410,6 +414,7 @@ private slots:
- 	void cs_delayedCloseFinished();
- 	void cs_warning(int);
- 	void cs_error(int);
-+	void client_rosterRequestGroupsDelimiterFinished(const QString &groupsDelimiter);
- 	void client_rosterRequestFinished(bool, int, const QString &);
- 	void resolveContactName();
- 	void client_rosterItemAdded(const RosterItem &);
---- git.temp.orig/src/psicontact.cpp
-+++ git.temp/src/psicontact.cpp
-@@ -63,8 +63,7 @@ class PsiContact::Private : public Alert
- 	Q_OBJECT
- public:
- 	Private(PsiContact* contact)
--		: account_(0)
--		, statusTimer_(0)
-+		: statusTimer_(0)
- 		, isValid_(true)
- 		, isAnimated_(false)
- 		, isAlwaysVisible_(false)
-@@ -100,7 +99,6 @@ public:
- 	{
- 	}
- 
--	PsiAccount* account_;
- 	QTimer* statusTimer_;
- 	QTimer* animTimer_;
- 	UserListItem u_;
-@@ -140,7 +138,7 @@ public:
- #ifdef YAPSI
- 		reconnecting_ = false;
- #endif
--		if (account_ && !account_->notifyOnline())
-+		if (contact_->account() && !contact_->account()->notifyOnline())
- 			oldStatus_ = status_;
- 		else
- 			statusTimer_->start();
-@@ -164,12 +162,11 @@ private:
-  * Creates new PsiContact.
-  */
- PsiContact::PsiContact(const UserListItem& u, PsiAccount* account)
--	: ContactListItem(account)
-+	: ContactListItem(account, account)
- {
- 	d = new Private(this);
--	d->account_ = account;
--	if (d->account_) {
--		connect(d->account_->avatarFactory(), SIGNAL(avatarChanged(const Jid&)), SLOT(avatarChanged(const Jid&)));
-+	if (account) {
-+		connect(account->avatarFactory(), SIGNAL(avatarChanged(const Jid&)), SLOT(avatarChanged(const Jid&)));
- 	}
- 	connect(VCardFactory::instance(), SIGNAL(vcardChanged(const Jid&)), SLOT(vcardChanged(const Jid&)));
- 	update(u);
-@@ -178,10 +175,9 @@ PsiContact::PsiContact(const UserListIte
- }
- 
- PsiContact::PsiContact()
--	: ContactListItem(0)
-+	: ContactListItem(0, 0)
- {
- 	d = new Private(this);
--	d->account_ = 0;
- }
- 
- /**
-@@ -195,14 +191,6 @@ PsiContact::~PsiContact()
- }
- 
- /**
-- * Returns account to which a contact belongs.
-- */
--PsiAccount* PsiContact::account() const
--{
--	return d->account_;
--}
--
--/**
-  * TODO: Think of ways to remove this function.
-  */
- const UserListItem& PsiContact::userListItem() const
---- git.temp.orig/src/psicontact.h
-+++ git.temp/src/psicontact.h
-@@ -45,7 +45,6 @@ public:
- 	PsiContact(const UserListItem& u, PsiAccount* account);
- 	~PsiContact();
- 
--	PsiAccount* account() const;
- 	const UserListItem& userListItem() const;
- 	const UserResourceList& userResourceList() const;
- 	virtual void update(const UserListItem& u);
---- git.temp.orig/src/psicontactlist.cpp
-+++ git.temp/src/psicontactlist.cpp
-@@ -315,6 +315,7 @@ void PsiContactList::link(PsiAccount* ac
- 	connect(account, SIGNAL(beginBulkContactUpdate()), this, SIGNAL(beginBulkContactUpdate()));
- 	connect(account, SIGNAL(endBulkContactUpdate()), this, SIGNAL(endBulkContactUpdate()));
- 	connect(account, SIGNAL(rosterRequestFinished()), this, SIGNAL(rosterRequestFinished()));
-+	connect(account, SIGNAL(groupsDelimiterChanged()), this, SIGNAL(groupsDelimiterChanged()));
- 	accounts_.append(account);
- 	if (account->enabled())
- 		addEnabledAccount(account);
---- git.temp.orig/src/psicontactlist.h
-+++ git.temp/src/psicontactlist.h
-@@ -99,6 +99,7 @@ signals:
- 	void beginBulkContactUpdate();
- 	void endBulkContactUpdate();
- 	void rosterRequestFinished();
-+	void groupsDelimiterChanged();
- 
- 	/**
- 	 * This signal is emitted when account is loaded from disk or created
---- git.temp.orig/src/psicontactmenu.cpp
-+++ git.temp/src/psicontactmenu.cpp
-@@ -50,6 +50,7 @@
- #endif
- 
- #include "groupchatdlg.h"
-+#include "creategroupdlg.h"
- 
- //----------------------------------------------------------------------------
- // GroupMenu
-@@ -130,23 +131,8 @@ private slots:
- 
- 	void createNewGroup()
- 	{
--		while (contact_) {
--			bool ok = false;
--			QString newgroup = QInputDialog::getText(0, tr("Create New Group"),
--			                   tr("Enter the new group name:"),
--			                   QLineEdit::Normal,
--			                   QString::null,
--			                   &ok, 0);
--			if (!ok)
--				break;
--			if (newgroup.isEmpty())
--				continue;
--
--			if (!contact_->userListItem().groups().contains(newgroup)) {
--				emit groupActivated(newgroup);
--				break;
--			}
--		}
-+		CreateGroupDlg dlg(contact_);
-+		dlg.exec();
- 	}
- };
- 
---- git.temp.orig/src/src.pri
-+++ git.temp/src/src.pri
-@@ -214,7 +214,8 @@ HEADERS += \
- 	$$PWD/coloropt.h \
- 	$$PWD/geolocationdlg.h \
- 	$$PWD/rosteravatarframe.h \
--	$$PWD/sendbuttonmenu.h
-+	$$PWD/sendbuttonmenu.h \
-+	$$PWD/creategroupdlg.h
- 
- 
- 
-@@ -357,7 +358,8 @@ SOURCES += \
- 	$$PWD/coloropt.cpp \
- 	$$PWD/geolocationdlg.cpp \
- 	$$PWD/rosteravatarframe.cpp \
--	$$PWD/sendbuttonmenu.cpp
-+	$$PWD/sendbuttonmenu.cpp \
-+	$$PWD/creategroupdlg.cpp
- 
- unix:!macx:!haiku {
- 	HEADERS += $$PWD/x11windowsystem.h
-@@ -452,7 +454,6 @@ mac {
- CONFIG += newcontactlist
- newcontactlist {
- 	DEFINES += NEWCONTACTLIST
--	# DEFINES += CONTACTLIST_NESTED_GROUPS
- 	HEADERS += \
- 		$$PWD/contactlistview.h \
- 		$$PWD/contactlistdragview.h \
-@@ -600,7 +601,8 @@ FORMS += \
- 	$$PWD/ahcformdlg.ui \
- 	$$PWD/geolocation.ui \
- 	$$PWD/rosteravatarframe.ui \
--	$$PWD/sendbuttontemplateseditor.ui
-+	$$PWD/sendbuttontemplateseditor.ui \
-+	$$PWD/creategroup.ui
- 
- # options dialog
- include($$PWD/options/options.pri)
---- git.temp.orig/src/userlist.cpp
-+++ git.temp/src/userlist.cpp
-@@ -1178,3 +1178,17 @@ UserListItem *UserList::find(const XMPP:
- 	return 0;
- }
- 
-+void UserList::setGroupsDelimiter(const QString &groupsDelimiter)
-+{
-+	_groupsDelimiter = groupsDelimiter;
-+}
-+
-+QString UserList::groupsDelimiter() const
-+{
-+	return _groupsDelimiter;
-+}
-+
-+bool UserList::hasGroupsDelimiter() const
-+{
-+	return groupsDelimiter().indexOf(QRegExp("^0-9A-Za-z?$")) == -1;
-+}
---- git.temp.orig/src/userlist.h
-+++ git.temp/src/userlist.h
-@@ -187,6 +187,16 @@ public:
- 	~UserList();
- 
- 	UserListItem *find(const XMPP::Jid &);
-+
-+	void setGroupsDelimiter(const QString &groupsDelimiter);
-+	QString groupsDelimiter() const;
-+
-+	// If the delimiter is a single alphanumeric character (a-z, A-Z, 0-9) or empty
-+	// the situation treats as if nesting were disabled
-+	bool hasGroupsDelimiter() const;
-+
-+private:
-+	QString _groupsDelimiter;
- };
- 
- #endif

psi-plus-main-20160309.tar.xz/patches/dev/psi-new-history.patch Deleted

@@ -1,4442 +0,0 @@
---- git.orig/admin/build/build_package.sh
-+++ git/admin/build/build_package.sh
-@@ -82,10 +82,13 @@ build_package_psi() {
- 		cp $mqtdir/bin/QtNetwork4.dll $arch_prefix
- 		cp $mqtdir/bin/QtXml4.dll $arch_prefix
- 		cp $mqtdir/bin/QtGui4.dll $arch_prefix
-+		cp $mqtdir/bin/QtSql4.dll $arch_prefix
- 		mkdir -p $arch_prefix/imageformats
- 		cp $mqtdir/plugins/imageformats/qgif4.dll $arch_prefix/imageformats
- 		cp $mqtdir/plugins/imageformats/qjpeg4.dll $arch_prefix/imageformats
- 		cp $mqtdir/plugins/imageformats/qmng4.dll $arch_prefix/imageformats
-+		mkdir -p $arch_prefix/sqldrivers
-+		cp $mqtdir/plugins/sqldrivers/qsqlite4.dll
- 		cp $deps_base/$qca_win_dir/$target_arch/bin/qca2.dll $arch_prefix
- 		mkdir -p $arch_prefix/crypto
- 		cp $deps_base/$qca_win_dir/$target_arch/plugins/crypto/qca-gnupg2.dll $arch_prefix/crypto
-@@ -126,8 +129,8 @@ build_package_psi() {
- 			QT_LIB_PATH=$QTDIR/lib
- 		fi
- 		cd $psi_base
--		export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework
--		./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal
-+		export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib
-+		./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal --with-qjson-lib=$deps_base/$qjson_mac_dir/lib
- 		make
- 	fi
- }
---- git.orig/admin/build/devconfig.sh
-+++ git/admin/build/devconfig.sh
-@@ -60,7 +60,7 @@ if  "$platform" == "win" ; then
- 	fi
- 	mqtdir=`get_msys_path $qtdir`
- 
--	PATH=$mqtdir/bin:$PATH ./configure.exe --qtdir=$qtdir --release --with-qca-inc=$deps_base/$qca_win_dir/$target_arch/include --with-qca-lib=$deps_base/$qca_win_dir/$target_arch/lib --with-zlib-inc=$deps_base/$zlib_win_dir/$target_arch/include --with-zlib-lib=$deps_base/$zlib_win_dir/$target_arch/lib --with-aspell-inc=$deps_base/$aspell_win_dir/$target_arch/include --with-aspell-lib=$deps_base/$aspell_win_dir/$target_arch/lib
-+	PATH=$mqtdir/bin:$PATH ./configure.exe --qtdir=$qtdir --release --with-qca-inc=$deps_base/$qca_win_dir/$target_arch/include --with-qca-lib=$deps_base/$qca_win_dir/$target_arch/lib --with-zlib-inc=$deps_base/$zlib_win_dir/$target_arch/include --with-zlib-lib=$deps_base/$zlib_win_dir/$target_arch/lib --with-aspell-inc=$deps_base/$aspell_win_dir/$target_arch/include --with-aspell-lib=$deps_base/$aspell_win_dir/$target_arch/lib --with-qjson-inc=$deps_base/$qjson_win_dir/$target_arch/include --with-qjson-lib=$deps_base/$qjson_win_dir/$target_arch/lib
- 
- 	rm -f $build_base/devenv
- 	touch $build_base/devenv
-@@ -79,8 +79,8 @@ else
- 	if  "$QT_PLUGIN_PATH" == "" ; then
- 		QT_PLUGIN_PATH=$QTDIR/plugins
- 	fi
--	export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework
--	./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal
-+	export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib
-+	./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal --with-qjson-lib=$deps_base/$qjson_mac_dir/lib
- 
- 	# remove some gstbundle problem files
- 	rm -f $deps_base/$gstbundle_mac_dir/uni/lib/gstreamer-0.10/libgstximagesink.so
-@@ -91,7 +91,7 @@ else
- 	rm -f $build_base/devenv
- 	touch $build_base/devenv
- 	echo "export DYLD_LIBRARY_PATH=$deps_base/$gstbundle_mac_dir/uni/lib:\$DYLD_LIBRARY_PATH" >> $build_base/devenv
--	echo "export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:\$DYLD_FRAMEWORK_PATH" >> $build_base/devenv
-+	echo "export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib:\$DYLD_FRAMEWORK_PATH" >> $build_base/devenv
- 	echo "export GST_PLUGIN_PATH=$deps_base/$gstbundle_mac_dir/uni/lib/gstreamer-0.10" >> $build_base/devenv
- 	echo "export GST_REGISTRY_FORK=no" >> $build_base/devenv
- 	echo "export QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$deps_base/$qca_mac_dir/plugins" >> $build_base/devenv
---- git.orig/admin/build/package_info
-+++ git/admin/build/package_info
-@@ -39,3 +39,11 @@ psimedia_win_dir=psimedia-20120725-win
- psimedia_mac_file=psimedia-20120725-mac.tar.bz2
- psimedia_mac_url=http://psi-im.org/files/deps/psimedia-20120725-mac.tar.bz2
- psimedia_mac_dir=psimedia-20120725-mac
-+
-+qjson_win_file=qjson-0.8.1-win.zip
-+qjson_win_url=http://psi-im.org/files/deps/qjson-0.8.1-win.zip
-+qjson_win_dir=qjson-0.8.1-win
-+
-+qjson_mac_file=qjson-0.8.1-mac.tar.bz2
-+qjson_mac_url=http://psi-im.org/files/deps/qjson-0.8.1-mac.tar.bz2
-+qjson_mac_dir=qjson-0.8.1-mac
---- git.orig/admin/build/prep_dist.sh
-+++ git/admin/build/prep_dist.sh
-@@ -45,8 +45,8 @@ if  "$platform" == "mac" ; then
- 
- 	mkdir -p $target_dist_base
- 
--	QT_FRAMEWORKS="QtCore QtNetwork QtXml QtGui"
--	QT_PLUGINS="imageformats/libqjpeg.dylib imageformats/libqgif.dylib imageformats/libqmng.dylib"
-+	QT_FRAMEWORKS="QtCore QtNetwork QtXml QtGui QtSql"
-+	QT_PLUGINS="imageformats/libqjpeg.dylib imageformats/libqgif.dylib imageformats/libqmng.dylib sqldrivers/libqsqlite.dylib"
- 	QCA_PLUGINS="crypto/libqca-ossl.dylib crypto/libqca-gnupg.dylib"
- 
- 	cp -a $psi_base/psi.app $target_dist_base/Psi.app
-@@ -57,6 +57,7 @@ if  "$platform" == "mac" ; then
- 	done
- 
- 	install_name_tool -change qca.framework/Versions/2/qca @executable_path/../Frameworks/qca.framework/Versions/2/qca $contentsdir/MacOS/psi
-+	install_name_tool -change qjson.framework/Versions/0.8.1/qjson @executable_path/../Frameworks/qjson.framework/Versions/0.8.1/qjson $contentsdir/MacOS/psi
- 
- 	mkdir -p $contentsdir/Frameworks
- 	for f in $QT_FRAMEWORKS; do
-@@ -80,8 +81,14 @@ if  "$platform" == "mac" ; then
- 	cp -a $deps_base/$qca_mac_dir/lib/qca.framework $contentsdir/Frameworks
- 	cleanup_framework $contentsdir/Frameworks/qca.framework qca 2
- 	install_name_tool -id @executable_path/../Frameworks/qca.framework/Versions/2/qca $contentsdir/Frameworks/qca.framework/qca
-+
-+	cp -a $deps_base/$qjson_mac_dir/lib/qjson.framework $contentsdir/Frameworks
-+	cleanup_framework $contentsdir/Frameworks/qjson.framework qjson 0.8.1
-+	install_name_tool -id @executable_path/../Frameworks/qjson.framework/Versions/0.8.1/qjson $contentsdir/Frameworks/qjson.framework/qjson
-+
- 	for g in $QT_FRAMEWORKS; do
- 		install_name_tool -change $g.framework/Versions/4/$g @executable_path/../Frameworks/$g.framework/Versions/4/$g $contentsdir/Frameworks/qca.framework/qca
-+		install_name_tool -change $g.framework/Versions/4/$g @executable_path/../Frameworks/$g.framework/Versions/4/$g $contentsdir/Frameworks/qjson.framework/qjson
- 	done
- 
- 	mkdir -p $contentsdir/Plugins/crypto
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -129,6 +129,9 @@
- 				<chatedit-height type="int">10</chatedit-height>
- 				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
- 				<default-jid-mode-ignorelist comment="Default autojid mode ignore list: jid1,jid2,..." type="QString"></default-jid-mode-ignorelist>
-+				<history comment="Message history options">
-+					<preload-history-size comment="The number of preloaded messages" type="int">5</preload-history-size>
-+				</history>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
-@@ -763,6 +766,9 @@ QLineEdit#le_status_text {
- 				<video-input type="QString"/>
- 			</devices>
- 		</media>
-+		<history comment="General history options">
-+			<store-muc-private comment="Keep a history of correspondence for MUC private" type="bool">false</store-muc-private>
-+		</history>
- 	</options>
- 	<accounts comment="Account definitions and options"/>
- 	<plugins comment="Plugin options"/>
---- git.orig/psi.qc
-+++ git/psi.qc
-@@ -17,6 +17,9 @@
-   <dep type='qca'>
-     <required/>
-   </dep>
-+  <dep type='qjson'>
-+    <required/>
-+  </dep>
-   <dep type='zlib'>
-     <required/>
-   </dep>
---- git.orig/qcm/qjson.qcm
-+++ git/qcm/qjson.qcm
-@@ -0,0 +1,162 @@
-+/*
-+-----BEGIN QCMOD-----
-+name: QJson
-+arg: with-qjson-inc=path,Path to QJson include files
-+arg: with-qjson-lib=path,Path to QJson library or framework files
-+-----END QCMOD-----
-+*/
-+
-+// adapted from json.prf
-+static QString internal_json_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir)
-+{
-+	QString out = QString(
-+"QJSON_INCDIR = %1\n"
-+"QJSON_LIBDIR = %2\n"
-+"QJSON_FRAMEWORKDIR = %3\n"
-+"\n"
-+"CONFIG *= qt\n"
-+"\n"
-+"LINKAGE =\n"
-+"\n"
-+"!isEmpty(QJSON_FRAMEWORKDIR): {\n"
-+"	framework_dir = $$QJSON_FRAMEWORKDIR\n"
-+"	exists($$framework_dir/qjson.framework) {\n"
-+"		QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
-+"		LIBS *= -F$$framework_dir\n"
-+"		INCLUDEPATH += $$framework_dir/qjson.framework\n"
-+"		LINKAGE = -framework qjson\n"
-+"	}\n"
-+"}\n"
-+"\n"
-+"# else, link normally\n"
-+"isEmpty(LINKAGE) {\n"
-+"	!isEmpty(QJSON_INCDIR):INCLUDEPATH += $$QJSON_INCDIR\n"
-+"	!isEmpty(QJSON_LIBDIR):LIBS += -L$$QJSON_LIBDIR\n"
-+"	LINKAGE = -lqjson\n"
-+"	CONFIG(debug, debug|release) {\n"
-+"		windows:LINKAGE = -lqjsond\n"
-+"		mac:LINKAGE = -lqjson_debug\n"
-+"	}\n"
-+"}\n"
-+"\n"
-+"LIBS += $$LINKAGE\n"
-+	).arg(incdir, libdir, frameworkdir);
-+	return out;
-+}
-+
-+// set either libdir or frameworkdir, but not both
-+static bool qjson_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release, bool debug, QString *_prf)
-+{
-+	QString proextra;
-+	QString prf = internal_json_prf(incdir, libdir, frameworkdir);
-+	proextra =
-+	"CONFIG += qt\n"
-+	"CONFIG -= debug_and_release debug release\n"
-+	"QT -= gui\n";
-+	proextra += prf;
-+
-+	QString str =
-+	"#include <qjson/parser.h>\n"
-+	"\n"
-+	"int main()\n"
-+	"{\n"
-+	"	return 0;\n"
-+	"}\n";
-+
-+	// test desired versions, potentially both release and debug
-+
-+	if(release)
-+	{
-+		int ret;
-+		if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\n", &ret) || ret != 0)
-+			return false;
-+	}
-+
-+	if(debug)
-+	{
-+		int ret;
-+		if(!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\n", &ret) || ret != 0)
-+			return false;
-+	}
-+
-+	*_prf = prf;
-+	return true;
-+}
-+
-+static bool qjson_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug, QString *prf)
-+{
-+	return qjson_try(conf, incdir, libdir, QString(), release, debug, prf);
-+}
-+
-+static bool qjson_try_framework(Conf *conf, const QString &frameworkdir, bool release, bool debug, QString *prf)
-+{
-+	return qjson_try(conf, QString(), QString(), frameworkdir, release, debug, prf);
-+}
-+
-+//----------------------------------------------------------------------------
-+// qc_qjson
-+//----------------------------------------------------------------------------
-+class qc_qjson : public ConfObj
-+{
-+public:
-+	qc_qjson(Conf *c) : ConfObj(c) {}
-+	QString name() const { return "QJson"; }
-+	QString shortname() const { return "qjson"; }
-+	bool exec()
-+	{
-+		// get the build mode
-+#ifdef QC_BUILDMODE
-+		bool release = qc_buildmode_release;
-+		bool debug = qc_buildmode_debug;
-+#else
-+		// else, default to just release mode
-+		bool release = true;
-+		bool debug = false;
-+#endif
-+
-+		QString qjson_incdir, qjson_libdir, qjson_json_prf;
-+		qjson_incdir = conf->getenv("QC_WITH_QJSON_INC");
-+		qjson_libdir = conf->getenv("QC_WITH_QJSON_LIB");
-+
-+#if defined(Q_OS_MAC)
-+		if(!qjson_libdir.isEmpty() && qjson_try_framework(conf, qjson_libdir, release, debug, &qjson_json_prf))
-+		{
-+			conf->addExtra(qjson_json_prf);
-+			return true;
-+		}
-+#endif
-+
-+		if(!qjson_incdir.isEmpty() && !qjson_libdir.isEmpty() && qjson_try_lib(conf, qjson_incdir, qjson_libdir, release, debug, &qjson_json_prf))
-+		{
-+			conf->addExtra(qjson_json_prf);
-+			return true;
-+		}
-+
-+		QStringList incs;
-+		QString version, libs, other;
-+		if(conf->findPkgConfig("QJson", VersionAny, QString(), &version, &incs, &libs, &other))
-+		{
-+			for(int n = 0; n < incs.count(); ++n)
-+				conf->addIncludePath(incsn);
-+			if(!libs.isEmpty())
-+				conf->addLib(libs);
-+			return true;
-+		}
-+
-+		QStringList prefixes;
-+		prefixes += "/usr";
-+		prefixes += "/usr/local";
-+
-+		for(int n = 0; n < prefixes.count(); ++n)
-+		{
-+			const QString &prefix = prefixesn;
-+			if(qjson_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qjson_json_prf))
-+			{
-+				conf->addExtra(qjson_json_prf);
-+				return true;
-+			}
-+		}
-+
-+		return false;
-+	}
-+};
---- git.orig/src/chatdlg.cpp
-+++ git/src/chatdlg.cpp
-@@ -74,8 +74,8 @@
- #include "psicontactlist.h"
- #include "accountlabel.h"
- #include "psirichtext.h"
--#include "messageview.h"
- #include "chatview.h"
-+#include "eventdb.h"
- 
- #ifdef Q_OS_WIN
- #include <windows.h>
-@@ -95,6 +95,7 @@ ChatDlg* ChatDlg::create(const Jid& jid,
- ChatDlg::ChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
- 	: TabbableWidget(jid, pa, tabManager)
- 	, highlightersInstalled_(false)
-+	, delayedMessages(0)
- {
- 	pending_ = 0;
- 	keepOpen_ = false;
-@@ -107,6 +108,9 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
- 
- 	status_ = -1;
- 
-+	historyState = false;
-+	preloadHistory();
-+
- 	autoSelectContact_ = false;
- 	if (PsiOptions::instance()->getOption("options.ui.chat.default-jid-mode").toString() == "auto") {
- 		UserListItem *uli = account()->findFirstRelevant(jid);
-@@ -164,6 +168,8 @@ void ChatDlg::init()
- 
- ChatDlg::~ChatDlg()
- {
-+	if (delayedMessages)
-+		delete delayedMessages;
- 	account()->dialogUnregister(this);
- }
- 
-@@ -434,6 +440,43 @@ UserStatus ChatDlg::userStatusFor(const
- 	return u;
- }
- 
-+void ChatDlg::preloadHistory()
-+{
-+	int cnt =PsiOptions::instance()->getOption("options.ui.chat.history.preload-history-size").toInt();
-+	if (cnt > 0) {
-+		holdMessages(true);
-+		if (cnt > 100)
-+			cnt = 100;
-+		EDBHandle *h = new EDBHandle(account()->edb());
-+		connect(h, SIGNAL(finished()), this, SLOT(getHistory()));
-+		Jid j = jid();
-+		if (!account()->findGCContact(j))
-+			j = jid().bare();
-+		int start = account()->eventQueue()->count(jid(), false);
-+		h->get(account()->id(), j, QDateTime(), EDB::Backward, start, cnt);
-+	}
-+}
-+
-+void ChatDlg::getHistory()
-+{
-+	EDBHandle *h = qobject_cast<EDBHandle *>(sender());
-+	if (!h)
-+		return;
-+
-+	historyState = true;
-+	const EDBResult &r = h->result();
-+	for (int i = r.count() - 1; i >= 0; --i) {
-+		const EDBItemPtr &item = r.at(i);
-+		PsiEvent::Ptr e = item->event();
-+		if (e->type() == PsiEvent::Message) {
-+			MessageEvent::Ptr me = e.staticCast<MessageEvent>();
-+			appendMessage(me->message(), me->originLocal());
-+		}
-+	}
-+	delete h;
-+	holdMessages(false);
-+}
-+
- void ChatDlg::ensureTabbedCorrectly()
- {
- 	TabbableWidget::ensureTabbedCorrectly();
-@@ -491,7 +534,7 @@ void ChatDlg::updateContact(const Jid &j
- 			if (PsiOptions::instance()->getOption("options.ui.chat.show-status-changes").toBool()
- 				&& fromPresence && statusChanged)
- 			{
--				chatView()->dispatchMessage(MessageView::statusMessage(
-+				dispatchMessage(MessageView::statusMessage(
- 												dispNick_, status_,
- 												statusString_, priority_));
- 			}
-@@ -778,6 +821,7 @@ void ChatDlg::doSend()
- 
- void ChatDlg::doneSend()
- {
-+	historyState = false;
- 	appendMessage(m_, true);
- 	disconnect(chatEdit(), SIGNAL(textChanged()), this, SLOT(setComposing()));
- 	chatEdit()->clear();
-@@ -806,6 +850,7 @@ void ChatDlg::encryptedMessageSent(int x
- 
- void ChatDlg::incomingMessage(const Message &m)
- {
-+	historyState = false;
- 	if (m.body().isEmpty() && m.subject().isEmpty() && m.urlList().isEmpty()) {
- 		// Event message
- 		if (m.containsEvent(CancelEvent)) {
-@@ -866,14 +911,16 @@ void ChatDlg::appendMessage(const Messag
- 	// figure out the encryption state
- 	bool encChanged = false;
- 	bool encEnabled = false;
--	if (lastWasEncrypted_ != m.wasEncrypted()) {
--		encChanged = true;
-+	if (!historyState) {
-+		if (lastWasEncrypted_ != m.wasEncrypted()) {
-+			encChanged = true;
-+		}
-+		lastWasEncrypted_ = m.wasEncrypted();
-+		encEnabled = lastWasEncrypted_;
- 	}
--	lastWasEncrypted_ = m.wasEncrypted();
--	encEnabled = lastWasEncrypted_;
- 
- 	if (encChanged) {
--		chatView()->dispatchMessage(MessageView::fromHtml(
-+		dispatchMessage(MessageView::fromHtml(
- 				encEnabled? QString("<icon name=\"psi/cryptoYes\"> ") + tr("Encryption Enabled"):
- 							QString("<icon name=\"psi/cryptoNo\"> ") + tr("Encryption Disabled"),
- 				MessageView::System
-@@ -889,7 +936,9 @@ void ChatDlg::appendMessage(const Messag
- 	}
- 
- 	if (!m.subject().isEmpty()) {
--		chatView()->dispatchMessage(MessageView::subjectMessage(m.subject()));
-+		MessageView smv = MessageView::subjectMessage(m.subject());
-+		smv.setSpooled(historyState);
-+		dispatchMessage(smv);
- 	}
- 
- 	MessageView mv(MessageView::Message);
-@@ -903,9 +952,9 @@ void ChatDlg::appendMessage(const Messag
- 	mv.setNick(whoNick(local));
- 	mv.setUserId(local?account()->jid().bare():jid().bare());
- 	mv.setDateTime(m.timeStamp());
--	mv.setSpooled(m.spooled());
-+	mv.setSpooled(historyState);
- 	mv.setAwaitingReceipt(local && m.messageReceipt() == ReceiptRequest);
--	chatView()->dispatchMessage(mv);
-+	dispatchMessage(mv);
- 
- 	if (!m.urlList().isEmpty()) {
- 		UrlList urls = m.urlList();
-@@ -913,11 +962,49 @@ void ChatDlg::appendMessage(const Messag
- 		foreach (const Url &u, urls) {
- 			urlsMap.insert(u.url(), u.desc());
- 		}
--		chatView()->dispatchMessage(MessageView::urlsMessage(urlsMap));
-+		MessageView umv = MessageView::urlsMessage(urlsMap);
-+		umv.setSpooled(historyState);
-+		dispatchMessage(umv);
- 	}
-+}
-+
-+void ChatDlg::holdMessages(bool hold)
-+{
-+	if (hold) {
-+		if (!delayedMessages)
-+			delayedMessages = new QList<MessageView>();
-+	}
-+	else if (delayedMessages) {
-+		foreach (const MessageView &mv, *delayedMessages)
-+		{
-+			if (mv.isSpooled())
-+				displayMessage(mv);
-+		}
-+		foreach (const MessageView &mv, *delayedMessages)
-+		{
-+			if (!mv.isSpooled())
-+				displayMessage(mv);
-+		}
-+		delete delayedMessages;
-+		delayedMessages = 0;
-+	}
-+}
-+
-+void ChatDlg::dispatchMessage(const MessageView &mv)
-+{
-+	if (delayedMessages)
-+		delayedMessages->append(mv);
-+	else
-+		displayMessage(mv);
-+}
-+
-+void ChatDlg::displayMessage(const MessageView &mv)
-+{
-+	chatView()->dispatchMessage(mv);
- 
- 	// if we're not active, notify the user by changing the title
--	if (!isActiveTab()) {
-+	MessageView::Type type = mv.type();
-+	if (type != MessageView::System && type != MessageView::Status && !mv.isSpooled() && !isActiveTab()) {
- 		++pending_;
- 		invalidateTab();
- 		if (PsiOptions::instance()->getOption("options.ui.flash-windows").toBool()) {
-@@ -939,7 +1026,7 @@ void ChatDlg::appendMessage(const Messag
- 	//	messagesRead(jid());
- 	//}
- 
--	if (!local) {
-+	if (!mv.isLocal()) {
- 		keepOpen_ = true;
- 		QTimer::singleShot(1000, this, SLOT(setKeepOpenFalse()));
- 	}
---- git.orig/src/chatdlg.h
-+++ git/src/chatdlg.h
-@@ -32,6 +32,7 @@
- #include "advwidget.h"
- 
- #include "tabbablewidget.h"
-+#include "messageview.h"
- 
- 
- namespace XMPP
-@@ -89,6 +90,7 @@ public:
- 	Jid realJid() const;
- 	bool autoSelectContact() const {return autoSelectContact_;};
- 	static UserStatus userStatusFor(const Jid& jid, QList<UserListItem*> ul, bool forceEmptyResource);
-+	void preloadHistory();
- 
- signals:
- 	void aInfo(const Jid &);
-@@ -148,6 +150,7 @@ private slots:
- 	void addEmoticon(QString text);
- 	void initComposing();
- 	void setComposing();
-+	void getHistory();
- 
- protected slots:
- 	void checkComposing();
-@@ -169,6 +172,9 @@ protected:
- 	virtual void contactUpdated(UserListItem* u, int status, const QString& statusString);
- 
- 	void appendMessage(const Message &, bool local = false);
-+	void holdMessages(bool hold);
-+	void dispatchMessage(const MessageView &mv);
-+	void displayMessage(const MessageView &mv);
- 	virtual bool isEncryptionEnabled() const;
- 
- public:
-@@ -214,9 +220,11 @@ private:
- 	QTimer* composingTimer_;
- 	bool isComposing_;
- 	bool sendComposingEvents_;
-+	bool historyState;
- 	QString eventId_;
- 	ChatState contactChatState_;
- 	ChatState lastChatState_;
-+	QList<MessageView> *delayedMessages;
- };
- 
- #endif
---- git.orig/src/chatview_te.cpp
-+++ git/src/chatview_te.cpp
-@@ -80,6 +80,7 @@ ChatView::ChatView(QWidget *parent)
- 			logIconDeliveredPgp = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok_pgp").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
- 			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
- 			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
-+			logIconHistory = IconsetFactory::iconPixmap("psi/history").scaledToHeight(logIconsSize, Qt::SmoothTransformation);
- 		} else {
- 			logIconReceive = IconsetFactory::iconPixmap("psi/notification_chat_receive");
- 			logIconSend = IconsetFactory::iconPixmap("psi/notification_chat_send");
-@@ -89,6 +90,7 @@ ChatView::ChatView(QWidget *parent)
- 			logIconDeliveredPgp = IconsetFactory::iconPixmap("psi/notification_chat_delivery_ok_pgp");
- 			logIconTime = IconsetFactory::iconPixmap("psi/notification_chat_time");
- 			logIconInfo = IconsetFactory::iconPixmap("psi/notification_chat_info");
-+			logIconHistory = IconsetFactory::iconPixmap("psi/history");
- 		}
- 		addLogIconsResources();
- 	}
-@@ -167,6 +169,7 @@ void ChatView::addLogIconsResources()
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_info"), logIconInfo);
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered"), logIconDelivered);
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_delivered_pgp"), logIconDeliveredPgp);
-+	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_history"), logIconHistory);
- }
- 
- void ChatView::markReceived(QString id)
-@@ -369,26 +372,47 @@ void ChatView::renderMucMessage(const Me
- void ChatView::renderMessage(const MessageView &mv)
- {
- 	QString timestr = formatTimeStamp(mv.dateTime());
--	QString color = colorString(mv.isLocal(), mv.isSpooled());
-+	QString color = colorString(mv.isLocal(), false);
- 	if (useMessageIcons_ && mv.isAwaitingReceipt()) {
- 		document()->addResource(QTextDocument::ImageResource, QUrl(QString("icon:delivery") + mv.messageId()),
- 					isEncryptionEnabled_ ? logIconSendPgp : logIconSend);
- 	}
--	QString icon = useMessageIcons_ ?
--		(QString("<img src=\"%1\" />").arg(mv.isLocal()?
--		(mv.isAwaitingReceipt() ? QString("icon:delivery") + mv.messageId()
--			: isEncryptionEnabled_ ? "icon:log_icon_send_pgp" : "icon:log_icon_send")
--		: isEncryptionEnabled_ ? "icon:log_icon_receive_pgp" : "icon:log_icon_receive")) : "";
-+	QString icon;
-+	if (useMessageIcons_) {
-+		QString sRes;
-+		if (mv.isSpooled())
-+			sRes = "icon:log_icon_history";
-+		else if (mv.isLocal()) {
-+			if (mv.isAwaitingReceipt())
-+				sRes = QString("icon:delivery") + mv.messageId();
-+			else if (isEncryptionEnabled_)
-+				sRes = "icon:log_icon_receive_pgp";
-+			else
-+				sRes = "icon:log_icon_send";
-+		} else {
-+			if (isEncryptionEnabled_)
-+				sRes = "icon:log_icon_receive_pgp";
-+			else
-+				sRes = "icon:log_icon_receive";
-+		}
-+		icon = QString("<img src=\"%1\" />").arg(sRes);
-+	}
-+	QString str;
- 	if (mv.isEmote()) {
--		appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("%1").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>");
-+		str = icon + QString("<span style=\"color: %1\">").arg(color) + QString("%1").arg(timestr) + QString(" *%1 ").arg(TextUtil::escape(mv.nick())) + mv.formattedText() + "</span>";
- 	} else {
- 		if (PsiOptions::instance()->getOption("options.ui.chat.use-chat-says-style").toBool()) {
--			appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("%1 ").arg(timestr) + tr("%1 says:").arg(TextUtil::escape(mv.nick())) + "</span><br>" + mv.formattedText());
-+			str = icon + QString("<span style=\"color: %1\">").arg(color) + QString("%1 ").arg(timestr) + tr("%1 says:").arg(TextUtil::escape(mv.nick())) + "</span><br>";
- 		}
- 		else {
--			appendText(icon + QString("<span style=\"color: %1\">").arg(color) + QString("%1 &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</span> ") + mv.formattedText());
-+			str = icon + QString("<span style=\"color: %1\">").arg(color) + QString("%1 &lt;").arg(timestr) + TextUtil::escape(mv.nick()) + QString("&gt;</span> ");
- 		}
-+		if (mv.isSpooled())
-+			str.append(QString("<span style=\"color: %1\">%2</span>").arg(ColorOpt::instance()->color("options.ui.look.colors.messages.usertext").name()).arg(mv.formattedText()));
-+		else
-+			str.append(mv.formattedText());
- 	}
-+	appendText(str);
- 
- 	if (mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
- 		deferredScroll();
---- git.orig/src/chatview_te.h
-+++ git/src/chatview_te.h
-@@ -113,6 +113,7 @@ private:
- 	QPixmap logIconDeliveredPgp;
- 	QPixmap logIconTime;
- 	QPixmap logIconInfo;
-+	QPixmap logIconHistory;
- 	QAction *actQuote_;
- };
- 
---- git.orig/src/eventdb.cpp
-+++ git/src/eventdb.cpp
-@@ -28,23 +28,27 @@
- #include <QTimer>
- #include <QTextStream>
- #include <QDateTime>
-+#include <QSqlError>
-+#include <QSqlDriver>
-+#include <qjson/parser.h>
-+#include "qjson/serializer.h"
- 
- #include "common.h"
- #include "applicationinfo.h"
- #include "psievent.h"
-+#include "psicontactlist.h"
- #include "jidutil.h"
-+#include "historyimp.h"
- 
- using namespace XMPP;
- 
- //----------------------------------------------------------------------------
- // EDBItem
- //----------------------------------------------------------------------------
--EDBItem::EDBItem(const PsiEvent::Ptr &event, const QString &id, const QString &prevId, const QString &nextId)
-+EDBItem::EDBItem(const PsiEvent::Ptr &event, const QString &id)
- {
- 	e = event;
- 	v_id = id;
--	v_prevId = prevId;
--	v_nextId = nextId;
- }
- 
- EDBItem::~EDBItem()
-@@ -61,17 +65,6 @@ const QString & EDBItem::id() const
- 	return v_id;
- }
- 
--const QString & EDBItem::nextId() const
--{
--	return v_nextId;
--}
--
--const QString & EDBItem::prevId() const
--{
--	return v_prevId;
--}
--
--
- //----------------------------------------------------------------------------
- // EDBHandle
- //----------------------------------------------------------------------------
-@@ -81,6 +74,7 @@ public:
- 	Private() {}
- 
- 	EDB *edb;
-+	int beginRow_;
- 	EDBResult r;
- 	bool busy;
- 	bool writeSuccess;
-@@ -93,6 +87,7 @@ EDBHandle::EDBHandle(EDB *edb)
- {
- 	d = new Private;
- 	d->edb = edb;
-+	d->beginRow_ = 0;
- 	d->busy = false;
- 	d->writeSuccess = false;
- 	d->listeningFor = -1;
-@@ -108,53 +103,32 @@ EDBHandle::~EDBHandle()
- 	delete d;
- }
- 
--void EDBHandle::getLatest(const Jid &j, int len)
--{
--	d->busy = true;
--	d->lastRequestType = Read;
--	d->listeningFor = d->edb->op_getLatest(j, len);
--}
--
--void EDBHandle::getOldest(const Jid &j, int len)
-+void EDBHandle::get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int begin, int len)
- {
- 	d->busy = true;
- 	d->lastRequestType = Read;
--	d->listeningFor = d->edb->op_getOldest(j, len);
-+	d->listeningFor = d->edb->op_get(accId, jid, date, direction, begin, len);
- }
- 
--void EDBHandle::get(const Jid &j, const QString &id, int direction, int len)
-+void EDBHandle::find(const QString &accId, const QString &str, const XMPP::Jid &jid, const QDateTime date, int direction)
- {
- 	d->busy = true;
- 	d->lastRequestType = Read;
--	d->listeningFor = d->edb->op_get(j, id, direction, len);
-+	d->listeningFor = d->edb->op_find(accId, str, jid, date, direction);
- }
- 
--void EDBHandle::getByDate(const Jid &j, QDateTime first, QDateTime last)
--{
--	d->busy = true;
--	d->lastRequestType = Read;
--	d->listeningFor = d->edb->op_getByDate(j, first, last);
--}
--
--void EDBHandle::find(const QString &str, const Jid &j, const QString &id, int direction)
--{
--	d->busy = true;
--	d->lastRequestType = Read;
--	d->listeningFor = d->edb->op_find(str, j, id, direction);
--}
--
--void EDBHandle::append(const Jid &j, const PsiEvent::Ptr &e)
-+void EDBHandle::append(const QString &accId, const Jid &j, const PsiEvent::Ptr &e, int type)
- {
- 	d->busy = true;
- 	d->lastRequestType = Write;
--	d->listeningFor = d->edb->op_append(j, e);
-+	d->listeningFor = d->edb->op_append(accId, j, e, type);
- }
- 
--void EDBHandle::erase(const Jid &j)
-+void EDBHandle::erase(const QString &accId, const Jid &j)
- {
- 	d->busy = true;
- 	d->lastRequestType = Erase;
--	d->listeningFor = d->edb->op_erase(j);
-+	d->listeningFor = d->edb->op_erase(accId, j);
- }
- 
- bool EDBHandle::busy() const
-@@ -198,6 +172,11 @@ int EDBHandle::lastRequestType() const
- 	return d->lastRequestType;
- }
- 
-+int EDBHandle::beginRow() const
-+{
-+	return d->beginRow_;
-+}
-+
- 
- //----------------------------------------------------------------------------
- // EDB
-@@ -209,12 +188,14 @@ public:
- 
- 	QList<EDBHandle*> list;
- 	int reqid_base;
-+	PsiCon *psi;
- };
- 
--EDB::EDB()
-+EDB::EDB(PsiCon *psi)
- {
- 	d = new Private;
- 	d->reqid_base = 0;
-+	d->psi = psi;
- }
- 
- EDB::~EDB()
-@@ -239,46 +220,32 @@ void EDB::unreg(EDBHandle *h)
- 	d->list.removeAll(h);
- }
- 
--int EDB::op_getLatest(const Jid &j, int len)
--{
--	return getLatest(j, len);
--}
--
--int EDB::op_getOldest(const Jid &j, int len)
--{
--	return getOldest(j, len);
--}
--
--int EDB::op_get(const Jid &jid, const QString &id, int direction, int len)
--{
--	return get(jid, id, direction, len);
--}
--
--int EDB::op_getByDate(const Jid &j, QDateTime first, QDateTime last)
-+int EDB::op_get(const QString &accId, const Jid &jid, const QDateTime date, int direction, int start, int len)
- {
--	return getByDate(j, first, last);
-+	return get(accId, jid, date, direction, start, len);
- }
- 
--int EDB::op_find(const QString &str, const Jid &j, const QString &id, int direction)
-+int EDB::op_find(const QString &accId, const QString &str, const Jid &j, const QDateTime date, int direction)
- {
--	return find(str, j, id, direction);
-+	return find(accId, str, j, date, direction);
- }
- 
--int EDB::op_append(const Jid &j, const PsiEvent::Ptr &e)
-+int EDB::op_append(const QString &accId, const Jid &j, const PsiEvent::Ptr &e, int type)
- {
--	return append(j, e);
-+	return append(accId, j, e, type);
- }
- 
--int EDB::op_erase(const Jid &j)
-+int EDB::op_erase(const QString &accId, const Jid &j)
- {
--	return erase(j);
-+	return erase(accId, j);
- }
- 
--void EDB::resultReady(int req, EDBResult r)
-+void EDB::resultReady(int req, EDBResult r, int begin_row)
- {
- 	// deliver
- 	foreach(EDBHandle* h, d->list) {
- 		if(h->listeningFor() == req) {
-+			h->d->beginRow_ = begin_row;
- 			h->edb_resultReady(r);
- 			return;
- 		}
-@@ -296,6 +263,11 @@ void EDB::writeFinished(int req, bool b)
- 	}
- }
- 
-+inline PsiCon *EDB::psi()
-+{
-+	return d->psi;
-+}
-+
- 
- //----------------------------------------------------------------------------
- // EDBFlatFile
-@@ -304,21 +276,18 @@ struct item_file_req
- {
- 	Jid j;
- 	int type; // 0 = latest, 1 = oldest, 2 = random, 3 = write
-+	int start;
- 	int len;
- 	int dir;
- 	int id;
--	int eventId;
-+	QDateTime date;
- 	QString findStr;
- 	PsiEvent::Ptr event;
- 
--	QDateTime first, last;
- 	enum Type {
--		Type_getLatest = 0,
--		Type_getOldest,
- 		Type_get,
- 		Type_append,
- 		Type_find,
--		Type_getByDate,
- 		Type_erase
- 	};
- };
-@@ -332,8 +301,8 @@ public:
- 	QList<item_file_req*> rlist;
- };
- 
--EDBFlatFile::EDBFlatFile()
--:EDB()
-+EDBFlatFile::EDBFlatFile(PsiCon *psi)
-+:EDB(psi)
- {
- 	d = new Private;
- }
-@@ -347,64 +316,23 @@ EDBFlatFile::~EDBFlatFile()
- 	delete d;
- }
- 
--int EDBFlatFile::getLatest(const Jid &j, int len)
--{
--	item_file_req *r = new item_file_req;
--	r->j = j;
--	r->type = item_file_req::Type_getLatest;
--	r->len = len < 1 ? 1: len;
--	r->id = genUniqueId();
--	d->rlist.append(r);
--
--	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
--	return r->id;
--}
--
--int EDBFlatFile::getOldest(const Jid &j, int len)
--{
--	item_file_req *r = new item_file_req;
--	r->j = j;
--	r->type = item_file_req::Type_getOldest;
--	r->len = len < 1 ? 1: len;
--	r->id = genUniqueId();
--	d->rlist.append(r);
--
--	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
--	return r->id;
--}
--
--int EDBFlatFile::get(const Jid &j, const QString &id, int direction, int len)
-+int EDBFlatFile::get(const QString &/*accId*/, const Jid &j, const QDateTime date, int direction, int start, int len)
- {
- 	item_file_req *r = new item_file_req;
- 	r->j = j;
- 	r->type = item_file_req::Type_get;
-+	r->start = start;
- 	r->len = len < 1 ? 1: len;
- 	r->dir = direction;
--	r->eventId = id.toInt();
--	r->id = genUniqueId();
--	d->rlist.append(r);
--
--	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
--	return r->id;
--}
--
--
--int EDBFlatFile::getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last)
--{
--	item_file_req *r = new item_file_req;
--	r->j = jid;
--	r->type = item_file_req::Type_getByDate;
--	r->len = 1;
-+	r->date = date;
- 	r->id = genUniqueId();
- 	d->rlist.append(r);
--	r->first = first;
--	r->last = last;
- 
- 	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
- 	return r->id;
- }
- 
--int EDBFlatFile::find(const QString &str, const Jid &j, const QString &id, int direction)
-+int EDBFlatFile::find(const QString &/*accId*/, const QString &str, const Jid &j, const QDateTime date, int direction)
- {
- 	item_file_req *r = new item_file_req;
- 	r->j = j;
-@@ -412,7 +340,7 @@ int EDBFlatFile::find(const QString &str
- 	r->len = 1;
- 	r->dir = direction;
- 	r->findStr = str;
--	r->eventId = id.toInt();
-+	r->date = date;
- 	r->id = genUniqueId();
- 	d->rlist.append(r);
- 
-@@ -420,8 +348,10 @@ int EDBFlatFile::find(const QString &str
- 	return r->id;
- }
- 
--int EDBFlatFile::append(const Jid &j, const PsiEvent::Ptr &e)
-+int EDBFlatFile::append(const QString &/*accId*/, const Jid &j, const PsiEvent::Ptr &e, int type)
- {
-+	if (type != EDB::Contact)
-+		return 0;
- 	item_file_req *r = new item_file_req;
- 	r->j = j;
- 	r->type = item_file_req::Type_append;
-@@ -438,7 +368,7 @@ int EDBFlatFile::append(const Jid &j, co
- 	return r->id;
- }
- 
--int EDBFlatFile::erase(const Jid &j)
-+int EDBFlatFile::erase(const QString &/*accId*/, const Jid &j)
- {
- 	item_file_req *r = new item_file_req;
- 	r->j = j;
-@@ -450,6 +380,22 @@ int EDBFlatFile::erase(const Jid &j)
- 	return r->id;
- }
- 
-+QList<EDB::ContactItem> EDBFlatFile::contacts(const QString &/*accId*/, int type)
-+{
-+	return File::contacts(type);
-+}
-+
-+quint64 EDBFlatFile::eventsCount(const QString &accId, const XMPP::Jid &jid)
-+{
-+	quint64 res = 0;
-+	if (!jid.isEmpty())
-+		res = ensureFile(jid)->total();
-+	else
-+		foreach (const ContactItem &ci, contacts(accId, Contact))
-+			res += ensureFile(ci.jid)->total();
-+	return res;
-+}
-+
- EDBFlatFile::File *EDBFlatFile::findFile(const Jid &j) const
- {
- 	foreach(File* i, d->flist) {
-@@ -503,25 +449,10 @@ void EDBFlatFile::performRequests()
- 
- 	File *f = ensureFile(r->j);
- 	int type = r->type;
--	if(type >= item_file_req::Type_getLatest && type <= item_file_req::Type_get) {
--		int id, direction;
-+	if(type == item_file_req::Type_get) {
- 
--		if(type == item_file_req::Type_getLatest) {
--			direction = Backward;
--			id = f->total()-1;
--		}
--		else if(type == item_file_req::Type_getOldest) {
--			direction = Forward;
--			id = 0;
--		}
--		else if(type == item_file_req::Type_get) {
--			direction = r->dir;
--			id = r->eventId;
--		}
--		else {
--			qWarning("EDBFlatFile::performRequests(): Invalid type.");
--			return;
--		}
-+		int direction = r->dir;
-+		int id = f->getId(r->date, direction, r->start);
- 
- 		int len;
- 		if(direction == Forward) {
-@@ -538,15 +469,11 @@ void EDBFlatFile::performRequests()
- 		}
- 
- 		EDBResult result;
-+		int startId = id;
- 		for(int n = 0; n < len; ++n) {
- 			PsiEvent::Ptr e(f->get(id));
- 			if(e) {
--				QString prevId, nextId;
--				if(id > 0)
--					prevId = QString::number(id-1);
--				if(id < f->total()-1)
--					nextId = QString::number(id+1);
--				EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id), prevId, nextId));
-+				EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id)));
- 				result.append(ei);
- 			}
- 
-@@ -555,30 +482,26 @@ void EDBFlatFile::performRequests()
- 			else
- 				--id;
- 		}
--		resultReady(r->id, result);
-+		if (direction == Backward)
-+			startId = id + 1;
-+		resultReady(r->id, result, startId);
- 	}
- 	else if(type == item_file_req::Type_append) {
- 		writeFinished(r->id, f->append(r->event));
- 	}
- 	else if(type == item_file_req::Type_find) {
--		int id = r->eventId;
-+		int id = f->getId(r->date, r->dir, r->start);
- 		EDBResult result;
- 		while(1) {
- 			PsiEvent::Ptr e(f->get(id));
- 			if(!e)
- 				break;
- 
--			QString prevId, nextId;
--			if(id > 0)
--				prevId = QString::number(id-1);
--			if(id < f->total()-1)
--				nextId = QString::number(id+1);
--
- 			if(e->type() == PsiEvent::Message) {
- 				MessageEvent::Ptr me = e.staticCast<MessageEvent>();
- 				const Message &m = me->message();
- 				if(m.body().indexOf(r->findStr, 0, Qt::CaseInsensitive) != -1) {
--					EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id), prevId, nextId));
-+					EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id)));
- 					result.append(ei);
- 					//commented line below to return ALL(instead of just first) messages that contain findStr
- 					//break;
-@@ -590,40 +513,17 @@ void EDBFlatFile::performRequests()
- 			else
- 				--id;
- 		}
--		resultReady(r->id, result);
--	}
--	else if(type == item_file_req::Type_getByDate ) {
--		int id = 0;
--		EDBResult result;
--		for (int i=0; i < f->total(); ++i) {
--			PsiEvent::Ptr e(f->get(id));
--			if(!e)
--				continue;
--
--			QString prevId, nextId;
--			if(id > 0)
--				prevId = QString::number(id-1);
--			if(id < f->total()-1)
--				nextId = QString::number(id+1);
--
--			if(e->type() == PsiEvent::Message) {
--				MessageEvent::Ptr me = e.staticCast<MessageEvent>();
--				const Message &m = me->message();
--				if(m.timeStamp() > r->first && m.timeStamp() < r->last ) {
--					EDBItemPtr ei = EDBItemPtr(new EDBItem(e, QString::number(id), prevId, nextId));
--					result.append(ei);
--				}
--			}
--
--			++id;
--		}
--		resultReady(r->id, result);
-+		resultReady(r->id, result, 0);
- 	}
- 
- 	else if(type == item_file_req::Type_erase) {
- 		writeFinished(r->id, deleteFile(f->j));
- 	}
- 
-+	else {
-+		qWarning("EDBFlatFile::performRequests(): Invalid type.");
-+	}
-+
- 	delete r;
- }
- 
-@@ -676,7 +576,28 @@ EDBFlatFile::File::~File()
- 
- QString EDBFlatFile::File::jidToFileName(const XMPP::Jid &j)
- {
--	return ApplicationInfo::historyDir() + "/" + JIDUtil::encode(j.bare()).toLower() + ".history";
-+	return ApplicationInfo::historyDir() + "/" + strToFileName(JIDUtil::encode(j.bare()).toLower());
-+}
-+
-+QString EDBFlatFile::File::strToFileName(const QString &s)
-+{
-+	QFileInfo fi(s);
-+	return fi.fileName() + ".history";
-+}
-+
-+QList<EDB::ContactItem> EDBFlatFile::File::contacts(int type)
-+{
-+	QList<ContactItem> res;
-+	if (type == EDB::Contact) {
-+		QDir dir(ApplicationInfo::historyDir() + "/");
-+		QFileInfoList flist = dir.entryInfoList(QStringList(strToFileName("*")), QDir::Files);
-+		foreach (const QFileInfo &fi, flist) {
-+			XMPP::Jid jid(JIDUtil::decode(fi.completeBaseName()));
-+			if (jid.isValid())
-+				res.append(ContactItem("", jid));
-+		}
-+	}
-+	return res;
- }
- 
- void EDBFlatFile::File::ensureIndex()
-@@ -728,6 +649,59 @@ int EDBFlatFile::File::total() const
- 	return d->index.size();
- }
- 
-+int EDBFlatFile::File::getId(QDateTime &date, int dir, int offset)
-+{
-+	if (date.isNull()) {
-+		if (dir == EDBFlatFile::Forward)
-+			return offset;
-+		if (offset >= total())
-+			return 0;
-+		return total() - offset - 1;
-+	}
-+	ensureIndex();
-+	int id = findIdByNearDate(date, 0, total()-1);
-+	if (id != -1) {
-+		QDateTime fDate = getLineDate(getLine(id));
-+		if (dir == EDBFlatFile::Forward) {
-+			if (fDate < date)
-+				++id;
-+			id += offset;
-+		} else {
-+			if (fDate > date)
-+				--id;
-+			id -= offset;
-+		}
-+		if (id >= total())
-+			id = total() - 1;
-+		else if (id < 0)
-+			id = 0;
-+	}
-+	return id;
-+}
-+
-+int EDBFlatFile::File::findIdByNearDate(QDateTime &date, int start, int end)
-+{
-+	if (start == end)
-+		return start;
-+
-+	int middle = (end - start) / 2;
-+	const QDateTime mDate = getLineDate(getLine(start + middle));
-+	if (!mDate.isValid())
-+		return -1;
-+
-+	if (mDate == date)
-+		return start + middle;
-+	if (middle == 0) {
-+		const QDateTime mDate2 = getLineDate(getLine(end));
-+		if (!mDate2.isValid())
-+			return -1;
-+		return (abs(date.secsTo(mDate)) < abs(date.secsTo(mDate2))) ? start : end;
-+	}
-+	if (mDate > date)
-+		return findIdByNearDate(date, start, start + middle);
-+	return findIdByNearDate(date, start + middle, end);
-+}
-+
- void EDBFlatFile::File::touch()
- {
- 	t->start(30000);
-@@ -738,24 +712,30 @@ void EDBFlatFile::File::timer_timeout()
- 	timeout();
- }
- 
--PsiEvent::Ptr EDBFlatFile::File::get(int id)
-+QString EDBFlatFile::File::getLine(int id)
- {
- 	touch();
- 
- 	if(!valid)
--		return PsiEvent::Ptr();
-+		return QString();
- 
- 	ensureIndex();
- 	if(id < 0 || id >= (int)d->index.size())
--		return PsiEvent::Ptr();
-+		return QString();
- 
- 	f.seek(d->indexid);
- 
- 	QTextStream t;
- 	t.setDevice(&f);
- 	t.setCodec("UTF-8");
--	QString line = t.readLine();
-+	return t.readLine();
-+}
- 
-+PsiEvent::Ptr EDBFlatFile::File::get(int id)
-+{
-+	QString line = getLine(id);
-+	if (line.isEmpty())
-+		return PsiEvent::Ptr();
- 	return lineToEvent(line);
- }
- 
-@@ -788,6 +768,13 @@ bool EDBFlatFile::File::append(const Psi
- 	return true;
- }
- 
-+QDateTime EDBFlatFile::File::getLineDate(const QString &line) const
-+{
-+	int x1 = line.indexOf('|') + 1;
-+	int x2 = line.indexOf('|', x1);
-+	return QDateTime::fromString(line.mid(x1, x2 - x1), Qt::ISODate);
-+}
-+
- PsiEvent::Ptr EDBFlatFile::File::lineToEvent(const QString &line)
- {
- 	// -- read the line --
-@@ -966,3 +953,811 @@ QString EDBFlatFile::File::eventToLine(c
- 
- 	return "";
- }
-+
-+//----------------------------------------------------------------------------
-+// EDBSqLite
-+//----------------------------------------------------------------------------
-+
-+EDBSqLite::EDBSqLite(PsiCon *psi) : EDB(psi),
-+	transactionsCounter(0),
-+	lastCommitTime(QDateTime::currentDateTime()),
-+	commitTimer(NULL),
-+	mirror_(NULL)
-+{
-+	status = NotActive;
-+	QString path = ApplicationInfo::historyDir() + "/history.db";
-+	QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "history");
-+	db.setDatabaseName(path);
-+	if (!db.open()) {
-+		qWarning("EDBSqLite::EDBSqLite(): Can't open base.\n" + db.lastError().text().toLatin1());
-+		return;
-+	}
-+	QSqlQuery query(db);
-+	query.exec("PRAGMA foreign_keys = ON;");
-+	setInsertingMode(Normal);
-+	if (db.tables(QSql::Tables).size() == 0) {
-+		// no tables found.
-+		if (db.transaction()) {
-+			query.exec("CREATE TABLE `system` ("
-+				"`key` TEXT, "
-+				"`value` TEXT"
-+				");");
-+			query.exec("CREATE TABLE `accounts` ("
-+				"`id` TEXT, "
-+				"`lifetime` INTEGER"
-+				");");
-+			query.exec("CREATE TABLE `contacts` ("
-+				"`id` INTEGER NOT NULL PRIMARY KEY ASC, "
-+				"`acc_id` TEXT, "
-+				"`type` INTEGER, "
-+				"`jid` TEXT, "
-+				"`lifetime` INTEGER"
-+				");");
-+			query.exec("CREATE TABLE `events` ("
-+				"`id` INTEGER NOT NULL PRIMARY KEY ASC, "
-+				"`contact_id` INTEGER NOT NULL REFERENCES `contacts`(`id`) ON DELETE CASCADE, "
-+				"`resource` TEXT, "
-+				"`date` TEXT, "
-+				"`type` INTEGER, "
-+				"`direction` INTEGER, "
-+				"`subject` TEXT, "
-+				"`m_text` TEXT, "
-+				"`lang` TEXT, "
-+				"`extra_data` TEXT"
-+				");");
-+			query.exec("CREATE INDEX `key` ON `system` (`key`);");
-+			query.exec("CREATE INDEX `jid` ON `contacts` (`jid`);");
-+			query.exec("CREATE INDEX `contact_id` ON `events` (`contact_id`);");
-+			query.exec("CREATE INDEX `date` ON `events` (`date`);");
-+			if (db.commit()) {
-+				status = Commited;
-+				setStorageParam("version", "0.1");
-+				setStorageParam("import_start", "yes");
-+			}
-+		}
-+	}
-+	else
-+		status = Commited;
-+}
-+
-+EDBSqLite::~EDBSqLite()
-+{
-+	commit();
-+	{
-+		QSqlDatabase db = QSqlDatabase::database("history", false);
-+		if (db.isOpen())
-+			db.close();
-+	}
-+	QSqlDatabase::removeDatabase("history");
-+}
-+
-+bool EDBSqLite::init()
-+{
-+	if (status == NotActive)
-+		return false;
-+
-+	if (!getStorageParam("import_start").isEmpty()) {
-+		if (!importExecute()) {
-+			status = NotActive;
-+			return false;
-+		}
-+	}
-+
-+	setMirror(new EDBFlatFile(psi()));
-+	return true;
-+}
-+
-+int EDBSqLite::get(const QString &accId, const XMPP::Jid &jid, QDateTime date, int direction, int start, int len)
-+{
-+	item_query_req *r = new item_query_req;
-+	r->accId = accId;
-+	r->j     = jid;
-+	r->type  = item_query_req::Type_get;
-+	r->start = start;
-+	r->len   = len < 1 ? 1 : len;
-+	r->dir   = direction;
-+	r->date  = date;
-+	r->id    = genUniqueId();
-+	rlist.append(r);
-+
-+	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
-+	return r->id;
-+}
-+
-+int EDBSqLite::find(const QString &accId, const QString &str, const XMPP::Jid &jid, const QDateTime date, int direction)
-+{
-+	item_query_req *r = new item_query_req;
-+	r->accId   = accId;
-+	r->j       = jid;
-+	r->type    = item_query_req::Type_find;
-+	r->len     = 1;
-+	r->dir     = direction;
-+	r->findStr = str;
-+	r->date    = date;
-+	r->id      = genUniqueId();
-+	rlist.append(r);
-+
-+	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
-+	return r->id;
-+}
-+
-+int EDBSqLite::append(const QString &accId, const XMPP::Jid &jid, const PsiEvent::Ptr &e, int type)
-+{
-+	item_query_req *r = new item_query_req;
-+	r->accId   = accId;
-+	r->j       = jid;
-+	r->jidType = type;
-+	r->type    = item_file_req::Type_append;
-+	r->event   = e;
-+	if ( !r->event ) {
-+		qWarning("EDBSqLite::append(): Attempted to append incompatible type.");
-+		delete r;
-+		return 0;
-+	}
-+	r->id      = genUniqueId();
-+	rlist.append(r);
-+
-+	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
-+
-+	if (mirror_)
-+		mirror_->append(accId, jid, e, type);
-+
-+	return r->id;
-+}
-+
-+int EDBSqLite::erase(const QString &accId, const XMPP::Jid &jid)
-+{
-+	item_query_req *r = new item_query_req;
-+	r->accId = accId;
-+	r->j     = jid;
-+	r->type  = item_query_req::Type_erase;
-+	r->id    = genUniqueId();
-+	rlist.append(r);
-+
-+	QTimer::singleShot(FAKEDELAY, this, SLOT(performRequests()));
-+	return r->id;
-+}
-+
-+QList<EDB::ContactItem> EDBSqLite::contacts(const QString &accId, int type)
-+{
-+	QList<ContactItem> res;
-+	EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(QueryContactsList, accId.isEmpty(), true);
-+	query->bindValue(":type", type);
-+	if (!accId.isEmpty())
-+		query->bindValue(":acc_id", accId);
-+	if (query->exec()) {
-+		while (query->next()) {
-+			const QSqlRecord &rec = query->record();
-+			res.append(ContactItem(rec.value("acc_id").toString(), XMPP::Jid(rec.value("jid").toString())));
-+		}
-+		query->freeResult();
-+	}
-+	return res;
-+}
-+
-+quint64 EDBSqLite::eventsCount(const QString &accId, const XMPP::Jid &jid)
-+{
-+	quint64 res = 0;
-+	bool fAccAll  = accId.isEmpty();
-+	bool fContAll = jid.isEmpty();
-+	EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(QueryRowCount, fAccAll, fContAll);
-+	if (!fAccAll)
-+		query->bindValue(":acc_id", accId);
-+	if (!fContAll)
-+		query->bindValue(":jid", jid.full());
-+	if (query->exec()) {
-+		if (query->next())
-+			res = query->record().value("count").toULongLong();
-+		query->freeResult();
-+	}
-+	return res;
-+}
-+
-+QString EDBSqLite::getStorageParam(const QString &key)
-+{
-+	QSqlQuery query(QSqlDatabase::database("history"));
-+	query.prepare("SELECT `value` FROM `system` WHERE `key` = :key;");
-+	query.bindValue(":key", key);
-+	if (query.exec() && query.next())
-+		return query.record().value("value").toString();
-+	return QString();
-+}
-+
-+void EDBSqLite::setStorageParam(const QString &key, const QString &val)
-+{
-+	transaction(true);
-+	QSqlQuery query(QSqlDatabase::database("history"));
-+	if (val.isEmpty()) {
-+		query.prepare("DELETE FROM `system` WHERE `key` = :key;");
-+		query.bindValue(":key", key);
-+		query.exec();
-+	}
-+	else {
-+		query.prepare("SELECT COUNT(*) AS `count` FROM `system` WHERE `key` = :key;");
-+		query.bindValue(":key", key);
-+		if (query.exec() && query.next() && query.record().value("count").toULongLong() != 0) {
-+			query.prepare("UPDATE `system` SET `value` = :val WHERE `key` = :key;");
-+			query.bindValue(":key", key);
-+			query.bindValue(":val", val);
-+			query.exec();
-+		}
-+		else {
-+			query.prepare("INSERT INTO `system` (`key`, `value`) VALUES (:key, :val);");
-+			query.bindValue(":key", key);
-+			query.bindValue(":val", val);
-+			query.exec();
-+		}
-+	}
-+	commit();
-+}
-+
-+void EDBSqLite::setInsertingMode(InsertMode mode)
-+{
-+	// in the case of a flow of new records
-+	if (mode == Import) {
-+		// Commit after 10000 inserts and every 5 seconds
-+		maxUncommitedRecs = 10000;
-+		maxUncommitedSecs = 5;
-+	} else {
-+		// Commit after 3 inserts and every 1 second
-+		maxUncommitedRecs = 3;
-+		maxUncommitedSecs = 1;
-+	}
-+	// Commit if there were no new additions for 1 second
-+	commitByTimeoutSecs = 1;
-+	//--
-+	commit();
-+}
-+
-+void EDBSqLite::setMirror(EDBFlatFile *mirr)
-+{
-+	if (mirr != mirror_) {
-+		if (mirror_)
-+			delete mirror_;
-+		mirror_ = mirr;
-+	}
-+}
-+
-+EDBFlatFile *EDBSqLite::mirror() const
-+{
-+	return mirror_;
-+}
-+
-+void EDBSqLite::performRequests()
-+{
-+	if (rlist.isEmpty())
-+		return;
-+
-+	item_query_req *r = rlist.takeFirst();
-+	const int type = r->type;
-+
-+	if (type == item_query_req::Type_append) {
-+		bool b = appendEvent(r->accId, r->j, r->event, r->jidType);
-+		writeFinished(r->id, b);
-+	}
-+
-+	else if (type == item_query_req::Type_get) {
-+		commit();
-+		bool fContAll = r->j.isEmpty();
-+		bool fAccAll  = r->accId.isEmpty();
-+		QueryType queryType;
-+		if (r->date.isNull()) {
-+			if (r->dir == Forward)
-+				queryType = QueryOldest;
-+			else
-+				queryType = QueryLatest;
-+		} else {
-+			if (r->dir == Backward)
-+				queryType = QueryDateBackward;
-+			else
-+				queryType = QueryDateForward;
-+		}
-+		EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(queryType, fAccAll, fContAll);
-+		if (!fContAll)
-+			query->bindValue(":jid", r->j.full());
-+		if (!fAccAll)
-+			query->bindValue(":acc_id", r->accId);
-+		if (!r->date.isNull())
-+			query->bindValue(":date", r->date);
-+		query->bindValue(":start", r->start);
-+		query->bindValue(":cnt", r->len);
-+		EDBResult result;
-+		if (query->exec()) {
-+			while (query->next()) {
-+				PsiEvent::Ptr e(getEvent(query->record()));
-+				if (e) {
-+					QString id = query->record().value("id").toString();
-+					result.append(EDBItemPtr(new EDBItem(e, id)));
-+				}
-+			}
-+			query->freeResult();
-+		}
-+		int beginRow;
-+		if (r->dir == Forward && r->date.isNull()) {
-+			beginRow = r->start;
-+		} else {
-+			int cnt = rowCount(r->accId, r->j, r->date);
-+			if (r->dir == Backward) {
-+				beginRow = cnt - r->len + 1;
-+				if (beginRow < 0)
-+					beginRow = 0;
-+			} else {
-+				beginRow = cnt + 1;
-+			}
-+		}
-+		resultReady(r->id, result, beginRow);
-+
-+	} else if(type == item_file_req::Type_find) {
-+		commit();
-+		bool fContAll = r->j.isEmpty();
-+		bool fAccAll  = r->accId.isEmpty();
-+		EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(QueryFindText, fAccAll, fContAll);
-+		if (!fContAll)
-+			query->bindValue(":jid", r->j.bare());
-+		if (!fAccAll)
-+			query->bindValue(":acc_id", r->accId);
-+		EDBResult result;
-+		if (query->exec()) {
-+			QString str = r->findStr.toLower();
-+			while (query->next()) {
-+				const QSqlRecord rec = query->record();
-+				if (!rec.value("m_text").toString().toLower().contains(str, Qt::CaseSensitive))
-+					continue;
-+				PsiEvent::Ptr e(getEvent(rec));
-+				if (e) {
-+					QString id = rec.value("id").toString();
-+					EDBItemPtr eip = EDBItemPtr(new EDBItem(e, id));
-+					result.append(eip);
-+				}
-+			}
-+			query->freeResult();
-+		}
-+		resultReady(r->id, result, 0);
-+
-+	} else if(type == item_file_req::Type_erase) {
-+		writeFinished(r->id, eraseHistory(r->accId, r->j));
-+	}
-+
-+	delete r;
-+}
-+
-+bool EDBSqLite::appendEvent(const QString &accId, const XMPP::Jid &jid, const PsiEvent::Ptr &e, int jidType)
-+{
-+	QSqlDatabase db = QSqlDatabase::database("history");
-+	const qint64 contactId = ensureJidRowId(accId, jid, jidType);
-+	if (contactId == 0)
-+		return false;
-+
-+	QDateTime dTime;
-+	int nType = 0;
-+
-+	if (e->type() == PsiEvent::Message) {
-+		MessageEvent::Ptr me = e.staticCast<MessageEvent>();
-+		const Message &m = me->message();
-+		dTime = m.timeStamp();
-+		if (m.type() == "chat")
-+			nType = 1;
-+		else if(m.type() == "error")
-+			nType = 4;
-+		else if(m.type() == "headline")
-+			nType = 5;
-+
-+	} else if (e->type() == PsiEvent::Auth) {
-+		AuthEvent::Ptr ae = e.staticCast<AuthEvent>();
-+		dTime = ae->timeStamp();
-+		QString subType = ae->authType();
-+		if(subType == "subscribe")
-+			nType = 3;
-+		else if(subType == "subscribed")
-+			nType = 6;
-+		else if(subType == "unsubscribe")
-+			nType = 7;
-+		else if(subType == "unsubscribed")
-+			nType = 8;
-+	} else
-+		return false;
-+
-+	int nDirection = e->originLocal() ? 1 : 2;
-+	if (!transaction(false))
-+		return false;
-+
-+	PreparedQuery *query = queryes.getPreparedQuery(QueryInsertEvent, false, false);
-+	query->bindValue(":contact_id", contactId);
-+	query->bindValue(":resource", (jidType != GroupChatContact) ? jid.resource() : "");
-+	query->bindValue(":date", dTime);
-+	query->bindValue(":type", nType);
-+	query->bindValue(":direction", nDirection);
-+	if (nType == 0 || nType == 1 || nType == 4 || nType == 5) {
-+		MessageEvent::Ptr me = e.staticCast<MessageEvent>();
-+		const Message &m = me->message();
-+		QString lang = m.lang();
-+		query->bindValue(":subject", m.subject(lang));
-+		query->bindValue(":m_text", m.body(lang));
-+		query->bindValue(":lang", lang);
-+		QString extraData;
-+		const UrlList &urls = m.urlList();
-+		if (!urls.isEmpty()) {
-+			QVariantMap xepList;
-+			QVariantList urlList;
-+			foreach (const Url &url, urls)
-+				if (!url.url().isEmpty()) {
-+					QVariantList urlItem;
-+					urlItem.append(QVariant(url.url()));
-+					if (!url.desc().isEmpty())
-+						urlItem.append(QVariant(url.desc()));
-+					urlList.append(QVariant(urlItem));
-+				}
-+			xepList"jabber:x:oob" = QVariant(urlList);
-+			QJson::Serializer serializer;
-+			extraData = QString::fromUtf8(serializer.serialize(xepList));
-+		}
-+		query->bindValue(":extra_data", extraData);
-+	}
-+	else {
-+		query->bindValue(":subject", QVariant(QVariant::String));
-+		query->bindValue(":m_text", QVariant(QVariant::String));
-+		query->bindValue(":lang", QVariant(QVariant::String));
-+		query->bindValue(":extra_data", QVariant(QVariant::String));
-+	}
-+	bool res = query->exec();
-+	return res;
-+}
-+
-+PsiEvent::Ptr EDBSqLite::getEvent(const QSqlRecord &record)
-+{
-+	PsiAccount *pa = psi()->contactList()->getAccount(record.value("acc_id").toString());
-+
-+	int type = record.value("type").toInt();
-+
-+	if(type == 0 || type == 1 || type == 4 || type == 5) {
-+		Message m;
-+		m.setTimeStamp(record.value("date").toDateTime());
-+		if(type == 1)
-+			m.setType("chat");
-+		else if(type == 4)
-+			m.setType("error");
-+		else if(type == 5)
-+			m.setType("headline");
-+		else
-+			m.setType("");
-+		m.setFrom(Jid(record.value("jid").toString()));
-+		QVariant text = record.value("m_text");
-+		if (!text.isNull()) {
-+			m.setBody(text.toString());
-+			m.setLang(record.value("lang").toString());
-+			m.setSubject(record.value("subject").toString());
-+		}
-+		m.setSpooled(true);
-+		QString extraStr = record.value("extra_data").toString();
-+		if (!extraStr.isEmpty()) {
-+			QJson::Parser parser;
-+			bool fOk;
-+			QVariantMap extraData = parser.parse(extraStr.toUtf8(), &fOk).toMap();
-+			if (fOk) {
-+				foreach (const QVariant &urlItem, extraData"jabber:x:oob".toList()) {
-+					QVariantList itemList = urlItem.toList();
-+					if (!itemList.isEmpty()) {
-+						QString url = itemList.at(0).toString();
-+						QString desc;
-+						if (itemList.size() > 1)
-+							desc = itemList.at(1).toString();
-+						m.urlAdd(Url(url, desc));
-+					}
-+				}
-+			}
-+		}
-+		MessageEvent::Ptr me(new MessageEvent(m, pa));
-+		me->setOriginLocal((record.value("direction").toInt() == 1));
-+		return me.staticCast<PsiEvent>();
-+	}
-+
-+	if(type == 2 || type == 3 || type == 6 || type == 7 || type == 8) {
-+		QString subType = "subscribe";
-+		// if(type == 2) { // Not used (stupid "system message" from Psi <= 0.8.6)
-+		if(type == 3)
-+			subType = "subscribe";
-+		else if(type == 6)
-+			subType = "subscribed";
-+		else if(type == 7)
-+			subType = "unsubscribe";
-+		else if(type == 8)
-+			subType = "unsubscribed";
-+
-+		AuthEvent::Ptr ae(new AuthEvent(Jid(record.value("jid").toString()), subType, pa));
-+		ae->setTimeStamp(record.value("date").toDateTime());
-+		return ae.staticCast<PsiEvent>();
-+	}
-+	return PsiEvent::Ptr();
-+}
-+
-+qint64 EDBSqLite::ensureJidRowId(const QString &accId, const XMPP::Jid &jid, int type)
-+{
-+	if (jid.isEmpty())
-+		return 0;
-+	QString sJid = (type == GroupChatContact) ? jid.full() : jid.bare();
-+	QString sKey = accId + "|" + sJid;
-+	qint64 id = jidsCache.value(sKey, 0);
-+	if (id != 0)
-+		return id;
-+
-+	EDBSqLite::PreparedQuery *query = queryes.getPreparedQuery(QueryJidRowId, false, false);
-+	query->bindValue(":jid", sJid);
-+	query->bindValue(":acc_id", accId);
-+	if (query->exec()) {
-+		if (query->first()) {
-+			id = query->record().value("id").toLongLong();
-+		} else {
-+			//
-+			QSqlQuery queryIns(QSqlDatabase::database("history"));
-+			queryIns.prepare("INSERT INTO `contacts` (`acc_id`, `type`, `jid`, `lifetime`)"
-+				" VALUES (:acc_id, :type, :jid, -1);");
-+			queryIns.bindValue(":acc_id", accId);
-+			queryIns.bindValue(":type", type);
-+			queryIns.bindValue(":jid", sJid);
-+			if (queryIns.exec()) {
-+				id  = queryIns.lastInsertId().toLongLong();
-+			}
-+		}
-+		query->freeResult();
-+		if (id != 0)
-+			jidsCachesKey = id;
-+	}
-+	return id;
-+}
-+
-+int EDBSqLite::rowCount(const QString &accId, const XMPP::Jid &jid, QDateTime before)
-+{
-+	bool fAccAll  = accId.isEmpty();
-+	bool fContAll = jid.isEmpty();
-+	QueryType type;
-+	if (before.isNull())
-+		type = QueryRowCount;
-+	else
-+		type = QueryRowCountBefore;
-+	PreparedQuery *query = queryes.getPreparedQuery(type, fAccAll, fContAll);
-+	if (!fContAll)
-+		query->bindValue(":jid", jid.full());
-+	if (!fAccAll)
-+		query->bindValue(":acc_id", accId);
-+	if (!before.isNull())
-+		query->bindValue(":date", before);
-+	int res = 0;
-+	if (query->exec()) {
-+		if (query->next()) {
-+			res = query->record().value("count").toInt();
-+		}
-+		query->freeResult();
-+	}
-+	return res;
-+}
-+
-+bool EDBSqLite::eraseHistory(const QString &accId, const XMPP::Jid &jid)
-+{
-+	bool res = false;
-+	if (!transaction(true))
-+		return false;
-+
-+	if (accId.isEmpty() && jid.isEmpty()) {
-+		QSqlQuery query(QSqlDatabase::database("history"));
-+		//if (query.exec("DELETE FROM `events`;"))
-+			if (query.exec("DELETE FROM `contacts`;")) {
-+				jidsCache.clear();
-+				res = true;
-+			}
-+	}
-+	else {
-+		PreparedQuery *query = queryes.getPreparedQuery(QueryJidRowId, false, false);
-+		query->bindValue(":jid", jid.full());
-+		query->bindValue(":acc_id", accId);
-+		if (query->exec() && query->next()) {
-+			const qint64 id = query->record().value("id").toLongLong();
-+			QSqlQuery query2(QSqlDatabase::database("history"));
-+			query2.prepare("DELETE FROM `events` WHERE `contact_id` = :id;");
-+			query2.bindValue(":id", id);
-+			if (query2.exec()) {
-+				res = true;
-+				query2.prepare("DELETE FROM `contacts` WHERE `id` = :id AND `lifetime` = -1;");
-+				query2.bindValue(":id", id);
-+				if (query2.exec()) {
-+					if (query2.numRowsAffected() > 0)
-+							jidsCache.clear();
-+				} else
-+					res = false;
-+			}
-+		}
-+	}
-+	if (res)
-+		res = commit();
-+	else
-+		rollback();
-+	return res;
-+}
-+
-+bool EDBSqLite::transaction(bool now)
-+{
-+	if (status == NotActive)
-+		return false;
-+	if (now || transactionsCounter >= maxUncommitedRecs
-+			|| lastCommitTime.secsTo(QDateTime::currentDateTime()) >= maxUncommitedSecs)
-+		if (!commit())
-+			return false;
-+
-+	if (status == Commited) {
-+		if (!QSqlDatabase::database("history").transaction())
-+			return false;
-+		status = NotCommited;
-+	}
-+	++transactionsCounter;
-+
-+	startAutocommitTimer();
-+
-+	return true;
-+}
-+
-+bool EDBSqLite::commit()
-+{
-+	if (status != NotActive) {
-+		if (status == Commited || QSqlDatabase::database("history").commit()) {
-+			transactionsCounter = 0;
-+			lastCommitTime = QDateTime::currentDateTime();
-+			status = Commited;
-+			stopAutocommitTimer();
-+			return true;
-+		}
-+	}
-+	return false;
-+}
-+
-+bool EDBSqLite::rollback()
-+{
-+	if (status == NotCommited && QSqlDatabase::database("history").rollback()) {
-+		transactionsCounter = 0;
-+		lastCommitTime = QDateTime::currentDateTime();
-+		status = Commited;
-+		stopAutocommitTimer();
-+		return true;
-+	}
-+	return false;
-+}
-+
-+void EDBSqLite::startAutocommitTimer()
-+{
-+	if (!commitTimer) {
-+		commitTimer = new QTimer(this);
-+		connect(commitTimer, SIGNAL(timeout()), this, SLOT(commit()));
-+		commitTimer->setSingleShot(true);
-+		commitTimer->setInterval(commitByTimeoutSecs * 1000);
-+	}
-+	commitTimer->start();
-+}
-+
-+void EDBSqLite::stopAutocommitTimer()
-+{
-+	if (commitTimer && commitTimer->isActive())
-+		commitTimer->stop();
-+}
-+
-+bool EDBSqLite::importExecute()
-+{
-+	bool res = true;
-+	HistoryImport *imp = new HistoryImport(psi());
-+	if (imp->isNeeded()) {
-+		if (imp->exec() != HistoryImport::ResultNormal) {
-+			res = false;
-+		}
-+	}
-+	delete imp;
-+	return res;
-+}
-+
-+// ****************** class PreparedQueryes ********************
-+
-+EDBSqLite::QueryStorage::QueryStorage()
-+{
-+}
-+
-+EDBSqLite::QueryStorage::~QueryStorage()
-+{
-+	foreach (EDBSqLite::PreparedQuery *q, queryList.values()) {
-+		if (q)
-+			delete q;
-+	}
-+}
-+
-+EDBSqLite::PreparedQuery *EDBSqLite::QueryStorage::getPreparedQuery(QueryType type, bool allAccounts, bool allContacts)
-+{
-+	QueryProperty queryProp(type, allAccounts, allContacts);
-+	EDBSqLite::PreparedQuery *q = queryList.value(queryProp, NULL);
-+	if (q != NULL)
-+		return q;
-+
-+	q = new EDBSqLite::PreparedQuery(QSqlDatabase::database("history"));
-+	q->setForwardOnly(true);
-+	q->prepare(getQueryString(type, allAccounts, allContacts));
-+	queryListqueryProp = q;
-+	return q;
-+}
-+
-+EDBSqLite::PreparedQuery::PreparedQuery(QSqlDatabase db) : QSqlQuery(db)
-+{
-+}
-+
-+QString EDBSqLite::QueryStorage::getQueryString(QueryType type, bool allAccounts, bool allContacts)
-+{
-+	QString queryStr;
-+	switch (type)
-+	{
-+		case QueryContactsList:
-+			queryStr = "SELECT `acc_id`, `jid` FROM `contacts` WHERE `type` = :type";
-+			if (!allAccounts)
-+				queryStr.append(" AND `acc_id` = :acc_id");
-+			queryStr.append(" ORDER BY `jid`;");
-+			break;
-+		case QueryLatest:
-+		case QueryOldest:
-+		case QueryDateBackward:
-+		case QueryDateForward:
-+			queryStr = "SELECT `acc_id`, `events`.`id`, `jid`, `date`, `events`.`type`, `direction`, `subject`, `m_text`, `lang`, `extra_data`"
-+				" FROM `events`, `contacts`"
-+				" WHERE `contacts`.`id` = `contact_id`";
-+			if (!allContacts)
-+				queryStr.append(" AND `jid` = :jid");
-+			if (!allAccounts)
-+				queryStr.append(" AND `acc_id` = :acc_id");
-+			if (type == QueryDateBackward)
-+				queryStr.append(" AND `date` < :date");
-+			else if (type == QueryDateForward)
-+				queryStr.append(" AND `date` >= :date");
-+			if (type == QueryLatest || type == QueryDateBackward)
-+				queryStr.append(" ORDER BY `date` DESC");
-+			else
-+				queryStr.append(" ORDER BY `date` ASC");
-+			queryStr.append(" LIMIT :start, :cnt;");
-+			break;
-+		case QueryRowCount:
-+		case QueryRowCountBefore:
-+			queryStr = "SELECT count(*) AS `count`"
-+				" FROM `events`, `contacts`"
-+				" WHERE `contacts`.`id` = `contact_id`";
-+			if (!allContacts)
-+				queryStr.append(" AND `jid` = :jid");
-+			if (!allAccounts)
-+				queryStr.append(" AND `acc_id` = :acc_id");
-+			if (type == QueryRowCountBefore)
-+				queryStr.append(" AND `date` < :date");
-+			queryStr.append(";");
-+			break;
-+		case QueryJidRowId:
-+			queryStr = "SELECT `id` FROM `contacts` WHERE `jid` = :jid AND acc_id = :acc_id;";
-+			break;
-+		case QueryFindText:
-+			queryStr = "SELECT `acc_id`, `events`.`id`, `jid`, `date`, `events`.`type`, `direction`, `subject`, `m_text`, `lang`, `extra_data`"
-+				" FROM `events`, `contacts`"
-+				" WHERE `contacts`.`id` = `contact_id`";
-+			if (!allContacts)
-+				queryStr.append(" AND `jid` = :jid");
-+			if (!allAccounts)
-+				queryStr.append(" AND `acc_id` = :acc_id");
-+			queryStr.append(" AND `m_text` IS NOT NULL");
-+			queryStr.append(" ORDER BY `date`;");
-+			break;
-+		case QueryInsertEvent:
-+			queryStr = "INSERT INTO `events` ("
-+				"`contact_id`, `resource`, `date`, `type`, `direction`, `subject`, `m_text`, `lang`, `extra_data`"
-+				") VALUES ("
-+				":contact_id, :resource, :date, :type, :direction, :subject, :m_text, :lang, :extra_data"
-+				");";
-+			break;
-+	}
-+	return queryStr;
-+}
-+
-+uint qHash(const QueryProperty &struc)
-+{
-+	uint res = struc.type;
-+	res <<= 8;
-+	res |=  struc.allAccounts;
-+	res <<= 8;
-+	res |=  struc.allContacts;
-+	return res;
-+}
---- git.orig/src/eventdb.h
-+++ git/src/eventdb.h
-@@ -26,23 +26,27 @@
- #include <QFile>
- #include <QSharedPointer>
- #include <QDateTime>
-+#include <QSqlDatabase>
-+#include <QSqlQuery>
-+#include <QSqlRecord>
-+#include <QHash>
-+#include <QVariant>
- 
- #include "xmpp_jid.h"
-+#include "psicon.h"
- #include "psievent.h"
- 
- class EDBItem
- {
- public:
--	EDBItem(const PsiEvent::Ptr &, const QString &id, const QString &nextId, const QString &prevId);
-+	EDBItem(const PsiEvent::Ptr &, const QString &id);
- 	~EDBItem();
- 
- 	PsiEvent::Ptr event() const;
- 	const QString & id() const;
--	const QString & nextId() const;
--	const QString & prevId() const;
- 
- private:
--	QString v_id, v_prevId, v_nextId;
-+	QString v_id;
- 	PsiEvent::Ptr e;
- };
- 
-@@ -59,18 +63,16 @@ public:
- 	~EDBHandle();
- 
- 	// operations
--	void getLatest(const XMPP::Jid &, int len);
--	void getOldest(const XMPP::Jid &, int len);
--	void get(const XMPP::Jid &jid, const QString &id, int direction, int len);
--	void getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last);
--	void find(const QString &, const XMPP::Jid &, const QString &id, int direction);
--	void append(const XMPP::Jid &, const PsiEvent::Ptr &);
--	void erase(const XMPP::Jid &);
-+	void get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int begin, int len);
-+	void find(const QString &accId, const QString &, const XMPP::Jid &, const QDateTime date, int direction);
-+	void append(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int);
-+	void erase(const QString &accId, const XMPP::Jid &);
- 
- 	bool busy() const;
- 	const EDBResult result() const;
- 	bool writeSuccess() const;
- 	int lastRequestType() const;
-+	int beginRow() const;
- 
- signals:
- 	void finished();
-@@ -90,20 +92,30 @@ class EDB : public QObject
- 	Q_OBJECT
- public:
- 	enum { Forward, Backward };
--	EDB();
-+	enum { Contact = 1, GroupChatContact = 2 };
-+	struct ContactItem
-+	{
-+		QString   accId;
-+		XMPP::Jid jid;
-+		ContactItem(const QString &aId, XMPP::Jid j) { accId = aId; jid = j; }
-+	};
-+
-+	EDB(PsiCon *psi);
- 	virtual ~EDB()=0;
-+	virtual QList<ContactItem> contacts(const QString &accId, int type) = 0;
-+	virtual quint64 eventsCount(const QString &accId, const XMPP::Jid &jid) = 0;
-+	virtual QString getStorageParam(const QString &key) = 0;
-+	virtual void setStorageParam(const QString &key, const QString &val) = 0;
- 
- protected:
- 	int genUniqueId() const;
--	virtual int getLatest(const XMPP::Jid &, int len)=0;
--	virtual int getOldest(const XMPP::Jid &, int len)=0;
--	virtual int get(const XMPP::Jid &jid, const QString &id, int direction, int len)=0;
--	virtual int getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last) = 0;
--	virtual int append(const XMPP::Jid &, const PsiEvent::Ptr &)=0;
--	virtual int find(const QString &, const XMPP::Jid &, const QString &id, int direction)=0;
--	virtual int erase(const XMPP::Jid &)=0;
--	void resultReady(int, EDBResult);
-+	virtual int get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int start, int len)=0;
-+	virtual int append(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int)=0;
-+	virtual int find(const QString &accId, const QString &, const XMPP::Jid &, const QDateTime date, int direction)=0;
-+	virtual int erase(const QString &accId, const XMPP::Jid &)=0;
-+	void resultReady(int, EDBResult, int);
- 	void writeFinished(int, bool);
-+	inline PsiCon *psi();
- 
- private:
- 	class Private;
-@@ -113,29 +125,27 @@ private:
- 	void reg(EDBHandle *);
- 	void unreg(EDBHandle *);
- 
--	int op_getLatest(const XMPP::Jid &, int len);
--	int op_getOldest(const XMPP::Jid &, int len);
--	int op_get(const XMPP::Jid &, const QString &id, int direction, int len);
--	int op_getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last);
--	int op_find(const QString &, const XMPP::Jid &, const QString &id, int direction);
--	int op_append(const XMPP::Jid &, const PsiEvent::Ptr&);
--	int op_erase(const XMPP::Jid &);
-+	int op_get(const QString &accId, const XMPP::Jid &, const QDateTime date, int direction, int start, int len);
-+	int op_find(const QString &accId, const QString &, const XMPP::Jid &, const QDateTime date, int direction);
-+	int op_append(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int);
-+	int op_erase(const QString &accId, const XMPP::Jid &);
- };
- 
- class EDBFlatFile : public EDB
- {
- 	Q_OBJECT
- public:
--	EDBFlatFile();
-+	EDBFlatFile(PsiCon *psi);
- 	~EDBFlatFile();
- 
--	int getLatest(const XMPP::Jid &, int len);
--	int getOldest(const XMPP::Jid &, int len);
--	int get(const XMPP::Jid &jid, const QString &id, int direction, int len);
--	int getByDate(const XMPP::Jid &jid, QDateTime first, QDateTime last);
--	int find(const QString &, const XMPP::Jid &, const QString &id, int direction);
--	int append(const XMPP::Jid &, const PsiEvent::Ptr&);
--	int erase(const XMPP::Jid &);
-+	int get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int start, int len);
-+	int find(const QString &accId, const QString &, const XMPP::Jid &, const QDateTime date, int direction);
-+	int append(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int);
-+	int erase(const QString &accId, const XMPP::Jid &);
-+	QList<ContactItem> contacts(const QString &accId, int type);
-+	quint64 eventsCount(const QString &accId, const XMPP::Jid &jid);
-+	QString getStorageParam(const QString &) {return QString();}
-+	void setStorageParam(const QString &, const QString &) {}
- 
- 	class File;
- 
-@@ -160,11 +170,14 @@ public:
- 	~File();
- 
- 	int total() const;
-+	int getId(QDateTime &date, int dir, int offset);
- 	void touch();
- 	PsiEvent::Ptr get(int);
- 	bool append(const PsiEvent::Ptr &);
- 
- 	static QString jidToFileName(const XMPP::Jid &);
-+	static QString strToFileName(const QString &);
-+	static QList<EDB::ContactItem> contacts(int type);
- 
- signals:
- 	void timeout();
-@@ -186,6 +199,145 @@ private:
- 	PsiEvent::Ptr lineToEvent(const QString &);
- 	QString eventToLine(const PsiEvent::Ptr&);
- 	void ensureIndex();
-+	int findIdByNearDate(QDateTime &date, int start, int end);
-+	QString getLine(int);
-+	QDateTime getLineDate(const QString &line) const;
-+};
-+
-+enum QueryType {
-+	QueryContactsList,
-+	QueryLatest, QueryOldest,
-+	QueryDateForward, QueryDateBackward,
-+	QueryFindText,
-+	QueryRowCount, QueryRowCountBefore,
-+	QueryJidRowId,
-+	QueryInsertEvent
-+};
-+
-+struct QueryProperty
-+{
-+	QueryType type;
-+	bool      allAccounts;
-+	bool      allContacts;
-+	QueryProperty(QueryType tp, bool allAcc, bool allCont) {
-+		type        = tp;
-+		allAccounts = allAcc;
-+		allContacts = allCont;
-+	}
-+	bool operator==(const QueryProperty &other) const {
-+		return (type        == other.type &&
-+				allAccounts == other.allAccounts &&
-+				allContacts == other.allContacts);
-+	}
-+};
-+uint qHash(const QueryProperty &struc);
-+
-+class EDBSqLite : public EDB
-+{
-+	Q_OBJECT
-+
-+	class QueryStorage;
-+	//--------
-+	class PreparedQuery : private QSqlQuery
-+	{
-+	public:
-+		void bindValue(const QString &placeholder, const QVariant &val) {QSqlQuery::bindValue(placeholder, val);}
-+		bool exec() {return QSqlQuery::exec();}
-+		bool first() {return QSqlQuery::first();}
-+		bool next() {return QSqlQuery::next();}
-+		QSqlRecord record() const {return QSqlQuery::record();}
-+		void freeResult() {QSqlQuery::finish();}
-+	private:
-+		friend class QueryStorage;
-+		PreparedQuery(QSqlDatabase db);
-+		~PreparedQuery() {}
-+
-+	};
-+	//--------
-+	class QueryStorage
-+	{
-+	public:
-+		QueryStorage();
-+		~QueryStorage();
-+		PreparedQuery *getPreparedQuery(QueryType type, bool allAccounts, bool allContacts);
-+	private:
-+		QString getQueryString(QueryType type, bool allAccounts, bool allContacts);
-+	private:
-+		QHash<QueryProperty, PreparedQuery *> queryList;
-+	};
-+	//--------
-+
-+public:
-+	enum InsertMode {Normal, Import};
-+
-+	EDBSqLite(PsiCon *psi);
-+	~EDBSqLite();
-+	bool init();
-+
-+	int get(const QString &accId, const XMPP::Jid &jid, const QDateTime date, int direction, int start, int len);
-+	int find(const QString &accId, const QString &str, const XMPP::Jid &jid, const QDateTime date, int direction);
-+	int append(const QString &accId, const XMPP::Jid &jid, const PsiEvent::Ptr &e, int type);
-+	int erase(const QString &accId, const XMPP::Jid &jid);
-+	QList<ContactItem> contacts(const QString &accId, int type);
-+	quint64 eventsCount(const QString &accId, const XMPP::Jid &jid);
-+	QString getStorageParam(const QString &key);
-+	void setStorageParam(const QString &key, const QString &val);
-+
-+	void setInsertingMode(InsertMode mode);
-+	void setMirror(EDBFlatFile *mirr);
-+	EDBFlatFile *mirror() const;
-+
-+private:
-+	enum {NotActive, NotCommited, Commited};
-+	struct item_query_req
-+	{
-+		QString accId;
-+		XMPP::Jid j;
-+		int jidType;
-+		int type; // 0 = latest, 1 = oldest, 2 = random, 3 = write
-+		int start;
-+		int len;
-+		int dir;
-+		int id;
-+		QDateTime date;
-+		QString findStr;
-+		PsiEvent::Ptr event;
-+
-+		enum Type {
-+			Type_get,
-+			Type_append,
-+			Type_find,
-+			Type_erase
-+		};
-+	};
-+	int  status;
-+	unsigned int transactionsCounter;
-+	QDateTime lastCommitTime;
-+	unsigned int maxUncommitedRecs;
-+	int maxUncommitedSecs;
-+	unsigned int commitByTimeoutSecs;
-+	QTimer *commitTimer;
-+	EDBFlatFile *mirror_;
-+	QList<item_query_req*> rlist;
-+	QHash<QString, qint64>jidsCache;
-+	QueryStorage queryes;
-+
-+private:
-+	bool appendEvent(const QString &accId, const XMPP::Jid &, const PsiEvent::Ptr &, int);
-+	PsiEvent::Ptr getEvent(const QSqlRecord &record);
-+	qint64 ensureJidRowId(const QString &accId, const XMPP::Jid &jid, int type);
-+	int  rowCount(const QString &accId, const XMPP::Jid &jid, const QDateTime before);
-+	bool eraseHistory(const QString &accId, const XMPP::Jid &);
-+	bool transaction(bool now);
-+	bool rollback();
-+	void startAutocommitTimer();
-+	void stopAutocommitTimer();
-+	bool importExecute();
-+
-+private slots:
-+	void performRequests();
-+	bool commit();
-+
- };
- 
- #endif
---- git.orig/src/historydlg.cpp
-+++ git/src/historydlg.cpp
-@@ -101,7 +101,8 @@ public:
- 	Jid jid;
- 	PsiAccount *pa;
- 	PsiCon *psi;
--	QString id_prev, id_begin, id_end, id_next;
-+	int begin_row, end_row;
-+	bool can_backward, can_forward;
- 	HistoryDlg::RequestType reqType;
- 	QString findStr;
- 	QDate date;
-@@ -122,10 +123,12 @@ HistoryDlg::HistoryDlg(const Jid &jid, P
- 	setModal(false);
- 	d = new Private;
- 	d->reqType = TypeNone;
--	d->pa = pa;
-+	d->begin_row = 0;
-+	d->end_row = -1;
- 	d->psi = pa->psi();
- 	d->jid = jid;
--	d->pa->dialogRegister(this, d->jid);
-+	d->pa = pa;
-+	pa->dialogRegister(this, d->jid);
- 
- 	//workaround calendar size
- 	int minWidth = ui_.calendar->minimumSizeHint().width();
-@@ -133,7 +136,11 @@ HistoryDlg::HistoryDlg(const Jid &jid, P
- 	ui_.tb_find->setIcon(IconsetFactory::icon("psi/search").icon());
- 
- 	ui_.msgLog->setFont(fontForOption("options.ui.look.font.chat"));
--	ui_.jidList->setFont(fontForOption("options.ui.look.font.contactlist"));
-+	QFont f = fontForOption("options.ui.look.font.contactlist");
-+	ui_.jidList->setFont(f);
-+	ui_.jidList2->setFont(f);
-+	ui_.privList->setFont(f);
-+	ui_.advList->setFont(f);
- 
- 	ui_.calendar->setFirstDayOfWeek(firstDayOfWeekFromLocale());
- 
-@@ -142,7 +149,10 @@ HistoryDlg::HistoryDlg(const Jid &jid, P
- 	connect(ui_.buttonPrevious, SIGNAL(released()), SLOT(getPrevious()));
- 	connect(ui_.buttonNext, SIGNAL(released()), SLOT(getNext()));
- 	connect(ui_.buttonRefresh, SIGNAL(released()), SLOT(refresh()));
--	connect(ui_.jidList, SIGNAL(itemSelectionChanged()), SLOT(openSelectedContact()));
-+	connect(ui_.jidList, SIGNAL(clicked(QModelIndex)), SLOT(openSelectedContact()));
-+	connect(ui_.jidList2, SIGNAL(clicked(QModelIndex)), SLOT(openSelectedContact()));
-+	connect(ui_.privList, SIGNAL(clicked(QModelIndex)), SLOT(openSelectedContact()));
-+	connect(ui_.advList, SIGNAL(clicked(QModelIndex)), SLOT(openSelectedContact()));
- 	connect(ui_.tb_find, SIGNAL(clicked()), SLOT(findMessages()));
- 	connect(ui_.buttonLastest, SIGNAL(released()), SLOT(getLatest()));
- 	connect(ui_.buttonEarliest, SIGNAL(released()), SLOT(getEarliest()));
-@@ -159,16 +169,19 @@ HistoryDlg::HistoryDlg(const Jid &jid, P
- 	optionUpdated("options.ui.chat.legacy-formatting");
- 	connect(PsiOptions::instance(), SIGNAL(optionChanged(QString)), SLOT(optionUpdated(QString)));
- 
--	connect(d->pa, SIGNAL(removedContact(PsiContact*)), SLOT(removedContact(PsiContact*)));
-+	connect(pa, SIGNAL(removedContact(PsiContact*)), SLOT(removedContact(PsiContact*)));
- 
- 	ui_.jidList->installEventFilter(this);
-+	ui_.jidList2->installEventFilter(this);
-+	ui_.privList->installEventFilter(this);
-+	ui_.advList->installEventFilter(this);
- 
- 	listAccounts();
- 	loadContacts();
- 
- 	setGeometryOptionPath(geometryOption);
- 
--	ui_.jidList->setFocus();
-+	openSelectedContact();
- }
- 
- HistoryDlg::~HistoryDlg()
-@@ -178,7 +191,7 @@ HistoryDlg::~HistoryDlg()
- 
- bool HistoryDlg::eventFilter(QObject *obj, QEvent *e)
- {
--	if(obj == ui_.jidList && e->type() == QEvent::ContextMenu) {
-+	if((obj == ui_.jidList || obj == ui_.jidList2 || obj == ui_.privList || obj == ui_.advList) && e->type() == QEvent::ContextMenu) {
- 		e->accept();
- 		QTimer::singleShot(0, this, SLOT(doMenu()));
- 		return true;
-@@ -199,72 +212,189 @@ void HistoryDlg::changeAccount(const QSt
- 	ui_.msgLog->clear();
- 	setButtons(false);
- 	d->jid = QString();
--	d->pa = d->psi->contactList()->getAccountByJid(ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).toString());
- 	loadContacts();
--	ui_.jidList->setCurrentRow(0);
-+	setCurrentUserListItem();
- 	openSelectedContact();
- }
- 
-+void HistoryDlg::setCurrentUserListItem()
-+{
-+	switch (ui_.contactToolBox->currentIndex()) {
-+	case 0:
-+		ui_.jidList->setCurrentRow(0);
-+		break;
-+	case 1:
-+		ui_.jidList2->setCurrentRow(0);
-+		break;
-+	case 2:
-+		ui_.privList->setCurrentRow(0);
-+		break;
-+	case 3:
-+		ui_.advList->setCurrentRow(0);
-+		break;
-+	}
-+}
-+
- void HistoryDlg::listAccounts()
- {
-+	ui_.accountsBox->addItem(IconsetFactory::icon("psi/account").icon(), tr("All accounts"), QVariant());
- 	if (d->psi)
- 	{
- 		foreach (PsiAccount* account, d->psi->contactList()->enabledAccounts())
--			ui_.accountsBox->addItem(IconsetFactory::icon("psi/account").icon(), account->nameWithJid(), QVariant(account->jid().full()));
-+			ui_.accountsBox->addItem(IconsetFactory::icon("psi/account").icon(), account->nameWithJid(), QVariant(account->id()));
- 	}
- 	//select active account
--	ui_.accountsBox->setCurrentIndex(ui_.accountsBox->findData(d->pa->jid().full()));
-+	ui_.accountsBox->setCurrentIndex(ui_.accountsBox->findData(getCurrentAccountId()));
- 	//connect signal after the list is populated to prevent execution in the middle of the loop
- 	connect(ui_.accountsBox, SIGNAL(currentIndexChanged(const QString)), SLOT(changeAccount(const QString)));
- }
- 
- void HistoryDlg::loadContacts()
- {
--	jids_.clear();
-+	QStringList jids;
- 	ui_.jidList->clear();
-+	ui_.jidList2->clear();
-+	ui_.privList->clear();
-+	ui_.advList->clear();
- 	ui_.msgLog->clear();
--	foreach (PsiContact* contact, d->pa->contactList())
--	{
-+	QList<PsiContact*> contactList;
-+	QString pa_id = ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).toString();
-+	if (pa_id.isEmpty())
-+		contactList = d->psi->contactList()->contacts();
-+	else
-+		contactList = d->psi->contactList()->getAccount(pa_id)->contactList();
-+	// Roster contacts
-+	foreach (PsiContact* contact, contactList) {
- 		if(contact->isConference()
--		|| contact->isPrivate()
--		|| jids_.contains(contact->jid().bare()))
-+		|| contact->isPrivate())
-+			continue;
-+		QString contactId = contact->account()->id() + "|" + contact->jid().bare();
-+		if (jids.contains(contactId))
- 			continue;
- 
- 		QListWidgetItem *item = new QListWidgetItem(contact->name(), ui_.jidList);
--		item->setToolTip(contact->jid().bare());
-+		item->setToolTip(makeContactToolTip(contact, true));
- 		item->setIcon(PsiIconset::instance()->statusPtr(contact->jid(),Status(Status::Online))->icon());
- 		//item->setIcon(PsiIconset::instance()->status(contact->status()).icon());
-+		item->setStatusTip(contactId);
- 		ui_.jidList->addItem(item);
--		jids_.append(item->toolTip());
-+		jids.append(contactId);
-+		if (contact->jid().bare() == d->jid.bare()) {
-+			ui_.contactToolBox->setCurrentIndex(0);
-+			ui_.jidList->setCurrentItem(item);
-+		}
- 	}
--	PsiContact* self = d->pa->selfContact();
--	if(!jids_.contains(self->jid().bare())) {
--		QListWidgetItem *item = new QListWidgetItem(self->name(), ui_.jidList);
--		item->setToolTip(self->jid().bare());
--		//item->setIcon(PsiIconset::instance()->status(self->status()).icon());
--		item->setIcon(PsiIconset::instance()->statusPtr(self->jid(),Status(Status::Online))->icon());
--		ui_.jidList->addItem(item);
--		jids_.append(item->toolTip());
-+	// Self contact
-+	QString currentAccountId = ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).toString();
-+	foreach (PsiAccount *pa, d->psi->contactList()->accounts()) {
-+		if (currentAccountId.isEmpty() || pa->id() == currentAccountId)
-+		{
-+			PsiContact* self = pa->selfContact();
-+			QString contactId = pa->id() + "|" + self->jid().bare();
-+			if(!jids.contains(contactId)) {
-+				QListWidgetItem *item = new QListWidgetItem(self->name(), ui_.jidList);
-+				item->setToolTip(makeContactToolTip(self, true));
-+				item->setIcon(PsiIconset::instance()->statusPtr(self->jid(),Status(Status::Online))->icon());
-+				item->setStatusTip(contactId);
-+				ui_.jidList->addItem(item);
-+				jids.append(contactId);
-+				if (self->jid().bare() == d->jid.bare()) {
-+					ui_.contactToolBox->setCurrentIndex(0);
-+					ui_.jidList->setCurrentItem(item);
-+				}
-+			}
-+			if (!currentAccountId.isEmpty())
-+				break;
-+		}
- 	}
--
--	ui_.jidList->sortItems();
--	//set contact in jidList to selected jid
--	for (int i = 0; i < ui_.jidList->count(); i++)
-+	// Not in roster list
-+	foreach (const EDB::ContactItem &ci, d->psi->edb()->contacts(pa_id, EDB::Contact)) {
-+		QString contactId = ci.accId + "|" + ci.jid.bare();
-+		if (!jids.contains(contactId)) {
-+			QListWidgetItem *item = new QListWidgetItem(ci.jid.bare(), ui_.jidList2);
-+			item->setToolTip(makeContactToolTip(ci.accId, ci.jid, true));
-+			item->setIcon(PsiIconset::instance()->statusPtr(ci.jid, Status(Status::Offline))->icon());
-+			item->setStatusTip(contactId);
-+			ui_.jidList2->addItem(item);
-+			if (ci.jid.bare() == d->jid.bare()) {
-+				ui_.contactToolBox->setCurrentIndex(1);
-+				ui_.jidList2->setCurrentItem(item);
-+			}
-+		}
-+	}
-+	// Private
-+	foreach (const EDB::ContactItem &ci, d->psi->edb()->contacts(pa_id, EDB::GroupChatContact)) {
-+		QString contactId = ci.accId + "|" + ci.jid.full();
-+		QListWidgetItem *item = new QListWidgetItem(ci.jid.resource(), ui_.privList);
-+		item->setToolTip(makeContactToolTip(ci.accId, ci.jid, false));
-+		item->setIcon(PsiIconset::instance()->statusPtr(ci.jid, Status(Status::Offline))->icon());
-+		item->setStatusTip(contactId);
-+		ui_.privList->addItem(item);
-+		if (ci.jid == d->jid) {
-+			ui_.contactToolBox->setCurrentIndex(2);
-+			ui_.privList->setCurrentItem(item);
-+		}
-+	}
-+	// Advanced
- 	{
--		if (ui_.jidList->item(i)->toolTip() == d->jid.bare().toLower())
--			ui_.jidList->setCurrentRow(i);  //triggers openSelectedContact()
-+		QListWidgetItem *item = new QListWidgetItem(tr("All contacts"), ui_.advList);
-+		item->setToolTip(tr("All contacts"));
-+		item->setStatusTip(QString());
-+		ui_.advList->addItem(item);
- 	}
-+
-+	ui_.jidList->sortItems();
-+	ui_.jidList2->sortItems();
-+	ui_.privList->sortItems();
- }
- 
- void HistoryDlg::openSelectedContact()
- {
- 	ui_.msgLog->clear();
--	UserListItem *u = currentUserListItem();
--	if (!u)
--		return;
- 
--	setWindowTitle(u->name() + " (" + u->jid().full() + ")");
--	d->jid = u->jid();
-+	QListWidget *contactList = NULL;
-+	switch (ui_.contactToolBox->currentIndex()) {
-+		case 0:
-+			contactList = ui_.jidList;
-+			break;
-+		case 1:
-+			contactList = ui_.jidList2;
-+			break;
-+		case 2:
-+			contactList = ui_.privList;
-+			break;
-+	}
-+	d->pa = 0;
-+	d->jid = XMPP::Jid();
-+	if (contactList) {
-+		QListWidgetItem *item = contactList->currentItem();
-+		if (item) {
-+			QString sId = item->statusTip();
-+			if (!sId.isEmpty())
-+			{
-+				d->pa = d->psi->contactList()->getAccount(sId.section('|', 0, 0));
-+				d->jid = XMPP::Jid(sId.section('|', 1, -1));
-+			}
-+		}
-+	}
-+
-+	QString sTitle;
-+	if (!d->jid.isEmpty()) {
-+		UserListItem *u = currentUserListItem();
-+		if (u) {
-+			sTitle = u->name() + " (" + u->jid().full() + ")";
-+		}
-+		else {
-+			sTitle = d->jid.full();
-+		}
-+	}
-+	else {
-+		QString paId = ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).toString();
-+		if (!paId.isEmpty())
-+			d->pa = d->psi->contactList()->getAccount(paId);
-+		sTitle = tr("All contacts");
-+	}
-+	setWindowTitle(sTitle);
- 	getLatest();
- }
- 
-@@ -301,35 +431,38 @@ void HistoryDlg::findMessages()
- 	//get the oldest event as a starting point
- 	startRequest();
- 	d->reqType = TypeFindOldest;
--	getEDBHandle()->getOldest(d->jid, 1);
-+	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Forward, 0, 1);
- }
- 
- void HistoryDlg::removeHistory()
- {
- 	int res = QMessageBox::question(this, tr("Remove history"),
--					tr("Are you sure you want to completely remove history for a contact %1?").arg(d->jid.bare())
-+					tr("Are you sure you want to completely remove history for a contact %1?").arg(d->jid.full())
- 					,QMessageBox::Ok | QMessageBox::Cancel);
- 	if(res == QMessageBox::Ok) {
--		getEDBHandle()->erase(d->jid);
-+		getEDBHandle()->erase(getCurrentAccountId(), d->jid);
- 		openSelectedContact();
- 	}
- }
- 
- void HistoryDlg::openChat()
- {
--	UserListItem *u = currentUserListItem();
--	if(u) {
--		d->pa->actionOpenChat2(u->jid().bare());
--	}
-+	if (d->pa && !d->jid.isEmpty())
-+		d->pa->actionOpenChat2(d->jid);
- }
- 
- void HistoryDlg::exportHistory()
- {
- 	UserListItem *u = currentUserListItem();
--	if(!u)
--		return;
--	QString them = JIDUtil::nickOrJid(u->name(), u->jid().full());
--	QString s = JIDUtil::encode(them).toLower();
-+	QString them;
-+	if(u) {
-+		them = JIDUtil::nickOrJid(u->name(), u->jid().full());
-+	} else {
-+		//if (d->jid.isEmpty())
-+		//	return;
-+		them = d->jid.full();
-+	}
-+	QString s = (!them.isEmpty()) ? JIDUtil::encode(them).toLower() : "all_contacts";
- 	QString fname = FileUtil::getSaveFileName(this,
- 						  tr("Export message history"),
- 						  s + ".txt",
-@@ -344,19 +477,22 @@ void HistoryDlg::exportHistory()
- 	}
- 	QTextStream stream(&f);
- 
--	QString us = d->pa->nick();
--
--	EDBHandle* h;
--	QString id;
-+	int start = 0;
- 	startRequest();
--	while(1) {
--		h = new EDBHandle(d->pa->edb());
--		if(id.isEmpty()) {
--			h->getOldest(d->jid, 1000);
--		}
--		else {
--			h->get(d->jid, id, EDB::Forward, 1000);
-+	QString paId = getCurrentAccountId();
-+	int max = 0;
-+	{
-+		quint64 edbCnt = d->psi->edb()->eventsCount(paId, d->jid);
-+		if (edbCnt > 1000) {
-+			max = edbCnt / 1000;
-+			if ((edbCnt % 1000) != 0)
-+				++max;
-+			showProgress(max);
- 		}
-+	}
-+	while(1) {
-+		EDBHandle *h = new EDBHandle(d->psi->edb());
-+		h->get(paId, d->jid, QDateTime(), EDB::Forward, start, 1000);
- 		while(h->busy()) {
- 			qApp->processEvents();
- 		}
-@@ -367,7 +503,6 @@ void HistoryDlg::exportHistory()
- 		// events are in forward order
- 		for(int i = 0; i < cnt; ++i) {
- 			EDBItemPtr item = r.value(i);
--			id = item->nextId();
- 			PsiEvent::Ptr e(item->event());
- 			QString txt;
- 
-@@ -375,10 +510,16 @@ void HistoryDlg::exportHistory()
- 
- 			QString nick;
- 			if(e->originLocal()) {
--				nick = us;
-+				if (e->account())
-+					nick = e->account()->nick();
-+				else
-+					nick = tr("deleted");
- 			}
- 			else {
--				nick = them;
-+				if (!them.isEmpty())
-+					nick = them;
-+				else
-+					nick = e->from().full();
- 			}
- 
- 			if(e->type() == PsiEvent::Message) {
-@@ -401,10 +542,14 @@ void HistoryDlg::exportHistory()
- 		}
- 		delete h;
- 
-+		if (max > 0)
-+			incrementProgress();
-+
- 		// done!
--		if(cnt == 0 || id.isEmpty()) {
-+		if(cnt == 0)
- 			break;
--		}
-+
-+		start += 1000;
- 	}
- 	f.close();
- 	stopRequest();
-@@ -412,11 +557,16 @@ void HistoryDlg::exportHistory()
- 
- void HistoryDlg::doMenu()
- {
--	QMenu *m = new QMenu(ui_.jidList);
--	m->addAction(IconsetFactory::icon("psi/chat").icon(), tr("&Open chat"), this, SLOT(openChat()));
-+	openSelectedContact();
-+	bool fAll = (!d->pa || d->jid.isEmpty());
-+	QMenu *m = new QMenu();
-+	if (!fAll)
-+		m->addAction(IconsetFactory::icon("psi/chat").icon(), tr("&Open chat"), this, SLOT(openChat()));
- 	m->addAction(IconsetFactory::icon("psi/save").icon(), tr("&Export history"), this, SLOT(exportHistory()));
--	m->addAction(IconsetFactory::icon("psi/clearChat").icon(), tr("&Delete history"), this, SLOT(removeHistory()));
-+	if (!fAll)
-+		m->addAction(IconsetFactory::icon("psi/clearChat").icon(), tr("&Delete history"), this, SLOT(removeHistory()));
- 	m->exec(QCursor::pos());
-+	delete m;
- }
- 
- void HistoryDlg::edbFinished()
-@@ -437,28 +587,22 @@ void HistoryDlg::edbFinished()
- 			if (d->reqType == TypeLatest || d->reqType == TypePrevious)
- 			{
- 				// events are in backward order
--				// first entry is the end event
--				EDBItemPtr it = r.first();
--				d->id_end = it->id();
--				d->id_next = it->nextId();
--				// last entry is the begin event
--				it = r.last();
--				d->id_begin = it->id();
--				d->id_prev = it->prevId();
--				displayResult(r, EDB::Forward);
-+				d->begin_row = h->beginRow();
-+				d->end_row = d->begin_row + r.count() - 1;
-+
-+				d->can_backward = (d->begin_row > 0);
-+				d->can_forward = (d->reqType != TypeLatest);
-+				displayResult(r, (d->reqType == TypeLatest) ? EDB::Forward : EDB::Backward);
- 				setButtons();
- 			}
- 			else if (d->reqType == TypeEarliest || d->reqType == TypeNext || d->reqType == TypeDate)
- 			{
- 				// events are in forward order
--				// last entry is the end event
--				EDBItemPtr it = r.last();
--				d->id_end = it->id();
--				d->id_next = it->nextId();
--				// first entry is the begin event
--				it = r.first();
--				d->id_begin = it->id();
--				d->id_prev = it->prevId();
-+				d->begin_row = h->beginRow();
-+				d->end_row = d->begin_row + r.count() - 1;
-+
-+				d->can_backward = (d->begin_row > 0);
-+				d->can_forward = true;
- 				displayResult(r, EDB::Backward);
- 				setButtons();
- 			}
-@@ -473,14 +617,15 @@ void HistoryDlg::edbFinished()
- 				{
- 					d->reqType = TypeFind;
- 					d->findStr = str;
--					EDBItemPtr ei = r.first();
- 					startRequest();
--					getEDBHandle()->find(str, d->jid, ei->id(), EDB::Forward);
-+					getEDBHandle()->find(getCurrentAccountId(), str, d->jid, QDateTime(), EDB::Forward);
- 					setButtons();
- 				}
- 			}
- 			else if (d->reqType == TypeFind)
- 			{
-+				d->begin_row = 0;
-+				d->end_row = r.count() - 1;
- 				displayResult(r, EDB::Forward);
- 				highlightBlocks(ui_.searchField->text());
- 			}
-@@ -488,7 +633,29 @@ void HistoryDlg::edbFinished()
- 		}
- 		else
- 		{
--			ui_.msgLog->clear();
-+			// no more data. TODO: visualization is needed.
-+			bool buttons_updated = false;
-+			if (d->reqType == TypePrevious)
-+			{
-+				d->can_backward = false;
-+				buttons_updated = true;
-+			}
-+			else if (d->reqType == TypeLatest || d->reqType == TypeEarliest)
-+			{
-+				d->can_backward = false;
-+				d->can_forward = false;
-+				buttons_updated = true;
-+			}
-+			else if (d->reqType == TypeNext || d->reqType == TypeDate)
-+			{
-+				d->can_forward = false;
-+				buttons_updated = true;
-+			}
-+			if (d->reqType == TypeFind)
-+				ui_.msgLog->clear();
-+
-+			if (buttons_updated)
-+				setButtons();
- 		}
- 	}
- 	delete h;
-@@ -496,10 +663,10 @@ void HistoryDlg::edbFinished()
- 
- void HistoryDlg::setButtons()
- {
--	ui_.buttonPrevious->setEnabled(!d->id_prev.isEmpty());
--	ui_.buttonNext->setEnabled(!d->id_next.isEmpty());
--	ui_.buttonEarliest->setEnabled(!d->id_prev.isEmpty());
--	ui_.buttonLastest->setEnabled(!d->id_next.isEmpty());
-+	ui_.buttonPrevious->setEnabled(d->can_backward);
-+	ui_.buttonNext->setEnabled(d->can_forward);
-+	ui_.buttonEarliest->setEnabled(d->can_backward);
-+	ui_.buttonLastest->setEnabled(d->can_forward);
- }
- 
- void HistoryDlg::setButtons(bool act)
-@@ -521,28 +688,29 @@ void HistoryDlg::getLatest()
- {
- 	d->reqType = TypeLatest;
- 	startRequest();
--	getEDBHandle()->getLatest(d->jid, 50);
-+	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Backward, 0, 50);
- }
- 
- void HistoryDlg::getEarliest()
- {
- 	d->reqType = TypeEarliest;
- 	startRequest();
--	getEDBHandle()->getOldest(d->jid, 50);
-+	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Forward, 0, 50);
- }
- 
- void HistoryDlg::getPrevious()
- {
- 	d->reqType = TypePrevious;
- 	ui_.buttonPrevious->setEnabled(false);
--	getEDBHandle()->get(d->jid, d->id_prev, EDB::Backward, 50);
-+	int begin = (d->begin_row < 50) ? 0 : d->begin_row - 50;
-+	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Forward, begin, 50);
- }
- 
- void HistoryDlg::getNext()
- {
- 	d->reqType = TypeNext;
- 	ui_.buttonNext->setEnabled(false);
--	getEDBHandle()->get(d->jid, d->id_next, EDB::Forward, 50);
-+	getEDBHandle()->get(getCurrentAccountId(), d->jid, QDateTime(), EDB::Forward, d->end_row + 1, 50);
- }
- 
- void HistoryDlg::getDate()
-@@ -550,23 +718,33 @@ void HistoryDlg::getDate()
- 	const QDate date = ui_.calendar->selectedDate();
- 	d->reqType = TypeDate;
- 	d->date = date;
--	QDateTime first (d->date);
--	QDateTime last = first.addDays(1);
-+	QDateTime first(d->date);
- 	startRequest();
--	getEDBHandle()->getByDate(d->jid, first, last);
-+	getEDBHandle()->get(getCurrentAccountId(), d->jid, first, EDB::Forward, 0, 50);
- }
- 
- void HistoryDlg::removedContact(PsiContact *pc)
- {
--	QString jid = pc->jid().bare().toLower();
--	QString curJid  = ui_.jidList->currentItem()->toolTip();
-+	QString contactId = pc->account()->id() + "|" + pc->jid().bare().toLower();
-+	QString curId;
-+	QListWidgetItem *lwi = ui_.jidList->currentItem();
-+	if (lwi)
-+		curId = lwi->statusTip();
- 	for(int i = 0; i < ui_.jidList->count(); i++) {
- 		QListWidgetItem *it = ui_.jidList->item(i);
--		if(it && it->toolTip() == jid) {
-+		if(it && it->statusTip() == contactId) {
- 			ui_.jidList->removeItemWidget(it);
--			if(jid == curJid) {
-+			it = new QListWidgetItem(pc->jid().bare(), ui_.jidList2);
-+			it->setToolTip(makeContactToolTip(pc, true));
-+			it->setIcon(PsiIconset::instance()->statusPtr(pc->jid().bare(), Status(Status::Offline))->icon());
-+			it->setStatusTip(contactId);
-+			ui_.jidList2->addItem(it);
-+			if(contactId == curId) {
- 				ui_.jidList->setCurrentRow(0);
--				openSelectedContact();
-+				if (ui_.contactToolBox->currentIndex() == 0) {
-+					ui_.jidList2->setCurrentItem(it);
-+					ui_.contactToolBox->setCurrentIndex(1);
-+				}
- 			}
- 			break;
- 		}
-@@ -597,38 +775,53 @@ void HistoryDlg::autoCopy()
- 	}
- }
- #endif
--void HistoryDlg::displayResult(const EDBResult r, int direction, int max)
-+void HistoryDlg::displayResult(const EDBResult &r, int direction, int max)
- {
- 	int i  = (direction == EDB::Forward) ? r.count() - 1 : 0;
- 	int at = 0;
- 	ui_.msgLog->clear();
--	QString nick = TextUtil::plain2rich(d->pa->nick());
-+	bool fAll = d->jid.isEmpty();
- 	while (i >= 0 && i <= r.count() - 1 && (max == -1 ? true : at < max))
- 	{
- 		EDBItemPtr item = r.value(i);
- 		PsiEvent::Ptr e(item->event());
--		UserListItem *u = d->pa->findFirstRelevant(e->from().full());
--		if(u) {
--			QString from = JIDUtil::nickOrJid(u->name(), u->jid().full());
--			if (e->type() == PsiEvent::Message)
-+		if (e->type() == PsiEvent::Message) {
-+			PsiAccount *pa = e->account();
-+			QString from;
-+			if (pa)
- 			{
--				MessageEvent::Ptr me = e.staticCast<MessageEvent>();
--				QString msg = me->message().body();
--				msg = TextUtil::linkify(TextUtil::plain2rich(msg));
--
--				if (d->emoticons)
--					msg = TextUtil::emoticonify(msg);
--				if (d->formatting)
--					msg = TextUtil::legacyFormat(msg);
--
--				if (me->originLocal())
--					msg = "<span style='color:"+d->sentColor+"'>" + me->timeStamp().toString("dd.MM.yyyy hh:mm:ss")+" &lt;"+ nick +"&gt; " + msg + "</span>";
--				else
--					msg = "<span style='color:"+d->receivedColor+"'>" + me->timeStamp().toString("dd.MM.yyyy hh:mm:ss") + " &lt;" +  TextUtil::plain2rich(from) + "&gt; " + msg + "</span>";
--
--				ui_.msgLog->appendText(msg);
-+				UserListItem *u = pa->findFirstRelevant(e->from().full());
-+				if(u) {
-+					if (!u->name().trimmed().isEmpty())
-+						from = u->name().trimmed();
-+				}
-+			}
-+			if (from.isEmpty())
-+			{
-+				from = e->from().resource().trimmed(); // for offline conferences
-+				if (from.isEmpty())
-+						from = e->from().node();
-+			}
-+			MessageEvent::Ptr me = e.staticCast<MessageEvent>();
-+			QString msg = me->message().body();
-+			msg = TextUtil::linkify(TextUtil::plain2rich(msg));
-+
-+			if (d->emoticons)
-+				msg = TextUtil::emoticonify(msg);
-+			if (d->formatting)
-+				msg = TextUtil::legacyFormat(msg);
- 
-+			if (me->originLocal())
-+			{
-+				QString nick = (pa) ? TextUtil::plain2rich(pa->nick()) : tr("deleted");
-+				msg = "<span style='color:" + d->sentColor + "'>" + me->timeStamp().toString("dd.MM.yyyy hh:mm:ss") + " &lt;" + nick
-+					+ ((fAll) ? QString(" -> %1").arg(TextUtil::plain2rich(from)) : QString())
-+					+ "&gt; " + msg + "</span>";
- 			}
-+			else
-+				msg = "<span style='color:" + d->receivedColor + "'>" + me->timeStamp().toString("dd.MM.yyyy hh:mm:ss") + " &lt;" +  TextUtil::plain2rich(from) + "&gt; " + msg + "</span>";
-+
-+			ui_.msgLog->appendText(msg);
- 		}
- 
- 		++at;
-@@ -641,11 +834,9 @@ void HistoryDlg::displayResult(const EDB
- UserListItem* HistoryDlg::currentUserListItem() const
- {
- 	UserListItem* u = 0;
--	QListWidgetItem *i = ui_.jidList->currentItem();
--	if(!i)
--		return u;
--
--	u = d->pa->findFirstRelevant(i->toolTip());
-+	if (d->pa && !d->jid.isEmpty()) {
-+		u = d->pa->findFirstRelevant(d->jid);
-+	}
- 	return u;
- }
- 
-@@ -662,6 +853,7 @@ void HistoryDlg::stopRequest()
- 	if(ui_.busy->isActive()) {
- 		ui_.busy->stop();
- 	}
-+	ui_.progressBar->setVisible(false);
- 	setEnabled(true);
- #ifdef Q_OS_MAC
- 	// To workaround a Qt bug
-@@ -670,9 +862,46 @@ void HistoryDlg::stopRequest()
- #endif
- }
- 
-+void HistoryDlg::showProgress(int max)
-+{
-+	ui_.progressBar->setValue(0);
-+	ui_.progressBar->setMaximum(max);
-+	ui_.progressBar->setVisible(true);
-+}
-+
-+void HistoryDlg::incrementProgress()
-+{
-+	ui_.progressBar->setValue(ui_.progressBar->value() + 1);
-+}
-+
- EDBHandle* HistoryDlg::getEDBHandle()
- {
--	EDBHandle* h = new EDBHandle(d->pa->edb());
-+	EDBHandle* h = new EDBHandle(d->psi->edb());
- 	connect(h, SIGNAL(finished()), SLOT(edbFinished()));
- 	return h;
- }
-+
-+QString HistoryDlg::makeContactToolTip(const PsiContact *contact, bool bare) const
-+{
-+	QString jidStr = JIDUtil::toString(contact->jid(), !bare);
-+	if (ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).isNull())
-+		jidStr.append(QString(" %1").arg(contact->account()->name()));
-+	return jidStr;
-+}
-+
-+QString HistoryDlg::makeContactToolTip(const QString &accId, const XMPP::Jid &jid, bool bare) const
-+{
-+	QString jidStr = JIDUtil::toString(jid, !bare);
-+	if (ui_.accountsBox->itemData(ui_.accountsBox->currentIndex()).isNull()) {
-+		PsiAccount *pa = d->psi->contactList()->getAccount(accId);
-+		jidStr.append(QString(" %1").arg((pa) ? pa->name() : tr("deleted")));
-+	}
-+	return jidStr;
-+}
-+
-+QString HistoryDlg::getCurrentAccountId() const
-+{
-+	if (d->pa)
-+		return d->pa->id();
-+	return QString();
-+}
---- git.orig/src/historydlg.h
-+++ git/src/historydlg.h
-@@ -81,19 +81,23 @@ private:
- 	void setButtons();
- 	void setButtons(bool act);
- 	void loadContacts();
--	void displayResult(const EDBResult , int, int max=-1);
-+	void displayResult(const EDBResult &, int, int max=-1);
- 	QFont fontForOption(const QString& option);
- 	void listAccounts();
- 	UserListItem* currentUserListItem() const;
- 	void startRequest();
- 	void stopRequest();
--
-+	void showProgress(int max);
-+	void incrementProgress();
-+	void setCurrentUserListItem();
-+	QString makeContactToolTip(const PsiContact *contact, bool bare) const;
-+	QString makeContactToolTip(const QString &accId, const Jid &jid, bool bare) const;
- 	EDBHandle* getEDBHandle();
-+	QString getCurrentAccountId() const;
- 
- 	class Private;
- 	Private *d;
- 	Ui::HistoryDlg ui_;
--	QStringList jids_;
- };
- 
- #endif
---- git.orig/src/historyimp.cpp
-+++ git/src/historyimp.cpp
-@@ -0,0 +1,302 @@
-+/*
-+ * historyimp.cpp
-+ * Copyright (C) 2011   Aleksey Andreev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <QDir>
-+#include <QTimer>
-+#include <QMessageBox>
-+#include <QLayout>
-+
-+#include "historyimp.h"
-+#include "applicationinfo.h"
-+#include "psicontactlist.h"
-+#include "psiaccount.h"
-+#include "psicontact.h"
-+
-+HistoryImport::HistoryImport(PsiCon *psi) : QObject(),
-+	psi_(psi),
-+	srcEdb(NULL),
-+	dstEdb(NULL),
-+	hErase(NULL),
-+	hRead(NULL),
-+	hWrite(NULL),
-+	active(false),
-+	result_(ResultNone),
-+	recordsCount(0),
-+	dlg(NULL)
-+{
-+}
-+
-+HistoryImport::~HistoryImport()
-+{
-+	clear();
-+}
-+
-+bool HistoryImport::isNeeded()
-+{
-+	bool res = false;
-+	EDBSqLite *stor = static_cast<EDBSqLite *>(psi_->edb());
-+	if (!stor->getStorageParam("import_start").isEmpty()) {
-+		EDB *src = stor->mirror();
-+		if (!src)
-+			src = new EDBFlatFile(psi_);
-+		//if (sou && sou->eventsCount(QString(), XMPP::Jid()) != 0)
-+		if (!src->contacts(QString(), EDB::Contact).isEmpty())
-+			res = true;
-+		else
-+			stor->setStorageParam("import_start", QString());
-+		if (src != stor->mirror())
-+			delete src;
-+	}
-+	return res;
-+}
-+
-+void HistoryImport::clear()
-+{
-+	if (dstEdb) {
-+		((EDBSqLite *)dstEdb)->setInsertingMode(EDBSqLite::Normal);
-+		((EDBSqLite *)dstEdb)->setMirror(new EDBFlatFile(psi_));
-+	}
-+	if (hErase) {
-+		delete hErase;
-+		hErase = NULL;
-+	}
-+	if (hRead) {
-+		delete hRead;
-+		hRead = NULL;
-+	}
-+	if (srcEdb) {
-+		delete srcEdb;
-+		srcEdb = NULL;
-+	}
-+	if (hWrite) {
-+		delete hWrite;
-+		hWrite = NULL;
-+	}
-+	if (dlg) {
-+		delete dlg;
-+		dlg = NULL;
-+	}
-+}
-+
-+int HistoryImport::exec()
-+{
-+	active = true;
-+
-+	dstEdb = psi_->edb();
-+	((EDBSqLite *)dstEdb)->setMirror(NULL);
-+	((EDBSqLite *)dstEdb)->setInsertingMode(EDBSqLite::Import);
-+
-+	dstEdb->setStorageParam("import_start", "yes");
-+
-+	if (!srcEdb)
-+		srcEdb = new EDBFlatFile(psi_);
-+
-+	foreach (const EDB::ContactItem &ci, srcEdb->contacts(QString(), EDB::Contact)) {
-+		const XMPP::Jid &jid = ci.jid;
-+		QStringList accIds;
-+		foreach (PsiAccount *acc, psi_->contactList()->accounts()) {
-+			foreach (PsiContact *contact, acc->contactList()) {
-+				if (contact->jid() == jid)
-+					accIds.append(acc->id());
-+			}
-+		}
-+		if (accIds.isEmpty()) {
-+			PsiAccount *pa = psi_->contactList()->defaultAccount();
-+			if (pa)
-+				accIds.append(pa->id());
-+			else
-+				accIds.append(psi_->contactList()->accounts().first()->id());
-+		}
-+		importList.append(ImportItem(accIds, jid));
-+	}
-+
-+	if (importList.isEmpty())
-+		stop(ResultNormal);
-+	else
-+		showDialog();
-+
-+	return result_;
-+}
-+
-+void HistoryImport::stop(int reason)
-+{
-+	stopTime = QDateTime::currentDateTime();
-+	result_ = reason;
-+	if (reason == ResultNormal) {
-+		dstEdb->setStorageParam("import_start", QString());
-+		int sec = importDuration();
-+		int min = sec / 60;
-+		sec = sec % 60;
-+		qWarning(QString("Import is finished. Duration is %1 min. %2 sec.").arg(min).arg(sec).toLatin1());
-+	}
-+	else if (reason == ResultCancel)
-+		qWarning("Import canceled");
-+	else
-+		qWarning("Import error");
-+
-+	active = false;
-+	emit finished(reason);
-+}
-+
-+int HistoryImport::importDuration()
-+{
-+	return startTime.secsTo(stopTime);
-+}
-+
-+void HistoryImport::readFromFiles()
-+{
-+	if (!active)
-+		return;
-+	if (hWrite != NULL) {
-+		if (!hWrite->writeSuccess()) {
-+			stop(ResultError); // Write error
-+			return;
-+		}
-+	}
-+	else if (hErase != NULL && !hErase->writeSuccess()) {
-+		stop(ResultError);
-+		return;
-+	}
-+	if (importList.isEmpty()) {
-+		stop(ResultNormal);
-+		return;
-+	}
-+	if (hRead == NULL) {
-+		hRead = new EDBHandle(srcEdb);
-+		connect(hRead, SIGNAL(finished()), this, SLOT(writeToSqlite()));
-+	}
-+
-+	const ImportItem &item = importList.first();
-+	int start = item.startNum;
-+	if (start == 0)
-+		qWarning(QString("Importing %1").arg(JIDUtil::toString(item.jid, true)).toLatin1());
-+	--recordsCount;
-+	if (dlg && (recordsCount % 100) == 0)
-+		progressBar->setValue(progressBar->value() + 1);
-+	hRead->get(item.accIds.first(), item.jid, QDateTime(), EDB::Forward, start, 1);
-+}
-+
-+void HistoryImport::writeToSqlite()
-+{
-+	if (!active)
-+		return;
-+	const EDBResult r = hRead->result();
-+	if (hRead->lastRequestType() != EDBHandle::Read || r.size() > 1) {
-+		stop(ResultError);
-+		return;
-+	}
-+	if (r.isEmpty()) {
-+		importList.first().accIds.removeFirst();
-+		if (importList.first().accIds.isEmpty())
-+			importList.removeFirst();
-+		QTimer::singleShot(0, this, SLOT(readFromFiles()));
-+		return;
-+	}
-+	if (hWrite == NULL) {
-+		hWrite = new EDBHandle(dstEdb);
-+		connect(hWrite, SIGNAL(finished()), this, SLOT(readFromFiles()));
-+	}
-+	EDBItemPtr it = r.first();
-+	ImportItem &item = importList.first();
-+	hWrite->append(item.accIds.first(), item.jid, it->event(), EDB::Contact);
-+	item.startNum += 1;
-+}
-+
-+void HistoryImport::showDialog()
-+{
-+	dlg = new QDialog();
-+	dlg->setModal(true);
-+	dlg->setWindowTitle(tr("Psi+ Import history"));
-+	QVBoxLayout *mainLayout = new QVBoxLayout(dlg);
-+	stackedWidget = new QStackedWidget(dlg);
-+
-+	QWidget *page1 = new QWidget();
-+	QGridLayout *page1Layout = new QGridLayout(page1);
-+	QLabel *lbMessage = new QLabel(page1);
-+	lbMessage->setWordWrap(true);
-+	lbMessage->setText(tr("Found %1 files for import.\nContinue?").arg(importList.size()));
-+	page1Layout->addWidget(lbMessage, 0, 0, 1, 1);
-+	stackedWidget->addWidget(page1);
-+
-+	QWidget *page2 = new QWidget();
-+	QHBoxLayout *page2Layout = new QHBoxLayout(page2);
-+	QGridLayout *page2GridLayout = new QGridLayout();
-+	page2GridLayout->addWidget(new QLabel(tr("Status:"), page2), 0, 0, 1, 1);
-+	lbStatus = new QLabel(page2);
-+	page2GridLayout->addWidget(lbStatus, 0, 1, 1, 1);
-+	page2GridLayout->addWidget(new QLabel(tr("Progress:"), page2), 1, 0, 1, 1);
-+	progressBar = new QProgressBar(page2);
-+	progressBar->setMaximum(1);
-+	progressBar->setValue(0);
-+	page2GridLayout->addWidget(progressBar, 1, 1, 1, 1);
-+	page2Layout->addLayout(page2GridLayout);
-+	stackedWidget->addWidget(page2);
-+
-+	mainLayout->addWidget(stackedWidget);
-+	QHBoxLayout *buttonsLayout = new QHBoxLayout();
-+	QSpacerItem *buttonsSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
-+	buttonsLayout->addItem(buttonsSpacer);
-+	btnOk = new QPushButton(dlg);
-+	connect(btnOk, SIGNAL(clicked()), this, SLOT(start()));
-+	btnOk->setText(tr("Ok"));
-+	buttonsLayout->addWidget(btnOk);
-+	QPushButton *btnCancel = new QPushButton(dlg);
-+	connect(btnCancel, SIGNAL(clicked()), this, SLOT(cancel()));
-+	btnCancel->setText(tr("Exit"));
-+	buttonsLayout->addWidget(btnCancel);
-+	mainLayout->addLayout(buttonsLayout);
-+
-+	dlg->adjustSize();
-+	dlg->exec();
-+}
-+
-+void HistoryImport::start()
-+{
-+	qWarning("Import start");
-+	startTime = QDateTime::currentDateTime();
-+	btnOk->setEnabled(false);
-+	stackedWidget->setCurrentIndex(1);
-+
-+	lbStatus->setText(tr("Counting records"));
-+	qApp->processEvents();
-+	recordsCount = srcEdb->eventsCount(QString(), XMPP::Jid());
-+	int max = recordsCount / 100;
-+	if ((recordsCount % 100) != 0)
-+		++max;
-+	progressBar->setMaximum(max);
-+	progressBar->setValue(0);
-+
-+	lbStatus->setText(tr("Import"));
-+	hErase = new EDBHandle(dstEdb);
-+	connect(hErase, SIGNAL(finished()), this, SLOT(readFromFiles()));
-+	hErase->erase(QString(), QString());
-+	while (active)
-+		qApp->processEvents();
-+	if (result_ == ResultNormal)
-+		dlg->accept();
-+	else
-+		lbStatus->setText(tr("Error"));
-+}
-+
-+void HistoryImport::cancel()
-+{
-+	stop();
-+	dlg->reject();
-+}
---- git.orig/src/historyimp.h
-+++ git/src/historyimp.h
-@@ -0,0 +1,91 @@
-+/*
-+ * historyimp.h
-+ * Copyright (C) 2011   Aleksey Andreev
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef HISTORYIMP_H
-+#define HISTORYIMP_H
-+
-+#include <QObject>
-+#include <QDialog>
-+#include <QLabel>
-+#include <QProgressBar>
-+#include <QStackedWidget>
-+#include <QPushButton>
-+
-+#include "xmpp/jid/jid.h"
-+#include "jidutil.h"
-+#include "psicon.h"
-+#include "eventdb.h"
-+
-+struct ImportItem
-+{
-+	QStringList   accIds;
-+	XMPP::Jid     jid;
-+	int           startNum;
-+	ImportItem(const QStringList &ids, const XMPP::Jid &j) { accIds = ids; jid = j; startNum = 0; }
-+};
-+
-+class HistoryImport : public QObject
-+{
-+	Q_OBJECT
-+
-+public:
-+	enum {ResultNone, ResultNormal, ResultCancel, ResultError};
-+	HistoryImport(PsiCon *psi);
-+	~HistoryImport();
-+	bool isNeeded();
-+	int exec();
-+	int importDuration();
-+
-+private:
-+	PsiCon *psi_;
-+	QList<ImportItem> importList;
-+	EDB *srcEdb;
-+	EDB *dstEdb;
-+	EDBHandle *hErase;
-+	EDBHandle *hRead;
-+	EDBHandle *hWrite;
-+	QDateTime startTime;
-+	QDateTime stopTime;
-+	bool active;
-+	int result_;
-+	quint64 recordsCount;
-+	QDialog *dlg;
-+	QLabel *lbStatus;
-+	QProgressBar *progressBar;
-+	QStackedWidget *stackedWidget;
-+	QPushButton *btnOk;
-+
-+private:
-+	void clear();
-+	void showDialog();
-+
-+private slots:
-+	void readFromFiles();
-+	void writeToSqlite();
-+	void start();
-+	void stop(int reason = ResultCancel);
-+	void cancel();
-+
-+signals:
-+	void finished(int);
-+
-+};
-+
-+#endif
---- git.orig/src/history.ui
-+++ git/src/history.ui
-@@ -9,7 +9,7 @@
-    <rect>
-     <x>0</x>
-     <y>0</y>
--    <width>672</width>
-+    <width>670</width>
-     <height>680</height>
-    </rect>
-   </property>
-@@ -34,207 +34,377 @@
-   <property name="modal">
-    <bool>true</bool>
-   </property>
--  <layout class="QGridLayout" name="gridLayout">
--   <item row="0" column="0">
--    <widget class="QComboBox" name="accountsBox">
--     <property name="maximumSize">
--      <size>
--       <width>220</width>
--       <height>16777215</height>
--      </size>
--     </property>
--    </widget>
--   </item>
--   <item row="0" column="1">
--    <layout class="QHBoxLayout" name="horizontalLayout_2">
-+  <layout class="QVBoxLayout" name="verticalLayout_2">
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,0,1">
-      <item>
--      <widget class="QLineEdit" name="searchField">
--       <property name="sizePolicy">
--        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
--         <horstretch>0</horstretch>
--         <verstretch>0</verstretch>
--        </sizepolicy>
--       </property>
--      </widget>
-+      <layout class="QVBoxLayout" name="verticalLayout">
-+       <item>
-+        <widget class="QComboBox" name="accountsBox">
-+         <property name="maximumSize">
-+          <size>
-+           <width>220</width>
-+           <height>16777215</height>
-+          </size>
-+         </property>
-+        </widget>
-+       </item>
-+       <item>
-+        <widget class="QToolBox" name="contactToolBox">
-+         <property name="maximumSize">
-+          <size>
-+           <width>220</width>
-+           <height>16777215</height>
-+          </size>
-+         </property>
-+         <property name="currentIndex">
-+          <number>0</number>
-+         </property>
-+         <widget class="QWidget" name="page_1">
-+          <property name="geometry">
-+           <rect>
-+            <x>0</x>
-+            <y>0</y>
-+            <width>220</width>
-+            <height>233</height>
-+           </rect>
-+          </property>
-+          <attribute name="label">
-+           <string>Roster contacts</string>
-+          </attribute>
-+          <layout class="QGridLayout" name="gridLayout">
-+           <property name="margin">
-+            <number>0</number>
-+           </property>
-+           <item row="1" column="0">
-+            <widget class="QListWidget" name="jidList">
-+             <property name="sizePolicy">
-+              <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
-+               <horstretch>0</horstretch>
-+               <verstretch>0</verstretch>
-+              </sizepolicy>
-+             </property>
-+             <property name="maximumSize">
-+              <size>
-+               <width>220</width>
-+               <height>16777215</height>
-+              </size>
-+             </property>
-+            </widget>
-+           </item>
-+          </layout>
-+         </widget>
-+         <widget class="QWidget" name="page_3">
-+          <property name="geometry">
-+           <rect>
-+            <x>0</x>
-+            <y>0</y>
-+            <width>220</width>
-+            <height>233</height>
-+           </rect>
-+          </property>
-+          <attribute name="label">
-+           <string>Not in roster</string>
-+          </attribute>
-+          <layout class="QGridLayout" name="gridLayout_2">
-+           <property name="margin">
-+            <number>0</number>
-+           </property>
-+           <item row="0" column="0">
-+            <widget class="QListWidget" name="jidList2">
-+             <property name="maximumSize">
-+              <size>
-+               <width>220</width>
-+               <height>16777215</height>
-+              </size>
-+             </property>
-+            </widget>
-+           </item>
-+          </layout>
-+         </widget>
-+         <widget class="QWidget" name="page_4">
-+          <property name="geometry">
-+           <rect>
-+            <x>0</x>
-+            <y>0</y>
-+            <width>220</width>
-+            <height>233</height>
-+           </rect>
-+          </property>
-+          <attribute name="label">
-+           <string>Private</string>
-+          </attribute>
-+          <layout class="QGridLayout" name="gridLayout_3">
-+           <property name="margin">
-+            <number>0</number>
-+           </property>
-+           <item row="0" column="0">
-+            <widget class="QListWidget" name="privList">
-+             <property name="maximumSize">
-+              <size>
-+               <width>220</width>
-+               <height>16777215</height>
-+              </size>
-+             </property>
-+            </widget>
-+           </item>
-+          </layout>
-+         </widget>
-+         <widget class="QWidget" name="page_5">
-+          <property name="geometry">
-+           <rect>
-+            <x>0</x>
-+            <y>0</y>
-+            <width>220</width>
-+            <height>233</height>
-+           </rect>
-+          </property>
-+          <attribute name="label">
-+           <string>Advanced</string>
-+          </attribute>
-+          <layout class="QGridLayout" name="gridLayout_4">
-+           <property name="margin">
-+            <number>0</number>
-+           </property>
-+           <item row="0" column="0">
-+            <widget class="QListWidget" name="advList">
-+             <property name="maximumSize">
-+              <size>
-+               <width>220</width>
-+               <height>16777215</height>
-+              </size>
-+             </property>
-+            </widget>
-+           </item>
-+          </layout>
-+         </widget>
-+        </widget>
-+       </item>
-+       <item>
-+        <widget class="QCalendarWidget" name="calendar">
-+         <property name="minimumSize">
-+          <size>
-+           <width>220</width>
-+           <height>0</height>
-+          </size>
-+         </property>
-+         <property name="maximumSize">
-+          <size>
-+           <width>220</width>
-+           <height>220</height>
-+          </size>
-+         </property>
-+         <property name="firstDayOfWeek">
-+          <enum>Qt::Sunday</enum>
-+         </property>
-+         <property name="gridVisible">
-+          <bool>true</bool>
-+         </property>
-+         <property name="horizontalHeaderFormat">
-+          <enum>QCalendarWidget::ShortDayNames</enum>
-+         </property>
-+         <property name="verticalHeaderFormat">
-+          <enum>QCalendarWidget::NoVerticalHeader</enum>
-+         </property>
-+        </widget>
-+       </item>
-+       <item>
-+        <widget class="QPushButton" name="buttonRefresh">
-+         <property name="sizePolicy">
-+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-+           <horstretch>0</horstretch>
-+           <verstretch>0</verstretch>
-+          </sizepolicy>
-+         </property>
-+         <property name="maximumSize">
-+          <size>
-+           <width>220</width>
-+           <height>16777215</height>
-+          </size>
-+         </property>
-+         <property name="focusPolicy">
-+          <enum>Qt::NoFocus</enum>
-+         </property>
-+         <property name="toolTip">
-+          <string>Refresh history</string>
-+         </property>
-+         <property name="text">
-+          <string>&amp;Refresh</string>
-+         </property>
-+         <property name="autoDefault">
-+          <bool>false</bool>
-+         </property>
-+        </widget>
-+       </item>
-+      </layout>
-      </item>
-      <item>
--      <widget class="QToolButton" name="tb_find">
--       <property name="sizePolicy">
--        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
--         <horstretch>0</horstretch>
--         <verstretch>0</verstretch>
--        </sizepolicy>
--       </property>
--       <property name="maximumSize">
--        <size>
--         <width>27</width>
--         <height>27</height>
--        </size>
--       </property>
--       <property name="text">
--        <string/>
-+      <widget class="Line" name="line">
-+       <property name="orientation">
-+        <enum>Qt::Vertical</enum>
-        </property>
-       </widget>
-      </item>
--    </layout>
--   </item>
--   <item row="1" column="0">
--    <widget class="QListWidget" name="jidList">
--     <property name="maximumSize">
--      <size>
--       <width>220</width>
--       <height>16777215</height>
--      </size>
--     </property>
--     <property name="sortingEnabled">
--      <bool>true</bool>
--     </property>
--    </widget>
--   </item>
--   <item row="1" column="1" rowspan="2">
--    <widget class="PsiTextView" name="msgLog">
--     <property name="sizePolicy">
--      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
--       <horstretch>0</horstretch>
--       <verstretch>0</verstretch>
--      </sizepolicy>
--     </property>
--     <property name="maximumSize">
--      <size>
--       <width>16777215</width>
--       <height>16777215</height>
--      </size>
--     </property>
--     <property name="focusPolicy">
--      <enum>Qt::ClickFocus</enum>
--     </property>
--     <property name="readOnly">
--      <bool>true</bool>
--     </property>
--    </widget>
--   </item>
--   <item row="2" column="0">
--    <widget class="QCalendarWidget" name="calendar">
--     <property name="maximumSize">
--      <size>
--       <width>220</width>
--       <height>220</height>
--      </size>
--     </property>
--     <property name="firstDayOfWeek">
--      <enum>Qt::Sunday</enum>
--     </property>
--     <property name="gridVisible">
--      <bool>true</bool>
--     </property>
--     <property name="horizontalHeaderFormat">
--      <enum>QCalendarWidget::ShortDayNames</enum>
--     </property>
--     <property name="verticalHeaderFormat">
--      <enum>QCalendarWidget::NoVerticalHeader</enum>
--     </property>
--    </widget>
--   </item>
--   <item row="3" column="0">
--    <widget class="QPushButton" name="buttonRefresh">
--     <property name="sizePolicy">
--      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
--       <horstretch>0</horstretch>
--       <verstretch>0</verstretch>
--      </sizepolicy>
--     </property>
--     <property name="maximumSize">
--      <size>
--       <width>220</width>
--       <height>16777215</height>
--      </size>
--     </property>
--     <property name="focusPolicy">
--      <enum>Qt::NoFocus</enum>
--     </property>
--     <property name="toolTip">
--      <string>Refresh history</string>
--     </property>
--     <property name="text">
--      <string>&amp;Refresh</string>
--     </property>
--     <property name="autoDefault">
--      <bool>false</bool>
--     </property>
--    </widget>
--   </item>
--   <item row="3" column="1">
--    <layout class="QHBoxLayout" name="horizontalLayout">
--     <property name="sizeConstraint">
--      <enum>QLayout::SetDefaultConstraint</enum>
--     </property>
-      <item>
--      <widget class="QPushButton" name="buttonEarliest">
--       <property name="focusPolicy">
--        <enum>Qt::NoFocus</enum>
--       </property>
--       <property name="text">
--        <string>&amp;Earliest</string>
--       </property>
--      </widget>
-+      <layout class="QVBoxLayout" name="verticalLayout_3">
-+       <item>
-+        <layout class="QHBoxLayout" name="horizontalLayout_2">
-+         <item>
-+          <widget class="QLineEdit" name="searchField">
-+           <property name="sizePolicy">
-+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-+             <horstretch>0</horstretch>
-+             <verstretch>0</verstretch>
-+            </sizepolicy>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="QToolButton" name="tb_find">
-+           <property name="sizePolicy">
-+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-+             <horstretch>0</horstretch>
-+             <verstretch>0</verstretch>
-+            </sizepolicy>
-+           </property>
-+           <property name="maximumSize">
-+            <size>
-+             <width>27</width>
-+             <height>27</height>
-+            </size>
-+           </property>
-+           <property name="text">
-+            <string/>
-+           </property>
-+          </widget>
-+         </item>
-+        </layout>
-+       </item>
-+       <item>
-+        <widget class="PsiTextView" name="msgLog">
-+         <property name="sizePolicy">
-+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-+           <horstretch>0</horstretch>
-+           <verstretch>0</verstretch>
-+          </sizepolicy>
-+         </property>
-+         <property name="maximumSize">
-+          <size>
-+           <width>16777215</width>
-+           <height>16777215</height>
-+          </size>
-+         </property>
-+         <property name="focusPolicy">
-+          <enum>Qt::ClickFocus</enum>
-+         </property>
-+         <property name="readOnly">
-+          <bool>true</bool>
-+         </property>
-+        </widget>
-+       </item>
-+       <item>
-+        <layout class="QHBoxLayout" name="horizontalLayout">
-+         <property name="sizeConstraint">
-+          <enum>QLayout::SetDefaultConstraint</enum>
-+         </property>
-+         <item>
-+          <widget class="QPushButton" name="buttonEarliest">
-+           <property name="focusPolicy">
-+            <enum>Qt::NoFocus</enum>
-+           </property>
-+           <property name="text">
-+            <string>&amp;Earliest</string>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="QPushButton" name="buttonPrevious">
-+           <property name="focusPolicy">
-+            <enum>Qt::NoFocus</enum>
-+           </property>
-+           <property name="text">
-+            <string>&amp;Previous</string>
-+           </property>
-+           <property name="autoDefault">
-+            <bool>false</bool>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <spacer name="horizontalSpacer_2">
-+           <property name="orientation">
-+            <enum>Qt::Horizontal</enum>
-+           </property>
-+           <property name="sizeType">
-+            <enum>QSizePolicy::Expanding</enum>
-+           </property>
-+           <property name="sizeHint" stdset="0">
-+            <size>
-+             <width>13</width>
-+             <height>13</height>
-+            </size>
-+           </property>
-+          </spacer>
-+         </item>
-+         <item>
-+          <widget class="QPushButton" name="buttonNext">
-+           <property name="focusPolicy">
-+            <enum>Qt::NoFocus</enum>
-+           </property>
-+           <property name="text">
-+            <string>&amp;Next</string>
-+           </property>
-+           <property name="autoDefault">
-+            <bool>false</bool>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="QPushButton" name="buttonLastest">
-+           <property name="focusPolicy">
-+            <enum>Qt::NoFocus</enum>
-+           </property>
-+           <property name="text">
-+            <string>&amp;Lastest</string>
-+           </property>
-+          </widget>
-+         </item>
-+        </layout>
-+       </item>
-+      </layout>
-      </item>
-+    </layout>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <item>
--      <widget class="QPushButton" name="buttonPrevious">
--       <property name="focusPolicy">
--        <enum>Qt::NoFocus</enum>
--       </property>
--       <property name="text">
--        <string>&amp;Previous</string>
--       </property>
--       <property name="autoDefault">
--        <bool>false</bool>
--       </property>
--      </widget>
-+      <widget class="BusyWidget" name="busy" native="true"/>
-      </item>
-      <item>
--      <spacer name="horizontalSpacer_2">
-+      <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
--       <property name="sizeType">
--        <enum>QSizePolicy::Expanding</enum>
--       </property>
-        <property name="sizeHint" stdset="0">
-         <size>
--         <width>13</width>
--         <height>13</height>
-+         <width>20</width>
-+         <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
--      <widget class="QPushButton" name="buttonNext">
--       <property name="focusPolicy">
--        <enum>Qt::NoFocus</enum>
--       </property>
--       <property name="text">
--        <string>&amp;Next</string>
--       </property>
--       <property name="autoDefault">
--        <bool>false</bool>
--       </property>
--      </widget>
--     </item>
--     <item>
--      <widget class="QPushButton" name="buttonLastest">
--       <property name="focusPolicy">
--        <enum>Qt::NoFocus</enum>
--       </property>
--       <property name="text">
--        <string>&amp;Lastest</string>
-+      <widget class="QProgressBar" name="progressBar">
-+       <property name="sizePolicy">
-+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-+         <horstretch>1</horstretch>
-+         <verstretch>0</verstretch>
-+        </sizepolicy>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
--   <item row="4" column="0">
--    <widget class="BusyWidget" name="busy" native="true"/>
--   </item>
-   </layout>
-  </widget>
-  <customwidgets>
-@@ -251,14 +421,13 @@
-   </customwidget>
-  </customwidgets>
-  <tabstops>
-+  <tabstop>accountsBox</tabstop>
-   <tabstop>jidList</tabstop>
-+  <tabstop>jidList2</tabstop>
-+  <tabstop>privList</tabstop>
-+  <tabstop>advList</tabstop>
-   <tabstop>calendar</tabstop>
-   <tabstop>searchField</tabstop>
--  <tabstop>buttonEarliest</tabstop>
--  <tabstop>buttonPrevious</tabstop>
--  <tabstop>buttonNext</tabstop>
--  <tabstop>buttonLastest</tabstop>
--  <tabstop>accountsBox</tabstop>
-   <tabstop>tb_find</tabstop>
-   <tabstop>msgLog</tabstop>
-  </tabstops>
---- git.orig/src/psiaccount.cpp
-+++ git/src/psiaccount.cpp
-@@ -4764,11 +4764,12 @@ void PsiAccount::dj_sendMessage(const Me
- 
- 	// don't log groupchat, private messages, or encrypted messages
- 	if(log) {
--		if(m.type() != "groupchat" && m.xencrypted().isEmpty() && !findGCContact(m.to())) {
-+		if(m.type() != "groupchat" && m.xencrypted().isEmpty()/* && !findGCContact(m.to())*/) {
-+			int type = findGCContact(m.to()) ? EDB::GroupChatContact : EDB::Contact;
- 			MessageEvent::Ptr me(new MessageEvent(m, this));
- 			me->setOriginLocal(true);
- 			me->setTimeStamp(QDateTime::currentDateTime());
--			logEvent(m.to(), me);
-+			logEvent(m.to(), me, type);
- 		}
- 	}
- 
-@@ -5113,7 +5114,7 @@ void PsiAccount::handleEvent(const PsiEv
- 
- 			// don't log private messages
- 			if (!found &&
--				!findGCContact(e->from()) &&
-+				//!findGCContact(e->from()) &&
- 				!(e->type() == PsiEvent::Message &&
- 				 e.staticCast<MessageEvent>()->message().body().isEmpty()))
- 			{
-@@ -5126,7 +5127,8 @@ void PsiAccount::handleEvent(const PsiEv
- 				}
- #endif
- 				if (!isMuc) {
--					logEvent(e->from(), e);
-+					int type = findGCContact(e->from()) ? EDB::GroupChatContact : EDB::Contact;
-+					logEvent(e->from(), e, type);
- 				}
- 			}
- 		}
-@@ -5827,14 +5829,16 @@ void PsiAccount::groupChatMessagesRead(c
- }
- #endif
- 
--void PsiAccount::logEvent(const Jid &j, const PsiEvent::Ptr &e)
-+void PsiAccount::logEvent(const Jid &j, const PsiEvent::Ptr &e, int type)
- {
- 	if (!d->acc.opt_log)
- 		return;
-+	if (type == EDB::GroupChatContact && !PsiOptions::instance()->getOption("options.history.store-muc-private").toBool())
-+		return;
- 
- 	EDBHandle *h = new EDBHandle(d->psi->edb());
- 	connect(h, SIGNAL(finished()), SLOT(edb_finished()));
--	h->append(j, e);
-+	h->append(id(), j, e, type);
- }
- 
- void PsiAccount::edb_finished()
-@@ -6289,7 +6293,7 @@ void PsiAccount::pgp_encryptFinished()
- 			MessageEvent::Ptr me(new MessageEvent(m, this));
- 			me->setOriginLocal(true);
- 			me->setTimeStamp(QDateTime::currentDateTime());
--			logEvent(m.to(), me);
-+			logEvent(m.to(), me, EDB::Contact);
- 		}
- 
- 		Message mwrap;
---- git.orig/src/psiaccount.h
-+++ git/src/psiaccount.h
-@@ -529,7 +529,7 @@ private:
- 	void simulateRosterOffline();
- 	void cpUpdate(const UserListItem &, const QString &rname="", bool fromPresence=false);
- 	UserListItem* addUserListItem(const Jid& jid, const QString& nick="");
--	void logEvent(const Jid &, const PsiEvent::Ptr &);
-+	void logEvent(const Jid &, const PsiEvent::Ptr &, int);
- 	void queueEvent(const PsiEvent::Ptr &e, ActivationType activationType);
- 	void openNextEvent(const UserListItem &, ActivationType activationType);
- 	void updateReadNext(const Jid &);
---- git.orig/src/psichatdlg.cpp
-+++ git/src/psichatdlg.cpp
-@@ -960,7 +960,7 @@ bool PsiChatDlg::isEncryptionEnabled() c
- 
- void PsiChatDlg::appendSysMsg(const QString &str)
- {
--	chatView()->dispatchMessage(MessageView::fromHtml(str, MessageView::System));
-+	dispatchMessage(MessageView::fromHtml(str, MessageView::System));
- }
- 
- ChatView* PsiChatDlg::chatView() const
---- git.orig/src/psicon.cpp
-+++ git/src/psicon.cpp
-@@ -359,8 +359,7 @@ PsiCon::PsiCon()
- 	d->ftwin = 0;
- #endif
- 
--	d->edb = new EDBFlatFile;
--
-+	d->edb = 0;
- 	d->s5bServer = 0;
- 	d->tuneManager = 0;
- 	d->autoUpdater = 0;
-@@ -381,7 +380,8 @@ PsiCon::~PsiCon()
- 
- 	delete d->autoUpdater;
- 	delete d->actionList;
--	delete d->edb;
-+	if (d->edb)
-+		delete d->edb;
- 	delete d->defaultMenuBar;
- 	delete d->tabManager;
- 	delete d->popupManager;
-@@ -703,6 +703,12 @@ bool PsiCon::init()
- 
- 	checkAccountsEmpty();
- 
-+	// Import for SQLite history
-+	EDBSqLite *edb = new EDBSqLite(this);
-+	d->edb = edb;
-+	if (!edb->init())
-+		return false;
-+
- 	// try autologin if needed
- 	foreach(PsiAccount* account, d->contactList->accounts()) {
- 		account->autoLogin();
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -1,4 +1,4 @@
--QT += xml network
-+QT += xml network sql
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
-   QT += widgets multimedia concurrent
-@@ -142,6 +142,7 @@ HEADERS += \
- 	$$PWD/translationmanager.h \
- 	$$PWD/eventdb.h \
- 	$$PWD/historydlg.h \
-+	$$PWD/historyimp.h \
- 	$$PWD/tipdlg.h \
- 	$$PWD/searchdlg.h \
- 	$$PWD/registrationdlg.h \
-@@ -290,6 +291,7 @@ SOURCES += \
- 	$$PWD/translationmanager.cpp \
- 	$$PWD/eventdb.cpp \
- 	$$PWD/historydlg.cpp \
-+	$$PWD/historyimp.cpp \
- 	$$PWD/searchdlg.cpp \
- 	$$PWD/registrationdlg.cpp \
- 	$$PWD/psitoolbar.cpp \
---- git.orig/themes/chatview/psi/adapter.js
-+++ git/themes/chatview/psi/adapter.js
-@@ -189,7 +189,11 @@ windowchatServer.jsNamespace().adapter
- 							}
- 							if (!template) {
- 								data.nextOfGroup = false; //can't group w/o template
--								template = data.local?shared.templates.sentMessage:shared.templates.receivedMessage;
-+								if (data.spooled) {
-+									template = shared.templates.spooledMessage;
-+								} else {
-+									template = data.local?shared.templates.sentMessage:shared.templates.receivedMessage;
-+								}
- 							}
- 							break;
-                         case "status":
---- git.orig/themes/chatview/psi/classic/index.html
-+++ git/themes/chatview/psi/classic/index.html
-@@ -13,6 +13,7 @@ body > div img { vertical-align:bottom;
- body > div > img:first-child { vertical-align:text-bottom; }
- .sent {}
- .received {}
-+.spooledmsg {}
- .infmsg {}
- .usertext {}
- .alert {font-weight:bold;}
-@@ -32,6 +33,7 @@ windowchatServer.jsNamespace().theme =
- 	var cssBody = chat.util.findStyleSheet(document.styleSheets0, "body").style;
- 	var cssSentMsg = chat.util.findStyleSheet(document.styleSheets0, ".sent").style;
- 	var cssReceivedMsg = chat.util.findStyleSheet(document.styleSheets0, ".received").style;
-+	var cssSpooledMsg = chat.util.findStyleSheet(document.styleSheets0, ".spooledmsg").style;
- 	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets0, ".infmsg").style;
- 	var cssUserText = chat.util.findStyleSheet(document.styleSheets0, ".usertext").style;
- 	var cssChatSays = chat.util.findStyleSheet(document.styleSheets0, ".msg>span:first").style;
-@@ -46,6 +48,7 @@ windowchatServer.jsNamespace().theme =
- 		cssReceivedMsg.color = shared.colorOption("options.ui.look.colors.messages.received");
- 		cssInfMsg.color = shared.colorOption("options.ui.look.colors.messages.informational");
- 		cssUserText.color = shared.colorOption("options.ui.look.colors.messages.usertext");
-+		cssSpooledMsg.color = cssUserText.color;
- 		cssAlertMsg.color = shared.psiOption("options.ui.look.colors.messages.highlighting");
- 		useMessageIcons = shared.psiOption("options.ui.chat.use-message-icons");
- 		if (shared.psiOption("options.ui.chat.scaled-message-icons")) {
-@@ -73,7 +76,9 @@ windowchatServer.jsNamespace().theme =
- 			receivedMessage: shared.isMuc?
- 				"<div class='msg'>%icon%<span style='color:%nickcolor%'>%time% %sender%</span> %alertedmessage%</div>"
- 				: null,
--			spooledMessage: "<div class='infmsg'>%icon%%time% %sender% %message%</div>",
-+			spooledMessage: shared.isMuc?
-+				"<div class='spooledmsg'>%icon%<span style='color:%nickcolor%'>%time% %sender%</span> %message%</div>"
-+				: "<div class='spooledmsg'>%icon%<span class='%sentrec%'>%time% %sender%</span> %message%</div>",
- 			sys: "<div class='infmsg'>%icon%%message%</div>",
- 			sysMessage: "<div class='infmsg'>%icon%%time% *** %message%</div>",
- 			sysMessageUT: "<div class='infmsg'>%icon%%time% *** %message%: <span class='usertext'>%usertext%</span></div>",
-@@ -97,7 +102,7 @@ windowchatServer.jsNamespace().theme =
- 			}
- 			if (shared.cdata.mtype == "message") {
- 				var template = shared.cdata.emote && shared.templates.messageNC ||
--					(shared.cdata.spooled && shared.templates.message || null);
-+					(shared.cdata.spooled && shared.templates.spooledMessage || null);
- 				if (template) {
- 					shared.appendHtml(template.toString(), shared.cdata.local?true:null);
- 					return false;
-@@ -119,8 +124,7 @@ windowchatServer.jsNamespace().theme =
- 				return shared.cdata.alert?"<span class='alert'>"+
- 					shared.cdata.message+"</span>":shared.cdata.message;
- 			},
--			sentrec : function() {return shared.cdata.spooled?"infmsg":
--				(shared.cdata.local?"sent":"received");},
-+			sentrec : function() {return shared.cdata.local?"sent":"received";},
- 			nickcolor : function() {
- 				return shared.session.mucNickColor(shared.cdata.sender, shared.cdata.local);
- 			},
-@@ -129,6 +133,10 @@ windowchatServer.jsNamespace().theme =
- 				if (useMessageIcons) {
- 					switch (shared.cdata.mtype) {
- 						case "message":
-+							if (shared.cdata.spooled) {
-+								icon = "psi/history";
-+								break;
-+							}
- 							icon = shared.cdata.local?(shared.cdata.awaitingReceipt?
- 								"psi/notification_chat_send":"psi/notification_chat_delivery_ok")
- 								: "psi/notification_chat_receive";

psi-plus-main-20160309.tar.xz/patches/dev/psi-plus-add-kde-icon.diff Deleted

@@ -1,229 +0,0 @@
---- git.orig/src/psitrayicon.cpp
-+++ git/src/psitrayicon.cpp
-@@ -4,6 +4,16 @@
- #include <QSystemTrayIcon>
- #include <QHelpEvent>
- 
-+#ifdef USE_KDE
-+#include <QDBusInterface>
-+#ifndef USE_KDE5
-+#include <kmenu.h>
-+#endif
-+static const QString KSNI_SERVICE = "org.kde.StatusNotifierWatcher";
-+static const QString KSNI_PATH = "/StatusNotifierWatcher";
-+static const QString KSNI_IFACE = "org.kde.StatusNotifierWatcher";
-+#endif
-+
- #include "psitrayicon.h"
- #include "iconset.h"
- #include "alerticon.h"
-@@ -14,18 +24,42 @@
- PsiTrayIcon::PsiTrayIcon(const QString &tip, QMenu *popup, QObject *parent)
- 	: QObject(parent)
- 	, icon_(NULL)
--	, trayicon_(new QSystemTrayIcon())
-+#ifdef USE_DBUS
-+	, newIcon_(KStatusNotifierItemPtr())
-+#endif
-+	, trayicon_(QSystemTrayIconPtr())
- 	, realIcon_(0)
- {	
--	trayicon_->setContextMenu(popup);
--	setToolTip(tip);
--	connect(trayicon_,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),SLOT(trayicon_activated(QSystemTrayIcon::ActivationReason)));
--	trayicon_->installEventFilter(this);
-+	bool newInterface = false;
-+#ifdef USE_KDE
-+	QDBusInterface iface(KSNI_SERVICE, KSNI_PATH, KSNI_IFACE);
-+	if (iface.isValid()) {
-+		newInterface = true;
-+		newIcon_ = KStatusNotifierItemPtr(new KStatusNotifierItem("Psi+",parent));
-+		newIcon_->setStatus(KStatusNotifierItem::Active);
-+		newIcon_->setTitle("Psi+");
-+#ifndef USE_KDE5
-+		newIcon_->setContextMenu(static_cast<KMenu*>(popup));
-+#else
-+		newIcon_->setContextMenu(popup);
-+#endif
-+		connect(newIcon_.data(), SIGNAL(activateRequested(bool,QPoint)), SLOT(iconActivated(bool,QPoint)));
-+		connect(newIcon_.data(), SIGNAL(secondaryActivateRequested(QPoint)), SLOT(iconActivatedSecondary(QPoint)));
-+		setToolTip(tip);
-+	}
-+#endif
-+	if (!newInterface) {
-+		trayicon_ = QSystemTrayIconPtr(new QSystemTrayIcon());
-+		trayicon_->setContextMenu(popup);
-+		setToolTip(tip);
-+		connect(trayicon_.data(),SIGNAL(activated(QSystemTrayIcon::ActivationReason)),SLOT(trayicon_activated(QSystemTrayIcon::ActivationReason)));
-+		trayicon_->installEventFilter(this);
-+	}
- }
- 
- PsiTrayIcon::~PsiTrayIcon()
- {
--	delete trayicon_;
-+	//delete trayicon_;
- 	if ( icon_ ) {
- 		icon_->disconnect();
- 		icon_->stop();
-@@ -35,13 +69,29 @@ PsiTrayIcon::~PsiTrayIcon()
- 
- void PsiTrayIcon::setContextMenu(QMenu* menu)
- {
--	trayicon_->setContextMenu(menu);
-+	if (trayicon_) {
-+		trayicon_->setContextMenu(menu);
-+	}
-+#ifdef USE_KDE
-+	else {
-+#ifndef USE_KDE5
-+		newIcon_->setContextMenu(static_cast<KMenu*>(menu));
-+#else
-+		newIcon_->setContextMenu(menu);
-+#endif
-+	}
-+#endif
- }
- 
- void PsiTrayIcon::setToolTip(const QString &str)
- {
- #ifndef HAVE_X11
- 	trayicon_->setToolTip(str);
-+#elif USE_KDE
-+	QIcon icon;
-+	if(icon_)
-+		icon = icon_->icon();
-+	newIcon_->setToolTip(icon, "Psi+", str);
- #else
- 	Q_UNUSED(str)
- #endif
-@@ -90,12 +140,22 @@ bool PsiTrayIcon::isWMDock()
- 
- void PsiTrayIcon::show()
- {
--	trayicon_->show();
-+	if(trayicon_)
-+		trayicon_->show();
-+#ifdef USE_KDE
-+	if (newIcon_)
-+		newIcon_->setStatus(KStatusNotifierItem::Active);
-+#endif
- }
- 
- void PsiTrayIcon::hide()
- {
--	trayicon_->hide();
-+	if(trayicon_)
-+		trayicon_->hide();
-+#ifdef USE_KDE
-+	if (newIcon_)
-+		newIcon_->setStatus(KStatusNotifierItem::Passive);
-+#endif
- }
- 
- 
-@@ -197,7 +257,14 @@ void PsiTrayIcon::animate()
- 		p = makeIcon();
- 		QPixmapCache::insert( cachedName, p );
- 	}
--	trayicon_->setIcon(p);
-+	if (trayicon_) {
-+		trayicon_->setIcon(p);
-+	}
-+#ifdef USE_KDE
-+	else {
-+		newIcon_->setIconByPixmap(p);
-+	}
-+#endif
- }
- 
- bool PsiTrayIcon::eventFilter(QObject *obj, QEvent *event)
-@@ -208,3 +275,16 @@ bool PsiTrayIcon::eventFilter(QObject *o
- 	}
- 	return QObject::eventFilter(obj, event);
- }
-+
-+#ifdef USE_KDE
-+void PsiTrayIcon::iconActivated(bool isIt, QPoint point)
-+{
-+	Q_UNUSED(isIt);
-+	emit doubleClicked(point);
-+}
-+
-+void PsiTrayIcon::iconActivatedSecondary(QPoint point) //Middle click
-+{
-+	emit clicked(point,Qt::MidButton);
-+}
-+#endif
---- git.orig/src/psitrayicon.h
-+++ git/src/psitrayicon.h
-@@ -5,11 +5,24 @@
- #include <QRgb>
- #include <QSystemTrayIcon>
- 
-+#ifdef USE_KDE
-+#ifndef USE_KDE5
-+#include <kstatusnotifieritem.h>
-+#else
-+#include <KStatusNotifierItem>
-+#endif
-+#include <QSharedPointer>
-+typedef QSharedPointer<KStatusNotifierItem> KStatusNotifierItemPtr;
-+#endif
-+
-+
- class PsiIcon;
- class QMenu;
- class QPoint;
- class QPixmap;
- 
-+typedef QSharedPointer<QSystemTrayIcon> QSystemTrayIconPtr;
-+
- class PsiTrayIcon : public QObject
- {
- 	Q_OBJECT
-@@ -38,6 +51,10 @@ public slots:
- private slots:
- 	void animate();
- 	void trayicon_activated(QSystemTrayIcon::ActivationReason);
-+#ifdef USE_KDE
-+	void iconActivated(bool isIt, QPoint point);
-+	void iconActivatedSecondary(QPoint point);
-+#endif
- 
- protected:
- 	QPixmap makeIcon();
-@@ -46,7 +63,10 @@ protected:
- 
- private:
- 	PsiIcon* icon_;
--	QSystemTrayIcon* trayicon_;
-+#ifdef USE_KDE
-+	KStatusNotifierItemPtr newIcon_;
-+#endif
-+	QSystemTrayIconPtr trayicon_;
- 	quintptr realIcon_;
- };
- 
---- git.orig/src/src.pri
-+++ git/src/src.pri
-@@ -631,6 +631,19 @@ dbus {
- 			$$PWD/psidbusnotifier.cpp
- 	DEFINES += USE_DBUS
- 	QT += dbus
-+	unix:!mac:CONFIG += kde
-+	kde {
-+		greaterThan(QT_MAJOR_VERSION, 4) {
-+			QT += KNotifications dbus
-+			DEFINES += USE_KDE5
-+		}
-+		else {
-+			INCLUDEPATH += /usr/include/KDE
-+			QT += gui
-+			LIBS += -lkdeui -lkdecore
-+		}
-+		DEFINES += USE_KDE
-+	}
- }
- 
- win32:!dbus {

psi-plus-main-20160309.tar.xz/patches/dev/psi-plus-psimedia.patch Deleted

@@ -1,81 +0,0 @@
-diff --git a/psi.qc b/psi.qc
-index 1f74092..70c99a6 100644
---- a/psi.qc
-+++ b/psi.qc
-@@ -42,6 +42,7 @@
-   <dep type='conf'>
-     <required/>
-   </dep>
-+  <dep type='psimedia'/>
-   <dep type='recursiveprl'>
-     <required/>
-   </dep>
-diff --git a/qcm/psimedia.qcm b/qcm/psimedia.qcm
-new file mode 100644
-index 0000000..cae88b6
---- /dev/null
-+++ b/qcm/psimedia.qcm
-@@ -0,0 +1,34 @@
-+/*
-+-----BEGIN QCMOD-----
-+name: psimedia
-+arg: with-psimedia-path=path,Extra search path to libgstprovider.so
-+-----END QCMOD-----
-+*/
-+
-+//----------------------------------------------------------------------------
-+// qc_psimedia
-+//----------------------------------------------------------------------------
-+class qc_psimedia : public ConfObj
-+{
-+public:
-+	qc_psimedia(Conf *c) : ConfObj(c) {}
-+	QString name() const { return "psimedia"; }
-+	QString shortname() const { return "psimedia"; }
-+
-+	bool exec()
-+	{
-+		QString path = conf->getenv("QC_WITH_PSIMEDIA_PATH");
-+		if (path.isEmpty()) {
-+			return false;
-+		}
-+
-+		conf->addDefine("HAVE_GSTPROVIDER_PATH");
-+		QFile file("src/config.h");
-+		if ( file.open(QIODevice::Append | QIODevice::Text) ) {
-+			QTextStream stream( &file );
-+			stream << "#define GSTPROVIDER_PATH \"" << path << "\"" << endl;
-+		}
-+
-+		return true;
-+	}
-+};
-diff --git a/src/avcall/avcall.cpp b/src/avcall/avcall.cpp
-index 38fff17..320a4b3 100644
---- a/src/avcall/avcall.cpp
-+++ b/src/avcall/avcall.cpp
-@@ -30,6 +30,7 @@
- #include "applicationinfo.h"
- #include "psiaccount.h"
- #include "psioptions.h"
-+#include "../config.h"
- 
- #define USE_THREAD
- 
-@@ -108,6 +109,16 @@ static void ensureLoaded()
- 		QString resourcePath;
- 
- 		pluginFile = qgetenv("PSI_MEDIA_PLUGIN");
-+
-+#ifdef HAVE_GSTPROVIDER_PATH
-+		if(pluginFile.isEmpty())
-+		{
-+			QFileInfo fi(GSTPROVIDER_PATH);
-+			if(fi.exists())
-+				pluginFile = GSTPROVIDER_PATH;
-+		}
-+#endif
-+
- 		if(pluginFile.isEmpty())
- 		{
- #if defined(Q_OS_WIN)

psi-plus-main-20160309.tar.xz/patches/dev/psi-win32-crash-dialog.patch Deleted

@@ -1,1581 +0,0 @@
-Index: src/tools/crash/crash.pri
-===================================================================
---- orig/src/tools/crash/crash.pri	(revision 944)
-+++ work/src/tools/crash/crash.pri	(working copy)
-@@ -16,6 +16,12 @@
- 		SOURCES +=  $$PWD/crash.cpp 
- 	}
- }
--else {
-+
-+win32 {
-+	SOURCES     += $$PWD/crash_win32.cpp $$PWD/stackwalker.cpp
-+	HEADERS     += $$PWD/crash_win32.h $$PWD/stackwalker.h
-+}
-+
-+macx {
- 	SOURCES += $$PWD/crash_dummy.cpp
- }
---- orig/src/tools/crash/crash_win32.h	1970-01-01 03:00:00.000000000 +0300
-+++ work/src/tools/crash/crash_win32.h	2008-01-23 10:30:52.388649000 +0300
-@@ -0,0 +1,123 @@
-+/*
-+ * crash_win32 -- win32 crash handlers
-+ *
-+ * Copyright (c) 2008 Ustyugov Roman (qtdevel@gmail.com)
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+#ifndef CRASH_WIN32_H
-+#define CRASH_WIN32_H
-+
-+#include "crash.h"
-+#include "stackwalker.h"
-+#include <QtGui>
-+
-+namespace Crash {
-+
-+/**
-+ *	Simple dialog to show crash log.
-+ *	Must be created in GUI thread.
-+ */
-+class CrashDialog : public QDialog
-+{
-+	Q_OBJECT
-+
-+public:
-+	CrashDialog(QString text, QWidget *parent = 0)
-+		: QDialog(parent)
-+	{
-+		//	Create readonly text editor for logging
-+		editor_ = new QTextEdit(this);
-+		editor_->setText(text);
-+		editor_->setReadOnly(true);
-+		QGridLayout *mainLayout = new QGridLayout;
-+		mainLayout->setContentsMargins(3,3,3,3);
-+		setWindowTitle(tr("Crash handler log")); 
-+		mainLayout->addWidget(editor_, 0, 0);
-+		setLayout(mainLayout);
-+		setModal(true);
-+	}
-+
-+private:
-+	QTextEdit * editor_;
-+};
-+
-+
-+/**
-+ *	Simple implementation of stack walker with output accumulation.
-+ *	Output may be redirected to file (or crash dialog)
-+ */
-+class Win32StackWalker : public StackWalker
-+{
-+private:
-+	QString text_;
-+
-+public:
-+	Win32StackWalker() : StackWalker() {}
-+
-+	BOOL ShowCallstack(
-+		HANDLE hThread = GetCurrentThread(),
-+		CONTEXT *context = NULL,
-+		PReadProcessMemoryRoutine readMemoryFunction = NULL,
-+		LPVOID pUserData = NULL
-+		)
-+	{
-+		BOOL res = StackWalker::ShowCallstack(hThread, context, readMemoryFunction, pUserData);
-+#if 1
-+		//	Write crash log to file.
-+		//	Log file will be created in working directory of Psi application
-+		//	or in the root of drive "C", if application directory path is undefined.
-+		QString path = qApp->applicationDirPath();
-+		if (path.isEmpty()) {
-+			path = "c:";
-+		}
-+		path += "/psi_crash.log";
-+		QFile crashLog(path);
-+		if (crashLog.open(QIODevice::WriteOnly | QIODevice::Append)) {
-+			QString log = "\n\n------------------------------------------------------------------------------------------------\n";
-+			log += "Log is created at ";
-+			log += QDateTime::currentDateTime().toString(Qt::SystemLocaleDate) + "\n";
-+			log += "\nCall stack:\n\n";
-+			//	Add callstack log
-+			log += text_;
-+			//	Make right end of line
-+			log.replace("\n", "\r\n");
-+			crashLog.write(log.toLatin1());
-+			crashLog.close();
-+		}
-+#else
-+		//	This code may cause an exception, because
-+		//	crash dialog must be created in GUI thread.
-+		//	That's why there is more preferable to use file log as written above.
-+		CrashDialog cd(text_);
-+		cd.resize(640, 512);
-+		cd.exec();
-+#endif
-+		return res;
-+	}
-+
-+	//	Accumulate output in string
-+	virtual void OnOutput(LPCSTR szText) {
-+		text_ += szText;
-+	}
-+};
-+
-+}; // namespace Crash
-+
-+#endif
---- orig/src/tools/crash/crash_win32.cpp	1970-01-01 03:00:00.000000000 +0300
-+++ work/src/tools/crash/crash_win32.cpp	2008-01-23 09:47:01.029274000 +0300
-@@ -0,0 +1,19 @@
-+#include "crash_win32.h"
-+
-+namespace Crash {
-+
-+// The exception filter function
-+LONG WINAPI ExpFilter(EXCEPTION_POINTERS* pExp)
-+{
-+	Win32StackWalker sw;
-+	sw.ShowCallstack(GetCurrentThread(), pExp->ContextRecord);
-+	return EXCEPTION_EXECUTE_HANDLER;
-+}
-+
-+void registerSigsegvHandler(QString progname)
-+{
-+	//	Enable an application to supersede the top-level exception handler
-+	SetUnhandledExceptionFilter(ExpFilter);
-+}
-+
-+}; // namespace Crash
---- orig/src/tools/crash/stackwalker.h	1970-01-01 03:00:00.000000000 +0300
-+++ work/src/tools/crash/stackwalker.h	2005-11-07 07:07:48.000000000 +0300
-@@ -0,0 +1,189 @@
-+/**********************************************************************
-+ * 
-+ * StackWalker.h
-+ *
-+ *
-+ * History:
-+ *  2005-07-27   v1    - First public release on http://www.codeproject.com/
-+ *  (for additional changes see History in 'StackWalker.cpp'!
-+ *
-+ **********************************************************************/
-+// #pragma once is supported starting with _MCS_VER 1000, 
-+// so we need not to check the version (because we only support _MSC_VER >= 1100)!
-+#pragma once
-+
-+#include <windows.h>
-+
-+// special defines for VC5/6 (if no actual PSDK is installed):
-+#if _MSC_VER < 1300
-+typedef unsigned __int64 DWORD64, *PDWORD64;
-+#if defined(_WIN64)
-+typedef unsigned __int64 SIZE_T, *PSIZE_T;
-+#else
-+typedef unsigned long SIZE_T, *PSIZE_T;
-+#endif
-+#endif  // _MSC_VER < 1300
-+
-+class StackWalkerInternal;  // forward
-+class StackWalker
-+{
-+public:
-+  typedef enum StackWalkOptions
-+  {
-+    // No addition info will be retrived 
-+    // (only the address is available)
-+    RetrieveNone = 0,
-+    
-+    // Try to get the symbol-name
-+    RetrieveSymbol = 1,
-+    
-+    // Try to get the line for this symbol
-+    RetrieveLine = 2,
-+    
-+    // Try to retrieve the module-infos
-+    RetrieveModuleInfo = 4,
-+    
-+    // Also retrieve the version for the DLL/EXE
-+    RetrieveFileVersion = 8,
-+    
-+    // Contains all the abouve
-+    RetrieveVerbose = 0xF,
-+    
-+    // Generate a "good" symbol-search-path
-+    SymBuildPath = 0x10,
-+    
-+    // Also use the public Microsoft-Symbol-Server
-+    SymUseSymSrv = 0x20,
-+    
-+    // Contains all the abouve "Sym"-options
-+    SymAll = 0x30,
-+    
-+    // Contains all options (default)
-+    OptionsAll = 0x3F
-+  } StackWalkOptions;
-+
-+  StackWalker(
-+    int options = OptionsAll, // 'int' is by design, to combine the enum-flags
-+    LPCSTR szSymPath = NULL, 
-+    DWORD dwProcessId = GetCurrentProcessId(), 
-+    HANDLE hProcess = GetCurrentProcess()
-+    );
-+  StackWalker(DWORD dwProcessId, HANDLE hProcess);
-+  virtual ~StackWalker();
-+
-+  typedef BOOL (__stdcall *PReadProcessMemoryRoutine)(
-+    HANDLE      hProcess,
-+    DWORD64     qwBaseAddress,
-+    PVOID       lpBuffer,
-+    DWORD       nSize,
-+    LPDWORD     lpNumberOfBytesRead,
-+    LPVOID      pUserData  // optional data, which was passed in "ShowCallstack"
-+    );
-+
-+  BOOL LoadModules();
-+
-+  BOOL ShowCallstack(
-+    HANDLE hThread = GetCurrentThread(), 
-+    const CONTEXT *context = NULL, 
-+    PReadProcessMemoryRoutine readMemoryFunction = NULL,
-+    LPVOID pUserData = NULL  // optional to identify some data in the 'readMemoryFunction'-callback
-+    );
-+
-+#if _MSC_VER >= 1300
-+// due to some reasons, the "STACKWALK_MAX_NAMELEN" must be declared as "public" 
-+// in older compilers in order to use it... starting with VC7 we can declare it as "protected"
-+protected:
-+#endif
-+	enum { STACKWALK_MAX_NAMELEN = 1024 }; // max name length for found symbols
-+
-+protected:
-+  // Entry for each Callstack-Entry
-+  typedef struct CallstackEntry
-+  {
-+    DWORD64 offset;  // if 0, we have no valid entry
-+    CHAR nameSTACKWALK_MAX_NAMELEN;
-+    CHAR undNameSTACKWALK_MAX_NAMELEN;
-+    CHAR undFullNameSTACKWALK_MAX_NAMELEN;
-+    DWORD64 offsetFromSmybol;
-+    DWORD offsetFromLine;
-+    DWORD lineNumber;
-+    CHAR lineFileNameSTACKWALK_MAX_NAMELEN;
-+    DWORD symType;
-+    LPCSTR symTypeString;
-+    CHAR moduleNameSTACKWALK_MAX_NAMELEN;
-+    DWORD64 baseOfImage;
-+    CHAR loadedImageNameSTACKWALK_MAX_NAMELEN;
-+  } CallstackEntry;
-+
-+  typedef enum CallstackEntryType {firstEntry, nextEntry, lastEntry};
-+
-+  virtual void OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUserName);
-+  virtual void OnLoadModule(LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWORD size, DWORD result, LPCSTR symType, LPCSTR pdbName, ULONGLONG fileVersion);
-+  virtual void OnCallstackEntry(CallstackEntryType eType, CallstackEntry &entry);
-+  virtual void OnDbgHelpErr(LPCSTR szFuncName, DWORD gle, DWORD64 addr);
-+  virtual void OnOutput(LPCSTR szText);
-+
-+  StackWalkerInternal *m_sw;
-+  HANDLE m_hProcess;
-+  DWORD m_dwProcessId;
-+  BOOL m_modulesLoaded;
-+  LPSTR m_szSymPath;
-+
-+  int m_options;
-+
-+  static BOOL __stdcall myReadProcMem(HANDLE hProcess, DWORD64 qwBaseAddress, PVOID lpBuffer, DWORD nSize, LPDWORD lpNumberOfBytesRead);
-+
-+  friend StackWalkerInternal;
-+};
-+
-+
-+// The "ugly" assembler-implementation is needed for systems before XP
-+// If you have a new PSDK and you only compile for XP and later, then you can use 
-+// the "RtlCaptureContext"
-+// Currently there is no define which determines the PSDK-Version... 
-+// So we just use the compiler-version (and assumes that the PSDK is 
-+// the one which was installed by the VS-IDE)
-+
-+// INFO: If you want, you can use the RtlCaptureContext if you only target XP and later...
-+//       But I currently use it in x64/IA64 environments...
-+//#if defined(_M_IX86) && (_WIN32_WINNT <= 0x0500) && (_MSC_VER < 1400)
-+
-+#if defined(_M_IX86)
-+#ifdef CURRENT_THREAD_VIA_EXCEPTION
-+// TODO: The following is not a "good" implementation, 
-+// because the callstack is only valid in the "__except" block...
-+#define GET_CURRENT_CONTEXT(c, contextFlags) \
-+  do { \
-+    memset(&c, 0, sizeof(CONTEXT)); \
-+    EXCEPTION_POINTERS *pExp = NULL; \
-+    __try { \
-+      throw 0; \
-+    } __except( ( (pExp = GetExceptionInformation()) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_EXECUTE_HANDLER)) {} \
-+    if (pExp != NULL) \
-+      memcpy(&c, pExp->ContextRecord, sizeof(CONTEXT)); \
-+      c.ContextFlags = contextFlags; \
-+  } while(0);
-+#else
-+// The following should be enough for walking the callstack...
-+#define GET_CURRENT_CONTEXT(c, contextFlags) \
-+  do { \
-+    memset(&c, 0, sizeof(CONTEXT)); \
-+    c.ContextFlags = contextFlags; \
-+    __asm    call x \
-+    __asm x: pop eax \
-+    __asm    mov c.Eip, eax \
-+    __asm    mov c.Ebp, ebp \
-+    __asm    mov c.Esp, esp \
-+  } while(0);
-+#endif
-+
-+#else
-+
-+// The following is defined for x86 (XP and higher), x64 and IA64:
-+#define GET_CURRENT_CONTEXT(c, contextFlags) \
-+  do { \
-+    memset(&c, 0, sizeof(CONTEXT)); \
-+    c.ContextFlags = contextFlags; \
-+    RtlCaptureContext(&c); \
-+} while(0);
-+#endif
---- orig/src/tools/crash/stackwalker.cpp	1970-01-01 03:00:00.000000000 +0300
-+++ work/src/tools/crash/stackwalker.cpp	2008-01-22 14:09:46.683009000 +0300
-@@ -0,0 +1,1220 @@
-+/**********************************************************************
-+ * 
-+ * StackWalker.cpp
-+ *
-+ *
-+ * History:
-+ *  2005-07-27   v1    - First public release on http://www.codeproject.com/
-+ *                       http://www.codeproject.com/threads/StackWalker.asp
-+ *  2005-07-28   v2    - Changed the params of the constructor and ShowCallstack
-+ *                       (to simplify the usage)
-+ *  2005-08-01   v3    - Changed to use 'CONTEXT_FULL' instead of CONTEXT_ALL 
-+ *                       (should also be enough)
-+ *                     - Changed to compile correctly with the PSDK of VC7.0
-+ *                       (GetFileVersionInfoSizeA and GetFileVersionInfoA is wrongly defined:
-+ *                        it uses LPSTR instead of LPCSTR as first paremeter)
-+ *                     - Added declarations to support VC5/6 without using 'dbghelp.h'
-+ *                     - Added a 'pUserData' member to the ShowCallstack function and the 
-+ *                       PReadProcessMemoryRoutine declaration (to pass some user-defined data, 
-+ *                       which can be used in the readMemoryFunction-callback)
-+ *  2005-08-02   v4    - OnSymInit now also outputs the OS-Version by default
-+ *                     - Added example for doing an exception-callstack-walking in main.cpp
-+ *                       (thanks to owillebo: http://www.codeproject.com/script/profile/whos_who.asp?id=536268)
-+ *  2005-08-05   v5    - Removed most Lint (http://www.gimpel.com/) errors... thanks to Okko Willeboordse!
-+ *
-+ **********************************************************************/
-+#include <windows.h>
-+#include <Wchar.h>
-+#include <stdio.h>
-+#pragma comment(lib, "version.lib")  // for "VerQueryValue"
-+
-+#include "StackWalker.h"
-+
-+
-+// If VC7 and later, then use the shipped 'dbghelp.h'-file
-+#if _MSC_VER >= 1300
-+#include <dbghelp.h>
-+#else
-+// inline the important dbghelp.h-declarations...
-+typedef enum {
-+    SymNone = 0,
-+    SymCoff,
-+    SymCv,
-+    SymPdb,
-+    SymExport,
-+    SymDeferred,
-+    SymSym,
-+    SymDia,
-+    SymVirtual,
-+    NumSymTypes
-+} SYM_TYPE;
-+typedef struct _IMAGEHLP_LINE64 {
-+    DWORD                       SizeOfStruct;           // set to sizeof(IMAGEHLP_LINE64)
-+    PVOID                       Key;                    // internal
-+    DWORD                       LineNumber;             // line number in file
-+    PCHAR                       FileName;               // full filename
-+    DWORD64                     Address;                // first instruction of line
-+} IMAGEHLP_LINE64, *PIMAGEHLP_LINE64;
-+typedef struct _IMAGEHLP_MODULE64 {
-+    DWORD                       SizeOfStruct;           // set to sizeof(IMAGEHLP_MODULE64)
-+    DWORD64                     BaseOfImage;            // base load address of module
-+    DWORD                       ImageSize;              // virtual size of the loaded module
-+    DWORD                       TimeDateStamp;          // date/time stamp from pe header
-+    DWORD                       CheckSum;               // checksum from the pe header
-+    DWORD                       NumSyms;                // number of symbols in the symbol table
-+    SYM_TYPE                    SymType;                // type of symbols loaded
-+    CHAR                        ModuleName32;         // module name
-+    CHAR                        ImageName256;         // image name
-+    CHAR                        LoadedImageName256;   // symbol file name
-+} IMAGEHLP_MODULE64, *PIMAGEHLP_MODULE64;
-+typedef struct _IMAGEHLP_SYMBOL64 {
-+    DWORD                       SizeOfStruct;           // set to sizeof(IMAGEHLP_SYMBOL64)
-+    DWORD64                     Address;                // virtual address including dll base address
-+    DWORD                       Size;                   // estimated size of symbol, can be zero
-+    DWORD                       Flags;                  // info about the symbols, see the SYMF defines
-+    DWORD                       MaxNameLength;          // maximum size of symbol name in 'Name'
-+    CHAR                        Name1;                // symbol name (null terminated string)
-+} IMAGEHLP_SYMBOL64, *PIMAGEHLP_SYMBOL64;
-+typedef enum {
-+    AddrMode1616,
-+    AddrMode1632,
-+    AddrModeReal,
-+    AddrModeFlat
-+} ADDRESS_MODE;
-+typedef struct _tagADDRESS64 {
-+    DWORD64       Offset;
-+    WORD          Segment;
-+    ADDRESS_MODE  Mode;
-+} ADDRESS64, *LPADDRESS64;
-+typedef struct _KDHELP64 {
-+    DWORD64   Thread;
-+    DWORD   ThCallbackStack;
-+    DWORD   ThCallbackBStore;
-+    DWORD   NextCallback;
-+    DWORD   FramePointer;
-+    DWORD64   KiCallUserMode;
-+    DWORD64   KeUserCallbackDispatcher;
-+    DWORD64   SystemRangeStart;
-+    DWORD64  Reserved8;
-+} KDHELP64, *PKDHELP64;
-+typedef struct _tagSTACKFRAME64 {
-+    ADDRESS64   AddrPC;               // program counter
-+    ADDRESS64   AddrReturn;           // return address
-+    ADDRESS64   AddrFrame;            // frame pointer
-+    ADDRESS64   AddrStack;            // stack pointer
-+    ADDRESS64   AddrBStore;           // backing store pointer
-+    PVOID       FuncTableEntry;       // pointer to pdata/fpo or NULL
-+    DWORD64     Params4;            // possible arguments to the function
-+    BOOL        Far;                  // WOW far call
-+    BOOL        Virtual;              // is this a virtual frame?
-+    DWORD64     Reserved3;
-+    KDHELP64    KdHelp;
-+} STACKFRAME64, *LPSTACKFRAME64;
-+typedef
-+BOOL
-+(__stdcall *PREAD_PROCESS_MEMORY_ROUTINE64)(
-+    HANDLE      hProcess,
-+    DWORD64     qwBaseAddress,
-+    PVOID       lpBuffer,
-+    DWORD       nSize,
-+    LPDWORD     lpNumberOfBytesRead
-+    );
-+typedef
-+PVOID
-+(__stdcall *PFUNCTION_TABLE_ACCESS_ROUTINE64)(
-+    HANDLE  hProcess,
-+    DWORD64 AddrBase
-+    );
-+typedef
-+DWORD64
-+(__stdcall *PGET_MODULE_BASE_ROUTINE64)(
-+    HANDLE  hProcess,
-+    DWORD64 Address
-+    );
-+typedef
-+DWORD64
-+(__stdcall *PTRANSLATE_ADDRESS_ROUTINE64)(
-+    HANDLE    hProcess,
-+    HANDLE    hThread,
-+    LPADDRESS64 lpaddr
-+    );
-+#define SYMOPT_CASE_INSENSITIVE         0x00000001
-+#define SYMOPT_UNDNAME                  0x00000002
-+#define SYMOPT_DEFERRED_LOADS           0x00000004
-+#define SYMOPT_NO_CPP                   0x00000008
-+#define SYMOPT_LOAD_LINES               0x00000010
-+#define SYMOPT_OMAP_FIND_NEAREST        0x00000020
-+#define SYMOPT_LOAD_ANYTHING            0x00000040
-+#define SYMOPT_IGNORE_CVREC             0x00000080
-+#define SYMOPT_NO_UNQUALIFIED_LOADS     0x00000100
-+#define SYMOPT_FAIL_CRITICAL_ERRORS     0x00000200
-+#define SYMOPT_EXACT_SYMBOLS            0x00000400
-+#define SYMOPT_ALLOW_ABSOLUTE_SYMBOLS   0x00000800
-+#define SYMOPT_IGNORE_NT_SYMPATH        0x00001000
-+#define SYMOPT_INCLUDE_32BIT_MODULES    0x00002000
-+#define SYMOPT_PUBLICS_ONLY             0x00004000
-+#define SYMOPT_NO_PUBLICS               0x00008000
-+#define SYMOPT_AUTO_PUBLICS             0x00010000
-+#define SYMOPT_NO_IMAGE_SEARCH          0x00020000
-+#define SYMOPT_SECURE                   0x00040000
-+#define SYMOPT_DEBUG                    0x80000000
-+#define UNDNAME_COMPLETE                 (0x0000)  // Enable full undecoration
-+#define UNDNAME_NAME_ONLY                (0x1000)  // Crack only the name for primary declaration;
-+#endif  // _MSC_VER < 1300
-+
-+// Some missing defines (for VC5/6):
-+#ifndef INVALID_FILE_ATTRIBUTES
-+#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-+#endif  
-+
-+
-+// secure-CRT_functions are only available starting with VC8
-+#if _MSC_VER < 1400
-+#define strcpy_s strcpy
-+#define strcat_s(dst, len, src) strcat(dst, src)
-+#define _snprintf_s _snprintf
-+#define _tcscat_s _tcscat
-+#endif
-+
-+// Normally it should be enough to use 'CONTEXT_FULL' (better would be 'CONTEXT_ALL')
-+#define USED_CONTEXT_FLAGS CONTEXT_FULL
-+
-+
-+class StackWalkerInternal
-+{
-+public:
-+  StackWalkerInternal(StackWalker *parent, HANDLE hProcess)
-+  {
-+    m_parent = parent;
-+    m_hDbhHelp = NULL;
-+    pSC = NULL;
-+    m_hProcess = hProcess;
-+    m_szSymPath = NULL;
-+    pSFTA = NULL;
-+    pSGLFA = NULL;
-+    pSGMB = NULL;
-+    pSGMI = NULL;
-+    pSGO = NULL;
-+    pSGSFA = NULL;
-+    pSI = NULL;
-+    pSLM = NULL;
-+    pSSO = NULL;
-+    pSW = NULL;
-+    pUDSN = NULL;
-+    pSGSP = NULL;
-+  }
-+  ~StackWalkerInternal()
-+  {
-+    if (pSC != NULL)
-+      pSC(m_hProcess);  // SymCleanup
-+    if (m_hDbhHelp != NULL)
-+      FreeLibrary(m_hDbhHelp);
-+    m_hDbhHelp = NULL;
-+    m_parent = NULL;
-+    if(m_szSymPath != NULL)
-+      free(m_szSymPath);
-+    m_szSymPath = NULL;
-+  }
-+  BOOL Init(LPCSTR szSymPath)
-+  {
-+    if (m_parent == NULL)
-+      return FALSE;
-+    // Dynamically load the Entry-Points for dbghelp.dll:
-+    // First try to load the newsest one from
-+    TCHAR szTemp4096;
-+    // But before wqe do this, we first check if the ".local" file exists
-+    if (GetModuleFileName(NULL, szTemp, 4096) > 0)
-+    {
-+      wcscat_s(szTemp, L".local");
-+      if (GetFileAttributes(szTemp) == INVALID_FILE_ATTRIBUTES)
-+      {
-+        // ".local" file does not exist, so we can try to load the dbghelp.dll from the "Debugging Tools for Windows"
-+        if (GetEnvironmentVariable(L"ProgramFiles", szTemp, 4096) > 0)
-+        {
-+          wcscat_s(szTemp, L"\\Debugging Tools for Windows\\dbghelp.dll");
-+          // now check if the file exists:
-+          if (GetFileAttributes(szTemp) != INVALID_FILE_ATTRIBUTES)
-+          {
-+            m_hDbhHelp = LoadLibrary(szTemp);
-+          }
-+        }
-+          // Still not found? Then try to load the 64-Bit version:
-+        if ( (m_hDbhHelp == NULL) && (GetEnvironmentVariable(L"ProgramFiles", szTemp, 4096) > 0) )
-+        {
-+          wcscat_s(szTemp, L"\\Debugging Tools for Windows 64-Bit\\dbghelp.dll");
-+          if (GetFileAttributes(szTemp) != INVALID_FILE_ATTRIBUTES)
-+          {
-+            m_hDbhHelp = LoadLibrary(szTemp);
-+          }
-+        }
-+      }
-+    }
-+    if (m_hDbhHelp == NULL)  // if not already loaded, try to load a default-one
-+      m_hDbhHelp = LoadLibrary( L"dbghelp.dll" );
-+    if (m_hDbhHelp == NULL)
-+      return FALSE;
-+    pSI = (tSI) GetProcAddress(m_hDbhHelp, "SymInitialize" );
-+    pSC = (tSC) GetProcAddress(m_hDbhHelp, "SymCleanup" );
-+
-+    pSW = (tSW) GetProcAddress(m_hDbhHelp, "StackWalk64" );
-+    pSGO = (tSGO) GetProcAddress(m_hDbhHelp, "SymGetOptions" );
-+    pSSO = (tSSO) GetProcAddress(m_hDbhHelp, "SymSetOptions" );
-+
-+    pSFTA = (tSFTA) GetProcAddress(m_hDbhHelp, "SymFunctionTableAccess64" );
-+    pSGLFA = (tSGLFA) GetProcAddress(m_hDbhHelp, "SymGetLineFromAddr64" );
-+    pSGMB = (tSGMB) GetProcAddress(m_hDbhHelp, "SymGetModuleBase64" );
-+    pSGMI = (tSGMI) GetProcAddress(m_hDbhHelp, "SymGetModuleInfo64" );
-+    //pSGMI_V3 = (tSGMI_V3) GetProcAddress(m_hDbhHelp, "SymGetModuleInfo64" );
-+    pSGSFA = (tSGSFA) GetProcAddress(m_hDbhHelp, "SymGetSymFromAddr64" );
-+    pUDSN = (tUDSN) GetProcAddress(m_hDbhHelp, "UnDecorateSymbolName" );
-+    pSLM = (tSLM) GetProcAddress(m_hDbhHelp, "SymLoadModule64" );
-+    pSGSP =(tSGSP) GetProcAddress(m_hDbhHelp, "SymGetSearchPath" );
-+
-+    if ( pSC == NULL || pSFTA == NULL || pSGMB == NULL || pSGMI == NULL ||
-+      pSGO == NULL || pSGSFA == NULL || pSI == NULL || pSSO == NULL ||
-+      pSW == NULL || pUDSN == NULL || pSLM == NULL )
-+    {
-+      FreeLibrary(m_hDbhHelp);
-+      m_hDbhHelp = NULL;
-+      pSC = NULL;
-+      return FALSE;
-+    }
-+
-+    // SymInitialize
-+    if (szSymPath != NULL)
-+      m_szSymPath = _strdup(szSymPath);
-+    if (this->pSI(m_hProcess, m_szSymPath, FALSE) == FALSE)
-+      this->m_parent->OnDbgHelpErr("SymInitialize", GetLastError(), 0);
-+      
-+    DWORD symOptions = this->pSGO();  // SymGetOptions
-+    symOptions |= SYMOPT_LOAD_LINES;
-+    symOptions |= SYMOPT_FAIL_CRITICAL_ERRORS;
-+    //symOptions |= SYMOPT_NO_PROMPTS;
-+    // SymSetOptions
-+    symOptions = this->pSSO(symOptions);
-+
-+    char bufStackWalker::STACKWALK_MAX_NAMELEN = {0};
-+    if (this->pSGSP != NULL)
-+    {
-+      if (this->pSGSP(m_hProcess, buf, StackWalker::STACKWALK_MAX_NAMELEN) == FALSE)
-+        this->m_parent->OnDbgHelpErr("SymGetSearchPath", GetLastError(), 0);
-+    }
-+    char szUserName1024 = {0};
-+    DWORD dwSize = 1024;
-+    GetUserNameA(szUserName, &dwSize);
-+    this->m_parent->OnSymInit(buf, symOptions, szUserName);
-+
-+    return TRUE;
-+  }
-+
-+  StackWalker *m_parent;
-+
-+  HMODULE m_hDbhHelp;
-+  HANDLE m_hProcess;
-+  LPSTR m_szSymPath;
-+
-+/*typedef struct IMAGEHLP_MODULE64_V3 {
-+    DWORD    SizeOfStruct;           // set to sizeof(IMAGEHLP_MODULE64)
-+    DWORD64  BaseOfImage;            // base load address of module
-+    DWORD    ImageSize;              // virtual size of the loaded module
-+    DWORD    TimeDateStamp;          // date/time stamp from pe header
-+    DWORD    CheckSum;               // checksum from the pe header
-+    DWORD    NumSyms;                // number of symbols in the symbol table
-+    SYM_TYPE SymType;                // type of symbols loaded
-+    CHAR     ModuleName32;         // module name
-+    CHAR     ImageName256;         // image name
-+    // new elements: 07-Jun-2002
-+    CHAR     LoadedImageName256;   // symbol file name
-+    CHAR     LoadedPdbName256;     // pdb file name
-+    DWORD    CVSig;                  // Signature of the CV record in the debug directories
-+    CHAR         CVDataMAX_PATH * 3;   // Contents of the CV record
-+    DWORD    PdbSig;                 // Signature of PDB
-+    GUID     PdbSig70;               // Signature of PDB (VC 7 and up)
-+    DWORD    PdbAge;                 // DBI age of pdb
-+    BOOL     PdbUnmatched;           // loaded an unmatched pdb
-+    BOOL     DbgUnmatched;           // loaded an unmatched dbg
-+    BOOL     LineNumbers;            // we have line number information
-+    BOOL     GlobalSymbols;          // we have internal symbol information
-+    BOOL     TypeInfo;               // we have type information
-+    // new elements: 17-Dec-2003
-+    BOOL     SourceIndexed;          // pdb supports source server
-+    BOOL     Publics;                // contains public symbols
-+};
-+*/
-+typedef struct IMAGEHLP_MODULE64_V2 {
-+    DWORD    SizeOfStruct;           // set to sizeof(IMAGEHLP_MODULE64)
-+    DWORD64  BaseOfImage;            // base load address of module
-+    DWORD    ImageSize;              // virtual size of the loaded module
-+    DWORD    TimeDateStamp;          // date/time stamp from pe header
-+    DWORD    CheckSum;               // checksum from the pe header
-+    DWORD    NumSyms;                // number of symbols in the symbol table
-+    SYM_TYPE SymType;                // type of symbols loaded
-+    CHAR     ModuleName32;         // module name
-+    CHAR     ImageName256;         // image name
-+    CHAR     LoadedImageName256;   // symbol file name
-+};
-+
-+
-+  // SymCleanup()
-+  typedef BOOL (__stdcall *tSC)( IN HANDLE hProcess );
-+  tSC pSC;
-+
-+  // SymFunctionTableAccess64()
-+  typedef PVOID (__stdcall *tSFTA)( HANDLE hProcess, DWORD64 AddrBase );
-+  tSFTA pSFTA;
-+
-+  // SymGetLineFromAddr64()
-+  typedef BOOL (__stdcall *tSGLFA)( IN HANDLE hProcess, IN DWORD64 dwAddr,
-+    OUT PDWORD pdwDisplacement, OUT PIMAGEHLP_LINE64 Line );
-+  tSGLFA pSGLFA;
-+
-+  // SymGetModuleBase64()
-+  typedef DWORD64 (__stdcall *tSGMB)( IN HANDLE hProcess, IN DWORD64 dwAddr );
-+  tSGMB pSGMB;
-+
-+  // SymGetModuleInfo64()
-+  typedef BOOL (__stdcall *tSGMI)( IN HANDLE hProcess, IN DWORD64 dwAddr, OUT IMAGEHLP_MODULE64_V2 *ModuleInfo );
-+  tSGMI pSGMI;
-+
-+//  // SymGetModuleInfo64()
-+//  typedef BOOL (__stdcall *tSGMI_V3)( IN HANDLE hProcess, IN DWORD64 dwAddr, OUT IMAGEHLP_MODULE64_V3 *ModuleInfo );
-+//  tSGMI_V3 pSGMI_V3;
-+
-+  // SymGetOptions()
-+  typedef DWORD (__stdcall *tSGO)( VOID );
-+  tSGO pSGO;
-+
-+  // SymGetSymFromAddr64()
-+  typedef BOOL (__stdcall *tSGSFA)( IN HANDLE hProcess, IN DWORD64 dwAddr,
-+    OUT PDWORD64 pdwDisplacement, OUT PIMAGEHLP_SYMBOL64 Symbol );
-+  tSGSFA pSGSFA;
-+
-+  // SymInitialize()
-+  typedef BOOL (__stdcall *tSI)( IN HANDLE hProcess, IN PSTR UserSearchPath, IN BOOL fInvadeProcess );
-+  tSI pSI;
-+
-+  // SymLoadModule64()
-+  typedef DWORD64 (__stdcall *tSLM)( IN HANDLE hProcess, IN HANDLE hFile,
-+    IN PSTR ImageName, IN PSTR ModuleName, IN DWORD64 BaseOfDll, IN DWORD SizeOfDll );
-+  tSLM pSLM;
-+
-+  // SymSetOptions()
-+  typedef DWORD (__stdcall *tSSO)( IN DWORD SymOptions );
-+  tSSO pSSO;
-+
-+  // StackWalk64()
-+  typedef BOOL (__stdcall *tSW)( 
-+    DWORD MachineType, 
-+    HANDLE hProcess,
-+    HANDLE hThread, 
-+    LPSTACKFRAME64 StackFrame, 
-+    PVOID ContextRecord,
-+    PREAD_PROCESS_MEMORY_ROUTINE64 ReadMemoryRoutine,
-+    PFUNCTION_TABLE_ACCESS_ROUTINE64 FunctionTableAccessRoutine,
-+    PGET_MODULE_BASE_ROUTINE64 GetModuleBaseRoutine,
-+    PTRANSLATE_ADDRESS_ROUTINE64 TranslateAddress );
-+  tSW pSW;
-+
-+  // UnDecorateSymbolName()
-+  typedef DWORD (__stdcall WINAPI *tUDSN)( PCSTR DecoratedName, PSTR UnDecoratedName,
-+    DWORD UndecoratedLength, DWORD Flags );
-+  tUDSN pUDSN;
-+
-+  typedef BOOL (__stdcall WINAPI *tSGSP)(HANDLE hProcess, PSTR SearchPath, DWORD SearchPathLength);
-+  tSGSP pSGSP;
-+
-+
-+private:
-+  // **************************************** ToolHelp32 ************************
-+  #define MAX_MODULE_NAME32 255
-+  #define TH32CS_SNAPMODULE   0x00000008
-+  #pragma pack( push, 8 )
-+  typedef struct tagMODULEENTRY32
-+  {
-+      DWORD   dwSize;
-+      DWORD   th32ModuleID;       // This module
-+      DWORD   th32ProcessID;      // owning process
-+      DWORD   GlblcntUsage;       // Global usage count on the module
-+      DWORD   ProccntUsage;       // Module usage count in th32ProcessID's context
-+      BYTE  * modBaseAddr;        // Base address of module in th32ProcessID's context
-+      DWORD   modBaseSize;        // Size in bytes of module starting at modBaseAddr
-+      HMODULE hModule;            // The hModule of this module in th32ProcessID's context
-+      char    szModuleMAX_MODULE_NAME32 + 1;
-+      char    szExePathMAX_PATH;
-+  } MODULEENTRY32;
-+  typedef MODULEENTRY32 *  PMODULEENTRY32;
-+  typedef MODULEENTRY32 *  LPMODULEENTRY32;
-+  #pragma pack( pop )
-+
-+  BOOL GetModuleListTH32(HANDLE hProcess, DWORD pid)
-+  {
-+    // CreateToolhelp32Snapshot()
-+    typedef HANDLE (__stdcall *tCT32S)(DWORD dwFlags, DWORD th32ProcessID);
-+    // Module32First()
-+    typedef BOOL (__stdcall *tM32F)(HANDLE hSnapshot, LPMODULEENTRY32 lpme);
-+    // Module32Next()
-+    typedef BOOL (__stdcall *tM32N)(HANDLE hSnapshot, LPMODULEENTRY32 lpme);
-+
-+    // try both dlls...
-+    const WCHAR *dllname = { L"kernel32.dll", L"tlhelp32.dll" };
-+    HINSTANCE hToolhelp = NULL;
-+    tCT32S pCT32S = NULL;
-+    tM32F pM32F = NULL;
-+    tM32N pM32N = NULL;
-+
-+    HANDLE hSnap;
-+    MODULEENTRY32 me;
-+    me.dwSize = sizeof(me);
-+    BOOL keepGoing;
-+    size_t i;
-+
-+    for (i = 0; i<(sizeof(dllname) / sizeof(dllname0)); i++ )
-+    {
-+      hToolhelp = LoadLibrary( dllnamei );
-+      if (hToolhelp == NULL)
-+        continue;
-+      pCT32S = (tCT32S) GetProcAddress(hToolhelp, "CreateToolhelp32Snapshot");
-+      pM32F = (tM32F) GetProcAddress(hToolhelp, "Module32First");
-+      pM32N = (tM32N) GetProcAddress(hToolhelp, "Module32Next");
-+      if ( (pCT32S != NULL) && (pM32F != NULL) && (pM32N != NULL) )
-+        break; // found the functions!
-+      FreeLibrary(hToolhelp);
-+      hToolhelp = NULL;
-+    }
-+
-+    if (hToolhelp == NULL)
-+      return FALSE;
-+
-+    hSnap = pCT32S( TH32CS_SNAPMODULE, pid );
-+    if (hSnap == (HANDLE) -1)
-+      return FALSE;
-+
-+    keepGoing = !!pM32F( hSnap, &me );
-+    int cnt = 0;
-+    while (keepGoing)
-+    {
-+      this->LoadModule(hProcess, me.szExePath, me.szModule, (DWORD64) me.modBaseAddr, me.modBaseSize);
-+      cnt++;
-+      keepGoing = !!pM32N( hSnap, &me );
-+    }
-+    CloseHandle(hSnap);
-+    FreeLibrary(hToolhelp);
-+    if (cnt <= 0)
-+      return FALSE;
-+    return TRUE;
-+  }  // GetModuleListTH32
-+
-+  // **************************************** PSAPI ************************
-+  typedef struct _MODULEINFO {
-+      LPVOID lpBaseOfDll;
-+      DWORD SizeOfImage;
-+      LPVOID EntryPoint;
-+  } MODULEINFO, *LPMODULEINFO;
-+
-+  BOOL GetModuleListPSAPI(HANDLE hProcess)
-+  {
-+    // EnumProcessModules()
-+    typedef BOOL (__stdcall *tEPM)(HANDLE hProcess, HMODULE *lphModule, DWORD cb, LPDWORD lpcbNeeded );
-+    // GetModuleFileNameEx()
-+    typedef DWORD (__stdcall *tGMFNE)(HANDLE hProcess, HMODULE hModule, LPSTR lpFilename, DWORD nSize );
-+    // GetModuleBaseName()
-+    typedef DWORD (__stdcall *tGMBN)(HANDLE hProcess, HMODULE hModule, LPSTR lpFilename, DWORD nSize );
-+    // GetModuleInformation()
-+    typedef BOOL (__stdcall *tGMI)(HANDLE hProcess, HMODULE hModule, LPMODULEINFO pmi, DWORD nSize );
-+
-+    HINSTANCE hPsapi;
-+    tEPM pEPM;
-+    tGMFNE pGMFNE;
-+    tGMBN pGMBN;
-+    tGMI pGMI;
-+
-+    DWORD i;
-+    //ModuleEntry e;
-+    DWORD cbNeeded;
-+    MODULEINFO mi;
-+    HMODULE *hMods = 0;
-+    char *tt = NULL;
-+    char *tt2 = NULL;
-+    const SIZE_T TTBUFLEN = 8096;
-+    int cnt = 0;
-+
-+    hPsapi = LoadLibrary( L"psapi.dll" );
-+    if (hPsapi == NULL)
-+      return FALSE;
-+
-+    pEPM = (tEPM) GetProcAddress( hPsapi, "EnumProcessModules" );
-+    pGMFNE = (tGMFNE) GetProcAddress( hPsapi, "GetModuleFileNameExA" );
-+    pGMBN = (tGMFNE) GetProcAddress( hPsapi, "GetModuleBaseNameA" );
-+    pGMI = (tGMI) GetProcAddress( hPsapi, "GetModuleInformation" );
-+    if ( (pEPM == NULL) || (pGMFNE == NULL) || (pGMBN == NULL) || (pGMI == NULL) )
-+    {
-+      // we couldn´t find all functions
-+      FreeLibrary(hPsapi);
-+      return FALSE;
-+    }
-+
-+    hMods = (HMODULE*) malloc(sizeof(HMODULE) * (TTBUFLEN / sizeof HMODULE));
-+    tt = (char*) malloc(sizeof(char) * TTBUFLEN);
-+    tt2 = (char*) malloc(sizeof(char) * TTBUFLEN);
-+    if ( (hMods == NULL) || (tt == NULL) || (tt2 == NULL) )
-+      goto cleanup;
-+
-+    if ( ! pEPM( hProcess, hMods, TTBUFLEN, &cbNeeded ) )
-+    {
-+      //_ftprintf(fLogFile, _T("%lu: EPM failed, GetLastError = %lu\n"), g_dwShowCount, gle );
-+      goto cleanup;
-+    }
-+
-+    if ( cbNeeded > TTBUFLEN )
-+    {
-+      //_ftprintf(fLogFile, _T("%lu: More than %lu module handles. Huh?\n"), g_dwShowCount, lenof( hMods ) );
-+      goto cleanup;
-+    }
-+
-+    for ( i = 0; i < cbNeeded / sizeof hMods0; i++ )
-+    {
-+      // base address, size
-+      pGMI(hProcess, hModsi, &mi, sizeof mi );
-+      // image file name
-+      tt0 = 0;
-+      pGMFNE(hProcess, hModsi, tt, TTBUFLEN );
-+      // module name
-+      tt20 = 0;
-+      pGMBN(hProcess, hModsi, tt2, TTBUFLEN );
-+
-+      DWORD dwRes = this->LoadModule(hProcess, tt, tt2, (DWORD64) mi.lpBaseOfDll, mi.SizeOfImage);
-+      if (dwRes != ERROR_SUCCESS)
-+        this->m_parent->OnDbgHelpErr("LoadModule", dwRes, 0);
-+      cnt++;
-+    }
-+
-+  cleanup:
-+    if (hPsapi != NULL) FreeLibrary(hPsapi);
-+    if (tt2 != NULL) free(tt2);
-+    if (tt != NULL) free(tt);
-+    if (hMods != NULL) free(hMods);
-+
-+    return cnt != 0;
-+  }  // GetModuleListPSAPI
-+
-+  DWORD LoadModule(HANDLE hProcess, LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWORD size)
-+  {
-+    CHAR *szImg = _strdup(img);
-+    CHAR *szMod = _strdup(mod);
-+    DWORD result = ERROR_SUCCESS;
-+    if ( (szImg == NULL) || (szMod == NULL) )
-+      result = ERROR_NOT_ENOUGH_MEMORY;
-+    else
-+    {
-+      if (pSLM(hProcess, 0, szImg, szMod, baseAddr, size) == 0)
-+        result = GetLastError();
-+    }
-+    ULONGLONG fileVersion = 0;
-+    if ( (m_parent != NULL) && (szImg != NULL) )
-+    {
-+      // try to retrive the file-version:
-+      if ( (this->m_parent->m_options & StackWalker::RetrieveFileVersion) != 0)
-+      {
-+        VS_FIXEDFILEINFO *fInfo = NULL;
-+        DWORD dwHandle;
-+        DWORD dwSize = GetFileVersionInfoSizeA(szImg, &dwHandle);
-+        if (dwSize > 0)
-+        {
-+          LPVOID vData = malloc(dwSize);
-+          if (vData != NULL)
-+          {
-+            if (GetFileVersionInfoA(szImg, dwHandle, dwSize, vData) != 0)
-+            {
-+              UINT len;
-+              WCHAR szSubBlock = L"\\";
-+              if (VerQueryValue(vData, szSubBlock, (LPVOID*) &fInfo, &len) == 0)
-+                fInfo = NULL;
-+              else
-+              {
-+                fileVersion = ((ULONGLONG)fInfo->dwFileVersionLS) + ((ULONGLONG)fInfo->dwFileVersionMS << 32);
-+              }
-+            }
-+            free(vData);
-+          }
-+        }
-+      }
-+
-+      // Retrive some additional-infos about the module
-+      IMAGEHLP_MODULE64_V2 Module;
-+      const char *szSymType = "-unknown-";
-+      if (this->GetModuleInfo(hProcess, baseAddr, &Module) != FALSE)
-+      {
-+        switch(Module.SymType)
-+        {
-+          case SymNone:
-+            szSymType = "-nosymbols-";
-+            break;
-+          case SymCoff:
-+            szSymType = "COFF";
-+            break;
-+          case SymCv:
-+            szSymType = "CV";
-+            break;
-+          case SymPdb:
-+            szSymType = "PDB";
-+            break;
-+          case SymExport:
-+            szSymType = "-exported-";
-+            break;
-+          case SymDeferred:
-+            szSymType = "-deferred-";
-+            break;
-+          case SymSym:
-+            szSymType = "SYM";
-+            break;
-+          case 8: //SymVirtual:
-+            szSymType = "Virtual";
-+            break;
-+          case 9: // SymDia:
-+            szSymType = "DIA";
-+            break;
-+        }
-+      }
-+      this->m_parent->OnLoadModule(img, mod, baseAddr, size, result, szSymType, Module.LoadedImageName, fileVersion);
-+    }
-+    if (szImg != NULL) free(szImg);
-+    if (szMod != NULL) free(szMod);
-+    return result;
-+  }
-+public:
-+  BOOL LoadModules(HANDLE hProcess, DWORD dwProcessId)
-+  {
-+    // first try toolhelp32
-+    if (GetModuleListTH32(hProcess, dwProcessId))
-+      return true;
-+    // then try psapi
-+    return GetModuleListPSAPI(hProcess);
-+  }
-+
-+
-+  BOOL GetModuleInfo(HANDLE hProcess, DWORD64 baseAddr, IMAGEHLP_MODULE64_V2 *pModuleInfo)
-+  {
-+    if(this->pSGMI == NULL)
-+    {
-+      SetLastError(ERROR_DLL_INIT_FAILED);
-+      return FALSE;
-+    }
-+    // First try to use the larger ModuleInfo-Structure
-+//    memset(pModuleInfo, 0, sizeof(IMAGEHLP_MODULE64_V3));
-+//    pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64_V3);
-+//    if (this->pSGMI_V3 != NULL)
-+//    {
-+//      if (this->pSGMI_V3(hProcess, baseAddr, pModuleInfo) != FALSE)
-+//        return TRUE;
-+//      // check if the parameter was wrong (size is bad...)
-+//      if (GetLastError() != ERROR_INVALID_PARAMETER)
-+//        return FALSE;
-+//    }
-+    // could not retrive the bigger structure, try with the smaller one (as defined in VC7.1)...
-+    pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64_V2);
-+    void *pData = malloc(4096); // reserve enough memory, so the bug in v6.3.5.1 does not lead to memory-overwrites...
-+    if (pData == NULL)
-+    {
-+      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-+      return FALSE;
-+    }
-+    memcpy(pData, pModuleInfo, sizeof(IMAGEHLP_MODULE64_V2));
-+    if (this->pSGMI(hProcess, baseAddr, (IMAGEHLP_MODULE64_V2*) pData) != FALSE)
-+    {
-+      // only copy as much memory as is reserved...
-+      memcpy(pModuleInfo, pData, sizeof(IMAGEHLP_MODULE64_V2));
-+      pModuleInfo->SizeOfStruct = sizeof(IMAGEHLP_MODULE64_V2);
-+      free(pData);
-+      return TRUE;
-+    }
-+    free(pData);
-+    SetLastError(ERROR_DLL_INIT_FAILED);
-+    return FALSE;
-+  }
-+};
-+
-+// #############################################################
-+StackWalker::StackWalker(DWORD dwProcessId, HANDLE hProcess)
-+{
-+  this->m_options = OptionsAll;
-+  this->m_modulesLoaded = FALSE;
-+  this->m_hProcess = hProcess;
-+  this->m_sw = new StackWalkerInternal(this, this->m_hProcess);
-+  this->m_dwProcessId = dwProcessId;
-+  this->m_szSymPath = NULL;
-+}
-+StackWalker::StackWalker(int options, LPCSTR szSymPath, DWORD dwProcessId, HANDLE hProcess)
-+{
-+  this->m_options = options;
-+  this->m_modulesLoaded = FALSE;
-+  this->m_hProcess = hProcess;
-+  this->m_sw = new StackWalkerInternal(this, this->m_hProcess);
-+  this->m_dwProcessId = dwProcessId;
-+  if (szSymPath != NULL)
-+  {
-+    this->m_szSymPath = _strdup(szSymPath);
-+    this->m_options |= SymBuildPath;
-+  }
-+  else
-+    this->m_szSymPath = NULL;
-+}
-+
-+StackWalker::~StackWalker()
-+{
-+  if (m_szSymPath != NULL)
-+    free(m_szSymPath);
-+  m_szSymPath = NULL;
-+  if (this->m_sw != NULL)
-+    delete this->m_sw;
-+  this->m_sw = NULL;
-+}
-+
-+BOOL StackWalker::LoadModules()
-+{
-+  if (this->m_sw == NULL)
-+  {
-+    SetLastError(ERROR_DLL_INIT_FAILED);
-+    return FALSE;
-+  }
-+  if (m_modulesLoaded != FALSE)
-+    return TRUE;
-+
-+  // Build the sym-path:
-+  char *szSymPath = NULL;
-+  if ( (this->m_options & SymBuildPath) != 0)
-+  {
-+    const size_t nSymPathLen = 4096;
-+    szSymPath = (char*) malloc(nSymPathLen);
-+    if (szSymPath == NULL)
-+    {
-+      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-+      return FALSE;
-+    }
-+    szSymPath0 = 0;
-+    // Now first add the (optional) provided sympath:
-+    if (this->m_szSymPath != NULL)
-+    {
-+      strcat_s(szSymPath, nSymPathLen, this->m_szSymPath);
-+      strcat_s(szSymPath, nSymPathLen, ";");
-+    }
-+
-+    strcat_s(szSymPath, nSymPathLen, ".;");
-+
-+    const size_t nTempLen = 1024;
-+    char szTempnTempLen;
-+    // Now add the current directory:
-+    if (GetCurrentDirectoryA(nTempLen, szTemp) > 0)
-+    {
-+      szTempnTempLen-1 = 0;
-+      strcat_s(szSymPath, nSymPathLen, szTemp);
-+      strcat_s(szSymPath, nSymPathLen, ";");
-+    }
-+
-+    // Now add the path for the main-module:
-+    if (GetModuleFileNameA(NULL, szTemp, nTempLen) > 0)
-+    {
-+      szTempnTempLen-1 = 0;
-+      for (char *p = (szTemp+strlen(szTemp)-1); p >= szTemp; --p)
-+      {
-+        // locate the rightmost path separator
-+        if ( (*p == '\\') || (*p == '/') || (*p == ':') )
-+        {
-+          *p = 0;
-+          break;
-+        }
-+      }  // for (search for path separator...)
-+      if (strlen(szTemp) > 0)
-+      {
-+        strcat_s(szSymPath, nSymPathLen, szTemp);
-+        strcat_s(szSymPath, nSymPathLen, ";");
-+      }
-+    }
-+    if (GetEnvironmentVariableA("_NT_SYMBOL_PATH", szTemp, nTempLen) > 0)
-+    {
-+      szTempnTempLen-1 = 0;
-+      strcat_s(szSymPath, nSymPathLen, szTemp);
-+      strcat_s(szSymPath, nSymPathLen, ";");
-+    }
-+    if (GetEnvironmentVariableA("_NT_ALTERNATE_SYMBOL_PATH", szTemp, nTempLen) > 0)
-+    {
-+      szTempnTempLen-1 = 0;
-+      strcat_s(szSymPath, nSymPathLen, szTemp);
-+      strcat_s(szSymPath, nSymPathLen, ";");
-+    }
-+    if (GetEnvironmentVariableA("SYSTEMROOT", szTemp, nTempLen) > 0)
-+    {
-+      szTempnTempLen-1 = 0;
-+      strcat_s(szSymPath, nSymPathLen, szTemp);
-+      strcat_s(szSymPath, nSymPathLen, ";");
-+      // also add the "system32"-directory:
-+      strcat_s(szTemp, nTempLen, "\\system32");
-+      strcat_s(szSymPath, nSymPathLen, szTemp);
-+      strcat_s(szSymPath, nSymPathLen, ";");
-+    }
-+
-+    if ( (this->m_options & SymBuildPath) != 0)
-+    {
-+      if (GetEnvironmentVariableA("SYSTEMDRIVE", szTemp, nTempLen) > 0)
-+      {
-+        szTempnTempLen-1 = 0;
-+        strcat_s(szSymPath, nSymPathLen, "SRV*");
-+        strcat_s(szSymPath, nSymPathLen, szTemp);
-+        strcat_s(szSymPath, nSymPathLen, "\\websymbols");
-+        strcat_s(szSymPath, nSymPathLen, "*http://msdl.microsoft.com/download/symbols;");
-+      }
-+      else
-+        strcat_s(szSymPath, nSymPathLen, "SRV*c:\\websymbols*http://msdl.microsoft.com/download/symbols;");
-+    }
-+  }
-+
-+  // First Init the whole stuff...
-+  BOOL bRet = this->m_sw->Init(szSymPath);
-+  if (szSymPath != NULL) free(szSymPath); szSymPath = NULL;
-+  if (bRet == FALSE)
-+  {
-+    this->OnDbgHelpErr("Error while initializing dbghelp.dll", 0, 0);
-+    SetLastError(ERROR_DLL_INIT_FAILED);
-+    return FALSE;
-+  }
-+
-+  bRet = this->m_sw->LoadModules(this->m_hProcess, this->m_dwProcessId);
-+  if (bRet != FALSE)
-+    m_modulesLoaded = TRUE;
-+  return bRet;
-+}
-+
-+
-+// The following is used to pass the "userData"-Pointer to the user-provided readMemoryFunction
-+// This has to be done due to a problem with the "hProcess"-parameter in x64...
-+// Because this class is in no case multi-threading-enabled (because of the limitations 
-+// of dbghelp.dll) it is "safe" to use a static-variable
-+static StackWalker::PReadProcessMemoryRoutine s_readMemoryFunction = NULL;
-+static LPVOID s_readMemoryFunction_UserData = NULL;
-+
-+BOOL StackWalker::ShowCallstack(HANDLE hThread, const CONTEXT *context, PReadProcessMemoryRoutine readMemoryFunction, LPVOID pUserData)
-+{
-+  CONTEXT c;;
-+  CallstackEntry csEntry;
-+  IMAGEHLP_SYMBOL64 *pSym = NULL;
-+  StackWalkerInternal::IMAGEHLP_MODULE64_V2 Module;
-+  IMAGEHLP_LINE64 Line;
-+  int frameNum;
-+
-+  if (m_modulesLoaded == FALSE)
-+    this->LoadModules();  // ignore the result...
-+
-+  if (this->m_sw->m_hDbhHelp == NULL)
-+  {
-+    SetLastError(ERROR_DLL_INIT_FAILED);
-+    return FALSE;
-+  }
-+
-+  s_readMemoryFunction = readMemoryFunction;
-+  s_readMemoryFunction_UserData = pUserData;
-+
-+  if (context == NULL)
-+  {
-+    // If no context is provided, capture the context
-+    if (hThread == GetCurrentThread())
-+    {
-+      GET_CURRENT_CONTEXT(c, USED_CONTEXT_FLAGS);
-+    }
-+    else
-+    {
-+      SuspendThread(hThread);
-+      memset(&c, 0, sizeof(CONTEXT));
-+      c.ContextFlags = USED_CONTEXT_FLAGS;
-+      if (GetThreadContext(hThread, &c) == FALSE)
-+      {
-+        ResumeThread(hThread);
-+        return FALSE;
-+      }
-+    }
-+  }
-+  else
-+    c = *context;
-+
-+  // init STACKFRAME for first call
-+  STACKFRAME64 s; // in/out stackframe
-+  memset(&s, 0, sizeof(s));
-+  DWORD imageType;
-+#ifdef _M_IX86
-+  // normally, call ImageNtHeader() and use machine info from PE header
-+  imageType = IMAGE_FILE_MACHINE_I386;
-+  s.AddrPC.Offset = c.Eip;
-+  s.AddrPC.Mode = AddrModeFlat;
-+  s.AddrFrame.Offset = c.Ebp;
-+  s.AddrFrame.Mode = AddrModeFlat;
-+  s.AddrStack.Offset = c.Esp;
-+  s.AddrStack.Mode = AddrModeFlat;
-+#elif _M_X64
-+  imageType = IMAGE_FILE_MACHINE_AMD64;
-+  s.AddrPC.Offset = c.Rip;
-+  s.AddrPC.Mode = AddrModeFlat;
-+  s.AddrFrame.Offset = c.Rsp;
-+  s.AddrFrame.Mode = AddrModeFlat;
-+  s.AddrStack.Offset = c.Rsp;
-+  s.AddrStack.Mode = AddrModeFlat;
-+#elif _M_IA64
-+  imageType = IMAGE_FILE_MACHINE_IA64;
-+  s.AddrPC.Offset = c.StIIP;
-+  s.AddrPC.Mode = AddrModeFlat;
-+  s.AddrFrame.Offset = c.IntSp;
-+  s.AddrFrame.Mode = AddrModeFlat;
-+  s.AddrBStore.Offset = c.RsBSP;
-+  s.AddrBStore.Mode = AddrModeFlat;
-+  s.AddrStack.Offset = c.IntSp;
-+  s.AddrStack.Mode = AddrModeFlat;
-+#else
-+#error "Platform not supported!"
-+#endif
-+
-+  pSym = (IMAGEHLP_SYMBOL64 *) malloc(sizeof(IMAGEHLP_SYMBOL64) + STACKWALK_MAX_NAMELEN);
-+  if (!pSym) goto cleanup;  // not enough memory...
-+  memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + STACKWALK_MAX_NAMELEN);
-+  pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
-+  pSym->MaxNameLength = STACKWALK_MAX_NAMELEN;
-+
-+  memset(&Line, 0, sizeof(Line));
-+  Line.SizeOfStruct = sizeof(Line);
-+
-+  memset(&Module, 0, sizeof(Module));
-+  Module.SizeOfStruct = sizeof(Module);
-+
-+  for (frameNum = 0; ; ++frameNum )
-+  {
-+    // get next stack frame (StackWalk64(), SymFunctionTableAccess64(), SymGetModuleBase64())
-+    // if this returns ERROR_INVALID_ADDRESS (487) or ERROR_NOACCESS (998), you can
-+    // assume that either you are done, or that the stack is so hosed that the next
-+    // deeper frame could not be found.
-+    // CONTEXT need not to be suplied if imageTyp is IMAGE_FILE_MACHINE_I386!
-+    if ( ! this->m_sw->pSW(imageType, this->m_hProcess, hThread, &s, &c, myReadProcMem, this->m_sw->pSFTA, this->m_sw->pSGMB, NULL) )
-+    {
-+      this->OnDbgHelpErr("StackWalk64", GetLastError(), s.AddrPC.Offset);
-+      break;
-+    }
-+
-+    csEntry.offset = s.AddrPC.Offset;
-+    csEntry.name0 = 0;
-+    csEntry.undName0 = 0;
-+    csEntry.undFullName0 = 0;
-+    csEntry.offsetFromSmybol = 0;
-+    csEntry.offsetFromLine = 0;
-+    csEntry.lineFileName0 = 0;
-+    csEntry.lineNumber = 0;
-+    csEntry.loadedImageName0 = 0;
-+    csEntry.moduleName0 = 0;
-+    if (s.AddrPC.Offset == s.AddrReturn.Offset)
-+    {
-+      this->OnDbgHelpErr("StackWalk64-Endless-Callstack!", 0, s.AddrPC.Offset);
-+      break;
-+    }
-+    if (s.AddrPC.Offset != 0)
-+    {
-+      // we seem to have a valid PC
-+      // show procedure info (SymGetSymFromAddr64())
-+      if (this->m_sw->pSGSFA(this->m_hProcess, s.AddrPC.Offset, &(csEntry.offsetFromSmybol), pSym) != FALSE)
-+      {
-+        // TODO: Mache dies sicher...!
-+        strcpy_s(csEntry.name, pSym->Name);
-+        // UnDecorateSymbolName()
-+        this->m_sw->pUDSN( pSym->Name, csEntry.undName, STACKWALK_MAX_NAMELEN, UNDNAME_NAME_ONLY );
-+        this->m_sw->pUDSN( pSym->Name, csEntry.undFullName, STACKWALK_MAX_NAMELEN, UNDNAME_COMPLETE );
-+      }
-+      else
-+      {
-+        this->OnDbgHelpErr("SymGetSymFromAddr64", GetLastError(), s.AddrPC.Offset);
-+      }
-+
-+      // show line number info, NT5.0-method (SymGetLineFromAddr64())
-+      if (this->m_sw->pSGLFA != NULL )
-+      { // yes, we have SymGetLineFromAddr64()
-+        if (this->m_sw->pSGLFA(this->m_hProcess, s.AddrPC.Offset, &(csEntry.offsetFromLine), &Line) != FALSE)
-+        {
-+          csEntry.lineNumber = Line.LineNumber;
-+          // TODO: Mache dies sicher...!
-+          strcpy_s(csEntry.lineFileName, Line.FileName);
-+        }
-+        else
-+        {
-+          this->OnDbgHelpErr("SymGetLineFromAddr64", GetLastError(), s.AddrPC.Offset);
-+        }
-+      } // yes, we have SymGetLineFromAddr64()
-+
-+      // show module info (SymGetModuleInfo64())
-+      if (this->m_sw->GetModuleInfo(this->m_hProcess, s.AddrPC.Offset, &Module ) != FALSE)
-+      { // got module info OK
-+        switch ( Module.SymType )
-+        {
-+        case SymNone:
-+          csEntry.symTypeString = "-nosymbols-";
-+          break;
-+        case SymCoff:
-+          csEntry.symTypeString = "COFF";
-+          break;
-+        case SymCv:
-+          csEntry.symTypeString = "CV";
-+          break;
-+        case SymPdb:
-+          csEntry.symTypeString = "PDB";
-+          break;
-+        case SymExport:
-+          csEntry.symTypeString = "-exported-";
-+          break;
-+        case SymDeferred:
-+          csEntry.symTypeString = "-deferred-";
-+          break;
-+        case SymSym:
-+          csEntry.symTypeString = "SYM";
-+          break;
-+#if API_VERSION_NUMBER >= 9
-+        case SymDia:
-+          csEntry.symTypeString = "DIA";
-+          break;
-+#endif
-+        case 8: //SymVirtual:
-+          csEntry.symTypeString = "Virtual";
-+          break;
-+        default:
-+          //_snprintf( ty, sizeof ty, "symtype=%ld", (long) Module.SymType );
-+          csEntry.symTypeString = NULL;
-+          break;
-+        }
-+
-+        // TODO: Mache dies sicher...!
-+        strcpy_s(csEntry.moduleName, Module.ModuleName);
-+        csEntry.baseOfImage = Module.BaseOfImage;
-+        strcpy_s(csEntry.loadedImageName, Module.LoadedImageName);
-+      } // got module info OK
-+      else
-+      {
-+        this->OnDbgHelpErr("SymGetModuleInfo64", GetLastError(), s.AddrPC.Offset);
-+      }
-+    } // we seem to have a valid PC
-+
-+    CallstackEntryType et = nextEntry;
-+    if (frameNum == 0)
-+      et = firstEntry;
-+    this->OnCallstackEntry(et, csEntry);
-+    
-+    if (s.AddrReturn.Offset == 0)
-+    {
-+      this->OnCallstackEntry(lastEntry, csEntry);
-+      SetLastError(ERROR_SUCCESS);
-+      break;
-+    }
-+  } // for ( frameNum )
-+
-+  cleanup:
-+    if (pSym) free( pSym );
-+
-+  if (context == NULL)
-+    ResumeThread(hThread);
-+
-+  return TRUE;
-+}
-+
-+BOOL __stdcall StackWalker::myReadProcMem(
-+    HANDLE      hProcess,
-+    DWORD64     qwBaseAddress,
-+    PVOID       lpBuffer,
-+    DWORD       nSize,
-+    LPDWORD     lpNumberOfBytesRead
-+    )
-+{
-+  if (s_readMemoryFunction == NULL)
-+  {
-+    SIZE_T st;
-+    BOOL bRet = ReadProcessMemory(hProcess, (LPVOID) qwBaseAddress, lpBuffer, nSize, &st);
-+    *lpNumberOfBytesRead = (DWORD) st;
-+    //printf("ReadMemory: hProcess: %p, baseAddr: %p, buffer: %p, size: %d, read: %d, result: %d\n", hProcess, (LPVOID) qwBaseAddress, lpBuffer, nSize, (DWORD) st, (DWORD) bRet);
-+    return bRet;
-+  }
-+  else
-+  {
-+    return s_readMemoryFunction(hProcess, qwBaseAddress, lpBuffer, nSize, lpNumberOfBytesRead, s_readMemoryFunction_UserData);
-+  }
-+}
-+
-+void StackWalker::OnLoadModule(LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWORD size, DWORD result, LPCSTR symType, LPCSTR pdbName, ULONGLONG fileVersion)
-+{
-+  CHAR bufferSTACKWALK_MAX_NAMELEN;
-+  if (fileVersion == 0)
-+    _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "%s:%s (%p), size: %d (result: %d), SymType: '%s', PDB: '%s'\n", img, mod, (LPVOID) baseAddr, size, result, symType, pdbName);
-+  else
-+  {
-+    DWORD v4 = (DWORD) fileVersion & 0xFFFF;
-+    DWORD v3 = (DWORD) (fileVersion>>16) & 0xFFFF;
-+    DWORD v2 = (DWORD) (fileVersion>>32) & 0xFFFF;
-+    DWORD v1 = (DWORD) (fileVersion>>48) & 0xFFFF;
-+    _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "%s:%s (%p), size: %d (result: %d), SymType: '%s', PDB: '%s', fileVersion: %d.%d.%d.%d\n", img, mod, (LPVOID) baseAddr, size, result, symType, pdbName, v1, v2, v3, v4);
-+  }
-+  OnOutput(buffer);
-+}
-+
-+void StackWalker::OnCallstackEntry(CallstackEntryType eType, CallstackEntry &entry)
-+{
-+  CHAR bufferSTACKWALK_MAX_NAMELEN;
-+  if ( (eType != lastEntry) && (entry.offset != 0) )
-+  {
-+    if (entry.name0 == 0)
-+      strcpy_s(entry.name, "(function-name not available)");
-+    if (entry.undName0 != 0)
-+      strcpy_s(entry.name, entry.undName);
-+    if (entry.undFullName0 != 0)
-+      strcpy_s(entry.name, entry.undFullName);
-+    if (entry.lineFileName0 == 0)
-+    {
-+      strcpy_s(entry.lineFileName, "(filename not available)");
-+      if (entry.moduleName0 == 0)
-+        strcpy_s(entry.moduleName, "(module-name not available)");
-+      _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "%p (%s): %s: %s\n", (LPVOID) entry.offset, entry.moduleName, entry.lineFileName, entry.name);
-+    }
-+    else
-+      _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "%s (%d): %s\n", entry.lineFileName, entry.lineNumber, entry.name);
-+    OnOutput(buffer);
-+  }
-+}
-+
-+void StackWalker::OnDbgHelpErr(LPCSTR szFuncName, DWORD gle, DWORD64 addr)
-+{
-+  CHAR bufferSTACKWALK_MAX_NAMELEN;
-+  _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "ERROR: %s, GetLastError: %d (Address: %p)\n", szFuncName, gle, (LPVOID) addr);
-+  OnOutput(buffer);
-+}
-+
-+void StackWalker::OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUserName)
-+{
-+  CHAR bufferSTACKWALK_MAX_NAMELEN;
-+  _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "SymInit: Symbol-SearchPath: '%s', symOptions: %d, UserName: '%s'\n", szSearchPath, symOptions, szUserName);
-+  OnOutput(buffer);
-+  // Also display the OS-version
-+#if _MSC_VER <= 1200
-+  OSVERSIONINFOA ver;
-+  ZeroMemory(&ver, sizeof(OSVERSIONINFOA));
-+  ver.dwOSVersionInfoSize = sizeof(ver);
-+  if (GetVersionExA(&ver) != FALSE)
-+  {
-+    _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "OS-Version: %d.%d.%d (%s)\n", 
-+      ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber,
-+      ver.szCSDVersion);
-+    OnOutput(buffer);
-+  }
-+#else
-+  OSVERSIONINFOEXA ver;
-+  ZeroMemory(&ver, sizeof(OSVERSIONINFOEXA));
-+  ver.dwOSVersionInfoSize = sizeof(ver);
-+  if (GetVersionExA( (OSVERSIONINFOA*) &ver) != FALSE)
-+  {
-+    _snprintf_s(buffer, STACKWALK_MAX_NAMELEN, "OS-Version: %d.%d.%d (%s) 0x%x-0x%x\n", 
-+      ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber,
-+      ver.szCSDVersion, ver.wSuiteMask, ver.wProductType);
-+    OnOutput(buffer);
-+  }
-+#endif
-+}
-+
-+void StackWalker::OnOutput(LPCSTR buffer)
-+{
-+  OutputDebugStringA(buffer);
-+}

psi-plus-main-20160309.tar.xz/patches/dev/psi_new_jingle_rtp.patch Deleted

@@ -1,2126 +0,0 @@
-diff --git a/iris b/iris
---- a/iris
-+++ b/iris
-@@ -1 +1 @@
--Subproject commit 6373822ebded777f9f26fe53374ae81262dfe2cc
-+Subproject commit 6373822ebded777f9f26fe53374ae81262dfe2cc-dirty
-diff --git a/src/avcall/avcall.cpp b/src/avcall/avcall.cpp
-index c398bab..858ba7d 100644
---- a/src/avcall/avcall.cpp
-+++ b/src/avcall/avcall.cpp
-@@ -131,9 +131,9 @@ static void ensureLoaded()
- 	}
- }
- 
--static JingleRtpPayloadType payloadInfoToPayloadType(const PsiMedia::PayloadInfo &pi)
-+static Jingle::Rtp::PayloadType payloadInfoToPayloadType(const PsiMedia::PayloadInfo &pi)
- {
--	JingleRtpPayloadType out;
-+	Jingle::Rtp::PayloadType out;
- 	out.id = pi.id();
- 	out.name = pi.name();
- 	out.clockrate = pi.clockrate();
-@@ -142,7 +142,7 @@ static JingleRtpPayloadType payloadInfoToPayloadType(const PsiMedia::PayloadInfo
- 	out.maxptime = pi.maxptime();
- 	foreach(const PsiMedia::PayloadInfo::Parameter &pip, pi.parameters())
- 	{
--		JingleRtpPayloadType::Parameter ptp;
-+		Jingle::Rtp::PayloadType::Parameter ptp;
- 		ptp.name = pip.name;
- 		ptp.value = pip.value;
- 		out.parameters += ptp;
-@@ -150,7 +150,7 @@ static JingleRtpPayloadType payloadInfoToPayloadType(const PsiMedia::PayloadInfo
- 	return out;
- }
- 
--static PsiMedia::PayloadInfo payloadTypeToPayloadInfo(const JingleRtpPayloadType &pt)
-+static PsiMedia::PayloadInfo payloadTypeToPayloadInfo(const Jingle::Rtp::PayloadType &pt)
- {
- 	PsiMedia::PayloadInfo out;
- 	out.setId(pt.id);
-@@ -160,7 +160,7 @@ static PsiMedia::PayloadInfo payloadTypeToPayloadInfo(const JingleRtpPayloadType
- 	out.setPtime(pt.ptime);
- 	out.setMaxptime(pt.maxptime);
- 	QList<PsiMedia::PayloadInfo::Parameter> list;
--	foreach(const JingleRtpPayloadType::Parameter &ptp, pt.parameters)
-+	foreach(const Jingle::Rtp::PayloadType::Parameter &ptp, pt.parameters)
- 	{
- 		PsiMedia::PayloadInfo::Parameter pip;
- 		pip.name = ptp.name;
-@@ -177,9 +177,9 @@ class AvTransmit : public QObject
- 
- public:
- 	PsiMedia::RtpChannel *audio, *video;
--	JingleRtpChannel *transport;
-+	Jingle::Rtp::Channel *transport;
- 
--	AvTransmit(PsiMedia::RtpChannel *_audio, PsiMedia::RtpChannel *_video, JingleRtpChannel *_transport, QObject *parent = 0) :
-+	AvTransmit(PsiMedia::RtpChannel *_audio, PsiMedia::RtpChannel *_video, Jingle::Rtp::Channel *_transport, QObject *parent = 0) :
- 		QObject(parent),
- 		audio(_audio),
- 		video(_video),
-@@ -218,8 +218,8 @@ private slots:
- 		{
- 			PsiMedia::RtpPacket packet = audio->read();
- 
--			JingleRtp::RtpPacket jpacket;
--			jpacket.type = JingleRtp::Audio;
-+			Session::RtpPacket jpacket;
-+			jpacket.type = Session::Audio;
- 			jpacket.portOffset = packet.portOffset();
- 			jpacket.value = packet.rawValue();
- 
-@@ -233,8 +233,8 @@ private slots:
- 		{
- 			PsiMedia::RtpPacket packet = video->read();
- 
--			JingleRtp::RtpPacket jpacket;
--			jpacket.type = JingleRtp::Video;
-+			Session::RtpPacket jpacket;
-+			jpacket.type = Session::Video;
- 			jpacket.portOffset = packet.portOffset();
- 			jpacket.value = packet.rawValue();
- 
-@@ -246,11 +246,11 @@ private slots:
- 	{
- 		while(transport->packetsAvailable())
- 		{
--			JingleRtp::RtpPacket jpacket = transport->read();
-+			Session::RtpPacket jpacket = transport->read();
- 
--			if(jpacket.type == JingleRtp::Audio)
-+			if(jpacket.type == Session::Audio)
- 				audio->write(PsiMedia::RtpPacket(jpacket.value, jpacket.portOffset));
--			else if(jpacket.type == JingleRtp::Video)
-+			else if(jpacket.type == Session::Video)
- 				video->write(PsiMedia::RtpPacket(jpacket.value, jpacket.portOffset));
- 		}
- 	}
-@@ -341,7 +341,7 @@ class AvCallManagerPrivate : public QObject
- public:
- 	AvCallManager *q;
- 	PsiAccount *pa;
--	JingleRtpManager *rtpManager;
-+	Jingle::Rtp::Manager *rtpManager;
- 	QList<AvCall*> sessions;
- 	QList<AvCall*> pending;
- 
-@@ -362,7 +362,7 @@ public:
- 	AvCall *q;
- 	AvCallManagerPrivate *manager;
- 	bool incoming;
--	JingleRtp *sess;
-+	Session *sess;
- 	PsiMedia::RtpSession rtp;
- 	XMPP::Jid peer;
- 	AvCall::Mode mode;
-@@ -465,11 +465,11 @@ public:
- 		//   localMediaUpdated()
- 		int types;
- 		if(mode == AvCall::Both)
--			types = JingleRtp::Audio | JingleRtp::Video;
-+			types = Session::Audio | Session::Video;
- 		else if(mode == AvCall::Audio)
--			types = JingleRtp::Audio;
-+			types = Session::Audio;
- 		else // Video
--			types = JingleRtp::Video;
-+			types = Session::Video;
- 
- 		sess->accept(types);
- 		start_rtp();
-@@ -597,18 +597,18 @@ private:
- 	{
- 		if(transmitAudio)
- 		{
--			QList<JingleRtpPayloadType> payloadTypes = sess->remoteAudioPayloadTypes();
-+			QList<Jingle::Rtp::PayloadType> payloadTypes = sess->remoteAudioPayloadTypes();
- 			QList<PsiMedia::PayloadInfo> list;
--			foreach(const JingleRtpPayloadType &pt, payloadTypes)
-+			foreach(const Jingle::Rtp::PayloadType &pt, payloadTypes)
- 				list += payloadTypeToPayloadInfo(pt);
- 			rtp.setRemoteAudioPreferences(list);
- 		}
- 
- 		if(transmitVideo)
- 		{
--			QList<JingleRtpPayloadType> payloadTypes = sess->remoteVideoPayloadTypes();
-+			QList<Jingle::Rtp::PayloadType> payloadTypes = sess->remoteVideoPayloadTypes();
- 			QList<PsiMedia::PayloadInfo> list;
--			foreach(const JingleRtpPayloadType &pt, payloadTypes)
-+			foreach(const Jingle::Rtp::PayloadType &pt, payloadTypes)
- 				list += payloadTypeToPayloadInfo(pt);
- 			rtp.setRemoteVideoPreferences(list);
- 		}
-@@ -674,14 +674,14 @@ private slots:
- 
- 		if(pAudio)
- 		{
--			JingleRtpPayloadType pt = payloadInfoToPayloadType(*pAudio);
--			sess->setLocalAudioPayloadTypes(QList<JingleRtpPayloadType>() << pt);
-+			Jingle::Rtp::PayloadType pt = payloadInfoToPayloadType(*pAudio);
-+			sess->setLocalAudioPayloadTypes(QList<Jingle::Rtp::PayloadType>() << pt);
- 		}
- 
- 		if(pVideo)
- 		{
--			JingleRtpPayloadType pt = payloadInfoToPayloadType(*pVideo);
--			sess->setLocalVideoPayloadTypes(QList<JingleRtpPayloadType>() << pt);
-+			Jingle::Rtp::PayloadType pt = payloadInfoToPayloadType(*pVideo);
-+			sess->setLocalVideoPayloadTypes(QList<Jingle::Rtp::PayloadType>() << pt);
- 		}
- 
- 		if(!incoming)
-@@ -716,13 +716,13 @@ private slots:
- 
- 	void sess_error()
- 	{
--		JingleRtp::Error e = sess->errorCode();
--		if(e == JingleRtp::ErrorTimeout)
-+		Session::Error e = sess->errorCode();
-+		if(e == Session::ErrorTimeout)
- 		{
- 			errorString = tr("Call negotiation timed out.");
- 			cleanup();
- 		}
--		else if(e == JingleRtp::ErrorICE)
-+		else if(e == Session::ErrorICE)
- 		{
- 			errorString = tr("Unable to establish peer-to-peer connection.");
- 			reject();
-@@ -843,7 +843,7 @@ AvCallManagerPrivate::AvCallManagerPrivate(PsiAccount *_pa, AvCallManager *_q) :
- 	q(_q),
- 	pa(_pa)
- {
--	rtpManager = new JingleRtpManager(pa->client());
-+	rtpManager = new Jingle::Rtp::Manager(pa->client());
- 	connect(rtpManager, SIGNAL(incomingReady()), SLOT(rtp_incomingReady()));
- }
- 
-diff --git a/src/avcall/jinglertp.cpp b/src/avcall/jinglertp.cpp
-index c717c4d..11e1c5b 100755
---- a/src/avcall/jinglertp.cpp
-+++ b/src/avcall/jinglertp.cpp
-@@ -25,6 +25,11 @@
- #include "iris/turnclient.h"
- #include "iris/udpportreserver.h"
- #include "xmpp_client.h"
-+#include "jingle.h"
-+
-+namespace JingleRtp {
-+
-+using namespace XMPP::Jingle::Tasks;
- 
- // TODO: reject offers that don't contain at least one of audio or video
- // TODO: support candidate negotiations over the JingleRtpChannel thread
-@@ -357,22 +362,22 @@ private slots:
- //----------------------------------------------------------------------------
- // JingleRtp
- //----------------------------------------------------------------------------
--class JingleRtpChannelPrivate : public QObject
-+class Channel::Private : public QObject
- {
- 	Q_OBJECT
- 
- public:
--	JingleRtpChannel *q;
-+	Channel *q;
- 
- 	QMutex m;
- 	XMPP::UdpPortReserver *portReserver;
- 	XMPP::Ice176 *iceA;
- 	XMPP::Ice176 *iceV;
- 	QTimer *rtpActivityTimer;
--	QList<JingleRtp::RtpPacket> in;
-+	QList<Session::RtpPacket> in;
- 
--	JingleRtpChannelPrivate(JingleRtpChannel *_q);
--	~JingleRtpChannelPrivate();
-+	Private(Channel *_q);
-+	~Private();
- 
- 	void setIceObjects(XMPP::UdpPortReserver *_portReserver, XMPP::Ice176 *_iceA, XMPP::Ice176 *_iceV);
- 	void restartRtpActivityTimer();
-@@ -384,12 +389,12 @@ private slots:
- 	void rtpActivity_timeout();
- };
- 
--class JingleRtpManagerPrivate : public QObject
-+class Manager::Private : public QObject
- {
- 	Q_OBJECT
- 
- public:
--	JingleRtpManager *q;
-+	Manager *q;
- 
- 	XMPP::Client *client;
- 	QHostAddress selfAddr;
-@@ -406,38 +411,39 @@ public:
- 	QString stunRelayTcpPass;
- 	XMPP::TurnClient::Proxy stunProxy;
- 	int basePort;
--	QList<JingleRtp*> sessions;
--	QList<JingleRtp*> pending;
--	JT_PushJingleRtp *push_task;
-+	QList<Session*> sessions;
-+	QList<Session*> pending;
-+	JingleRtp::XmlHerlper xmlHelper;
- 
--	JingleRtpManagerPrivate(XMPP::Client *_client, JingleRtpManager *_q);
--	~JingleRtpManagerPrivate();
-+	Private(XMPP::Client *_client, Manager *_q);
-+	~Private();
- 
- 	QString createSid(const XMPP::Jid &peer) const;
- 
--	void unlink(JingleRtp *sess);
-+	void unlink(Session *sess);
- 
- private slots:
--	void push_task_incomingRequest(const XMPP::Jid &from, const QString &iq_id, const JingleRtpEnvelope &envelope);
-+	void push_task_incomingRequest(const XMPP::Jid &from, const QString &iq_id,
-+								   const XMPP::Jingle::Tasks::Envelope &envelope);
- };
- 
--class JingleRtpPrivate : public QObject
-+class Session::Private : public QObject
- {
- 	Q_OBJECT
- 
- public:
--	JingleRtp *q;
-+	Session *q;
- 
--	JingleRtpManagerPrivate *manager;
-+	Manager::Private *manager;
- 	bool incoming;
- 	XMPP::Jid peer;
- 	QString sid;
- 
- 	int types;
--	QList<JingleRtpPayloadType> localAudioPayloadTypes;
--	QList<JingleRtpPayloadType> localVideoPayloadTypes;
--	QList<JingleRtpPayloadType> remoteAudioPayloadTypes;
--	QList<JingleRtpPayloadType> remoteVideoPayloadTypes;
-+	QList<PayloadType> localAudioPayloadTypes;
-+	QList<PayloadType> localVideoPayloadTypes;
-+	QList<PayloadType> remoteAudioPayloadTypes;
-+	QList<PayloadType> remoteVideoPayloadTypes;
- 	int localMaximumBitrate;
- 	int remoteMaximumBitrate;
- 	QString audioName;
-@@ -452,7 +458,7 @@ public:
- 	int stunBindPort, stunRelayUdpPort, stunRelayTcpPort;
- 	XMPP::Ice176 *iceA;
- 	XMPP::Ice176 *iceV;
--	JingleRtpChannel *rtpChannel;
-+	Channel *rtpChannel;
- 
- 	class IceStatus
- 	{
-@@ -477,10 +483,10 @@ public:
- 	bool session_accepted;
- 	bool session_activated;
- 	QTimer *handshakeTimer;
--	JingleRtp::Error errorCode;
-+	Session::Error errorCode;
- 	XMPP::UdpPortReserver *portReserver;
- 
--	JingleRtpPrivate(JingleRtp *_q) :
-+	Private(Session *_q) :
- 		QObject(_q),
- 		q(_q),
- 		manager(0),
-@@ -503,10 +509,10 @@ public:
- 		connect(handshakeTimer, SIGNAL(timeout()), SLOT(handshake_timeout()));
- 		handshakeTimer->setSingleShot(true);
- 
--		rtpChannel = new JingleRtpChannel;
-+		rtpChannel = new Channel;
- 	}
- 
--	~JingleRtpPrivate()
-+	~Private()
- 	{
- 		cleanup();
- 		manager->unlink(q);
-@@ -526,12 +532,12 @@ public:
- 		if(!localAudioPayloadTypes.isEmpty())
- 		{
- 			printf("there are audio payload types\n");
--			types |= JingleRtp::Audio;
-+			types |= Session::Audio;
- 		}
- 		if(!localVideoPayloadTypes.isEmpty())
- 		{
- 			printf("there are video payload types\n");
--			types |= JingleRtp::Video;
-+			types |= Session::Video;
- 		}
- 
- 		printf("types=%d\n", types);
-@@ -552,9 +558,9 @@ public:
- 		if(!incoming)
- 		{
- 			bool ok = true;
--			if((types & JingleRtp::Audio) && !iceA_status.started)
-+			if((types & Session::Audio) && !iceA_status.started)
- 				ok = false;
--			if((types & JingleRtp::Video) && !iceV_status.started)
-+			if((types & Session::Video) && !iceV_status.started)
- 				ok = false;
- 
- 			// we haven't even sent session-initiate
-@@ -574,10 +580,8 @@ public:
- 			}
- 		}
- 
--		JingleRtpEnvelope envelope;
--		envelope.action = "session-terminate";
--		envelope.sid = sid;
--		envelope.reason.condition = JingleRtpReason::Gone;
-+		Envelope envelope(Envelope::SessionTerminate, sid);
-+		envelope.setReason(Reason::Gone);
- 
- 		JT_JingleRtp *task = new JT_JingleRtp(manager->client->rootTask());
- 		task->request(peer, envelope);
-@@ -597,36 +601,35 @@ public:
- 	// called by manager when request is received, including
- 	//   session-initiate.
- 	// note: manager will never send session-initiate twice.
--	bool incomingRequest(const QString &iq_id, const JingleRtpEnvelope &envelope)
-+	bool incomingRequest(const QString &iq_id, const XMPP::Jingle::Tasks::Envelope &envelope)
- 	{
- 		// TODO: jingle has a lot of fields, and we kind of skip over
- 		//   most of them just to grab what we need.  perhaps in the
- 		//   future we could do more integrity checking.
- 
--		if(envelope.action == "session-initiate")
-+		if(envelope.action == Envelope::SessionInitiate)
- 		{
- 			// initially flag both types, so we don't drop any
- 			//   transport-info before we accept (at which point
- 			//   we specify what types we actually want)
--			types = JingleRtp::Audio | JingleRtp::Video;
-+			types = Session::Audio | Session::Video;
- 
- 			init_iq_id = iq_id;
- 
--			const JingleRtpContent *audioContent = 0;
--			const JingleRtpContent *videoContent = 0;
-+			const XMPP::Jingle::Tasks::Content *audioContent = 0;
-+			const XMPP::Jingle::Tasks::Content *videoContent = 0;
- 
- 			// find content
--			foreach(const JingleRtpContent &c, envelope.contentList)
-+			foreach(const XMPP::Jingle::Tasks::Content &c, envelope.contentList)
- 			{
--				if((types & JingleRtp::Audio) && c.desc.media == "audio" && !audioContent)
-+				Description *desc = static_cast<Description *>(c.description.data());
-+				if((types & Session::Audio) && desc->media == "audio" && !audioContent)
- 				{
- 					audioContent = &c;
--					break;
- 				}
--				else if((types & JingleRtp::Video) && c.desc.media == "video" && !videoContent)
-+				else if((types & Session::Video) && desc->media == "video" && !videoContent)
- 				{
- 					videoContent = &c;
--					break;
- 				}
- 			}
- 
-@@ -661,31 +664,29 @@ public:
- 		{
- 			manager->push_task->respondSuccess(peer, iq_id);
- 
--			const JingleRtpContent *audioContent = 0;
--			const JingleRtpContent *videoContent = 0;
-+			const XMPP::Jingle::Tasks::Content *audioContent = 0;
-+			const XMPP::Jingle::Tasks::Content *videoContent = 0;
- 
- 			// find content
--			foreach(const JingleRtpContent &c, envelope.contentList)
-+			foreach(const XMPP::Jingle::Tasks::Content &c, envelope.contentList)
- 			{
--				if((types & JingleRtp::Audio) && c.desc.media == "audio" && c.name == audioName && !audioContent)
-+				if((types & Session::Audio) && c.desc.media == "audio" && c.name == audioName && !audioContent)
- 				{
- 					audioContent = &c;
--					break;
- 				}
--				else if((types & JingleRtp::Video) && c.desc.media == "video" && c.name == videoName && !videoContent)
-+				else if((types & Session::Video) && c.desc.media == "video" && c.name == videoName && !videoContent)
- 				{
- 					videoContent = &c;
--					break;
- 				}
- 			}
- 
- 			// we support audio, peer doesn't
--			if((types & JingleRtp::Audio) && !audioContent)
--				types &= ~JingleRtp::Audio;
-+			if((types & Session::Audio) && !audioContent)
-+				types &= ~Session::Audio;
- 
- 			// we support video, peer doesn't
--			if((types & JingleRtp::Video) && !videoContent)
--				types &= ~JingleRtp::Video;
-+			if((types & Session::Video) && !videoContent)
-+				types &= ~Session::Video;
- 
- 			if(types == 0)
- 			{
-@@ -734,21 +735,19 @@ public:
- 		{
- 			manager->push_task->respondSuccess(peer, iq_id);
- 
--			const JingleRtpContent *audioContent = 0;
--			const JingleRtpContent *videoContent = 0;
-+			const XMPP::Jingle::Tasks::Content *audioContent = 0;
-+			const XMPP::Jingle::Tasks::Content *videoContent = 0;
- 
- 			// find content
--			foreach(const JingleRtpContent &c, envelope.contentList)
-+			foreach(const XMPP::Jingle::Tasks::Content &c, envelope.contentList)
- 			{
--				if((types & JingleRtp::Audio) && c.name == audioName && !audioContent)
-+				if((types & Session::Audio) && c.name == audioName && !audioContent)
- 				{
- 					audioContent = &c;
--					break;
- 				}
--				else if((types & JingleRtp::Video) && c.name == videoName && !videoContent)
-+				else if((types & Session::Video) && c.name == videoName && !videoContent)
- 				{
- 					videoContent = &c;
--					break;
- 				}
- 			}
- 
-@@ -918,7 +917,7 @@ private:
- 				printf("  %s\n", qPrintable(s));
- 		}
- 
--		if(types & JingleRtp::Audio)
-+		if(types & Session::Audio)
- 		{
- 			iceA = new XMPP::Ice176(this);
- 			setup_ice(iceA, localAddrs);
-@@ -929,7 +928,7 @@ private:
- 			iceA_status.channelsReady1 = false;
- 		}
- 
--		if(types & JingleRtp::Video)
-+		if(types & Session::Video)
- 		{
- 			iceV = new XMPP::Ice176(this);
- 			setup_ice(iceV, localAddrs);
-@@ -1032,16 +1031,16 @@ private:
- 		{
- 			sid = manager->createSid(peer);
- 
--			JingleRtpEnvelope envelope;
-+			XMPP::Jingle::Tasks::Envelope envelope;
- 			envelope.action = "session-initiate";
- 			envelope.initiator = manager->client->jid().full();
- 			envelope.sid = sid;
- 
--			if(types & JingleRtp::Audio)
-+			if(types & Session::Audio)
- 			{
- 				audioName = "A";
- 
--				JingleRtpContent content;
-+				XMPP::Jingle::Tasks::Content content;
- 				content.creator = "initiator";
- 				content.name = audioName;
- 				content.senders = "both";
-@@ -1054,11 +1053,11 @@ private:
- 				envelope.contentList += content;
- 			}
- 
--			if(types & JingleRtp::Video)
-+			if(types & Session::Video)
- 			{
- 				videoName = "V";
- 
--				JingleRtpContent content;
-+				XMPP::Jingle::Tasks::Content content;
- 				content.creator = "initiator";
- 				content.name = videoName;
- 				content.senders = "both";
-@@ -1106,15 +1105,15 @@ private:
- 	{
- 		printf("flushing local candidates\n");
- 
--		QList<JingleRtpContent> contentList;
-+		QList<XMPP::Jingle::Tasks::Content> contentList;
- 
- 		// according to xep-166, creator is always whoever added
- 		//   the content type, which in our case is always the
- 		//   initiator
- 
--		if((types & JingleRtp::Audio) && !iceA_status.localCandidates.isEmpty())
-+		if((types & Session::Audio) && !iceA_status.localCandidates.isEmpty())
- 		{
--			JingleRtpContent content;
-+			XMPP::Jingle::Tasks::Content content;
- 			//if(!incoming)
- 				content.creator = "initiator";
- 			//else
-@@ -1129,9 +1128,9 @@ private:
- 			contentList += content;
- 		}
- 
--		if((types & JingleRtp::Video) && !iceV_status.localCandidates.isEmpty())
-+		if((types & Session::Video) && !iceV_status.localCandidates.isEmpty())
- 		{
--			JingleRtpContent content;
-+			XMPP::Jingle::Tasks::Content content;
- 			//if(!incoming)
- 				content.creator = "initiator";
- 			//else
-@@ -1148,7 +1147,7 @@ private:
- 
- 		if(!contentList.isEmpty())
- 		{
--			JingleRtpEnvelope envelope;
-+			XMPP::Jingle::Tasks::Envelope envelope;
- 			envelope.action = "transport-info";
- 			envelope.sid = sid;
- 			envelope.contentList = contentList;
-@@ -1167,7 +1166,7 @@ private:
- 		//   unfortunately this means we can't upgrade to better
- 		//   candidates on the fly.
- 
--		if(types & JingleRtp::Audio && iceA)
-+		if(types & Session::Audio && iceA)
- 		{
- 			iceA->setPeerUfrag(iceA_status.remoteUfrag);
- 			iceA->setPeerPassword(iceA_status.remotePassword);
-@@ -1178,7 +1177,7 @@ private:
- 			}
- 		}
- 
--		if(types & JingleRtp::Video && iceV)
-+		if(types & Session::Video && iceV)
- 		{
- 			iceV->setPeerUfrag(iceV_status.remoteUfrag);
- 			iceV->setPeerPassword(iceV_status.remotePassword);
-@@ -1203,14 +1202,14 @@ private:
- 	{
- 		if(local_media_ready && ice_connected && !session_accepted)
- 		{
--			JingleRtpEnvelope envelope;
-+			XMPP::Jingle::Tasks::Envelope envelope;
- 			envelope.action = "session-accept";
- 			envelope.responder = manager->client->jid().full();
- 			envelope.sid = sid;
- 
--			if(types & JingleRtp::Audio)
-+			if(types & Session::Audio)
- 			{
--				JingleRtpContent content;
-+				XMPP::Jingle::Tasks::Content content;
- 				content.creator = "initiator";
- 				content.name = audioName;
- 				content.senders = "both";
-@@ -1223,9 +1222,9 @@ private:
- 				envelope.contentList += content;
- 			}
- 
--			if(types & JingleRtp::Video)
-+			if(types & Session::Video)
- 			{
--				JingleRtpContent content;
-+				XMPP::Jingle::Tasks::Content content;
- 				content.creator = "initiator";
- 				content.name = videoName;
- 				content.senders = "both";
-@@ -1306,7 +1305,7 @@ private slots:
- 	void handshake_timeout()
- 	{
- 		reject();
--		errorCode = JingleRtp::ErrorTimeout;
-+		errorCode = Session::ErrorTimeout;
- 		emit q->error();
- 	}
- 
-@@ -1333,9 +1332,9 @@ private slots:
- 		}
- 
- 		bool ok = true;
--		if((types & JingleRtp::Audio) && !iceA_status.started)
-+		if((types & Session::Audio) && !iceA_status.started)
- 			ok = false;
--		if((types & JingleRtp::Video) && !iceV_status.started)
-+		if((types & Session::Video) && !iceV_status.started)
- 			ok = false;
- 
- 		if(ok)
-@@ -1346,7 +1345,7 @@ private slots:
- 	{
- 		Q_UNUSED(e);
- 
--		errorCode = JingleRtp::ErrorICE;
-+		errorCode = Session::ErrorICE;
- 		emit q->error();
- 	}
- 
-@@ -1382,7 +1381,7 @@ private slots:
- 
- 		bool allReady = true;
- 
--		if(types & JingleRtp::Audio)
-+		if(types & Session::Audio)
- 		{
- 			for(int n = 0; n < iceA_status.channelsReady.count(); ++n)
- 			{
-@@ -1394,7 +1393,7 @@ private slots:
- 			}
- 		}
- 
--		if(types & JingleRtp::Video)
-+		if(types & Session::Video)
- 		{
- 			for(int n = 0; n < iceV_status.channelsReady.count(); ++n)
- 			{
-@@ -1433,78 +1432,78 @@ private slots:
- 	}
- };
- 
--JingleRtp::JingleRtp()
-+Session::Session()
- {
--	d = new JingleRtpPrivate(this);
-+	d = new Private(this);
- }
- 
--JingleRtp::~JingleRtp()
-+Session::~Session()
- {
- 	delete d;
- }
- 
--XMPP::Jid JingleRtp::jid() const
-+XMPP::Jid Session::jid() const
- {
- 	return d->peer;
- }
- 
--QList<JingleRtpPayloadType> JingleRtp::remoteAudioPayloadTypes() const
-+QList<PayloadType> Session::remoteAudioPayloadTypes() const
- {
- 	return d->remoteAudioPayloadTypes;
- }
- 
--QList<JingleRtpPayloadType> JingleRtp::remoteVideoPayloadTypes() const
-+QList<PayloadType> Session::remoteVideoPayloadTypes() const
- {
- 	return d->remoteVideoPayloadTypes;
- }
- 
--int JingleRtp::remoteMaximumBitrate() const
-+int Session::remoteMaximumBitrate() const
- {
- 	return d->remoteMaximumBitrate;
- }
- 
--void JingleRtp::setLocalAudioPayloadTypes(const QList<JingleRtpPayloadType> &types)
-+void Session::setLocalAudioPayloadTypes(const QList<PayloadType> &types)
- {
- 	d->localAudioPayloadTypes = types;
- }
- 
--void JingleRtp::setLocalVideoPayloadTypes(const QList<JingleRtpPayloadType> &types)
-+void Session::setLocalVideoPayloadTypes(const QList<PayloadType> &types)
- {
- 	d->localVideoPayloadTypes = types;
- }
- 
--void JingleRtp::setLocalMaximumBitrate(int kbps)
-+void Session::setLocalMaximumBitrate(int kbps)
- {
- 	d->localMaximumBitrate = kbps;
- }
- 
--void JingleRtp::connectToJid(const XMPP::Jid &jid)
-+void Session::connectToJid(const XMPP::Jid &jid)
- {
- 	d->peer = jid;
- 	d->startOutgoing();
- }
- 
--void JingleRtp::accept(int types)
-+void Session::accept(int types)
- {
- 	d->accept(types);
- }
- 
--void JingleRtp::reject()
-+void Session::reject()
- {
- 	d->reject();
- }
- 
--void JingleRtp::localMediaUpdate()
-+void Session::localMediaUpdate()
- {
- 	d->localMediaUpdate();
- }
- 
--JingleRtp::Error JingleRtp::errorCode() const
-+Session::Error Session::errorCode() const
- {
- 	return d->errorCode;
- }
- 
--JingleRtpChannel *JingleRtp::rtpChannel()
-+Channel *Session::rtpChannel()
- {
- 	return d->rtpChannel;
- }
-@@ -1512,7 +1511,7 @@ JingleRtpChannel *JingleRtp::rtpChannel()
- //----------------------------------------------------------------------------
- // JingleRtpChannel
- //----------------------------------------------------------------------------
--JingleRtpChannelPrivate::JingleRtpChannelPrivate(JingleRtpChannel *_q) :
-+Channel::Private::Private(Channel *_q) :
- 	QObject(_q),
- 	q(_q),
- 	portReserver(0),
-@@ -1523,7 +1522,7 @@ JingleRtpChannelPrivate::JingleRtpChannelPrivate(JingleRtpChannel *_q) :
- 	connect(rtpActivityTimer, SIGNAL(timeout()), SLOT(rtpActivity_timeout()));
- }
- 
--JingleRtpChannelPrivate::~JingleRtpChannelPrivate()
-+Channel::Private::~Private()
- {
- 	if(portReserver)
- 	{
-@@ -1557,7 +1556,7 @@ JingleRtpChannelPrivate::~JingleRtpChannelPrivate()
- 	rtpActivityTimer->deleteLater();
- }
- 
--void JingleRtpChannelPrivate::setIceObjects(XMPP::UdpPortReserver *_portReserver, XMPP::Ice176 *_iceA, XMPP::Ice176 *_iceV)
-+void Channel::Private::setIceObjects(XMPP::UdpPortReserver *_portReserver, XMPP::Ice176 *_iceA, XMPP::Ice176 *_iceV)
- {
- 	if(QThread::currentThread() != thread())
- 	{
-@@ -1609,14 +1608,14 @@ void JingleRtpChannelPrivate::setIceObjects(XMPP::UdpPortReserver *_portReserver
- 	}
- }
- 
--void JingleRtpChannelPrivate::restartRtpActivityTimer()
-+void Channel::Private::restartRtpActivityTimer()
- {
- 	// if we go 5 seconds without an RTP packet, then that's
- 	//   pretty bad
- 	rtpActivityTimer->start(5000);
- }
- 
--void JingleRtpChannelPrivate::start()
-+void Channel::Private::start()
- {
- 	if(portReserver)
- 		portReserver->setParent(this);
-@@ -1627,7 +1626,7 @@ void JingleRtpChannelPrivate::start()
- 	restartRtpActivityTimer();
- }
- 
--void JingleRtpChannelPrivate::ice_readyRead(int componentIndex)
-+void Channel::Private::ice_readyRead(int componentIndex)
- {
- 	XMPP::Ice176 *ice = (XMPP::Ice176 *)sender();
- 
-@@ -1638,8 +1637,8 @@ void JingleRtpChannelPrivate::ice_readyRead(int componentIndex)
- 	{
- 		while(iceA->hasPendingDatagrams(componentIndex))
- 		{
--			JingleRtp::RtpPacket packet;
--			packet.type = JingleRtp::Audio;
-+			Session::RtpPacket packet;
-+			packet.type = Session::Audio;
- 			packet.portOffset = componentIndex;
- 			packet.value = iceA->readDatagram(componentIndex);
- 			in += packet;
-@@ -1649,8 +1648,8 @@ void JingleRtpChannelPrivate::ice_readyRead(int componentIndex)
- 	{
- 		while(iceV->hasPendingDatagrams(componentIndex))
- 		{
--			JingleRtp::RtpPacket packet;
--			packet.type = JingleRtp::Video;
-+			Session::RtpPacket packet;
-+			packet.type = Session::Video;
- 			packet.portOffset = componentIndex;
- 			packet.value = iceV->readDatagram(componentIndex);
- 			in += packet;
-@@ -1660,52 +1659,52 @@ void JingleRtpChannelPrivate::ice_readyRead(int componentIndex)
- 	emit q->readyRead();
- }
- 
--void JingleRtpChannelPrivate::ice_datagramsWritten(int componentIndex, int count)
-+void Channel::Private::ice_datagramsWritten(int componentIndex, int count)
- {
- 	Q_UNUSED(componentIndex);
- 
- 	emit q->packetsWritten(count);
- }
- 
--void JingleRtpChannelPrivate::rtpActivity_timeout()
-+void Channel::Private::rtpActivity_timeout()
- {
- 	printf("warning: 5 seconds passed without receiving audio RTP\n");
- }
- 
--JingleRtpChannel::JingleRtpChannel()
-+Channel::Channel()
- {
--	d = new JingleRtpChannelPrivate(this);
-+	d = new Private(this);
- }
- 
--JingleRtpChannel::~JingleRtpChannel()
-+Channel::~Channel()
- {
- 	delete d;
- }
- 
--bool JingleRtpChannel::packetsAvailable() const
-+bool Channel::packetsAvailable() const
- {
- 	return !d->in.isEmpty();
- }
- 
--JingleRtp::RtpPacket JingleRtpChannel::read()
-+Session::RtpPacket Channel::read()
- {
- 	return d->in.takeFirst();
- }
- 
--void JingleRtpChannel::write(const JingleRtp::RtpPacket &packet)
-+void Channel::write(const Session::RtpPacket &packet)
- {
- 	QMutexLocker locker(&d->m);
- 
--	if(packet.type == JingleRtp::Audio && d->iceA)
-+	if(packet.type == Session::Audio && d->iceA)
- 		d->iceA->writeDatagram(packet.portOffset, packet.value);
--	else if(packet.type == JingleRtp::Video && d->iceV)
-+	else if(packet.type == Session::Video && d->iceV)
- 		d->iceV->writeDatagram(packet.portOffset, packet.value);
- }
- 
- //----------------------------------------------------------------------------
--// JingleRtpManager
-+// Manager
- //----------------------------------------------------------------------------
--JingleRtpManagerPrivate::JingleRtpManagerPrivate(XMPP::Client *_client, JingleRtpManager *_q) :
-+Manager::Private::Private(XMPP::Client *_client, Manager *_q) :
- 	QObject(_q),
- 	q(_q),
- 	client(_client),
-@@ -1714,16 +1713,17 @@ JingleRtpManagerPrivate::JingleRtpManagerPrivate(XMPP::Client *_client, JingleRt
- 	stunRelayTcpPort(-1),
- 	basePort(-1)
- {
-+	_client->jingleManager()->registerDetailedReason(RTP_ERROR_NS, &xmlHelper);
- 	push_task = new JT_PushJingleRtp(client->rootTask());
--	connect(push_task, SIGNAL(incomingRequest(const XMPP::Jid &, const QString &, const JingleRtpEnvelope &)), SLOT(push_task_incomingRequest(const XMPP::Jid &, const QString &, const JingleRtpEnvelope &)));
-+	connect(push_task, SIGNAL(incomingRequest(const XMPP::Jid &, const QString &, const XMPP::Jingle::Tasks::Envelope &)), SLOT(push_task_incomingRequest(const XMPP::Jid &, const QString &, const XMPP::Jingle::Tasks::Envelope &)));
- }
- 
--JingleRtpManagerPrivate::~JingleRtpManagerPrivate()
-+Manager::Private::~Private()
- {
- 	delete push_task;
- }
- 
--QString JingleRtpManagerPrivate::createSid(const XMPP::Jid &peer) const
-+QString Manager::Private::createSid(const XMPP::Jid &peer) const
- {
- 	while(1)
- 	{
-@@ -1744,12 +1744,13 @@ QString JingleRtpManagerPrivate::createSid(const XMPP::Jid &peer) const
- 	}
- }
- 
--void JingleRtpManagerPrivate::unlink(JingleRtp *sess)
-+void Manager::Private::unlink(Session *sess)
- {
- 	sessions.removeAll(sess);
- }
- 
--void JingleRtpManagerPrivate::push_task_incomingRequest(const XMPP::Jid &from, const QString &iq_id, const JingleRtpEnvelope &envelope)
-+void Manager::Private::push_task_incomingRequest(const XMPP::Jid &from, const QString &iq_id,
-+												 const XMPP::Jingle::Tasks::Envelope &envelope)
- {
- 	printf("incoming request: %s\n", qPrintable(envelope.action));
- 
-@@ -1779,7 +1780,7 @@ void JingleRtpManagerPrivate::push_task_incomingRequest(const XMPP::Jid &from, c
- 			return;
- 		}
- 
--		JingleRtp *sess = new JingleRtp;
-+		Session *sess = new Session;
- 		sess->d->manager = this;
- 		sess->d->incoming = true;
- 		sess->d->peer = from;
-@@ -1819,48 +1820,48 @@ void JingleRtpManagerPrivate::push_task_incomingRequest(const XMPP::Jid &from, c
- 	}
- }
- 
--JingleRtpManager::JingleRtpManager(XMPP::Client *client) :
-+Manager::Manager(XMPP::Client *client) :
- 	QObject(0)
- {
--	d = new JingleRtpManagerPrivate(client, this);
-+	d = new Manager::Private(client, this);
- }
- 
--JingleRtpManager::~JingleRtpManager()
-+Manager::~Manager()
- {
- 	delete d;
- }
- 
--JingleRtp *JingleRtpManager::createOutgoing()
-+Session *Manager::createOutgoing()
- {
--	JingleRtp *sess = new JingleRtp;
-+	Session *sess = new Session;
- 	sess->d->manager = d;
- 	sess->d->incoming = false;
- 	d->sessions += sess;
- 	return sess;
- }
- 
--JingleRtp *JingleRtpManager::takeIncoming()
-+Session *Manager::takeIncoming()
- {
- 	return d->pending.takeFirst();
- }
- 
--void JingleRtpManager::setSelfAddress(const QHostAddress &addr)
-+void Manager::setSelfAddress(const QHostAddress &addr)
- {
- 	d->selfAddr = addr;
- }
- 
--void JingleRtpManager::setExternalAddress(const QString &host)
-+void Manager::setExternalAddress(const QString &host)
- {
- 	d->extHost = host;
- }
- 
--void JingleRtpManager::setStunBindService(const QString &host, int port)
-+void Manager::setStunBindService(const QString &host, int port)
- {
- 	d->stunBindHost = host;
- 	d->stunBindPort = port;
- }
- 
--void JingleRtpManager::setStunRelayUdpService(const QString &host, int port, const QString &user, const QString &pass)
-+void Manager::setStunRelayUdpService(const QString &host, int port, const QString &user, const QString &pass)
- {
- 	d->stunRelayUdpHost = host;
- 	d->stunRelayUdpPort = port;
-@@ -1868,7 +1869,7 @@ void JingleRtpManager::setStunRelayUdpService(const QString &host, int port, con
- 	d->stunRelayUdpPass = pass;
- }
- 
--void JingleRtpManager::setStunRelayTcpService(const QString &host, int port, const XMPP::AdvancedConnector::Proxy &proxy, const QString &user, const QString &pass)
-+void Manager::setStunRelayTcpService(const QString &host, int port, const XMPP::AdvancedConnector::Proxy &proxy, const QString &user, const QString &pass)
- {
- 	d->stunRelayTcpHost = host;
- 	d->stunRelayTcpPort = port;
-@@ -1891,9 +1892,11 @@ void JingleRtpManager::setStunRelayTcpService(const QString &host, int port, con
- 	d->stunProxy = tproxy;
- }
- 
--void JingleRtpManager::setBasePort(int port)
-+void Manager::setBasePort(int port)
- {
- 	d->basePort = port;
- }
- 
-+} //namespace JingleRtp
-+
- #include "jinglertp.moc"
-diff --git a/src/avcall/jinglertp.h b/src/avcall/jinglertp.h
-index c62c9bb..ad1ee7b 100644
---- a/src/avcall/jinglertp.h
-+++ b/src/avcall/jinglertp.h
-@@ -22,16 +22,19 @@
- #include "xmpp.h"
- #include "jinglertptasks.h"
- 
--class JingleRtpChannel;
--class JingleRtpPrivate;
--class JingleRtpChannelPrivate;
--class JingleRtpManagerPrivate;
-+namespace JingleRtp {
- 
--class JingleRtp : public QObject
-+
-+
-+class Channel;
-+
-+class Session : public QObject
- {
- 	Q_OBJECT
- 
- public:
-+	class Private;
-+
- 	enum Error
- 	{
- 		ErrorGeneric,
-@@ -53,15 +56,15 @@ public:
- 		QByteArray value;
- 	};
- 
--	~JingleRtp();
-+	~Session();
- 
- 	XMPP::Jid jid() const;
--	QList<JingleRtpPayloadType> remoteAudioPayloadTypes() const;
--	QList<JingleRtpPayloadType> remoteVideoPayloadTypes() const;
-+	QList<PayloadType> remoteAudioPayloadTypes() const;
-+	QList<PayloadType> remoteVideoPayloadTypes() const;
- 	int remoteMaximumBitrate() const;
- 
--	void setLocalAudioPayloadTypes(const QList<JingleRtpPayloadType> &types);
--	void setLocalVideoPayloadTypes(const QList<JingleRtpPayloadType> &types);
-+	void setLocalAudioPayloadTypes(const QList<PayloadType> &types);
-+	void setLocalVideoPayloadTypes(const QList<PayloadType> &types);
- 	void setLocalMaximumBitrate(int kbps);
- 
- 	void connectToJid(const XMPP::Jid &jid);
-@@ -81,7 +84,7 @@ public:
- 	//   JingleRtp's thread.  it can be moved to another thread as long
- 	//   it is moved back to JingleRtp's thread before destructing
- 	//   JingleRtp.
--	JingleRtpChannel *rtpChannel();
-+	Channel *rtpChannel();
- 
- signals:
- 	void rejected();
-@@ -94,24 +97,24 @@ signals:
- 	void remoteMediaUpdated();
- 
- private:
--	Q_DISABLE_COPY(JingleRtp);
-+	Q_DISABLE_COPY(Session);
- 
--	friend class JingleRtpPrivate;
--	friend class JingleRtpManager;
--	friend class JingleRtpManagerPrivate;
--	JingleRtp();
-+	friend class Private;
-+	friend class Manager;
-+	friend class ManagerPrivate;
-+	Session();
- 
--	JingleRtpPrivate *d;
-+	Private *d;
- };
- 
--class JingleRtpChannel : public QObject
-+class Channel : public QObject
- {
- 	Q_OBJECT
- 
- public:
- 	bool packetsAvailable() const;
--	JingleRtp::RtpPacket read();
--	void write(const JingleRtp::RtpPacket &packet);
-+	Session::RtpPacket read();
-+	void write(const Session::RtpPacket &packet);
- 
- signals:
- 	void readyRead();
-@@ -120,26 +123,27 @@ signals:
- 	void packetsWritten(int count);
- 
- private:
--	Q_DISABLE_COPY(JingleRtpChannel);
-+	Q_DISABLE_COPY(Channel);
- 
--	friend class JingleRtpChannelPrivate;
--	friend class JingleRtpPrivate;
--	JingleRtpChannel();
--	~JingleRtpChannel();
-+	friend class Session;
-+	Channel();
-+	~Channel();
- 
--	JingleRtpChannelPrivate *d;
-+	class Private;
-+	friend class Private;
-+	Private *d;
- };
- 
--class JingleRtpManager : public QObject
-+class Manager : public QObject
- {
- 	Q_OBJECT
- 
- public:
--	JingleRtpManager(XMPP::Client *client);
--	~JingleRtpManager();
-+	Manager(XMPP::Client *client);
-+	~Manager();
- 
--	JingleRtp *createOutgoing();
--	JingleRtp *takeIncoming();
-+	Session *createOutgoing();
-+	Session *takeIncoming();
- 
- 	void setSelfAddress(const QHostAddress &addr);
- 	void setExternalAddress(const QString &host); // resolved locally
-@@ -152,13 +156,17 @@ signals:
- 	void incomingReady();
- 
- private:
--	Q_DISABLE_COPY(JingleRtpManager);
-+	Q_DISABLE_COPY(Manager);
- 
--	friend class JingleRtpManagerPrivate;
--	friend class JingleRtp;
--	friend class JingleRtpPrivate;
-+	friend class Private;
-+	friend class Session;
-+	friend class Session::Private;
- 
--	JingleRtpManagerPrivate *d;
-+	class Private;
-+	Private *d;
- };
- 
-+
-+} //namespace JingleRtp
-+
- #endif
-diff --git a/src/avcall/jinglertptasks.cpp b/src/avcall/jinglertptasks.cpp
-index fdf8b8c..fb65744 100644
---- a/src/avcall/jinglertptasks.cpp
-+++ b/src/avcall/jinglertptasks.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2009  Barracuda Networks, Inc.
-+ * Copyright (C) 2011  rion
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -17,479 +17,239 @@
-  */
- 
- #include "jinglertptasks.h"
--
- #include "xmpp_xmlcommon.h"
- 
--static QDomElement candidateToElement(QDomDocument *doc, const XMPP::Ice176::Candidate &c)
--{
--	QDomElement e = doc->createElement("candidate");
--	e.setAttribute("component", QString::number(c.component));
--	e.setAttribute("foundation", c.foundation);
--	e.setAttribute("generation", QString::number(c.generation));
--	if(!c.id.isEmpty())
--		e.setAttribute("id", c.id);
--	e.setAttribute("ip", c.ip.toString());
--	if(c.network != -1)
--		e.setAttribute("network", QString::number(c.network));
--	else // weird?
--		e.setAttribute("network", QString::number(0));
--	e.setAttribute("port", QString::number(c.port));
--	e.setAttribute("priority", QString::number(c.priority));
--	e.setAttribute("protocol", c.protocol);
--	if(!c.rel_addr.isNull())
--		e.setAttribute("rel-addr", c.rel_addr.toString());
--	if(c.rel_port != -1)
--		e.setAttribute("rel-port", QString::number(c.rel_port));
--	// TODO: remove this?
--	//if(!c.rem_addr.isNull())
--	//	e.setAttribute("rem-addr", c.rem_addr.toString());
--	//if(c.rem_port != -1)
--	//	e.setAttribute("rem-port", QString::number(c.rem_port));
--	e.setAttribute("type", c.type);
--	return e;
--}
--
--static XMPP::Ice176::Candidate elementToCandidate(const QDomElement &e)
--{
--	if(e.tagName() != "candidate")
--		return XMPP::Ice176::Candidate();
--
--	XMPP::Ice176::Candidate c;
--	c.component = e.attribute("component").toInt();
--	c.foundation = e.attribute("foundation");
--	c.generation = e.attribute("generation").toInt();
--	c.id = e.attribute("id");
--	c.ip = QHostAddress(e.attribute("ip"));
--	c.network = e.attribute("network").toInt();
--	c.port = e.attribute("port").toInt();
--	c.priority = e.attribute("priority").toInt();
--	c.protocol = e.attribute("protocol");
--	c.rel_addr = QHostAddress(e.attribute("rel-addr"));
--	c.rel_port = e.attribute("rel-port").toInt();
--	// TODO: remove this?
--	//c.rem_addr = QHostAddress(e.attribute("rem-addr"));
--	//c.rem_port = e.attribute("rem-port").toInt();
--	c.type = e.attribute("type");
--	return c;
--}
-+namespace JingleRtp {
- 
--static QDomElement payloadTypeToElement(QDomDocument *doc, const JingleRtpPayloadType &type)
-+//-----------------------------------------------------------------------------
-+// PayloadType
-+//-----------------------------------------------------------------------------
-+QDomElement PayloadType::toXml(QDomDocument *doc) const
- {
- 	QDomElement e = doc->createElement("payload-type");
--	e.setAttribute("id", QString::number(type.id));
--	if(!type.name.isEmpty())
--		e.setAttribute("name", type.name);
--	e.setAttribute("clockrate", QString::number(type.clockrate));
--	if(type.channels > 1)
--		e.setAttribute("channels", QString::number(type.channels));
--	if(type.ptime != -1)
--		e.setAttribute("ptime", QString::number(type.ptime));
--	if(type.maxptime != -1)
--		e.setAttribute("maxptime", QString::number(type.maxptime));
--	foreach(const JingleRtpPayloadType::Parameter &p, type.parameters)
--	{
-+	e.setAttribute("id", QString::number(id));
-+	if(!name.isEmpty()) {
-+		e.setAttribute("name", name);
-+	}
-+	e.setAttribute("clockrate", QString::number(clockrate));
-+	if(channels > 1) {
-+		e.setAttribute("channels", QString::number(channels));
-+	}
-+	if(ptime != -1) {
-+		e.setAttribute("ptime", QString::number(ptime));
-+	}
-+	if(maxptime != -1) {
-+		e.setAttribute("maxptime", QString::number(maxptime));
-+	}
-+	foreach(const QString &key, parameters.keys()) {
- 		QDomElement pe = doc->createElement("parameter");
--		pe.setAttribute("name", p.name);
--		pe.setAttribute("value", p.value);
-+		pe.setAttribute("name", key);
-+		pe.setAttribute("value", parameters.value(key));
- 		e.appendChild(pe);
- 	}
- 	return e;
- }
- 
--static JingleRtpPayloadType elementToPayloadType(const QDomElement &e)
-+bool PayloadType::fromXml(const QDomElement &e)
- {
- 	if(e.tagName() != "payload-type")
--		return JingleRtpPayloadType();
-+		return false;
- 
--	JingleRtpPayloadType out;
- 	bool ok;
- 	int x;
- 
- 	x = e.attribute("id").toInt(&ok);
--	if(!ok)
--		return JingleRtpPayloadType();
--	out.id = x;
-+	if(!ok || x < 0 || x > 255)
-+		return false;
-+	id = x;
- 
--	out.name = e.attribute("name");
-+	name = e.attribute("name");
- 
- 	x = e.attribute("clockrate").toInt(&ok);
- 	if(!ok)
--		return JingleRtpPayloadType();
--	out.clockrate = x;
-+		return false;
-+	clockrate = x;
- 
- 	x = e.attribute("channels").toInt(&ok);
- 	if(ok)
--		out.channels = x;
-+		channels = x;
- 
- 	x = e.attribute("ptime").toInt(&ok);
- 	if(ok)
--		out.ptime = x;
-+		ptime = x;
- 
- 	x = e.attribute("maxptime").toInt(&ok);
- 	if(ok)
--		out.maxptime = x;
-+		maxptime = x;
- 
--	QList<JingleRtpPayloadType::Parameter> plist;
--	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
--	{
--		if(!n.isElement())
--			continue;
--
--		QDomElement pe = n.toElement();
--		if(pe.tagName() == "parameter")
--		{
--			JingleRtpPayloadType::Parameter p;
--			p.name = pe.attribute("name");
--			p.value = pe.attribute("value");
--			plist += p;
--		}
-+	for (QDomElement n = e.firstChildElement("parameter"); !n.isNull(); n = n.nextSiblingElement("parameter")) {
-+		parameters.insert(n.attribute("name"), n.attribute("value"));
- 	}
--	out.parameters = plist;
- 
--	return out;
-+	return true;
- }
- 
--struct JingleCondEntry
--{
--	const char *str;
--	int cond;
--};
--
--static JingleCondEntry jingleCondTable =
-+//-----------------------------------------------------------------------------
-+// Crypto
-+//-----------------------------------------------------------------------------
-+QDomElement Crypto::toXml(QDomDocument *doc) const
- {
--	{ "alternative-session",      JingleRtpReason::AlternativeSession },
--	{ "busy",                     JingleRtpReason::Busy },
--	{ "cancel",                   JingleRtpReason::Cancel },
--	{ "connectivity-error",       JingleRtpReason::ConnectivityError },
--	{ "decline",                  JingleRtpReason::Decline },
--	{ "expired",                  JingleRtpReason::Expired },
--	{ "failed-application",       JingleRtpReason::FailedApplication },
--	{ "failed-transport",         JingleRtpReason::FailedTransport },
--	{ "general-error",            JingleRtpReason::GeneralError },
--	{ "gone",                     JingleRtpReason::Gone },
--	{ "incompatible-parameters",  JingleRtpReason::IncompatibleParameters },
--	{ "media-error",              JingleRtpReason::MediaError },
--	{ "security-error",           JingleRtpReason::SecurityError },
--	{ "success",                  JingleRtpReason::Success },
--	{ "timeout",                  JingleRtpReason::Timeout },
--	{ "unsupported-applications", JingleRtpReason::UnsupportedApplications },
--	{ "unsupported-transports",   JingleRtpReason::UnsupportedTransports },
--	{ 0, 0 }
--};
--
--static QString conditionToElementName(JingleRtpReason::Condition cond)
--{
--	for(int n = 0; jingleCondTablen.str; ++n)
--	{
--		if(jingleCondTablen.cond == cond)
--			return QString::fromLatin1(jingleCondTablen.str);
--	}
--	return QString();
-+	QDomElement crypto = doc->createElement("crypto");
-+	crypto.setAttribute("crypto-suite", suite);
-+	crypto.setAttribute("key-params", keyParams);
-+	crypto.setAttribute("session-params", sessionParams);
-+	crypto.setAttribute("tag", QString::number(tag));
-+	return crypto;
- }
- 
--static int elementNameToCondition(const QString &in)
-+bool Crypto::fromXml(const QDomElement &e)
- {
--	for(int n = 0; jingleCondTablen.str; ++n)
--	{
--		if(QLatin1String(jingleCondTablen.str) == in)
--			return jingleCondTablen.cond;
-+	if (e.tagName() != "crypto") {
-+		return false;
- 	}
--	return -1;
--}
--
--static QDomElement reasonToElement(QDomDocument *doc, const JingleRtpReason &reason)
--{
--	QDomElement e = doc->createElement("reason");
--	e.appendChild(doc->createElement(conditionToElementName(reason.condition)));
--	if(!reason.text.isEmpty())
--	{
--		QDomElement text = doc->createElement("text");
--		text.appendChild(doc->createTextNode(reason.text));
--		e.appendChild(text);
-+	suite = e.attribute("crypto-suite");
-+	keyParams = e.attribute("key-params");
-+	sessionParams = e.attribute("session-params");
-+	bool ok;
-+	tag = e.attribute("tag").toInt(&ok);
-+	return ok && !suite.isEmpty();
-+}
-+
-+//-----------------------------------------------------------------------------
-+// Description
-+//-----------------------------------------------------------------------------
-+QDomElement Description::Bandwidth::toXml(QDomDocument *doc) const
-+{
-+	if (type != -1 && value) {
-+		QDomElement bandwidth = textTag(doc, "bandwidth", QString::number(value));
-+		QList<const char *> types = QList<const char *>() << "CT" << "AS" << "RS" << "RR" << "TIAS";
-+		const char *typeStr = types.value(type);
-+		if (typeStr) {
-+			bandwidth.setAttribute("type", typeStr);
-+			return bandwidth;
-+		}
- 	}
--	return e;
-+	return QDomElement();
- }
- 
--static QDomElement firstChildElement(const QDomElement &in)
-+bool Description::Bandwidth::fromXml(const QDomElement &e)
- {
--	for(QDomNode n = in.firstChild(); !n.isNull(); n = n.nextSibling())
--	{
--		if(!n.isElement())
--			continue;
--
--		return n.toElement();
-+	QList<const char *> types = QList<const char *>() << "CT" << "AS" << "RS" << "RR" << "TIAS";
-+	type = (Type)types.indexOf(qPrintable(e.attribute("type")));
-+	if (type != -1) {
-+		value = e.text().toInt();
-+		return true;
- 	}
--	return QDomElement();
-+	return false;
- }
- 
--static JingleRtpReason elementToReason(const QDomElement &e)
--{
--	if(e.tagName() != "reason")
--		return JingleRtpReason();
--
--	QDomElement condElement = firstChildElement(e);
--	if(condElement.isNull())
--		return JingleRtpReason();
--	int x = elementNameToCondition(condElement.tagName());
--	if(x == -1)
--		return JingleRtpReason();
- 
--	JingleRtpReason out;
--	out.condition = (JingleRtpReason::Condition)x;
--	bool found;
--	QDomElement text = findSubTag(e, "text", &found);
--	if(found)
--		out.text = tagContent(text);
--
--	return out;
--}
--
--//----------------------------------------------------------------------------
--// JT_JingleRtp
--//----------------------------------------------------------------------------
--JT_JingleRtp::JT_JingleRtp(XMPP::Task *parent) :
--	XMPP::Task(parent)
-+QDomElement Description::toXml(QDomDocument *doc) const
- {
--}
-+	QDomElement description = doc->createElementNS("urn:xmpp:jingle:apps:rtp:1", "description");
-+	//description.setAttribute("xmlns", "urn:xmpp:jingle:apps:rtp:1");
-+	description.setAttribute("media", media);
-+	if (haveSsrc) {
-+		description.setAttribute("ssrc", QString("%1").arg(ssrc));
-+	}
-+	foreach (const PayloadType &pt, payloadTypes) {
-+		description.appendChild(pt.toXml(doc));
-+	}
-+	if (cryptoList.count()) {
-+		QDomElement encryption = description.appendChild(doc->createElement("encryption")).toElement();
-+		if (encryptionRequired) {
-+			encryption.setAttribute("required", "1");
-+		}
-+		foreach (const Crypto &c, cryptoList) {
-+			encryption.appendChild(c.toXml(doc));
-+		}
-+	}
-+	if (!bandwidth.isValid()) {
-+		description.appendChild(bandwidth.toXml(doc));
-+	}
- 
--JT_JingleRtp::~JT_JingleRtp()
--{
-+	return description;
- }
- 
--void JT_JingleRtp::request(const XMPP::Jid &to, const JingleRtpEnvelope &envelope)
-+Description* Description::fromXml(const QDomElement &e)
- {
--	to_ = to;
--	iq_ = createIQ(doc(), "set", to.full(), id());
--	QDomElement query = doc()->createElement("jingle");
--	query.setAttribute("xmlns", "urn:xmpp:jingle:1");
--	query.setAttribute("action", envelope.action);
--	if(!envelope.initiator.isEmpty())
--		query.setAttribute("initiator", envelope.initiator);
--	if(!envelope.responder.isEmpty())
--		query.setAttribute("responder", envelope.responder);
--	query.setAttribute("sid", envelope.sid);
--
--	if(envelope.action == "session-terminate")
--	{
--		// for session terminate, there is no content list, just
--		//   a reason for termination
--		query.appendChild(reasonToElement(doc(), envelope.reason));
-+	QScopedPointer<Description> desc(new Description(e.attribute("media")));
-+	if (desc->media.isEmpty()) {
-+		return NULL;
-+	}
-+	if (e.hasAttribute("ssrc")) {
-+		bool ok;
-+		desc->ssrc = e.attribute("ssrc").toUInt(&ok);
-+		if (!ok) {
-+			return NULL;
-+		}
-+		desc->haveSsrc = true;
- 	}
--	else
--	{
--		foreach(const JingleRtpContent &c, envelope.contentList)
--		{
--			QDomElement content = doc()->createElement("content");
--			content.setAttribute("creator", c.creator);
--			if(!c.disposition.isEmpty())
--				content.setAttribute("disposition", c.disposition);
--			content.setAttribute("name", c.name);
--			if(!c.senders.isEmpty())
--				content.setAttribute("senders", c.senders);
- 
--			if(!c.desc.media.isEmpty())
--			{
--				// TODO: ssrc, bitrate, crypto
--				QDomElement description = doc()->createElement("description");
--				description.setAttribute("xmlns", "urn:xmpp:jingle:apps:rtp:1");
--				description.setAttribute("media", c.desc.media);
--				foreach(const JingleRtpPayloadType &pt, c.desc.payloadTypes)
--				{
--					QDomElement p = payloadTypeToElement(doc(), pt);
--					if(!p.isNull())
--						description.appendChild(p);
--				}
--				content.appendChild(description);
-+	for(QDomElement n = e.firstChildElement(); !n.isNull(); n = n.nextSiblingElement()) {
-+		if (n.tagName() == "payload-type") {
-+			PayloadType pt;
-+			if (!pt.fromXml(n)) {
-+				return NULL;
- 			}
--
--			if(!c.trans.user.isEmpty())
--			{
--				QDomElement transport = doc()->createElement("transport");
--				transport.setAttribute("xmlns", "urn:xmpp:jingle:transports:ice-udp:1");
--				transport.setAttribute("ufrag", c.trans.user);
--				transport.setAttribute("pwd", c.trans.pass);
--				foreach(const XMPP::Ice176::Candidate &ic, c.trans.candidates)
--				{
--					QDomElement e = candidateToElement(doc(), ic);
--					if(!e.isNull())
--						transport.appendChild(e);
-+			desc->payloadTypes += pt;
-+		}
-+		else if (n.tagName() == "bandwidth") {
-+			if (!desc->bandwidth.fromXml(n)) {
-+				return NULL;
-+			}
-+		}
-+		else if (n.tagName() == "encryption") {
-+			for(QDomElement cel = n.firstChildElement(); !cel.isNull(); cel = cel.nextSiblingElement()) {
-+				Crypto c;
-+				if (!c.fromXml(cel)) {
-+					return NULL;
- 				}
--				content.appendChild(transport);
-+				desc->cryptoList += c;
-+			}
-+			desc->encryptionRequired = n.attribute("required") == "1" || n.attribute("required") == "true";
-+			if (desc->encryptionRequired && !desc->cryptoList.count()) {
-+				return NULL;
- 			}
--
--			query.appendChild(content);
- 		}
- 	}
--
--	iq_.appendChild(query);
--}
--
--void JT_JingleRtp::onGo()
--{
--	send(iq_);
--}
--
--bool JT_JingleRtp::take(const QDomElement &x)
--{
--	if(!iqVerify(x, to_, id()))
--		return false;
--
--	if(x.attribute("type") == "result")
--		setSuccess();
--	else
--		setError(x);
--
--	return true;
-+	return desc.take();
- }
- 
--//----------------------------------------------------------------------------
--// JT_PushJingleRtp
--//----------------------------------------------------------------------------
--JT_PushJingleRtp::JT_PushJingleRtp(XMPP::Task *parent) :
--	XMPP::Task(parent)
-+//-----------------------------------------------------------------------------
-+// XmlHerlper
-+//-----------------------------------------------------------------------------
-+QDomElement DetailedReason::toXml(QDomDocument *doc) const
- {
-+	switch (type) {
-+	case CryptoRequired:
-+		return doc->createElement("crypto-rquired");
-+	case InvalidCrypto:
-+		return doc->createElement("invalid-crypto");
-+	}
-+	return QDomElement();
- }
- 
--JT_PushJingleRtp::~JT_PushJingleRtp()
-+DetailedReason* DetailedReason::fromXml(const QDomElement &e)
- {
-+	if (e.tagName() == "crypto-rquired") {
-+		return new DetailedReason(CryptoRequired);
-+	} else if (e.tagName() == "invalid-crypto") {
-+		return new DetailedReason(InvalidCrypto);
-+	}
-+	return NULL;
- }
- 
--void JT_PushJingleRtp::respondSuccess(const XMPP::Jid &to, const QString &id)
--{
--	QDomElement iq = createIQ(doc(), "result", to.full(), id);
--	send(iq);
-+//-----------------------------------------------------------------------------
-+// XmlHerlper
-+//-----------------------------------------------------------------------------
-+using namespace XMPP::Jingle::Tasks;
-+Xmlable* XmlHerlper::descriptionFromXml(const QDomElement &e) {
-+	return Description::fromXml(e);
- }
- 
--void JT_PushJingleRtp::respondError(const XMPP::Jid &to, const QString &id, int code, const QString &str)
--{
--	QDomElement iq = createIQ(doc(), "error", to.full(), id);
--	QDomElement err = textTag(doc(), "error", str);
--	err.setAttribute("code", QString::number(code));
--	iq.appendChild(err);
--	send(iq);
-+Xmlable* XmlHerlper::detailedReasonFromXml(const QDomElement &e) {
-+	return DetailedReason::fromXml(e);
- }
- 
--bool JT_PushJingleRtp::take(const QDomElement &e)
--{
--	// must be an iq-set tag
--	if(e.tagName() != "iq")
--		return false;
--	if(e.attribute("type") != "set")
--		return false;
--
--	QDomElement je;
--	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
--	{
--		if(!n.isElement())
--			continue;
--
--		QDomElement e = n.toElement();
--		if(e.tagName() == "jingle" && e.attribute("xmlns") == "urn:xmpp:jingle:1")
--		{
--			je = e;
--			break;
--		}
--	}
--
--	if(je.isNull())
--		return false;
--
--	XMPP::Jid from = e.attribute("from");
--	QString iq_id = e.attribute("id");
--
--	JingleRtpEnvelope envelope;
--	envelope.action = je.attribute("action");
--	envelope.initiator = je.attribute("initiator");
--	envelope.responder = je.attribute("responder");
--	envelope.sid = je.attribute("sid");
--
--	if(envelope.action == "session-terminate")
--	{
--		bool found;
--		QDomElement re = findSubTag(je, "reason", &found);
--		if(!found)
--		{
--			respondError(from, iq_id, 400, QString());
--			return true;
--		}
--
--		envelope.reason = elementToReason(re);
--		if((int)envelope.reason.condition == -1)
--		{
--			respondError(from, iq_id, 400, QString());
--			return true;
--		}
--	}
--	else
--	{
--		for(QDomNode n = je.firstChild(); !n.isNull(); n = n.nextSibling())
--		{
--			if(!n.isElement())
--				continue;
--
--			QDomElement e = n.toElement();
--			if(e.tagName() != "content")
--				continue;
--
--			JingleRtpContent c;
--			c.creator = e.attribute("creator");
--			c.disposition = e.attribute("disposition");
--			c.name = e.attribute("name");
--			c.senders = e.attribute("senders");
--
--			for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
--			{
--				if(!n.isElement())
--					continue;
--
--				QDomElement e = n.toElement();
--				if(e.tagName() == "description" && e.attribute("xmlns") == "urn:xmpp:jingle:apps:rtp:1")
--				{
--					c.desc.media = e.attribute("media");
--
--					for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
--					{
--						if(!n.isElement())
--							continue;
--
--						QDomElement e = n.toElement();
--						JingleRtpPayloadType pt = elementToPayloadType(e);
--						if(pt.id == -1)
--						{
--							respondError(from, iq_id, 400, QString());
--							return true;
--						}
--
--						c.desc.payloadTypes += pt;
--					}
--				}
--				else if(e.tagName() == "transport" && e.attribute("xmlns") == "urn:xmpp:jingle:transports:ice-udp:1")
--				{
--					c.trans.user = e.attribute("ufrag");
--					c.trans.pass = e.attribute("pwd");
--
--					for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
--					{
--						if(!n.isElement())
--							continue;
--
--						QDomElement e = n.toElement();
--						XMPP::Ice176::Candidate ic = elementToCandidate(e);
--						if(ic.type.isEmpty())
--						{
--							respondError(from, iq_id, 400, QString());
--							return true;
--						}
--
--						c.trans.candidates += ic;
--					}
--				}
--			}
--
--			envelope.contentList += c;
--		}
--	}
--
--	emit incomingRequest(from, iq_id, envelope);
--	return true;
--}
-+} //namespace JingleRtp
-diff --git a/src/avcall/jinglertptasks.h b/src/avcall/jinglertptasks.h
-index 283812d..d52563d 100644
---- a/src/avcall/jinglertptasks.h
-+++ b/src/avcall/jinglertptasks.h
-@@ -19,31 +19,33 @@
- #ifndef JINGLERTPTASKS_H
- #define JINGLERTPTASKS_H
- 
--#include <QHostAddress>
--#include <QDomElement>
-+//#include <QDomElement>
- #include "xmpp_jid.h"
- #include "xmpp_task.h"
- #include "iris/ice176.h"
-+#include "iris/jingle.h"
- 
--class JingleRtpPayloadType
-+namespace JingleRtp {
-+
-+class XmlHerlper : public XMPP::Jingle::Tasks::DetailedReasonFactory
-+		, XMPP::Jingle::Tasks::DescriptionFactory
- {
--public:
--	class Parameter
--	{
--	public:
--		QString name;
--		QString value;
--	};
-+	XMPP::Jingle::Tasks::Xmlable* descriptionFromXml(const QDomElement &e);
-+	XMPP::Jingle::Tasks::Xmlable* detailedReasonFromXml(const QDomElement &e);
-+};
- 
--	int id;
-+class PayloadType
-+{
-+public:
-+	quint8 id;
- 	QString name;
- 	int clockrate;
- 	int channels;
- 	int ptime;
- 	int maxptime;
--	QList<Parameter> parameters;
-+	QHash<QString, QString> parameters;
- 
--	JingleRtpPayloadType() :
-+	PayloadType() :
- 		id(-1),
- 		clockrate(-1),
- 		channels(-1),
-@@ -51,151 +53,89 @@ public:
- 		maxptime(-1)
- 	{
- 	}
-+
-+	QDomElement toXml(QDomDocument *doc) const;
-+	bool fromXml(const QDomElement &e);
- };
- 
--class JingleRtpCrypto
-+class Crypto : public XMPP::Jingle::Tasks::Xmlable
- {
- public:
- 	QString suite;
- 	QString keyParams;
- 	QString sessionParams;
- 	int tag;
--};
- 
--class JingleRtpDesc
--{
--public:
--	QString media;
--	bool haveSsrc;
--	quint32 ssrc;
--	QList<JingleRtpPayloadType> payloadTypes;
--	int bitrate; // in Kbps
--	bool encryptionRequired;
--	QList<JingleRtpCrypto> cryptoList;
--
--	JingleRtpDesc() :
--		haveSsrc(false),
--		ssrc(0),
--		bitrate(-1),
--		encryptionRequired(false)
--	{
--	}
-+	QDomElement toXml(QDomDocument *doc) const;
-+	bool fromXml(const QDomElement &e);
- };
- 
--class JingleRtpRemoteCandidate
-+class Description : public XMPP::Jingle::Tasks::Xmlable
- {
- public:
--	int component;
--	QHostAddress addr;
--	int port;
- 
--	JingleRtpRemoteCandidate() :
--		component(-1),
--		port(-1)
-+	class Bandwidth : public XMPP::Jingle::Tasks::Xmlable
- 	{
--	}
--};
-+	public:
-+		enum Type {
-+			CT, // conference total (kbps). RFC4566
-+			AS, // application specific (kbps). RFC4566
-+			RS, // for active data senders (bps). rfc3566
-+			RR, // for others besides RS (bps). rfc3566
-+			TIAS // transport idependent modifies (bps). rfc3890
-+		};
- 
--class JingleRtpTrans
--{
--public:
--	QString user;
--	QString pass;
--	QList<XMPP::Ice176::Candidate> candidates;
--	QList<JingleRtpRemoteCandidate> remoteCandidates;
--};
-+		Type type;
-+		int value;
- 
--class JingleRtpContent
--{
--public:
--	QString creator;
--	QString disposition;
--	QString name;
--	QString senders;
-+		Bandwidth(Type type = (Type)-1, int value = 0)
-+			: type(type)
-+			, value(value) {}
- 
--	JingleRtpDesc desc;
--	JingleRtpTrans trans;
--};
-+		inline bool isValid() const { return type >= CT && type <= TIAS; }
- 
--class JingleRtpReason
--{
--public:
--	enum Condition
--	{
--		AlternativeSession,
--		Busy,
--		Cancel,
--		ConnectivityError,
--		Decline,
--		Expired,
--		FailedApplication,
--		FailedTransport,
--		GeneralError,
--		Gone,
--		IncompatibleParameters,
--		MediaError,
--		SecurityError,
--		Success,
--		Timeout,
--		UnsupportedApplications,
--		UnsupportedTransports
-+		QDomElement toXml(QDomDocument *doc) const;
-+		bool fromXml(const QDomElement &e);
- 	};
- 
--	Condition condition;
--	QString text;
--
--	JingleRtpReason() :
--		condition((Condition)-1)
--	{
--	}
--};
--
--class JingleRtpEnvelope
--{
--public:
--	QString action;
--	QString initiator;
--	QString responder;
--	QString sid;
--
--	QList<JingleRtpContent> contentList;
--
--	JingleRtpReason reason;
--};
--
--class JT_JingleRtp : public XMPP::Task
--{
--	Q_OBJECT
--
--public:
--	JT_JingleRtp(XMPP::Task *parent);
--	~JT_JingleRtp();
-+	QString media;
-+	Bandwidth bandwidth;
-+	quint32 ssrc;
-+	bool haveSsrc;
-+	bool encryptionRequired;
-+	QList<Crypto> cryptoList;
-+	QList<PayloadType> payloadTypes;
- 
--	void request(const XMPP::Jid &to, const JingleRtpEnvelope &envelope);
-+	Description(const QString &media, const QList<PayloadType> &payloadTypes = QList<PayloadType>())
-+		: media(media)
-+		, ssrc(0)
-+		, haveSsrc(false)
-+		, encryptionRequired(false)
-+		, payloadTypes(payloadTypes) {}
- 
--	virtual void onGo();
--	virtual bool take(const QDomElement &x);
-+	QDomElement toXml(QDomDocument *doc) const;
-+	static Description* fromXml(const QDomElement &e);
- 
- private:
--	QDomElement iq_;
--	XMPP::Jid to_;
-+	Description() {}
- };
- 
--class JT_PushJingleRtp : public XMPP::Task
-+class DetailedReason : public XMPP::Jingle::Tasks::Xmlable
- {
--	Q_OBJECT
--
- public:
--	JT_PushJingleRtp(XMPP::Task *parent);
--	~JT_PushJingleRtp();
-+	enum Type {
-+		CryptoRequired,
-+		InvalidCrypto
-+	};
-+	Type type;
- 
--	void respondSuccess(const XMPP::Jid &to, const QString &id);
--	void respondError(const XMPP::Jid &to, const QString &id, int code, const QString &str);
-+	DetailedReason(Type type = (Type)-1) : type(type) {}
- 
--	virtual bool take(const QDomElement &e);
-+	QDomElement toXml(QDomDocument *doc) const;
-+	static DetailedReason* fromXml(const QDomElement &e);
- 
--signals:
--	void incomingRequest(const XMPP::Jid &from, const QString &iq_id, const JingleRtpEnvelope &envelope);
- };
- 
-+} //namespace JingleRtp
-+
- #endif
-diff --git a/src/filetransdlg.cpp b/src/filetransdlg.cpp
-index 2c0a337..6e15c84 100644
---- a/src/filetransdlg.cpp
-+++ b/src/filetransdlg.cpp
-@@ -21,6 +21,7 @@
- #include "psitooltip.h"
- #include "psicontactlist.h"
- #include "accountlabel.h"
-+#include "accountscombobox.h"
- #include "psioptions.h"
- #include "fileutil.h"
-

psi-plus-main-20160309.tar.xz/patches/extra Deleted

psi-plus-main-20160309.tar.xz/patches/extra/0220-psi-send-button-context-menu.diff Deleted

@@ -1,1410 +0,0 @@
-Заходим в «iris»
-Заходим в «src/libpsi»
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -114,6 +114,7 @@
- 				<use-message-icons type="bool">true</use-message-icons>
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
- 				<warn-before-clear type="bool">true</warn-before-clear>
-+				<only-paste-template type="bool">false</only-paste-template>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
---- a/src/chatdlg.ui
-+++ b/src/chatdlg.ui
-@@ -292,6 +292,9 @@
-            <property name="toolTip">
-             <string>Send</string>
-            </property>
-+           <property name="contextMenuPolicy" >
-+            <enum>Qt::CustomContextMenu</enum>
-+           </property>
-           </widget>
-          </item>
-          <item>
---- a/src/groupchatdlg.cpp
-+++ b/src/groupchatdlg.cpp
-@@ -207,7 +207,7 @@ public:
- 	QString password;
- 	QString topic;
- 	bool nonAnonymous;		 // got status code 100 ?
--	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_bookmark;
-+	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_bookmark, *act_ps, *act_templates;
- #ifdef WHITEBOARDING
- 	IconAction *act_whiteboard;
- #endif
-@@ -606,6 +606,13 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 
- 	d->state = Private::Connected;
- 
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		connect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		connect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
-+
- 	setAcceptDrops(true);
- 
- #ifndef Q_OS_MAC
-@@ -689,6 +696,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 	connect(bm, SIGNAL(conferencesChanged(QList<ConferenceBookmark>)), SLOT(updateBookmarkIcon()));
- 	connect(bm, SIGNAL(bookmarksSaved()), SLOT(updateBookmarkIcon()));
- 
-+	d->act_ps = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
-+	connect(d->act_ps, SIGNAL(triggered()), SLOT(doPasteAndSend()));
-+
-+	d->act_templates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
-+	d->act_templates->setMenu(getTemplateMenu());
- 	ui_.toolbar->setIconSize(QSize(16,16));
- 	ui_.toolbar->addAction(d->act_clear);
- 	ui_.toolbar->addAction(d->act_configure);
-@@ -697,6 +709,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- #endif
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(d->act_icon);
-+	((QToolButton *)ui_.toolbar->widgetForAction(d->act_icon))->setPopupMode(QToolButton::InstantPopup);
-+	ui_.toolbar->addAction(d->act_templates);
-+	((QToolButton *)ui_.toolbar->widgetForAction(d->act_templates))->setPopupMode(QToolButton::InstantPopup);
-+	ui_.toolbar->addAction(d->act_ps);
- 	ui_.toolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
- 
- 	// Common actions
-@@ -705,6 +721,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 	connect(d->act_send,SIGNAL(triggered()), SLOT(mle_returnPressed()));
-  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
- 	connect(ui_.pb_send, SIGNAL(clicked()), SLOT(mle_returnPressed()));
-+	connect(ui_.pb_send, SIGNAL(customContextMenuRequested(const QPoint)), SLOT(sendButtonMenu()));
- 	d->act_close = new QAction(this);
- 	addAction(d->act_close);
- 	connect(d->act_close,SIGNAL(triggered()), SLOT(close()));
-@@ -763,6 +780,13 @@ GCMainDlg::~GCMainDlg()
- 	account()->dialogUnregister(this);
- 	delete d->mucManager;
- 	delete d;
-+
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		disconnect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		disconnect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		disconnect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
- }
- 
- void GCMainDlg::ensureTabbedCorrectly()
-@@ -1869,6 +1893,8 @@ void GCMainDlg::buildMenu()
- 	d->pm_settings->addSeparator();
- 
- 	d->pm_settings->addAction(d->act_icon);
-+	d->pm_settings->addAction(d->act_templates);
-+	d->pm_settings->addAction(d->act_ps);
- 	d->pm_settings->addAction(d->act_nick);
- 	d->pm_settings->addAction(d->act_bookmark);
- }
-@@ -1901,6 +1927,50 @@ void GCMainDlg::setStatusTabIcon(int status)
- 	setTabIcon(PsiIconset::instance()->statusPtr(jid(), status)->icon());
- }
- 
-+void GCMainDlg::sendButtonMenu()
-+{
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		menu->setParams(true);
-+		menu->exec(QCursor::pos());
-+		menu->setParams(false);
-+		d->mle()->setFocus();
-+	}
-+}
-+
-+void GCMainDlg::editTemplates()
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		showTemplateEditor();
-+	}
-+}
-+
-+void GCMainDlg::doPasteAndSend()
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		d->mle()->paste();
-+		mle_returnPressed();
-+		d->act_ps->setEnabled(false);
-+		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
-+	}
-+}
-+
-+void GCMainDlg::psButtonEnabled()
-+{
-+	d->act_ps->setEnabled(true);
-+}
-+
-+void GCMainDlg::sendTemp(const QString &templText)
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		if (!templText.isEmpty()) {
-+			d->mle()->textCursor().insertText(templText);
-+			if (!PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
-+				mle_returnPressed();
-+		}
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // GCFindDlg
- //----------------------------------------------------------------------------
---- a/src/groupchatdlg.h
-+++ b/src/groupchatdlg.h
-@@ -138,6 +138,11 @@ private slots:
- 	void openWhiteboard();
- #endif
- 	void chatEditCreated();
-+	void sendButtonMenu();
-+	void editTemplates();
-+	void doPasteAndSend();
-+	void sendTemp(const QString &);
-+	void psButtonEnabled();
- 
- public:
- 	class Private;
---- a/src/groupchatdlg.ui
-+++ b/src/groupchatdlg.ui
-@@ -289,6 +289,9 @@
-            <property name="toolTip">
-             <string>Send</string>
-            </property>
-+           <property name="contextMenuPolicy" >
-+            <enum>Qt::CustomContextMenu</enum>
-+           </property>
-           </widget>
-          </item>
-         </layout>
---- a/src/psichatdlg.cpp
-+++ b/src/psichatdlg.cpp
-@@ -18,6 +18,7 @@
- #include <QDragEnterEvent>
- #include <QMessageBox>
- #include <QDebug>
-+#include <QTimer>
- 
- #include "psicon.h"
- #include "psiaccount.h"
-@@ -171,6 +172,22 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
- {
- 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
- 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		connect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		connect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
-+}
-+
-+PsiChatDlg::~PsiChatDlg()
-+{
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		disconnect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		disconnect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		disconnect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
- }
- 
- void PsiChatDlg::initUi()
-@@ -221,6 +238,7 @@ void PsiChatDlg::initUi()
- 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
-  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
- 	connect(ui_.pb_send, SIGNAL(clicked()), this, SLOT(doSend()));
-+	connect(ui_.pb_send, SIGNAL(customContextMenuRequested(const QPoint)), SLOT(sendButtonMenu()));
- 
- 	act_mini_cmd_ = new QAction(this);
- 	act_mini_cmd_->setText(tr("Input command..."));
-@@ -348,6 +366,12 @@ void PsiChatDlg::initToolButtons()
- 
- 	act_compact_ = new IconAction(tr("Toggle Compact/Full Size"), "psi/compact", tr("Toggle Compact/Full Size"), 0, this);
- 	connect(act_compact_, SIGNAL(triggered()), SLOT(toggleSmallChat()));
-+
-+	act_ps_ = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
-+	connect(act_ps_, SIGNAL(triggered()), SLOT(doPasteAndSend()));
-+
-+	act_templates_ = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
-+	act_templates_->setMenu(getTemplateMenu());
- }
- 
- void PsiChatDlg::initToolBar()
-@@ -357,6 +381,10 @@ void PsiChatDlg::initToolBar()
- 	ui_.toolbar->addAction(act_clear_);
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(act_icon_);
-+	((QToolButton *)ui_.toolbar->widgetForAction(act_icon_))->setPopupMode(QToolButton::InstantPopup);
-+	ui_.toolbar->addAction(act_templates_);
-+	((QToolButton *)ui_.toolbar->widgetForAction(act_templates_))->setPopupMode(QToolButton::InstantPopup);
-+	ui_.toolbar->addAction(act_ps_);
- 	ui_.toolbar->addAction(act_file_);
- 	if (PsiOptions::instance()->getOption("options.pgp.enable").toBool()) {
- 		ui_.toolbar->addAction(act_pgp_);
-@@ -548,6 +576,8 @@ void PsiChatDlg::buildMenu()
- 	pm_settings_->addSeparator();
- 
- 	pm_settings_->addAction(act_icon_);
-+	pm_settings_->addAction(act_templates_);
-+	pm_settings_->addAction(act_ps_);
- 	pm_settings_->addAction(act_file_);
- 	if (AvCallManager::isSupported()) {
- 		pm_settings_->addAction(act_voice_);
-@@ -646,5 +676,48 @@ bool PsiChatDlg::eventFilter( QObject *obj, QEvent *ev ) {
- 	return ChatDlg::eventFilter( obj, ev );
- }
- 
-+void PsiChatDlg::sendButtonMenu()
-+{
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		menu->setParams(true);
-+		menu->exec(QCursor::pos());
-+		menu->setParams(false);
-+		chatEdit()->setFocus();
-+	}
-+}
-+
-+void PsiChatDlg::editTemplates()
-+{
-+	if(ChatDlg::isActiveTab()) {
-+		showTemplateEditor();
-+	}
-+}
-+
-+void PsiChatDlg::doPasteAndSend()
-+{
-+	if(ChatDlg::isActiveTab()) {
-+		chatEdit()->paste();
-+		doSend();
-+		act_ps_->setEnabled(false);
-+		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
-+	}
-+}
-+
-+void PsiChatDlg::psButtonEnabled()
-+{
-+	act_ps_->setEnabled(true);
-+}
-+
-+void PsiChatDlg::sendTemp(const QString &templText)
-+{
-+	if(ChatDlg::isActiveTab()) {
-+		if (!templText.isEmpty()) {
-+			chatEdit()->textCursor().insertText(templText);
-+			if (!PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
-+				doSend();
-+		}
-+	}
-+}
- 
- #include "psichatdlg.moc"
---- a/src/psichatdlg.h
-+++ b/src/psichatdlg.h
-@@ -17,6 +17,7 @@ class PsiChatDlg : public ChatDlg
- 	Q_OBJECT
- public:
- 	PsiChatDlg(const Jid& jid, PsiAccount* account, TabManager* tabManager);
-+	~PsiChatDlg();
- 
- protected:
- 	// reimplemented
-@@ -39,6 +40,11 @@ private slots:
- 
- 	// reimplemented
- 	void chatEditCreated();
-+	void sendButtonMenu();
-+	void editTemplates();
-+	void doPasteAndSend();
-+	void sendTemp(const QString &);
-+	void psButtonEnabled();
- 
- private:
- 	void initToolBar();
-@@ -73,7 +79,8 @@ private:
- 	IconAction* act_file_;
- 	IconAction* act_compact_;
- 	IconAction* act_voice_;
--
-+	IconAction* act_ps_;
-+	IconAction* act_templates_;
- 	QAction *act_mini_cmd_;
- 
- 	MCmdManager mCmdManager_;
-new file mode 100644
-index 0000000..7ea870b
---- /dev/null
-+++ b/src/sendbuttonmenu.cpp
-@@ -0,0 +1,495 @@
-+#include <QInputDialog>
-+#include <QMessageBox>
-+
-+#include "sendbuttonmenu.h"
-+#include "psioptions.h"
-+#include "psiiconset.h"
-+#include "common.h"
-+
-+SendButtonTemplatesEditor::SendButtonTemplatesEditor(QWidget* parent)
-+	: QDialog(parent)
-+{
-+	ui_.setupUi(this);
-+	setAttribute(Qt::WA_DeleteOnClose);
-+	// Create actions
-+	QAction *addRootTemplAction = new QAction(tr("Add template string"), this);
-+	connect(addRootTemplAction, SIGNAL(triggered()), this, SLOT(addRootTemplate()));
-+	addChildTemplAction = new QAction(tr("Add template string as submenu"), this);
-+	connect(addChildTemplAction, SIGNAL(triggered()), this, SLOT(addChildTemplate()));
-+	QAction *addRootSeparatorAction = new QAction(tr("Add separator"), this);
-+	connect(addRootSeparatorAction, SIGNAL(triggered()), this, SLOT(addRootSeparator()));
-+	addChildSeparatorAction = new QAction(tr("Add separator as submenu"), this);
-+	connect(addChildSeparatorAction, SIGNAL(triggered()), this, SLOT(addChildSeparator()));
-+	editAction = new QAction(IconsetFactory::icon("psi/action_templates_edit").icon(), tr("Edit"), this);
-+	removeAction = new QAction(IconsetFactory::icon("psi/remove").icon(), tr("Remove"), this);
-+	upAction = new QAction(IconsetFactory::icon("psi/arrowUp").icon(), tr("Up"), this);
-+	downAction = new QAction(IconsetFactory::icon("psi/arrowDown").icon(), tr("Down"), this);
-+	// Create Add button menu
-+	QMenu *add_menu = new QMenu(this);
-+	add_menu->addAction(addRootTemplAction);
-+	add_menu->addAction(addChildTemplAction);
-+	add_menu->addAction(addRootSeparatorAction);
-+	add_menu->addAction(addChildSeparatorAction);
-+	ui_.btnAdd->setMenu(add_menu);
-+	//--
-+	QStringList templ_list = PsiOptions::instance()->getOption("options.ui.chat.templates", QStringList()).toStringList();
-+	int templ_cnt = templ_list.size();
-+	QHash<QString, QTreeWidgetItem *> subitems;
-+	for (int i = 0; i < templ_cnt; i++) {
-+		QStringList menu_list = SendButtonTemplatesMenu::getMenuItems(templ_list.at(i));
-+		if (menu_list.size() == 0)
-+			continue;
-+		// find subitems if exists
-+		QTreeWidgetItem *item = NULL;
-+		QString menu_str = "";
-+		int j = menu_list.size() - 2;
-+		for (; j >= 0; j--) {
-+			menu_str = "";
-+			QString menu_str2 = "";
-+			for (int k = 0; k <= j; k++) {
-+				menu_str = menu_str2;
-+				menu_str2.append("/" + menu_list.at(k));
-+			}
-+			item = subitems.value(menu_str2, NULL);
-+			if (item) {
-+				menu_str = menu_str2;
-+				++j;
-+				break;
-+			}
-+		}
-+		if (j < 0)
-+			j = 0;
-+		// create subitems
-+		int sub_cnt = menu_list.size();
-+		for (; j < sub_cnt; j++) {
-+			QString str1 = menu_list.at(j);
-+			QTreeWidgetItem::ItemType type = QTreeWidgetItem::Type;
-+			if (j == (sub_cnt - 1) && str1 == "\\-") {
-+				str1 = tr("<separator>");
-+				type = QTreeWidgetItem::UserType;
-+			}
-+			if (j == 0) {
-+				// toplevel item
-+				item = new QTreeWidgetItem(ui_.lstTemplates, type);
-+			} else {
-+				item = new QTreeWidgetItem(item, type);
-+			}
-+			if (type == QTreeWidgetItem::UserType) {
-+				item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
-+			}
-+			item->setText(0, SendButtonTemplatesMenu::stripSlashes(str1));
-+			if (j < (sub_cnt - 1)) {
-+				menu_str.append("/" + str1);
-+				subitemsmenu_str = item;
-+			}
-+		}
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::addRootTemplate()
-+{
-+	QString t = ui_.txtTemplate->text();
-+	if (t.isEmpty())
-+		return;
-+	QTreeWidgetItem *item = new QTreeWidgetItem(ui_.lstTemplates, QStringList(t), QTreeWidgetItem::Type);
-+	ui_.lstTemplates->addTopLevelItem(item);
-+	ui_.txtTemplate->setText("");
-+}
-+
-+void SendButtonTemplatesEditor::addChildTemplate()
-+{
-+	QString t = ui_.txtTemplate->text();
-+	if (t.isEmpty())
-+		return;
-+	QTreeWidgetItem *curr_item = ui_.lstTemplates->currentItem();
-+	if (curr_item && curr_item->type() == QTreeWidgetItem::Type) {
-+		curr_item->addChild(new QTreeWidgetItem(QStringList(t), QTreeWidgetItem::Type));
-+		ui_.txtTemplate->setText("");
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::addRootSeparator()
-+{
-+	QTreeWidgetItem *item = new QTreeWidgetItem(ui_.lstTemplates, QStringList(tr("<separator>")), QTreeWidgetItem::UserType);
-+	item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
-+	ui_.lstTemplates->addTopLevelItem(item);
-+}
-+
-+void SendButtonTemplatesEditor::addChildSeparator()
-+{
-+	QTreeWidgetItem *curr_item = ui_.lstTemplates->currentItem();
-+	if (curr_item && curr_item->type() == QTreeWidgetItem::Type) {
-+		QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(tr("<separator>")), QTreeWidgetItem::UserType);
-+		item->setFlags(item->flags() & ~Qt::ItemIsDropEnabled);
-+		curr_item->addChild(item);
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::removeTemplate()
-+{
-+	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
-+	if (item) {
-+		delete item;
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::editTemplate()
-+{
-+	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
-+	if (item && item->type() == QTreeWidgetItem::Type) {
-+		QString templ_str = item->text(0);
-+		QInputDialog *editBox = new QInputDialog(this, Qt::Dialog);
-+		editBox->setWindowTitle(tr("Edit template"));
-+		editBox->setLabelText(tr("Input new template text"));
-+		editBox->setTextEchoMode(QLineEdit::Normal);
-+		editBox->setTextValue(templ_str);
-+		editBox->setWindowModality(Qt::WindowModal);
-+		if (editBox->exec() == QInputDialog::Accepted) {
-+			QString new_templ_str = editBox->textValue();
-+			if (!new_templ_str.isEmpty() && new_templ_str != templ_str) {
-+				item->setText(0, new_templ_str);
-+			}
-+		}
-+		delete editBox;
-+	}
-+}
-+
-+void SendButtonTemplatesEditor::upTemplate()
-+{
-+	swapItem(-1);
-+}
-+
-+void SendButtonTemplatesEditor::downTemplate()
-+{
-+	swapItem(1);
-+}
-+
-+void SendButtonTemplatesEditor::selectionChanged(QTreeWidgetItem *current, QTreeWidgetItem */*previous*/)
-+{
-+	bool up_e = false;
-+	bool dw_e = false;
-+	bool ed_e = false;
-+	bool dl_e = false;
-+	QModelIndex index = ui_.lstTemplates->currentIndex();
-+	if (current && index.isValid()) {
-+		QTreeWidgetItem *parent = current->parent();
-+		int cnt = 0;
-+		if (parent) {
-+			cnt = parent->childCount();
-+		} else {
-+			cnt = ui_.lstTemplates->topLevelItemCount();
-+		}
-+		int row = index.row();
-+		if (cnt > 0) {
-+			if (row > 0)
-+				up_e = true;
-+			if (row < cnt - 1)
-+				dw_e = true;
-+			if (current->type() == QTreeWidgetItem::Type)
-+				ed_e = true;
-+			dl_e = true;
-+		}
-+
-+	}
-+	addChildTemplAction->setEnabled(ed_e);
-+	addChildSeparatorAction->setEnabled(ed_e);
-+	ui_.btnEdit->setEnabled(ed_e);
-+	editAction->setEnabled(ed_e);
-+	ui_.btnRemove->setEnabled(dl_e);
-+	removeAction->setEnabled(ed_e);
-+	ui_.btnUp->setEnabled(up_e);
-+	upAction->setEnabled(up_e);
-+	ui_.btnDown->setEnabled(dw_e);
-+	downAction->setEnabled(dw_e);
-+}
-+
-+void SendButtonTemplatesEditor::contextMenu(QPoint pos)
-+{
-+	QMenu* menu = new QMenu(this);
-+	menu->addAction(editAction);
-+	menu->addAction(removeAction);
-+	menu->addSeparator();
-+	menu->addAction(upAction);
-+	menu->addAction(downAction);
-+	QAction *result = menu->exec(ui_.lstTemplates->mapToGlobal(pos));
-+	if (result == editAction) {
-+		editTemplate();
-+	} else if (result == removeAction) {
-+		removeTemplate();
-+	} else if (result == upAction) {
-+		upTemplate();
-+	} else if (result == downAction) {
-+		downTemplate();
-+	}
-+	delete menu;
-+}
-+
-+void SendButtonTemplatesEditor::swapItem(int updown)
-+{
-+	QTreeWidgetItem *item = ui_.lstTemplates->currentItem();
-+	QModelIndex index = ui_.lstTemplates->currentIndex();
-+	if (item && index.isValid()) {
-+		int row = index.row();
-+		int new_pos = row + updown;
-+		QTreeWidgetItem * parent = item->parent();
-+		int cnt = 0;
-+		if (parent) {
-+			cnt = parent->childCount();
-+		} else {
-+			cnt = ui_.lstTemplates->topLevelItemCount();
-+		}
-+		if (new_pos >= 0 && new_pos < cnt) {
-+			if (parent) {
-+				parent->removeChild(item);
-+				parent->insertChild(new_pos, item);
-+			} else {
-+				ui_.lstTemplates->takeTopLevelItem(row);
-+				ui_.lstTemplates->insertTopLevelItem(new_pos, item);
-+			}
-+			ui_.lstTemplates->setCurrentItem(item);
-+			selectionChanged(item, item); // needed update buttons
-+		}
-+	}
-+}
-+
-+QStringList SendButtonTemplatesEditor::genTemplatesList(QTreeWidgetItem* item, QString base_path)
-+{
-+	QStringList res_lst;
-+	QString new_base = base_path;
-+	if (!new_base.isEmpty())
-+		new_base.append("/");
-+	QString item_text = SendButtonTemplatesMenu::addSlashes(item->text(0));
-+	int child_cnt = item->childCount();
-+	if (child_cnt == 0) {
-+		if (item->type() != QTreeWidgetItem::Type)
-+			item_text = "\\-"; // Separator
-+		res_lst.push_back(new_base + item_text);
-+		return res_lst;
-+	}
-+	new_base.append(item_text);
-+	for (int idx = 0; idx < child_cnt; idx++) {
-+		res_lst.append(genTemplatesList(item->child(idx), new_base));
-+	}
-+	return res_lst;
-+}
-+
-+void SendButtonTemplatesEditor::accept()
-+{
-+	QString t = ui_.txtTemplate->text().trimmed();
-+	if (!t.isEmpty()) {
-+		QMessageBox *msgBox = new QMessageBox(this);
-+		msgBox->setIcon(QMessageBox::Warning);
-+		msgBox->setWindowTitle(tr("Save templates"));
-+		msgBox->setText(tr("The template \"%1\" hasn't been saved!").arg(t));
-+		msgBox->setInformativeText(tr("Continue?"));
-+		msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-+		msgBox->setDefaultButton(QMessageBox::No);
-+		msgBox->setWindowModality(Qt::WindowModal);
-+		int res = msgBox->exec();
-+		delete msgBox;
-+		if (res == QMessageBox::No) {
-+			return;
-+		}
-+	}
-+	QStringList templates;
-+	int top_cnt = ui_.lstTemplates->topLevelItemCount();
-+	for (int idx = 0; idx < top_cnt; idx++) {
-+		templates.append(genTemplatesList(ui_.lstTemplates->topLevelItem(idx)));
-+	}
-+	PsiOptions::instance()->setOption("options.ui.chat.templates", templates);
-+	QDialog::accept();
-+	close();
-+}
-+
-+void SendButtonTemplatesEditor::reject()
-+{
-+	QDialog::reject();
-+	close();
-+}
-+
-+//------------------------------
-+
-+SendButtonTemplatesMenu::SendButtonTemplatesMenu(QWidget* parent)
-+	: QMenu(parent)
-+	, mapper(NULL)
-+	, ps_(false)
-+{
-+	setSeparatorsCollapsible(true);
-+	update();
-+	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
-+}
-+
-+void SendButtonTemplatesMenu::setParams(bool ps)
-+{
-+	if (ps_ != ps) {
-+		ps_ = ps;
-+		updatePsAction();
-+	}
-+}
-+
-+void SendButtonTemplatesMenu::updatePsAction()
-+{
-+	bool ps_v = false;
-+	if (ps_ && !PsiOptions::instance()->getOption("options.ui.chat.disable-paste-send").toBool())
-+		ps_v = true;
-+	pasteSendAct->setVisible(ps_v);
-+}
-+
-+/**
-+ * Split menu text string as submenu. Char '/' used as separator.
-+ */
-+QStringList SendButtonTemplatesMenu::getMenuItems(const QString text)
-+{
-+	QStringList res_list;
-+	int str_len = text.length();
-+	unsigned int sl_cnt = 0;
-+	int str_pos = 0;
-+	for (int i = 0; i < str_len; i++) {
-+		QChar ch = text.at(i);
-+		if (ch == '\\') {
-+			sl_cnt++;
-+		} else if (ch == '/') {
-+			if ((sl_cnt & 1) == 0) {
-+				QString str1 = text.mid(str_pos, i - str_pos).trimmed();
-+				if (!str1.isEmpty()) {
-+					res_list.push_back(str1);
-+					str_pos = i + 1;
-+				}
-+				str_pos = i + 1;
-+			}
-+			sl_cnt = 0;
-+		} else {
-+			sl_cnt = 0;
-+		}
-+	}
-+	if (str_pos < str_len) {
-+		QString str1 = text.mid(str_pos);
-+		if (!str1.isEmpty()) {
-+			res_list.push_back(str1);
-+		}
-+	}
-+	return res_list;
-+}
-+
-+QAction *SendButtonTemplatesMenu::makeAction(QString text)
-+{
-+	QString str1;
-+	if (text.length() > 30) {
-+		str1 = text.left(30).replace("&", "&&") + "...";
-+	} else {
-+		str1 = text.replace("&", "&&");
-+	}
-+	QAction *act = new QAction(str1, this);
-+	return act;
-+}
-+
-+void SendButtonTemplatesMenu::update()
-+{
-+	clearMenu(this);
-+	if (mapper)
-+		delete mapper;
-+	mapper = new QSignalMapper(this);
-+
-+	pasteSendAct = new QAction(IconsetFactory::icon("psi/action_paste_and_send").icon(), tr("Paste and &Send"), this);
-+	connect(pasteSendAct, SIGNAL(triggered()), SIGNAL(doPasteAndSend()));
-+	addAction(pasteSendAct);
-+	updatePsAction();
-+	addSeparator();
-+
-+	QAction *editTemplatesAct = new QAction(IconsetFactory::icon("psi/action_templates_edit").icon(), tr("&Edit Templates"), this);
-+	connect(editTemplatesAct, SIGNAL(triggered()), SIGNAL(doEditTemplates()));
-+	addAction(editTemplatesAct);
-+
-+	onlyPaste = new QAction(tr("Only &Paste"), this);
-+	onlyPaste->setCheckable(true);
-+	onlyPaste->setChecked(PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool());
-+	connect(onlyPaste, SIGNAL(triggered()), SLOT(clickOnlyPaste()));
-+	addAction(onlyPaste);
-+	addSeparator();
-+
-+	QStringList templ_list = PsiOptions::instance()->getOption("options.ui.chat.templates", QStringList()).toStringList();
-+	int templ_cnt = templ_list.size();
-+	QHash<QString, QAction *> submenus;
-+	for (int i = 0; i < templ_cnt; i++) {
-+		QStringList menu_list = SendButtonTemplatesMenu::getMenuItems(templ_list.at(i));
-+		if (menu_list.size() == 0)
-+			continue;
-+		// find submenus if exists
-+		QAction *m_act = NULL;
-+		QString menu_str = "";
-+		int j = menu_list.size() - 2;
-+		for (; j >= 0; j--) {
-+			menu_str = "";
-+			QString menu_str2 = "";
-+			for (int k = 0; k <= j; k++) {
-+				menu_str = menu_str2;
-+				menu_str2.append("/" + menu_list.at(k));
-+			}
-+			m_act = submenus.value(menu_str2, NULL);
-+			if (m_act) {
-+				menu_str = menu_str2;
-+				++j;
-+				break;
-+			}
-+		}
-+		if (j < 0)
-+			j = 0;
-+		// create submenus
-+		QMenu *smenu = this;
-+		if (m_act) {
-+			smenu = m_act->menu();
-+			if (!smenu)
-+				smenu = new QMenu(this);
-+		}
-+		int sub_cnt = menu_list.size();
-+		for (; ; j++) {
-+			QString str1 = menu_list.at(j);
-+			if (j == (sub_cnt - 1) && str1 == "\\-") {
-+				smenu->addSeparator();
-+				break;
-+			}
-+			QAction *c_act = makeAction(SendButtonTemplatesMenu::stripSlashes(str1));
-+			smenu->addAction(c_act);
-+			if (j == (sub_cnt - 1)) {
-+				connect(c_act, SIGNAL(triggered()), mapper, SLOT(map()));
-+				mapper->setMapping(c_act, SendButtonTemplatesMenu::stripSlashes(str1));
-+				break;
-+			} else {
-+				smenu = new QMenu(this);
-+				c_act->setMenu(smenu);
-+				menu_str.append("/" + str1);
-+				submenusmenu_str = c_act;
-+			}
-+		}
-+	}
-+	connect(mapper, SIGNAL(mapped(const QString &)), SIGNAL(doTemplateText(const QString &)));
-+}
-+
-+void SendButtonTemplatesMenu::clickOnlyPaste()
-+{
-+	if (PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
-+		PsiOptions::instance()->setOption("options.ui.chat.only-paste-template", false);
-+	else
-+		PsiOptions::instance()->setOption("options.ui.chat.only-paste-template", true);
-+}
-+
-+void SendButtonTemplatesMenu::optionChanged(const QString& option)
-+{
-+	if (option == "options.ui.chat.disable-paste-send") {
-+		updatePsAction();
-+	} else if (option == "options.ui.chat.css") {
-+		setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
-+	//} else if (option == "options.ui.chat.only-paste-template") {
-+	//	onlyPaste->setChecked(PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool());
-+	}
-+}
-+
-+QString SendButtonTemplatesMenu::addSlashes(QString str)
-+{
-+	return str.replace("\\", "\\\\", Qt::CaseSensitive).replace("/", "\\/");
-+}
-+
-+QString SendButtonTemplatesMenu::stripSlashes(QString str)
-+{
-+	return str.replace("\\/", "/").replace("\\\\", "\\");
-+}
-new file mode 100644
---- /dev/null
-+++ b/src/sendbuttonmenu.h
-@@ -0,0 +1,77 @@
-+#ifndef SENDBUTTONMENU_H
-+#define SENDBUTTONMENU_H
-+
-+#include <QDialog>
-+#include <QMenu>
-+#include <QPointer>
-+#include <QSignalMapper>
-+
-+#include "ui_sendbuttontemplateseditor.h"
-+
-+class SendButtonTemplatesEditor : public QDialog
-+{
-+	Q_OBJECT
-+public:
-+	SendButtonTemplatesEditor(QWidget* parent = 0);
-+
-+private:
-+	Ui::SendButtonTemplatesEditor ui_;
-+	//QString t;
-+	QAction *addChildTemplAction;
-+	QAction *addChildSeparatorAction;
-+	QAction *editAction;
-+	QAction *removeAction;
-+	QAction *upAction;
-+	QAction *downAction;
-+	void swapItem(int);
-+	QStringList genTemplatesList(QTreeWidgetItem* item, QString base_path = "");
-+
-+private slots:
-+	void addRootTemplate();
-+	void addChildTemplate();
-+	void addRootSeparator();
-+	void addChildSeparator();
-+	void removeTemplate();
-+	void editTemplate();
-+	void upTemplate();
-+	void downTemplate();
-+	void selectionChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
-+	void contextMenu(QPoint);
-+
-+protected slots:
-+	void accept();
-+	void reject();
-+
-+};
-+
-+class SendButtonTemplatesMenu : public QMenu
-+{
-+	Q_OBJECT
-+public:
-+	SendButtonTemplatesMenu(QWidget* parent);
-+	void setParams(bool ps);
-+	static QStringList getMenuItems(const QString);
-+	static QString addSlashes(QString);
-+	static QString stripSlashes(QString);
-+
-+private:
-+	QSignalMapper *mapper;
-+	bool ps_;
-+	QAction *pasteSendAct;
-+	QAction *onlyPaste;
-+	void updatePsAction();
-+	QAction *makeAction(const QString);
-+
-+private slots:
-+	void update();
-+	void clickOnlyPaste();
-+	void optionChanged(const QString& option);
-+
-+signals:
-+	void doPasteAndSend();
-+	void doEditTemplates();
-+	void doTemplateText(const QString &);
-+
-+};
-+
-+#endif
-new file mode 100644
---- /dev/null
-+++ b/src/sendbuttontemplateseditor.ui
-@@ -0,0 +1,364 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>SendButtonTemplatesEditor</class>
-+ <widget class="QDialog" name="SendButtonTemplatesEditor">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>464</width>
-+    <height>407</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>Template editor</string>
-+  </property>
-+  <layout class="QVBoxLayout">
-+   <item>
-+    <widget class="QGroupBox" name="groupBox">
-+     <property name="title">
-+      <string>Templates</string>
-+     </property>
-+     <layout class="QVBoxLayout">
-+      <item>
-+       <widget class="QLineEdit" name="txtTemplate">
-+        <property name="text">
-+         <string/>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <widget class="Line" name="line1">
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout">
-+        <item>
-+         <widget class="QTreeWidget" name="lstTemplates">
-+          <property name="contextMenuPolicy">
-+           <enum>Qt::CustomContextMenu</enum>
-+          </property>
-+          <property name="dragEnabled">
-+           <bool>true</bool>
-+          </property>
-+          <property name="dragDropMode">
-+           <enum>QAbstractItemView::InternalMove</enum>
-+          </property>
-+          <property name="defaultDropAction">
-+           <enum>Qt::MoveAction</enum>
-+          </property>
-+          <attribute name="headerVisible">
-+           <bool>false</bool>
-+          </attribute>
-+          <attribute name="headerVisible">
-+           <bool>false</bool>
-+          </attribute>
-+          <column>
-+           <property name="text">
-+            <string notr="true">1</string>
-+           </property>
-+          </column>
-+         </widget>
-+        </item>
-+        <item>
-+         <layout class="QVBoxLayout">
-+          <item>
-+           <widget class="QToolButton" name="btnUp">
-+            <property name="enabled">
-+             <bool>false</bool>
-+            </property>
-+            <property name="sizePolicy">
-+             <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
-+              <horstretch>0</horstretch>
-+              <verstretch>0</verstretch>
-+             </sizepolicy>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>26</width>
-+              <height>51</height>
-+             </size>
-+            </property>
-+            <property name="styleSheet">
-+             <string notr="true">margin:0;padding:0;</string>
-+            </property>
-+            <property name="arrowType">
-+             <enum>Qt::UpArrow</enum>
-+            </property>
-+           </widget>
-+          </item>
-+          <item>
-+           <widget class="QToolButton" name="btnDown">
-+            <property name="enabled">
-+             <bool>false</bool>
-+            </property>
-+            <property name="sizePolicy">
-+             <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
-+              <horstretch>0</horstretch>
-+              <verstretch>0</verstretch>
-+             </sizepolicy>
-+            </property>
-+            <property name="maximumSize">
-+             <size>
-+              <width>26</width>
-+              <height>51</height>
-+             </size>
-+            </property>
-+            <property name="styleSheet">
-+             <string notr="true">margin:0;padding:0;</string>
-+            </property>
-+            <property name="arrowType">
-+             <enum>Qt::DownArrow</enum>
-+            </property>
-+           </widget>
-+          </item>
-+         </layout>
-+        </item>
-+       </layout>
-+      </item>
-+      <item>
-+       <widget class="Line" name="line2">
-+        <property name="orientation">
-+         <enum>Qt::Horizontal</enum>
-+        </property>
-+       </widget>
-+      </item>
-+      <item>
-+       <layout class="QHBoxLayout">
-+        <property name="spacing">
-+         <number>6</number>
-+        </property>
-+        <property name="margin">
-+         <number>0</number>
-+        </property>
-+        <item>
-+         <widget class="QPushButton" name="btnAdd">
-+          <property name="text">
-+           <string>Add</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QPushButton" name="btnEdit">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="text">
-+           <string>Edit</string>
-+          </property>
-+         </widget>
-+        </item>
-+        <item>
-+         <widget class="QPushButton" name="btnRemove">
-+          <property name="enabled">
-+           <bool>false</bool>
-+          </property>
-+          <property name="text">
-+           <string>Remove</string>
-+          </property>
-+         </widget>
-+        </item>
-+       </layout>
-+      </item>
-+     </layout>
-+    </widget>
-+   </item>
-+   <item>
-+    <layout class="QHBoxLayout">
-+     <property name="spacing">
-+      <number>6</number>
-+     </property>
-+     <property name="margin">
-+      <number>0</number>
-+     </property>
-+     <item>
-+      <spacer>
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnOk">
-+       <property name="text">
-+        <string>Ok</string>
-+       </property>
-+       <property name="autoDefault">
-+        <bool>false</bool>
-+       </property>
-+       <property name="default">
-+        <bool>true</bool>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QPushButton" name="btnCancel">
-+       <property name="text">
-+        <string>Cancel</string>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <tabstops>
-+  <tabstop>txtTemplate</tabstop>
-+  <tabstop>lstTemplates</tabstop>
-+  <tabstop>btnUp</tabstop>
-+  <tabstop>btnDown</tabstop>
-+  <tabstop>btnAdd</tabstop>
-+  <tabstop>btnEdit</tabstop>
-+  <tabstop>btnRemove</tabstop>
-+  <tabstop>btnOk</tabstop>
-+  <tabstop>btnCancel</tabstop>
-+ </tabstops>
-+ <resources/>
-+ <connections>
-+  <connection>
-+   <sender>btnOk</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>accept()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>265</x>
-+     <y>271</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>-2</x>
-+     <y>287</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnCancel</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>reject()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>341</x>
-+     <y>283</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>81</x>
-+     <y>272</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnRemove</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>removeTemplate()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>290</x>
-+     <y>227</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>199</x>
-+     <y>149</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnEdit</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>editTemplate()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>231</x>
-+     <y>269</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnUp</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>upTemplate()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>439</x>
-+     <y>120</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>btnDown</sender>
-+   <signal>clicked()</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>downTemplate()</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>439</x>
-+     <y>196</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>lstTemplates</sender>
-+   <signal>customContextMenuRequested(QPoint)</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>contextMenu(QPoint)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>219</x>
-+     <y>158</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+  <connection>
-+   <sender>lstTemplates</sender>
-+   <signal>currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)</signal>
-+   <receiver>SendButtonTemplatesEditor</receiver>
-+   <slot>selectionChanged(QTreeWidgetItem*,QTreeWidgetItem*)</slot>
-+   <hints>
-+    <hint type="sourcelabel">
-+     <x>219</x>
-+     <y>158</y>
-+    </hint>
-+    <hint type="destinationlabel">
-+     <x>231</x>
-+     <y>162</y>
-+    </hint>
-+   </hints>
-+  </connection>
-+ </connections>
-+ <slots>
-+  <slot>removeTemplate()</slot>
-+  <slot>editTemplate()</slot>
-+  <slot>upTemplate()</slot>
-+  <slot>downTemplate()</slot>
-+  <slot>selectionChanged(QTreeWidgetItem*,QTreeWidgetItem*)</slot>
-+  <slot>contextMenu(QPoint)</slot>
-+ </slots>
-+</ui>
---- a/src/src.pri
-+++ b/src/src.pri
-@@ -209,7 +209,9 @@ HEADERS += \
- 	$$PWD/bookmarkmanagedlg.h \
- 	$$PWD/vcardphotodlg.h \
- 	$$PWD/psicli.h \
--	$$PWD/coloropt.h
-+	$$PWD/coloropt.h \
-+	$$PWD/sendbuttonmenu.h
-+
- 
- 
- HEADERS += tabcompletion.h
-@@ -345,7 +347,9 @@ SOURCES += \
- 	$$PWD/accountlabel.cpp \
- 	$$PWD/bookmarkmanagedlg.cpp \
- 	$$PWD/vcardphotodlg.cpp \
--	$$PWD/coloropt.cpp
-+	$$PWD/coloropt.cpp \
-+	$$PWD/sendbuttonmenu.cpp
-+
- 
- CONFIG += filetransfer
- filetransfer {
-@@ -576,7 +580,8 @@ FORMS += \
- 	$$PWD/chatdlg.ui \
- 	$$PWD/bookmarkmanage.ui \
- 	$$PWD/ahcommanddlg.ui \
--	$$PWD/ahcformdlg.ui
-+	$$PWD/ahcformdlg.ui \
-+	$$PWD/sendbuttontemplateseditor.ui
- 
- # options dialog
- include($$PWD/options/options.pri)
---- a/src/tabs/tabbablewidget.cpp
-+++ b/src/tabs/tabbablewidget.cpp
-@@ -41,6 +41,12 @@ TabbableWidget::TabbableWidget(const Jid &jid, PsiAccount *pa, TabManager *tabMa
- 	, pa_(pa)
- 	, tabManager_(tabManager)
- {
-+	if (TabbableWidget::chatsCount == 0) {
-+		TabbableWidget::templateMenu = new SendButtonTemplatesMenu(NULL);
-+		TabbableWidget::templateMenu->setParams(false);
-+		TabbableWidget::templateMenu->setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
-+	}
-+	++TabbableWidget::chatsCount;
- 	QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
- }
- 
-@@ -100,6 +106,42 @@ TabbableWidget::~TabbableWidget()
- 	if (isTabbed()) {
- 		getManagingTabDlg()->removeTabWithNoChecks(this);
- 	}
-+	--TabbableWidget::chatsCount;
-+	if (TabbableWidget::chatsCount == 0) {
-+		if (TabbableWidget::templateMenu != NULL) {
-+			delete TabbableWidget::templateMenu;
-+			TabbableWidget::templateMenu = NULL;
-+		}
-+		if (!TabbableWidget::templateEditDlg.isNull()) {
-+			delete (TabbableWidget::templateEditDlg);
-+			TabbableWidget::templateEditDlg = NULL;
-+		}
-+	}
-+}
-+
-+int TabbableWidget::chatsCount = 0;
-+SendButtonTemplatesMenu *TabbableWidget::templateMenu = NULL;
-+QPointer<SendButtonTemplatesEditor> TabbableWidget::templateEditDlg = NULL;
-+
-+SendButtonTemplatesMenu* TabbableWidget::getTemplateMenu()
-+{
-+	return TabbableWidget::templateMenu;
-+}
-+
-+void TabbableWidget::showTemplateEditor()
-+{
-+	bool new_window = false;
-+	if (TabbableWidget::templateEditDlg.isNull()) {
-+		new_window = true;
-+		TabbableWidget::templateEditDlg = new SendButtonTemplatesEditor(NULL);
-+		if (TabbableWidget::templateMenu) {
-+			TabbableWidget::templateEditDlg->setStyleSheet(PsiOptions::instance()->getOption("options.ui.chat.css").toString());
-+			connect(TabbableWidget::templateEditDlg.data(), SIGNAL(accepted()), TabbableWidget::templateMenu, SLOT(update()));
-+		}
-+	}
-+	TabbableWidget::templateEditDlg->show();
-+	if (!new_window)
-+		::bringToFront(TabbableWidget::templateEditDlg);
- }
- 
- /**
---- a/src/tabs/tabbablewidget.h
-+++ b/src/tabs/tabbablewidget.h
-@@ -24,6 +24,7 @@
- #include <QIcon>
- #include "advwidget.h"
- #include "im.h" // ChatState
-+#include "sendbuttonmenu.h"
- 
- namespace XMPP {
- 	class Jid;
-@@ -68,6 +69,11 @@ public:
- 	virtual int unreadMessageCount() const = 0;
- 	virtual QString desiredCaption() const = 0;
- 
-+	// Templates
-+	SendButtonTemplatesMenu* getTemplateMenu();
-+	void showTemplateEditor();
-+	// ---
-+
- signals:
- 	void invalidateTabInfo();
- 	void updateFlashState();
-@@ -90,6 +96,11 @@ private:
- 	PsiAccount *pa_;
- 	TabManager *tabManager_;
- 	QIcon icon_;
-+	// Templates
-+	static int chatsCount;
-+	static SendButtonTemplatesMenu *templateMenu;
-+	static QPointer<SendButtonTemplatesEditor> templateEditDlg;
-+	// ---
- };
- 
- #endif

psi-plus-main-20160309.tar.xz/patches/haiku Deleted

psi-plus-main-20160309.tar.xz/patches/haiku/4000-fix-psiplus-build-in-haiku.patch Deleted

@@ -1,498 +0,0 @@
---- a/iris/src/jdns/jdns_p.h
-+++ b/iris/src/jdns/jdns_p.h
-@@ -44,6 +44,8 @@
- # define JDNS_OS_SOLARIS
- #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
- # define JDNS_OS_MAC
-+#elif defined(__HAIKU__)
-+# define JDNS_OS_HAIKU
- #endif
- 
- #ifdef JDNS_OS_WIN
---- a/iris/src/jdns/jdns_sys.c
-+++ b/iris/src/jdns/jdns_sys.c
-@@ -726,8 +726,8 @@ static int my_res_init()
- //   a define, so the #ifdef doesn't work.  as a workaround, we'll explicitly
- //   specify the platforms that have __res_state_ext
- //#ifdef __res_state_ext
--#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || \
--    defined(JDNS_OS_NETBSD) || defined (JDNS_OS_SOLARIS)
-+#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || defined(JDNS_OS_NETBSD) \
-+	|| defined (JDNS_OS_SOLARIS) || defined (JDNS_OS_HAIKU)
- # define USE_EXTEXT
- #endif
- 
---- a/iris/src/jdns/qjdns_sock.cpp
-+++ b/iris/src/jdns/qjdns_sock.cpp
-@@ -46,6 +46,7 @@
- 
- #ifndef QT_NO_IPV6
- # define HAVE_IPV6
-+#ifndef Q_OS_HAIKU
- # ifndef s6_addr
- #  define IPPROTO_IPV6 41
-    struct in6_addr
-@@ -59,6 +60,7 @@
-    };
- #  define s6_addr _S6_un._S6_u8
- # endif
-+#endif
- # ifndef IPV6_JOIN_GROUP
- #  define IPV6_JOIN_GROUP 12
- #  define IPV6_MULTICAST_HOPS 10
---- a/src/applicationinfo.cpp
-+++ b/src/applicationinfo.cpp
-@@ -160,7 +160,7 @@ QString ApplicationInfo::resourcesDir()
- {
- #if defined(HAVE_X11)
- 	return PSI_DATADIR;
--#elif defined(Q_OS_WIN)
-+#elif defined(Q_OS_WIN) || defined(Q_WS_HAIKU)
- 	return qApp->applicationDirPath();
- #elif defined(Q_OS_MAC)
- 	// FIXME: Clean this up (remko)
-@@ -297,6 +297,10 @@ QString ApplicationInfo::homeDir(ApplicationInfo::HomedirType type)
- 				QMessageBox::information(0, QObject::tr("Conversion Error"), QObject::tr("Configuration data for a previous version of Psi was found, but it was not possible to convert it to work with the current version. Ensure you have appropriate permission and that another copy of Psi is not running, and try again."));
- 				exit(0);
- 			}
-+#elif defined Q_OS_HAIKU
-+			QDir configDir(QDir::homePath() + "/.config/" + sname());
-+			QDir cacheDir(QDir::homePath() + "/.cache/" + sname());
-+			QDir dataDir(configDir);
- #endif
- 			configDir_ = configDir.path();
- 			cacheDir_ = cacheDir.path();
---- a/src/libpsi/tools/globalshortcut/globalshortcut.pri
-+++ b/src/libpsi/tools/globalshortcut/globalshortcut.pri
-@@ -2,7 +2,7 @@ HEADERS += $$PWD/globalshortcutmanager.h $$PWD/globalshortcuttrigger.h
- SOURCES += $$PWD/globalshortcutmanager.cpp
- DEPENDPATH  += $$PWD
- 
--unix:!mac {
-+unix:!mac:!haiku {
- 	SOURCES += $$PWD/globalshortcutmanager_x11.cpp
- }
- win32: {
-@@ -16,3 +16,6 @@ mac: {
- 	HEADERS += \
- 		$$PWD/NDKeyboardLayout.h
- }
-+haiku: {
-+	SOURCES += $$PWD/globalshortcutmanager_haiku.cpp
-+}
---- a/src/libpsi/tools/tools.pri
-+++ b/src/libpsi/tools/tools.pri
-@@ -25,7 +25,7 @@ SOURCES += \
- 	$$PWD/priorityvalidator.cpp \
- 	$$PWD/iodeviceopener.cpp
- 
--unix:!mac {
-+unix:!mac:!haiku {
- 	HEADERS += $$PWD/x11info.h
- 	SOURCES += $$PWD/x11info.cpp
- }
---- a/src/src.pri
-+++ b/src/src.pri
-@@ -6,7 +6,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
- 
-   unix:!mac:LIBS += -lxcb
- }
--unix:!mac:DEFINES += HAVE_X11
-+unix:!mac:!haiku:DEFINES += HAVE_X11
- 
- # modules
- include($$PWD/protocol/protocol.pri)
---- a/src/systeminfo.cpp
-+++ b/src/systeminfo.cpp
-@@ -26,6 +26,14 @@
- #include <windows.h>
- #endif
- 
-+#if defined(Q_WS_HAIKU)
-+#include <sys/utsname.h>
-+#include <Path.h>
-+#include <FindDirectory.h>
-+#include <AppFileInfo.h>
-+extern "C" const char* __get_haiku_revision();
-+#endif
-+
- #include "systeminfo.h"
- 
- #if defined(HAVE_X11)
-@@ -172,7 +180,7 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
- 	os_str_ = "Unknown";
- 
- 	// Detect
--#if defined(HAVE_X11) || defined(Q_OS_MAC)
-+#if defined(HAVE_X11) || defined(Q_OS_MAC) || defined(Q_WS_HAIKU)
- 	time_t x;
- 	time(&x);
- 	char str256;
-@@ -225,6 +233,31 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
- 		default:
- 			os_str_ = "Mac OS X";
- 	}
-+#elif defined(Q_WS_HAIKU)
-+	QString strVersion("Haiku");
-+	BPath path;
-+	if (find_directory(B_BEOS_LIB_DIRECTORY, &path) == B_OK) {
-+		path.Append("libbe.so");
-+
-+		BAppFileInfo appFileInfo;
-+		version_info versionInfo;
-+		BFile file;
-+		if (file.SetTo(path.Path(), B_READ_ONLY) == B_OK
-+			&& appFileInfo.SetTo(&file) == B_OK
-+			&& appFileInfo.GetVersionInfo(&versionInfo, 
-+				B_APP_VERSION_KIND) == B_OK
-+			&& versionInfo.short_info0 != '\0')
-+				strVersion = versionInfo.short_info;
-+	}
-+
-+	 const char* haikuRevision = __get_haiku_revision();
-+       if (haikuRevision != NULL) {
-+               os_str_ = "Haiku";
-+               os_str_ += " ( " + strVersion + " Rev. ";
-+               os_str_ += haikuRevision;
-+               os_str_ += ")";
-+       }
-+
- #endif
- 
- #if defined(Q_OS_WIN)
---- /dev/null
-+++ b/src/libpsi/tools/globalshortcut/globalshortcutmanager_haiku.cpp
-@@ -0,0 +1,333 @@
-+/*
-+ * globalshortcutmanager_haiku.cpp - Haiku implementation of global shortcuts by Vitaly (Diger)
-+ * Based on X11 implementation of global shortcuts
-+ * Copyright (C) 2003-2006  Justin Karneges, Maciej Niedzielski
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "globalshortcutmanager.h"
-+#include "globalshortcuttrigger.h"
-+
-+#include <InterfaceDefs.h>
-+
-+#include <QWidget>
-+#include <QCoreApplication>
-+
-+
-+class HKeyTrigger
-+{
-+public:
-+	virtual ~HKeyTrigger() {}
-+	virtual void activate() = 0;
-+	virtual bool isAccepted(int qkey) const = 0;
-+};
-+
-+class HKeyTriggerManager : public QObject
-+{
-+public:
-+	static HKeyTriggerManager* instance()
-+	{
-+		if(!instance_)
-+			instance_ = new HKeyTriggerManager();
-+		return instance_;
-+	}
-+
-+	void addTrigger(HKeyTrigger* trigger)
-+	{
-+		triggers_ << trigger;
-+	}
-+
-+	void removeTrigger(HKeyTrigger* trigger)
-+	{
-+		triggers_.removeAll(trigger);
-+	}
-+
-+	struct Qt_HK_Keygroup
-+	{
-+		char num;
-+		int sym3;
-+	};
-+
-+protected:
-+	// reimplemented
-+	bool eventFilter(QObject* o, QEvent* e)
-+	{
-+		if(e->type() == QEvent::KeyPress) {
-+			QKeyEvent* k = static_cast<QKeyEvent*>(e);
-+			int qkey = k->key();
-+			if (k->modifiers() & Qt::ShiftModifier)
-+				qkey |= Qt::SHIFT;
-+			if (k->modifiers() & Qt::ControlModifier)
-+				qkey |= Qt::CTRL;
-+			if (k->modifiers() & Qt::AltModifier)
-+				qkey |= Qt::ALT;
-+			if (k->modifiers() & Qt::MetaModifier)
-+				qkey |= Qt::META;
-+
-+			foreach(HKeyTrigger* trigger, triggers_) {
-+				if (trigger->isAccepted(qkey)) {
-+					trigger->activate();
-+					return true;
-+				}
-+			}
-+		}
-+
-+		return QObject::eventFilter(o, e);
-+	}
-+
-+private:
-+	HKeyTriggerManager()
-+		: QObject(QCoreApplication::instance())
-+	{
-+		QCoreApplication::instance()->installEventFilter(this);
-+	}
-+
-+	static HKeyTriggerManager* instance_;
-+	QList<HKeyTrigger*> triggers_;
-+
-+private:
-+	struct Qt_HK_Keymap
-+	{
-+		int key;
-+		Qt_HK_Keygroup hk;
-+	};
-+
-+	static Qt_HK_Keymap qt_hk_table;
-+	static long alt_mask;
-+	static long meta_mask;
-+	static long super_mask;
-+	static long hyper_mask;
-+	static long numlock_mask;
-+	static bool haveMods;
-+
-+	// adapted from qapplication_x11.cpp
-+	static void ensureModifiers()
-+	{
-+		if (haveMods)
-+			return;
-+	}
-+
-+public:
-+	static bool convertKeySequence(const QKeySequence& ks, unsigned int* _mod, Qt_HK_Keygroup* _kg)
-+	{
-+		int code = ks;
-+		ensureModifiers();
-+
-+		unsigned int mod = 0;
-+		/*
-+		if (code & Qt::META)
-+			mod |= meta_mask;
-+		if (code & Qt::SHIFT)
-+			mod |= ShiftMask;
-+		if (code & Qt::CTRL)
-+			mod |= ControlMask;
-+		if (code & Qt::ALT)
-+			mod |= alt_mask;
-+		*/
-+		Qt_HK_Keygroup kg;
-+		kg.num = 0;
-+		kg.sym0 = 0;
-+		code &= ~Qt::KeyboardModifierMask;
-+
-+		bool found = false;
-+		for (int n = 0; qt_hk_tablen.key != Qt::Key_unknown; ++n) {
-+			if (qt_hk_tablen.key == code) {
-+				kg = qt_hk_tablen.hk;
-+				found = true;
-+				break;
-+			}
-+		}
-+
-+		if (!found) {
-+			// try latin1
-+			if (code >= 0x20 && code <= 0x7f) {
-+				kg.num = 1;
-+				kg.sym0 = code;
-+			}
-+		}
-+
-+		if (!kg.num)
-+			return false;
-+
-+		if (_mod)
-+			*_mod = mod;
-+		if (_kg)
-+			*_kg = kg;
-+
-+		return true;
-+	}
-+
-+	static QList<long> ignModifiersList()
-+	{
-+		QList<long> ret;
-+		/*
-+		if (numlock_mask) {
-+			ret << 0 << LockMask << numlock_mask << (LockMask | numlock_mask);
-+		}
-+		else {
-+			ret << 0 << LockMask;
-+		}
-+		*/
-+		return ret;
-+	}
-+};
-+
-+
-+HKeyTriggerManager* HKeyTriggerManager::instance_ = NULL;
-+class GlobalShortcutManager::KeyTrigger::Impl : public HKeyTrigger
-+{
-+private:
-+	KeyTrigger* trigger_;
-+	int qkey_;
-+
-+	struct GrabbedKey {
-+		int code;
-+		uint mod;
-+	};
-+	QList<GrabbedKey> grabbedKeys_;
-+
-+	static bool failed;
-+
-+public:
-+	/**
-+	 * Constructor registers the hotkey.
-+	 */
-+	Impl(GlobalShortcutManager::KeyTrigger* t, const QKeySequence& ks)
-+		: trigger_(t)
-+		, qkey_(ks)
-+	{
-+		HKeyTriggerManager::instance()->addTrigger(this);
-+
-+		HKeyTriggerManager::Qt_HK_Keygroup kg;
-+		unsigned int mod;
-+	}
-+
-+	/**
-+	 * Destructor unregisters the hotkey.
-+	 */
-+	~Impl()
-+	{
-+		HKeyTriggerManager::instance()->removeTrigger(this);
-+
-+	}
-+
-+	void activate()
-+	{
-+		emit trigger_->triggered();
-+	}
-+
-+	bool isAccepted(int qkey) const
-+	{
-+		return qkey_ == qkey;
-+	}
-+};
-+
-+bool GlobalShortcutManager::KeyTrigger::Impl::failed;
-+long HKeyTriggerManager::alt_mask  = 0;
-+long HKeyTriggerManager::meta_mask = 0;
-+long HKeyTriggerManager::super_mask  = 0;
-+long HKeyTriggerManager::hyper_mask  = 0;
-+long HKeyTriggerManager::numlock_mask  = 0;
-+bool HKeyTriggerManager::haveMods  = false;
-+
-+
-+HKeyTriggerManager::Qt_HK_Keymap
-+HKeyTriggerManager::qt_hk_table = {
-+	{ Qt::Key_Escape,      B_ESCAPE },
-+	{ Qt::Key_Tab,         B_TAB},
-+	{ Qt::Key_Backtab,     0 },
-+	{ Qt::Key_Backspace,   B_BACKSPACE},
-+	{ Qt::Key_Return,      B_RETURN},
-+	{ Qt::Key_Enter,       B_ENTER},
-+	{ Qt::Key_Insert,      B_INSERT},
-+	{ Qt::Key_Delete,      B_DELETE},
-+	{ Qt::Key_Pause,       B_PAUSE_KEY},
-+	{ Qt::Key_Print,       B_PRINT_KEY},
-+	{ Qt::Key_SysReq,      0 },
-+	//{ Qt::Key_Clear,       B_CLEAR_KEY},
-+	{ Qt::Key_Home,        B_HOME},
-+	{ Qt::Key_End,         B_END},
-+	{ Qt::Key_Left,        B_LEFT_ARROW},
-+	{ Qt::Key_Up,          B_UP_ARROW},
-+	{ Qt::Key_Right,       B_RIGHT_ARROW},
-+	{ Qt::Key_Down,        B_DOWN_ARROW},
-+	{ Qt::Key_PageUp,      B_PAGE_UP},
-+	{ Qt::Key_PageDown,    B_PAGE_DOWN},
-+	{ Qt::Key_Shift,       B_SHIFT_KEY},
-+	{ Qt::Key_Control,     B_CONTROL_KEY},
-+	{ Qt::Key_Meta,        B_LEFT_OPTION_KEY},
-+	{ Qt::Key_Alt,         B_MENU_KEY},
-+	{ Qt::Key_CapsLock,    B_CAPS_LOCK},
-+	{ Qt::Key_NumLock,     B_NUM_LOCK},
-+	{ Qt::Key_ScrollLock,  B_SCROLL_KEY},
-+	{ Qt::Key_F1,          B_F1_KEY},
-+	{ Qt::Key_F2,          B_F2_KEY},
-+	{ Qt::Key_F3,          B_F3_KEY},
-+	{ Qt::Key_F4,          B_F4_KEY},
-+	{ Qt::Key_F5,          B_F5_KEY},
-+	{ Qt::Key_F6,          B_F6_KEY},
-+	{ Qt::Key_F7,          B_F7_KEY},
-+	{ Qt::Key_F8,          B_F8_KEY},
-+	{ Qt::Key_F9,          B_F9_KEY},
-+	{ Qt::Key_F10,         B_F10_KEY},
-+	{ Qt::Key_F11,         B_F11_KEY},
-+	{ Qt::Key_F12,         B_F12_KEY},
-+	{ Qt::Key_F13,         0 },
-+	{ Qt::Key_F14,         0 },
-+	{ Qt::Key_F15,         0 },
-+	{ Qt::Key_F16,         0 },
-+	{ Qt::Key_F17,         0 },
-+	{ Qt::Key_F18,         0 },
-+	{ Qt::Key_F19,         0 },
-+	{ Qt::Key_F20,         0 },
-+	{ Qt::Key_F21,         0 },
-+	{ Qt::Key_F22,         0 },
-+	{ Qt::Key_F23,         0 },
-+	{ Qt::Key_F24,         0 },
-+	{ Qt::Key_F25,         0 },
-+	{ Qt::Key_F26,         0 },
-+	{ Qt::Key_F27,         0 },
-+	{ Qt::Key_F28,         0 },
-+	{ Qt::Key_F29,         0 },
-+	{ Qt::Key_F30,         0 },
-+	{ Qt::Key_F31,         0 },
-+	{ Qt::Key_F32,         0 },
-+	{ Qt::Key_F33,         0 },
-+	{ Qt::Key_F34,         0 },
-+	{ Qt::Key_F35,         0 },
-+	{ Qt::Key_Super_L,     0 },
-+	{ Qt::Key_Super_R,     0 },
-+	{ Qt::Key_Menu,        0 },
-+	{ Qt::Key_Hyper_L,     0 },
-+	{ Qt::Key_Hyper_R,     0 },
-+	{ Qt::Key_Help,        0 },
-+	{ Qt::Key_Direction_L, 0 },
-+	{ Qt::Key_Direction_R, 0 },
-+
-+	{ Qt::Key_unknown,     0 },
-+};
-+
-+GlobalShortcutManager::KeyTrigger::KeyTrigger(const QKeySequence& key)
-+{
-+	d = new Impl(this, key);
-+}
-+
-+GlobalShortcutManager::KeyTrigger::~KeyTrigger()
-+{
-+	delete d;
-+	d = 0;
-+}

psi-plus-main-20160309.tar.xz/patches/haiku/4010-fix-iconselect-buttons-in-haiku.patch Deleted

@@ -1,35 +0,0 @@
---- a/src/widgets/iconselect.cpp
-+++ b/src/widgets/iconselect.cpp
-@@ -102,6 +102,10 @@ public:
- signals:
- 	void iconSelected(const PsiIcon *);
- 	void textSelected(QString);
-+	
-+public slots:
-+	void aboutToShow() { iconStart(); }
-+	void aboutToHide() { iconStop();  }
- 
- private:
- 	void iconStart()
-@@ -142,8 +146,8 @@ private:
- 		}
- 	}
- 
--	void enterEvent(QEvent *) { iconStart(); setFocus();  update(); } // focus follows mouse mode
--	void leaveEvent(QEvent *) { iconStop(); clearFocus(); update(); }
-+	void enterEvent(QEvent *) { setFocus();   update(); } // focus follows mouse mode
-+	void leaveEvent(QEvent *) { clearFocus(); update(); }
- 
- private slots:
- 	void iconUpdated()
-@@ -333,8 +337,8 @@ void IconSelect::setIconset(const Iconset &iconset)
- 		connect (b, SIGNAL(iconSelected(const PsiIcon *)), menu, SIGNAL(iconSelected(const PsiIcon *)));
- 		connect (b, SIGNAL(textSelected(QString)), menu, SIGNAL(textSelected(QString)));
- 
--		//connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
--		//connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
-+		connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
-+		connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
- 
- 		if (++column >= size) {
- 			++row;

psi-plus-main-20160309.tar.xz/patches/haiku/4020-fix-screenshotplugin-build-in-haiku.patch Deleted

psi-plus-main-20160309.tar.xz/patches/mac Deleted

psi-plus-main-20160309.tar.xz/patches/mac/3000-brushed-metal.diff Deleted

@@ -1,81 +0,0 @@
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -97,6 +97,11 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
- 	: TabbableWidget(jid, pa, tabManager)
- 	, highlightersInstalled_(false)
- {
-+	if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) {
-+			setAttribute(Qt::WA_MacMetalStyle);
-+
-+	}
-+
- 	pending_ = 0;
- 	keepOpen_ = false;
- 	warnSend_ = false;
---- psi.orig/src/eventdlg.cpp
-+++ psi/src/eventdlg.cpp
-@@ -458,6 +458,8 @@ void AttachView::addUrlList(const UrlLis
- AddUrlDlg::AddUrlDlg(QWidget *parent)
- :QDialog(parent)
- {
-+	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+			setAttribute(Qt::WA_MacMetalStyle);
- 	setupUi(this);
- #ifndef Q_OS_MAC
- 	setWindowIcon(IconsetFactory::icon("psi/www").icon());
-@@ -580,6 +582,8 @@ EventDlg::EventDlg(const QString &to, Ps
- 	: AdvancedWidget<QWidget>(0)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+ 	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+			setAttribute(Qt::WA_MacMetalStyle);
- 	d = new Private(this);
- 	d->composing = true;
- 	d->psi = psi;
---- psi.orig/src/infodlg.cpp
-+++ psi/src/infodlg.cpp
-@@ -127,6 +127,8 @@ InfoDlg::InfoDlg(int type, const Jid &j,
- 	: QDialog(parent)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+			setAttribute(Qt::WA_MacMetalStyle);
-	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-	ui_.setupUi(this);
-	d = new Private;
---- psi.orig/src/psi_profiles.cpp
-+++ psi/src/psi_profiles.cpp
-@@ -896,6 +896,7 @@ bool OptionsMigration::fromFile(const QS
- 				migrateBoolEntry(tag, "jidComplete", "options.ui.message.use-jid-auto-completion");
- 				migrateBoolEntry(tag, "grabUrls", "options.ui.message.auto-grab-urls-from-clipboard");
- 				migrateBoolEntry(tag, "smallChats", "options.ui.chat.use-small-chats");
-+				migrateBoolEntry(tag, "brushedMetal", "options.ui.mac.use-brushed-metal-windows");
- 				migrateBoolEntry(tag, "chatLineEdit", "options.ui.chat.use-expanding-line-edit");
- 				migrateBoolEntry(tag, "useTabs", "options.ui.tabs.use-tabs");
- 				migrateBoolEntry(tag, "putTabsAtBottom", "options.ui.tabs.put-tabs-at-bottom");
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -149,6 +149,11 @@ TabDlg::TabDlg(TabManager* tabManager, c
- 		delegate_->create(this);
- 	}
-
-+	if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) {
-+			setAttribute(Qt::WA_MacMetalStyle);
-+
-+	}
-+
- 	// FIXME
- 	qRegisterMetaType<TabDlg*>("TabDlg*");
- 	qRegisterMetaType<TabbableWidget*>("TabbableWidget*");
---- psi.orig/src/whiteboarding/wbdlg.cpp
-+++ psi/src/whiteboarding/wbdlg.cpp
-@@ -41,6 +41,9 @@ static const QString geometryOption = "o
- //----------------------------------------------------------------------------
-
- WbDlg::WbDlg(SxeSession* session, PsiAccount* pa) {
-+	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+		setAttribute(Qt::WA_MacMetalStyle);
-+
- 	groupChat_ = session->groupChat();
- 	pending_ = 0;
- 	keepOpen_ = false;

psi-plus-main-20160309.tar.xz/patches/mac/3020-psi-mac-Makefile.diff Deleted

@@ -1,99 +0,0 @@
-diff -urN src/mac/Makefile work/mac/Makefile
---- src/mac/Makefile	2010-03-30 17:15:28.000000000 +0400
-+++ work/mac/Makefile	2011-01-20 07:17:50.000000000 +0300
-@@ -23,25 +23,25 @@
- SPARKLEDIR=/Library/Frameworks
- PSI_DIR=..
-
--EXECUTABLE_NAME=psi
--NAME=Psi
-+EXECUTABLE_NAME=psi-plus
-+NAME=Psi+
- VOLUME_NAME=$(NAME)
--VERSION=0.15-devel_$(shell date +"%Y%m%d")
--#VERSION=0.15
-+VERSION=0.15.xxx-macosx
-
--APPFILE_NAME=Psi.app
-+APPFILE_NAME=Psi+.app
- FILES=$(APPFILE_NAME)
- DISK_DIR=disk
- ifneq ($(BUILD),no)
- DISK_FILES=$(foreach f,$(FILES), $(addprefix $(DISK_DIR)/,$(f)))
- endif
--MASTER_DMG=$(NAME)-$(VERSION).dmg
-+MASTER_DMG=$(EXECUTABLE_NAME)-$(VERSION).dmg
-
-
- # Other variables
- QT_FRAMEWORK_VERSION=4
--QT_FRAMEWORKS=QtCore QtXml QtNetwork QtGui QtSql QtSvg
-+QT_FRAMEWORKS=QtCore QtXml QtXmlPatterns QtNetwork QtGui QtSql QtSvg QtDBus phonon
- QT_PLUGINS=imageformats/libqjpeg.dylib imageformats/libqgif.dylib
-+PSIPLUS_PLUGINS=`ls ../src/$(EXECUTABLE_NAME).app/Contents/Resources/plugins`
-
- # The rules
- .PHONY: buildall
-@@ -68,7 +68,7 @@
- build-psi:
- 	@echo
- 	@echo --------------------- Building Source Tree --------------------
--	$(MAKE) -C $(PSI_DIR)
-+#	$(MAKE) -C $(PSI_DIR)
- 	@echo
- else
- build-psi:
-@@ -88,7 +88,7 @@
- 	mkdir -p "$@/Contents/Frameworks"
- 	-ditto -rsrc "$(GROWLDIR)/Growl.framework" "$@/Contents/Frameworks/Growl.framework"
- 	-ditto -rsrc "$(SPARKLEDIR)/Sparkle.framework" "$@/Contents/Frameworks/Sparkle.framework"
--	#strip "$@/Contents/MacOS/$(EXECUTABLE_NAME)"
-+	strip "$@/Contents/MacOS/$(EXECUTABLE_NAME)"
- 	#
- 	#@echo
- 	#@echo Installing QCA ...
-@@ -112,7 +112,7 @@
- 	@echo
- 	@echo Installing Qt Frameworks ...
- 	for f in $(QT_FRAMEWORKS); do \
--		ditto -rsrc "$(QTDIR)/lib/$$f.framework" "$@/Contents/Frameworks/$$f.framework"; \
-+		ditto -rsrc "/Library/Frameworks/$$f.framework" "$@/Contents/Frameworks/$$f.framework"; \
- 		rm -rf "$@/Contents/Frameworks/$$f.framework/Headers"; \
- 		rm -rf "$@/Contents/Frameworks/$$f.framework/$$f""_debug"; \
- 		rm -rf "$@/Contents/Frameworks/$$f.framework/$$f""_debug.prl"; \
-@@ -121,15 +121,16 @@
- 		rm -rf "$@/Contents/Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f""_debug.prl"; \
- 		install_name_tool -id "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Frameworks/$$f.framework/$$f"; \
- 		for g in $(QT_FRAMEWORKS); do \
--			install_name_tool -change "$(QTDIR)/lib/$$g.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$g" "@executable_path/../Frameworks/$$g.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$g" "$@/Contents/Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f"; \
-+			install_name_tool -change "$$g.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$g" "@executable_path/../Frameworks/$$g.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$g" "$@/Contents/Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f"; \
- 		done; \
- 		for g in $(QT_PLUGINS); do \
--			install_name_tool -change "$(QTDIR)/lib/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Plugins/$$g"; \
-+			install_name_tool -change "$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Plugins/$$g"; \
- 		done; \
--		\# install_name_tool -change "$(QTDIR)/lib/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Frameworks/libqca.2.dylib"; \
--		\# install_name_tool -change "$(QTDIR)/lib/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Resources/crypto/libqca-openssl.dylib"; \
--		install_name_tool -change "$(QTDIR)/lib/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/MacOS/$(EXECUTABLE_NAME)"; \
--	done
-+		for p in $(PSIPLUS_PLUGINS); do \
-+			install_name_tool -change "$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Resources/plugins/$$p"; \
-+		done; \
-+		install_name_tool -change "$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/MacOS/$(EXECUTABLE_NAME)"; \
-+	done; \
-
- # The rest
- $(DISK_DIR)/%: $(PSI_DIR)/%
-@@ -150,9 +151,9 @@
- $(TEMPLATE_DMG).bz2:
- 	@echo
- 	@echo --------------------- Generating empty template --------------------
--	mkdir template
--	hdiutil create -size 80m "$(TEMPLATE_DMG)" -srcfolder template -format UDRW -volname "$(VOLUME_NAME)" -quiet
--	rmdir template
-+#	mkdir template
-+#	hdiutil create -size 200m "$(TEMPLATE_DMG)" -srcfolder template -format UDRW -volname "$(VOLUME_NAME)" -quiet
-+#	rmdir template
- 	bzip2 "$(TEMPLATE_DMG)"
- 	@echo
-

psi-plus-main-20160309.tar.xz/patches/mac/3030-psi-mac-sparkle.diff Deleted

@@ -1,134 +0,0 @@
---- psi.orig/mac/Info.plist.in
-+++ psi/mac/Info.plist.in
-@@ -7,23 +7,25 @@
- 	<key>CFBundleExecutable</key>
- 	<string>psi</string>
- 	<key>CFBundleGetInfoString</key>
--	<string>Psi @@VERSION@@ by the Psi team. This program is licensed under the GNU GPL.</string>
-+	<string>Psi+ @@VERSION@@ by the Psi+ team. This program is licensed under the GNU GPL.</string>
- 	<key>CFBundleIconFile</key>
- 	<string>application.icns</string>
- 	<key>CFBundleIdentifier</key>
--	<string>org.psi-im</string>
-+	<string>com.googlecode.psi-dev</string>
- 	<key>CFBundleInfoDictionaryVersion</key>
- 	<string>6.0</string>
- 	<key>CFBundleName</key>
--	<string>Psi</string>
-+	<string>Psi+</string>
- 	<key>CFBundlePackageType</key>
- 	<string>APPL</string>
- 	<key>CFBundleShortVersionString</key>
--	<string>Psi @@VERSION@@</string>
-+	<string>Psi+ @@VERSION@@</string>
- 	<key>CFBundleSignature</key>
- 	<string>psi</string>
- 	<key>CFBundleVersion</key>
- 	<string>@@VERSION@@</string>
-+	<key>SUPublicDSAKeyFile</key>
-+	<string>dsa_pub.pem</string>
- 	<key>CSResourcesFileMapped</key>
- 	<true/>
- </dict>
---- psi.orig/src/applicationinfo.cpp
-+++ psi/src/applicationinfo.cpp
-@@ -36,7 +36,7 @@
- #define PROG_STORAGE_NS "http://psi-im.org/storage"
- #define PROG_FILECACHE_NS "http://psi-im.org/filecache"
- #ifdef Q_OS_MAC
--#define PROG_APPCAST_URL "http://psi-im.org/appcast/psi-mac.xml"
-+#define PROG_APPCAST_URL "http://psi-dev.googlecode.com/files/psi-plus-mac.xml"
- #else
- #define PROG_APPCAST_URL ""
- #endif
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -89,6 +89,11 @@
- #include <x11windowsystem.h>
- #endif
-
-+#include "AutoUpdater/AutoUpdater.h"
-+#ifdef HAVE_SPARKLE
-+#include "AutoUpdater/SparkleAutoUpdater.h"
-+#endif
-+
- using namespace XMPP;
-
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
-@@ -536,6 +541,9 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	d->getAction("help_online_home")->addTo (helpMenu);
- 	d->getAction("help_online_forum")->addTo (helpMenu);
- 	d->getAction("help_psi_muc")->addTo (helpMenu);
-+#ifdef HAVE_SPARKLE
-+	d->getAction("help_update")->addTo (helpMenu);
-+#endif
- 	d->getAction("help_report_bug")->addTo (helpMenu);
- 	QMenu* diagMenu = new QMenu(tr("Diagnostics"), this);
- 	helpMenu->addMenu(diagMenu);
-@@ -718,6 +724,9 @@ void MainWin::registerAction( IconAction
- 		{ "help_online_home", activated, this, SLOT( actOnlineHomeActivated() ) },
- 		{ "help_online_forum", activated, this, SLOT( actOnlineForumActivated() ) },
- 		{ "help_psi_muc",     activated, this, SLOT( actJoinPsiMUCActivated() ) },
-+#ifdef HAVE_SPARKLE
-+		{ "help_update",     activated, this, SLOT( actCheckUpdateActivated() ) },
-+#endif
- 		{ "help_report_bug",  activated, this, SLOT( actBugReportActivated() ) },
- 		{ "help_about",       activated, this, SLOT( actAboutActivated() ) },
- 		{ "help_about_qt",    activated, this, SLOT( actAboutQtActivated() ) },
-@@ -972,6 +979,9 @@ void MainWin::buildOptionsMenu()
- 			<< "help_report_bug"
- 			<< "diagnostics"
- 			<< "separator"
-+#ifdef HAVE_SPARKLE
-+			<< "help_update"
-+#endif
- 			<< "help_about"
- 			<< "help_about_qt";
-
-@@ -1097,6 +1105,16 @@ void MainWin::actAboutQtActivated ()
- 	QMessageBox::aboutQt(this);
- }
-
-+void MainWin::actCheckUpdateActivated()
-+{
-+#ifdef HAVE_SPARKLE
-+	AutoUpdater* autoUpdater;
-+	autoUpdater = new SparkleAutoUpdater(ApplicationInfo::getAppCastURL());
-+	autoUpdater->checkForUpdates();
-+	delete autoUpdater;
-+#endif
-+}
-+
- void MainWin::actAboutPsiMediaActivated ()
- {
- 	QString creditText = PsiMedia::creditText();
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -133,6 +133,7 @@ private slots:
- 	void actOnlineHomeActivated ();
- 	void actOnlineForumActivated ();
- 	void actJoinPsiMUCActivated();
-+	void actCheckUpdateActivated();
- 	void actBugReportActivated ();
- 	void actAboutActivated ();
- 	void actAboutQtActivated ();
---- psi.orig/src/psiactionlist.cpp
-+++ psi/src/psiactionlist.cpp
-@@ -387,6 +387,9 @@ void PsiActionList::Private::createMainW
- 		IconAction *actPsiMUC = new IconAction (tr("Join Psi Discussion Room (Online)"), tr("&Join Psi Discussion Room (Online)"), 0, this);
- 		actOnlineHome->setWhatsThis (tr("Join Psi Discussion Room (Online)"));
-
-+		IconAction *actCheckUpdate = new IconAction (tr("Check for Updates..."), tr("&Check for Updates..."), 0, this);
-+		actCheckUpdate->setWhatsThis (tr("Check for Updates..."));
-+
- 		IconAction *actBugReport = new IconAction (tr("Report a Bug (Online)"), tr("Report a &Bug (Online)"), 0, this);
- 		actBugReport->setWhatsThis (tr("Report a Bug (Online)"));
-
-@@ -415,6 +418,7 @@ void PsiActionList::Private::createMainW
- 			{ "help_report_bug",       actBugReport       },
- 			{ "help_about",            actAbout           },
- 			{ "help_about_qt",         actAboutQt         },
-+			{ "help_update",           actCheckUpdate     },
- 			{ "help_about_psimedia",   actAboutPsiMedia   },
- 			{ "help_diag_qcaplugin",   actDiagQCAPlugin   },
- 			{ "help_diag_qcakeystore", actDiagQCAKeyStore },

psi-plus-main-20160309.tar.xz/patches/mac/3040-psi-chat-theme-mac_native.diff Deleted

@@ -1,144 +0,0 @@
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Info.plist
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>AllowTextColors</key>
-+	<false/>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>English</string>
-+	<key>CFBundleGetInfoString</key>
-+	<string>Native Mac Message Style</string>
-+	<key>CFBundleIdentifier</key>
-+	<string>nativemac.style</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>1.2</string>
-+	<key>CFBundleName</key>
-+	<string>Native Mac</string>
-+	<key>CFBundlePackageType</key>
-+	<string>AdIM</string>
-+	<key>DefaultBackgroundColor</key>
-+	<string>ffffff</string>
-+	<key>DefaultFontFamily</key>
-+	<string>Helvetica</string>
-+	<key>DefaultFontSize</key>
-+	<integer>9</integer>
-+	<key>MessageViewVersion</key>
-+	<real>1.1</real>
-+	<key>DisableCustomBackground</key>
-+	<true/>
-+	<key>DefaultVariant</key>
-+	<string>Normal</string>
-+	<key>DisableCombineConsecutive</key>
-+	<true/>
-+	<key>ShowsUserIcons</key>
-+	<true/>
-+</dict>
-+</plist>
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Main.css
-@@ -0,0 +1,53 @@
-+body {
-+  background-color: #fff;
-+  margin: 0;
-+  padding: 0;
-+  font-family: 'helvetica neue', helvetica, arial, sans-serif;
-+  font-size: 14px;
-+  text-align: left;
-+}
-+
-+/* Heading */
-+div.heading {
-+  position: fixed;
-+  top: 0;
-+  right: 0;
-+  padding: 1.25em 0;
-+  width: 100%;
-+  z-index: 999;
-+  color: #fff;
-+  border-bottom: 1px solid #666;
-+  background: #777;
-+  text-shadow: #333 0.1em 0.1em 0.1em
-+}
-+div.heading .icon { position: absolute; top: 1px; left: 1px; border: 1px solid #333; background: #fff; }
-+div.heading img.icon { height: 66px; width: 66px; }
-+div.heading .with, div.heading .timestamp {
-+  font-weight: bold;
-+  font-family: 'myriadd pro', 'myriad', 'lucida grande', 'trebuchet ms', arial, sans-serif;
-+  position: relative;
-+  left: 4.5em;
-+}
-+div.heading .with { font-size: 20px; }
-+div.heading .timestamp { font-size: 13px; margin: 0 0 0 2.5em; }
-+
-+/* Main message style */
-+dl, dt, dd { margin: 0; display: hidden; }
-+dl { border-top: 1px solid #ccc; padding: .7em .8em; }
-+dt, dd { display: inline; }
-+dt.nickname, dd.timestamp { font-weight: bold; }
-+dt.nickname { color: #333; background: none; }
-+dd.msg { color: #555; font-family: helvetica, arial, sans-serif; }
-+dd.timestamp { float: right; color: #555 }
-+dl.item.notice { font-style: italic; text-align: center; }
-+dl.item.mine { background: #f5f5f5; }
-+
-+
-+/* Links */
-+a:link { color: #c9a874; text-decoration: none; outline: 0 none; }
-+a:hover { color: #c6903a; border-bottom: 1px dotted #c6903a; }
-+
-+@media screen {
-+  a:visited, .visited { padding: 4px 0px 0 20px; background-color: transparent; background-repeat: no-repeat; background-position: 0px center; }
-+  a:visited, .visited { background-image: url('../img/tick.png'); }
-+}
-\ No newline at end of file
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Status.html
-@@ -0,0 +1,5 @@
-+<dl class="item notice">
-+  <dd class="timestamp">%time%</dd>
-+  <dd class="msg">%message%</dd>
-+</dl>
-+<div id="insert"></div>
-\ No newline at end of file
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Incoming/Content.html
-@@ -0,0 +1,6 @@
-+<dl class="item">
-+  <dd class="timestamp">%time%</dd>
-+  <dt class="nickname">%sender% &nbsp;&raquo;</dt>
-+  <dd class="msg">&nbsp;%message%</dd>
-+</dl>
-+<div id="insert"></div>
-\ No newline at end of file
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Incoming/Context.html
-@@ -0,0 +1,6 @@
-+<dl class="item">
-+  <dd class="timestamp">%time%</dd>
-+  <dt class="nickname">%sender% &nbsp;&raquo;</dt>
-+  <dd class="msg">&nbsp;%message%</dd>
-+</dl>
-+<div id="insert"></div>
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Outgoing/Content.html
-@@ -0,0 +1,6 @@
-+<dl class="item mine">
-+  <dd class="timestamp">%time%</dd>
-+  <dt class="nickname">%sender% &nbsp;&raquo;</dt>
-+  <dd class="msg">&nbsp;%message%</dd>
-+</dl>
-+<div id="insert"></div>
-\ No newline at end of file
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Outgoing/Context.html
-@@ -0,0 +1,6 @@
-+<dl class="item mine">
-+  <dd class="timestamp">%time%</dd>
-+  <dt class="nickname">%sender% &nbsp;&raquo;</dt>
-+  <dd class="msg">&nbsp;%message%</dd>
-+</dl>
-+<div id="insert"></div>
-\ No newline at end of file

psi-plus-main-20160309.tar.xz/patches/mac/fix-cocoa-tray-click.diff Deleted

@@ -1,182 +0,0 @@
-diff -urpN git.orig/src/CocoaUtilities/CocoaTrayClick.cpp git/src/CocoaUtilities/CocoaTrayClick.cpp
---- git.orig/src/CocoaUtilities/CocoaTrayClick.cpp	1970-01-01 03:00:00.000000000 +0300
-+++ git/src/CocoaUtilities/CocoaTrayClick.cpp	2015-05-04 11:30:57.000000000 +0400
-@@ -0,0 +1,91 @@
-+/*
-+ * CocoaTrayClick
-+ * Copyright (C) 2012, 2015  Khryukin Evgeny
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version 2
-+ * of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "CocoaTrayClick.h"
-+#include <objc/runtime.h>
-+#include <objc/message.h>
-+#include <QApplication>
-+
-+#ifdef DEBUG_OUTPUT
-+#include <QDebug>
-+#endif
-+
-+bool dockClickHandler(id /*self*/, SEL /*_cmd*/, ...)
-+{
-+	CocoaTrayClick::instance()->emitTrayClicked();
-+	return true;
-+}
-+
-+
-+CocoaTrayClick * CocoaTrayClick::instance()
-+{
-+	if(!instance_)
-+		instance_ = new CocoaTrayClick();
-+
-+	return instance_;
-+}
-+
-+CocoaTrayClick::CocoaTrayClick()
-+	: QObject(qApp)
-+{
-+	Class cls = objc_getClass("NSApplication");
-+	objc_object *appInst = objc_msgSend((objc_object*)cls, sel_registerName("sharedApplication"));
-+
-+	if(appInst != NULL) {
-+		objc_object* delegate = objc_msgSend(appInst, sel_registerName("delegate"));
-+		Class delClass = (Class)objc_msgSend(delegate,  sel_registerName("class"));
-+		SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
-+		if (class_getInstanceMethod(delClass, shouldHandle)) {
-+			if (class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:")) {
-+#ifdef DEBUG_OUTPUT
-+				qDebug() << "Registered dock click handler (replaced original method)";
-+#endif
-+			}
-+			else {
-+#ifdef DEBUG_OUTPUT
-+				qDebug() << "Failed to replace method for dock click handler";
-+#endif
-+			}
-+		}
-+		else {
-+			if (class_addMethod(delClass, shouldHandle, (IMP)dockClickHandler,"B@:")) {
-+#ifdef DEBUG_OUTPUT
-+				qDebug() << "Registered dock click handler";
-+#endif
-+			}
-+			else {
-+#ifdef DEBUG_OUTPUT
-+				qDebug() << "Failed to register dock click handler";
-+#endif
-+			}
-+		}
-+	}
-+}
-+
-+CocoaTrayClick::~CocoaTrayClick()
-+{
-+}
-+
-+void CocoaTrayClick::emitTrayClicked()
-+{
-+	emit trayClicked();
-+}
-+
-+CocoaTrayClick* CocoaTrayClick::instance_ = NULL;
-diff -urpN git.orig/src/CocoaUtilities/CocoaTrayClick.mm git/src/CocoaUtilities/CocoaTrayClick.mm
---- git.orig/src/CocoaUtilities/CocoaTrayClick.mm	2014-07-29 14:24:36.000000000 +0400
-+++ git/src/CocoaUtilities/CocoaTrayClick.mm	1970-01-01 03:00:00.000000000 +0300
-@@ -1,60 +0,0 @@
--/*
-- * CocoaTrayClick
-- * Copyright (C) 2012  Khryukin Evgeny
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#include "CocoaUtilities/CocoaTrayClick.h"
--#include <objc/runtime.h>
--#include <QApplication>
--#include <QDebug>
--#ifdef HAVE_QT5
--#include <AppKit/NSApplication.h>
--#endif
--
--void dockClickHandler(id /*self*/, SEL /*_cmd*/)
--{
--	CocoaTrayClick::instance()->emitTrayClicked();
--}
--
--
--CocoaTrayClick * CocoaTrayClick::instance()
--{
--	if(!instance_)
--		instance_ = new CocoaTrayClick();
--
--	return instance_;
--}
--
--CocoaTrayClick::CocoaTrayClick()
--	: QObject(qApp)
--{
--	Class cls = NSApplication sharedApplication delegate class;
--	if (!class_addMethod(cls, @selector(applicationShouldHandleReopen:hasVisibleWindows:), (IMP) dockClickHandler, "v@:"))
--		qDebug() << "CocoaTrayClick::Private : class_addMethod failed!";
--}
--
--CocoaTrayClick::~CocoaTrayClick()
--{
--}
--
--void CocoaTrayClick::emitTrayClicked()
--{
--	emit trayClicked();
--}
--
--CocoaTrayClick* CocoaTrayClick::instance_ = NULL;
-diff -urpN git.orig/src/CocoaUtilities/CocoaUtilities.pri git/src/CocoaUtilities/CocoaUtilities.pri
---- git.orig/src/CocoaUtilities/CocoaUtilities.pri	2014-07-29 14:24:36.000000000 +0400
-+++ git/src/CocoaUtilities/CocoaUtilities.pri	2015-05-04 12:48:32.000000000 +0400
-@@ -8,5 +8,6 @@ HEADERS += \
- 
- OBJECTIVE_SOURCES += \
- 	$$PWD/CocoaInitializer.mm \
--	$$PWD/cocoacommon.mm \
--	$$PWD/CocoaTrayClick.mm
-+	$$PWD/cocoacommon.mm
-+
-+SOURCES += $$PWD/CocoaTrayClick.cpp
-diff -urpN git.orig/src/src.pri git/src/src.pri
---- git.orig/src/src.pri	2015-05-04 12:46:00.000000000 +0400
-+++ git/src/src.pri	2015-05-04 12:57:43.000000000 +0400
-@@ -632,6 +632,7 @@ else {
- 
- mac {
- 	QMAKE_LFLAGS += -framework Carbon -framework IOKit -framework AppKit
-+	QMAKE_LFLAGS += -framework CoreFoundation -lobjc #for cocoatrayclick
- }
- 
- INCLUDEPATH += $$PWD

psi-plus-main-20160309.tar.xz/patches/psimedia Deleted

psi-plus-main-20160309.tar.xz/patches/psimedia/0010-psimedia-varrate-asterisk.diff Deleted

@@ -1,131 +0,0 @@
-diff -ru psimedia-1.0.3/gstprovider/modes.cpp psimedia-1.0.3-hacked/gstprovider/modes.cpp
---- psimedia-1.0.3/gstprovider/modes.cpp	2009-03-04 22:26:59.000000000 +0100
-+++ psimedia-1.0.3-hacked/gstprovider/modes.cpp	2010-03-05 00:42:20.000000000 +0100
-@@ -67,7 +67,7 @@
- 		p.sampleSize = 16;
- 		p.channels = 1;
- 		list += p;
--	}
-+	}*/
- 	{
- 		PAudioParams p;
- 		p.codec = "speex";
-@@ -75,7 +75,7 @@
- 		p.sampleSize = 16;
- 		p.channels = 1;
- 		list += p;
--	}*/
-+	}
- 	{
- 		PAudioParams p;
- 		p.codec = "speex";
-diff -ru psimedia-1.0.3/gstprovider/rtpworker.cpp psimedia-1.0.3-hacked/gstprovider/rtpworker.cpp
---- psimedia-1.0.3/gstprovider/rtpworker.cpp	2009-05-17 20:32:59.000000000 +0200
-+++ psimedia-1.0.3-hacked/gstprovider/rtpworker.cpp	2010-03-05 00:50:59.000000000 +0100
-@@ -969,6 +969,11 @@
-
- bool RtpWorker::startSend()
- {
-+  return startSend(16000);
-+}
-+
-+bool RtpWorker::startSend(int rate)
-+{
- 	// file source
- 	if(!infile.isEmpty() || !indata.isEmpty())
- 	{
-@@ -1055,7 +1060,7 @@
-
- 	if(audiosrc)
- 	{
--		if(!addAudioChain())
-+		if(!addAudioChain(rate))
- 		{
- 			delete pd_audiosrc;
- 			pd_audiosrc = 0;
-@@ -1192,15 +1197,22 @@
-
- 	// TODO: support more than speex
- 	int speex_at = -1;
-+	int samplerate = -1;
- 	for(int n = 0; n < remoteAudioPayloadInfo.count(); ++n)
- 	{
- 		const PPayloadInfo &ri = remoteAudioPayloadInfon;
--		if(ri.name.toUpper() == "SPEEX" && ri.clockrate == 16000)
-+		if(ri.name.toUpper() == "SPEEX")
- 		{
--			speex_at = n;
--			break;
-+			if (ri.clockrate > samplerate) {
-+			  speex_at = n;
-+			  samplerate = ri.clockrate;
-+			}
- 		}
- 	}
-+	if (samplerate != 16000) {
-+	  cleanup();
-+	  startSend(samplerate);
-+	}
-
- 	// TODO: support more than theora
- 	int theora_at = -1;
-@@ -1460,9 +1472,13 @@
-
- bool RtpWorker::addAudioChain()
- {
-+  return addAudioChain(16000);
-+}
-+
-+bool RtpWorker::addAudioChain(int rate)
-+{
- 	// TODO: support other codecs.  for now, we only support speex 16khz
- 	QString codec = "speex";
--	int rate = 16000;
- 	int size = 16;
- 	int channels = 1;
- 	//QString codec = localAudioParams0.codec;
-@@ -1478,7 +1494,7 @@
- 	for(int n = 0; n < remoteAudioPayloadInfo.count(); ++n)
- 	{
- 		const PPayloadInfo &ri = remoteAudioPayloadInfon;
--		if(ri.name.toUpper() == "SPEEX" && ri.clockrate == 16000)
-+		if(ri.name.toUpper() == "SPEEX" && ri.clockrate == rate)
- 		{
- 			pt = ri.id;
- 			break;
-@@ -1683,7 +1699,20 @@
-
- 		gst_caps_unref(caps);
-
--		localAudioPayloadInfo = QList<PPayloadInfo>() << pi;
-+		PPayloadInfo speexnb;
-+		speexnb.id = 97;
-+		speexnb.name = "SPEEX";
-+		speexnb.clockrate = 8000;
-+		speexnb.channels = 1;
-+		speexnb.ptime = pi.ptime;
-+		speexnb.maxptime = pi.maxptime;
-+
-+		QList<PPayloadInfo> ppil;
-+		ppil << pi;
-+		ppil << speexnb;
-+
-+
-+		localAudioPayloadInfo = ppil;
- 		canTransmitAudio = true;
- 	}
-
-diff -ru psimedia-1.0.3/gstprovider/rtpworker.h psimedia-1.0.3-hacked/gstprovider/rtpworker.h
---- psimedia-1.0.3/gstprovider/rtpworker.h	2009-03-13 20:46:42.000000000 +0100
-+++ psimedia-1.0.3-hacked/gstprovider/rtpworker.h	2010-03-05 00:50:37.000000000 +0100
-@@ -177,8 +177,10 @@
-
- 	bool setupSendRecv();
- 	bool startSend();
-+	bool startSend(int rate);
- 	bool startRecv();
- 	bool addAudioChain();
-+	bool addAudioChain(int rate);
- 	bool addVideoChain();
- 	bool getCaps();
- 	bool updateTheoraConfig();

psi-plus-main-20160309.tar.xz/patches/psimedia/0020-psimedia-win32-compilation-paths.diff Deleted

@@ -1,60 +0,0 @@
-Index: psimedia/gstprovider/gstconf.pri
-===================================================================
---- psimedia/gstprovider/gstconf.pri	(revision 783)
-+++ psimedia/gstprovider/gstconf.pri	(working copy)
-@@ -5,29 +5,37 @@
-
- windows {
- 	INCLUDEPATH += \
--		c:/mingw/include/glib-2.0 \
--		c:/mingw/lib/glib-2.0/include \
--		c:/msys/1.0/home/gst/include \
--		c:/msys/1.0/home/gst/include/liboil-0.3 \
--		c:/msys/1.0/home/gst/include/gstreamer-0.10
-+		c:/glib/include/glib-2.0 \
-+		c:/glib/lib/glib-2.0/include \
-+		c:/gstforwin/dxsdk/include \
-+		c:/gstforwin/winsdk/include \
-+		c:/gstforwin/include \
-+		c:/gstforwin/include/liboil-0.3 \
-+		c:/gstforwin/include/libxml2 \
-+		c:/gstforwin/gstreamer/include/gstreamer-0.10 \
-+		c:/gstforwin/gst-plugins-base/include/gstreamer-0.10
- 	LIBS += \
--		-Lc:/msys/1.0/home/gst/lib \
--		-lgstreamer-0.10.dll \
--		-lgthread-2.0 \
--		-lglib-2.0 \
--		-lgobject-2.0 \
--		-lgstvideo-0.10.dll \
--		-lgstbase-0.10.dll \
--		-lgstinterfaces-0.10.dll
-+		-Lc:/glib/bin \
-+		-Lc:/gstforwin/bin \
-+		-Lc:/gstforwin/gstreamer/bin \
-+		-Lc:/gstforwin/gst-plugins-base/bin \
-+		-lgstreamer-0.10-0 \
-+		-lgthread-2.0-0 \
-+		-lglib-2.0-0 \
-+		-lgobject-2.0-0 \
-+		-lgstvideo-0.10-0 \
-+		-lgstbase-0.10-0 \
-+		-lgstinterfaces-0.10-0
-
- 	# qmake mingw seems to have broken prl support, so force these
- 	win32-g++|contains($$list($$QT_VERSION), 4.0.*|4.1.*|4.2.*|4.3.*) {
- 		LIBS *= \
--			-loil-0.3 \
--			-lgstaudio-0.10.dll \
--			-lgstrtp-0.10.dll \
--			-lgstnetbuffer-0.10.dll \
--			-lspeexdsp.dll \
-+			-Lc:/gstforwin/winsdk/lib \
-+			-loil-0.3-0 \
-+			-lgstaudio-0.10-0 \
-+			-lgstrtp-0.10-0 \
-+			-lgstnetbuffer-0.10-0 \
-+			-lspeexdsp-1 \
- 			-lsetupapi \
- 			-lksuser \
- 			-lamstrmid \

psi-plus-main-20160309.tar.xz/patches/psimedia/0030-psimedia-uvcvideo-fix.diff Deleted

@@ -1,41 +0,0 @@
-Index: psimedia/gstprovider/pipeline.cpp
-===================================================================
---- psimedia/gstprovider/pipeline.cpp	(revision 791)
-+++ psimedia/gstprovider/pipeline.cpp	(working copy)
-@@ -156,20 +156,23 @@
- 	GstElement *capsfilter = gst_element_factory_make("capsfilter", NULL);
- 	GstCaps *caps = gst_caps_new_empty();
-
--	for(int n = 0; n < widths.count(); ++n)
--	{
--		GstStructure *cs;
--		cs = gst_structure_new("video/x-raw-yuv",
--			"width", GST_TYPE_INT_RANGE, 1, widthsn,
--			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
--		gst_caps_append_structure(caps, cs);
-+// 	for(int n = 0; n < widths.count(); ++n)
-+// 	{
-+// 		GstStructure *cs;
-+// 		cs = gst_structure_new("video/x-raw-yuv",
-+// 			"width", GST_TYPE_INT_RANGE, 1, widthsn,
-+// 			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
-+// 		gst_caps_append_structure(caps, cs);
-+//
-+// 		cs = gst_structure_new("video/x-raw-rgb",
-+// 			"width", GST_TYPE_INT_RANGE, 1, widthsn,
-+// 			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
-+// 		gst_caps_append_structure(caps, cs);
-+// 	}
-+        caps = gst_caps_from_string("video/x-raw-yuv , width=320 , "
-+			"height=240 , framerate=30/1");
-+        g_object_set(G_OBJECT(capsfilter), "caps", caps, NULL);
-
--		cs = gst_structure_new("video/x-raw-rgb",
--			"width", GST_TYPE_INT_RANGE, 1, widthsn,
--			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
--		gst_caps_append_structure(caps, cs);
--	}
--
- 	GstStructure *cs = gst_structure_new("image/jpeg", NULL);
- 	gst_caps_append_structure(caps, cs);
-

psi-plus-main-20160309.tar.xz/patches/psimedia/0040-psimedia-2.6.38-compilation-fix.diff Deleted

@@ -1,100 +0,0 @@
-Index: psimedia/gstprovider/deviceenum/deviceenum_unix.cpp
-===================================================================
---- psimedia/gstprovider/deviceenum/deviceenum_unix.cpp	(revision 808)
-+++ psimedia/gstprovider/deviceenum/deviceenum_unix.cpp	(working copy)
-@@ -35,7 +35,7 @@
- # include <sys/stat.h>
- # include <dirent.h>
- # include <sys/ioctl.h>
--# include <linux/videodev.h>
-+# include <linux/videodev2.h>
- #endif
-
- namespace DeviceEnum {
-@@ -475,77 +475,6 @@
- 	return out;
- }
-
--// v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
--static QList<Item> get_v4l_items()
--{
--#ifdef Q_OS_LINUX
--	QList<Item> out;
--
--	QList<V4LName> list = get_v4l_names("/sys/class/video4linux", true);
--	if(list.isEmpty())
--		list = get_v4l_names("/proc/video/dev", false);
--
--	// if we can't find anything, then do a raw scan for possibilities
--	if(list.isEmpty())
--	{
--		QStringList possible = scan_for_videodevs("/dev");
--		foreach(QString str, possible)
--		{
--			V4LName v;
--			v.dev = str;
--			list += v;
--		}
--	}
--
--	for(int n = 0; n < list.count(); ++n)
--	{
--		V4LName &v = listn;
--
--		// if we already have a friendly name then we'll skip the confirm
--		//   in order to save resources.  the only real drawback here that
--		//   I can think of is if the device isn't a capture type.  but
--		//   what does it mean to have a V4L device that isn't capture??
--		if(v.friendlyName.isEmpty())
--		{
--			int fd = open(QFile::encodeName(v.dev).data(), O_RDONLY | O_NONBLOCK);
--			if(fd == -1)
--				continue;
--
--			// get video capabilities and close
--			struct video_capability caps;
--			memset(&caps, 0, sizeof(caps));
--			int ret = ioctl(fd, VIDIOCGCAP, &caps);
--			close(fd);
--			if(ret == -1)
--				continue;
--
--			if(!(caps.type & VID_TYPE_CAPTURE))
--				continue;
--
--			v.friendlyName = caps.name;
--		}
--
--		Item i;
--		i.type = Item::Video;
--		i.dir = Item::Input;
--		i.name = v.friendlyName;
--		i.driver = "v4l";
--		i.id = v.dev;
--
--		// HACK
--		if(v.friendlyName == "Labtec Webcam Notebook")
--			i.explicitCaptureSize = QSize(640, 480);
--
--		out += i;
--	}
--
--	return out;
--#else
--	// return empty list if non-linux
--	return QList<Item>();
--#endif
--}
--
- static QList<Item> get_v4l2_items()
- {
- #ifdef Q_OS_LINUX
-@@ -636,8 +565,6 @@
- 	QList<Item> out;
- 	if(driver.isEmpty() || driver == "v4l2")
- 		out += get_v4l2_items();
--	if(driver.isEmpty() || driver == "v4l")
--		out += get_v4l_items();
- 	return out;
- }
-

psi-plus-main-20160309.tar.xz/patches/psimedia/0050-psimedia-drop-v4lsrc-gst-plugin.diff Deleted

@@ -1,51 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=361419#c5
-
---- psimedia/gstprovider/devices.cpp	2009-06-09 10:12:11.000000000 +0200
-+++ psimedia/gstprovider/devices.cpp	2011-04-02 11:47:21.898041830 +0200
-@@ -90,7 +90,6 @@
- 		element_name == "alsasink" ||
- 		element_name == "osssrc" ||
- 		element_name == "osssink" ||
--		element_name == "v4lsrc" ||
- 		element_name == "v4l2src" ||
- 		element_name == "osxaudiosrc" ||
- 		element_name == "osxaudiosink" ||
-@@ -224,11 +223,6 @@
- 		if(type == PDevice::VideoIn)
- 			element_name = "osxvideosrc";
- 	}
--	else if(driver == "v4l")
--	{
--		if(type == PDevice::VideoIn)
--			element_name = "v4lsrc";
--	}
- 	else if(driver == "v4l2")
- 	{
- 		if(type == PDevice::VideoIn)
-@@ -380,7 +374,7 @@
- 			bool first = true;
- 			foreach(const DeviceEnum::Item &i, list)
- 			{
--				if(type == PDevice::VideoIn && (element_name == "v4lsrc" || element_name == "v4l2src"))
-+				if(type == PDevice::VideoIn && element_name == "v4l2src")
- 				{
- 					if(!test_video(element_name, i.id))
- 						continue;
-@@ -444,7 +438,6 @@
- 	else // PDevice::VideoIn
- 	{
- 		drivers
--		<< "v4l"
- 		<< "v4l2"
- 		<< "osxvideo"
- 		<< "winks";
---- psimedia/gstprovider/gstthread.cpp	2009-05-17 19:55:27.000000000 +0200
-+++ psimedia/gstprovider/gstthread.cpp	2011-04-02 11:48:28.581514484 +0200
-@@ -235,7 +235,6 @@
- #elif defined(Q_OS_LINUX)
- 			reqelem
- 			<< "alsasrc" << "alsasink"
--			<< "v4lsrc"
- 			<< "v4l2src";
- #elif defined(Q_OS_UNIX)
- 			reqelem

psi-plus-main-20160309.tar.xz/version.txt Deleted

psi-plus-resources-1.tar.xz/iconsets/emoticons/Emojis.jisp Changed

psi-plus-resources-1.tar.xz/skins Deleted

psi-plus-resources-1.tar.xz/skins/default_skin.png Deleted

psi-plus-resources-1.tar.xz/skins/default_skin.skn Deleted

@@ -1,208 +0,0 @@
-<skin version="0.5" author="tux-den" name="Default skin">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f0f0f0</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#5a5a5a</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#969696</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff0000</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#910000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#00008a</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#336600</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">24</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">false</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString"></options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_options</item>
-            <item>button_status</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{3688b1b9-77a0-4c52-a45b-06721939e2b1}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Кнопки</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>view_groups</item>
-            <item>menu_add_contact</item>
-            <item>menu_disco</item>
-            <item>menu_options</item>
-            <item>menu_play_sounds</item>
-            <item>menu_xml_console</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{2c44307f-91b3-45ef-aee6-c1b6b910c6f9}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{d4154360-373b-40e4-b1b0-d789a20c098f}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">true</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAJYAAAEfAAAABAAAAAQAAAAIAAAACPwAAAADAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewAyAGMANAA0ADMAMAA3AGYALQA5ADEAYgAzAC0ANAA1AGUAZgAtAGEAZQBlADYALQBjADEAYgA2AGIAOQAxADAAYwA2AGYAOQB9AQAAAAD/////AAAAAAAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADMANgA4ADgAYgAxAGIAOQAtADcANwBhADAALQA0AGMANQAyAC0AYQA0ADUAYgAtADAANgA3ADIAMQA5ADMAOQBlADIAYgAxAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAZAA0ADEANQA0ADMANgAwAC0AMwA3ADMAYgAtADQAMABlADQALQBiADEAYgAwAC0AZAA3ADgAOQBhADIAMABjADAAOQA4AGYAfQEAAAAA/////wAAAAAAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities-16.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">default</options.iconsets.status>
-        <options.iconsets.system type="QString">default</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">32</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">/* frame of avatar - general settings */
-/* фрейм с аватаром - общие настройки */
-RosterAvatarFrame * {
-	margin: 1px;
-}
-
-/* frame of avatar - avatar */
-/* фрейм с аватаром - аватар */
-QLabel#lb_avatar {
-	margin-left: 0px;
-	margin-top: 2px;
-	margin-bottom: 2px;
-	border: 1px solid #949494;
-	border-radius: 3px;
-}
-
-/* frame of avatar - nick */
-/* фрейм с аватаром - ник */
-QLabel#lb_nick {
-	margin: 2px;
-	margin-right: 1px;
-	margin-bottom: 3px;
-	border: 1px solid #949494;
-	border-radius: 3px;
-}
-
-/* frame of avatar - buttons of PEP and status */
-/* фрейм с аватаром - кнопки PEP и статуса */
-QToolButton#tb_status, #tb_mood, #tb_activity {
-	margin-left: 1px;
-	margin-right: 1px;
-	margin-bottom: 2px;
-	width: 100%;
-}
-
-QToolButton#tb_status {
-	margin-top: 0px;
-	margin-bottom: 1px;
-}
-
-/* frame of avatar - button of status, arrow */
-/* фрейм с аватаром - кнопка статуса, стрелка */
-QToolButton#tb_status::menu-indicator {
-	background: argb(0,0,0,0);
-}
-
-/* frame of avatar - field of status message */
-/* фрейм с аватаром - строка статусного сообщения */
-QLineEdit#le_status_text {
-	margin-right: 0px;
-	margin-bottom: 2px;
-}</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">true</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">true</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">true</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">true</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">true</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">true</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">false</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">true</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">true</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type=""></options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">true</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">true</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString"></options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">false</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">true</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">52</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">0</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">medals-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/classic</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">true</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-    </options>
-</skin>
-

psi-plus-resources-1.tar.xz/skins/mac Deleted

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal Deleted

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal/brush.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal/brushed_metal.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal/brushed_metal.skn Deleted

@@ -1,314 +0,0 @@
-<skin version="0.2.2" author="tux-den" name="Brushed Metal" path="/Applications/Psi+.app/Contents/Resources/skins/mac/brushed_metal">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#d1d1d1</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#444444</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#c9c9c9</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#444444</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#162bc0</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#d2000c</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#6c6c6c</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff000b</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#cfcfcf</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">31</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QToolBar { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); border: 1px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; min-width: 5ex; padding: 2px; }
-
-QToolButton:pressed { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a7a7a7, stop: 0.4 #a7a7a7, stop: 0.7 #a7a7a7, stop: 1.0 #a7a7a7); border: 2px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-right-radius: 4px; min-width: 5ex; padding: 2px; }
-
-QLineEdit { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); border: 3px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; }
-
-QTabBar::tab:selected { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #eaf1fb, stop: 0.4 #b7d4f4, stop: 0.5 #7cb6e9, stop: 1.0 #c9f9ff); border: 1px solid #3c3396; border-bottom-color: #55697b; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; padding: 5px; }
-
-QFrame#log { background-color: #ffffff; border: 1px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; min-width: 5ex; padding: 2px; }
-
-Q3ListView { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #ebebeb, stop: 0.7 #ebebeb, stop: 1.0 #ebebeb); border: 1px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; min-width: 5ex; padding: 2px; }
-
-QLabel#lb_status { background: argb(0,0,0,0); border: -1px solid #ffffff; }
-
-QLabel#lb_client { background: argb(0,0,0,0); border: -1px solid #ffffff; }
-
-QLabel { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); border: 3px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; padding: 1px; }
-
-QToolButton::menu-indicator { image: none; }
-
-QTextEdit { background-color: #f5f5f5; border: 3px solid #c8c8c8; border-bottom-color: #c8c8c8; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; }</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">true</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">true</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.look.font.chat type="QString">Lucida Grande,12,-1,5,50,0,0,0,0,0</options.ui.look.font.chat>
-        <options.ui.look.font.contactlist type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</options.ui.look.font.contactlist>
-        <options.ui.look.font.message type="QString">Lucida Grande,12,-1,5,50,0,0,0,0,0</options.ui.look.font.message>
-        <options.ui.look.font.passive-popup type="QString">Lucida Grande,12,-1,5,50,0,0,0,0,0</options.ui.look.font.passive-popup>
-        <options.ui.contactlist.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAOQAAAKsAAAABAAAAAQAAAAIAAAACPwAAAAEAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewBjADMAOABkADkAMwAwADcALQAxADMAZQBkAC0ANAA5AGUAMQAtAGIAZQA3ADMALQAwADIAYwA1AGIAMwA0AGUAZgAyAGQANgB9AQAAAAD/////AAAAAAAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADEAMwAwAGIAMwA1ADYAYwAtAGYAZQA3ADUALQA0AGMANAA5AC0AOAA2AGQANQAtADcAYQBkADYAZgAzADUAMwA4AGQANAA2AH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsANgBkADIAMgBhADkANwBmAC0AMgA3ADYAZgAtADQAMABjADAALQA5AGQAYwAwAC0AMgAwAGIAMgA2ADkANgBmAGMAYwA5AGIAfQEAAAAA/////wAAAAAAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA2ADgAOAA5ADYAOAA5ADYALQAyAGQAMgAzAC0ANAAwAGYAMwAtADkANQBkADcALQA2AGYAZQBjAGQAYgAwADgANwAxADYAMgB9AAAAAAD/////AAAAAAAAAAA=</options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>spacer</item>
-            <item>status_online</item>
-            <item>spacer</item>
-            <item>status_away</item>
-            <item>spacer</item>
-            <item>status_xa</item>
-            <item>spacer</item>
-            <item>status_dnd</item>
-            <item>spacer</item>
-            <item>status_offline</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">2</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{c38d9307-13ed-49e1-be73-02c5b34ef2d6}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Status</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">false</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>spacer</item>
-            <item>menu_add_contact</item>
-            <item>spacer</item>
-            <item>button_options</item>
-            <item>spacer</item>
-            <item>show_offline</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">3</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{6d22a97f-276f-40c0-9dc0-20b2696fcc9b}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Кнопки</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>spacer</item>
-            <item>show_offline</item>
-            <item>spacer</item>
-            <item>show_statusmsg</item>
-            <item>spacer</item>
-            <item>menu_join_groupchat</item>
-            <item>spacer</item>
-            <item>show_agents</item>
-            <item>spacer</item>
-            <item>enable_groups</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">2</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{130b356c-fe75-4c49-86d5-7ad6f3538d46}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type="bool">true</options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type="int">3</options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type="QString">{68896896-2d23-40f3-95d7-6fecdb087162}</options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type="bool">true</options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type="bool">false</options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAANEAAAKfAAAABAAAAAQAAAAIAAAACPwAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGMAMwA4AGQAOQAzADAANwAtADEAMwBlAGQALQA0ADkAZQAxAC0AYgBlADcAMwAtADAAMgBjADUAYgAzADQAZQBmADIAZAA2AH0AAAAAAP////8AAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewAxADMAMABiADMANQA2AGMALQBmAGUANwA1AC0ANABjADQAOQAtADgANgBkADUALQA3AGEAZAA2AGYAMwA1ADMAOABkADQANgB9AAAAAAD/////AAAAAAAAAAAAAAACAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADYAZAAyADIAYQA5ADcAZgAtADIANwA2AGYALQA0ADAAYwAwAC0AOQBkAGMAMAAtADIAMABiADIANgA5ADYAZgBjAGMAOQBiAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA2ADgAOAA5ADYAOAA5ADYALQAyAGQAMgAzAC0ANAAwAGYAMwAtADkANQBkADcALQA2AGYAZQBjAGQAYgAwADgANwAxADYAMgB9AQAAAAD/////AAAAAAAAAAA=</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">oxygen.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">oxygen_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">40</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">true</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QMainWindow { 
-     background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/brushed_metal/brush.png) repeat-x #bebebe; }
-
-QToolButton {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #f4f4f3, stop: 0.3 #f1f1f1, stop: 0.5 #d1d0d0, stop: 0.7 #bbbaba, stop: 1.0 #9d9c9b);
-     border: 1px solid #4a4949;
-     border-bottom-color: #4a4949;
-     border-radius: 4px; 
-     width: 25px; 
-     height: 21px; 
-     margin-bottom: 3px;
-}
-
-QToolButton:pressed {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece);
-     border: 1px solid #4a4949;
-     border-bottom-color: #4a4949;
-     border-radius: 4px; 
-     width: 25px; 
-     height: 21px; 
-}
-
-QToolButton:checked {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece);
-     border: 1px solid #4a4949;
-     border-bottom-color: #4a4949;
-     border-radius: 4px; 
-     width: 25px; 
-     height: 21px; 
-}
-
-QLineEdit { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #e6e6e6, stop: 0.1 #ffffff, stop: 0.5 #dededd, stop: 0.8 #fbfbfb, stop: 0.9 #ffffff, stop: 1.0 #e3e3e3); 
-border: 1px solid qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #5e5e5e,  stop: 1.0 #838383);
-     border-radius: 5px; 
-     border-top-left-radius: 0px; 
-     border-bottom-left-radius: 0px;
-     padding-left: 4px;
-     padding-right: 6px;
-     color: #2b2b2b;
-     margin-top: 4px; 
-     margin-left: -1px;
-     margin-bottom: 0px; 
-}
-
-PsiToolBar { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bebebe, stop: 0.3 #b6b6b6, stop: 0.5 #a8a8a8, stop: 0.7 #9f9f9f, stop: 1.0 #969696); 
-      border: 1px solid argb(0,0,0,30);  
-      border-bottom-left-radius: 5px; 
-      border-bottom-right-radius: 5px; 
-      border-top: 0px; 
-}
-
-PsiContactListView { 
-     margin-top: 2px; 
-     border: 1px solid #656565; 
-     border-left: 0px; 
-     border-right: 0px; 
-}
-
-QTreeView { 
-     background: #ffffff; 
-     alternate-background-color: #ffffff; 
-}
-
-QTreeView:active { 
-     selection-background-color: #8698aa; 
-}
-
-QPushButton::menu-indicator { image: none; }
-
-QToolButton::menu-indicator { image: none; }
-
-QLabel#lb_avatar { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #959595, stop: 0.1 #c1c1c1, stop: 0.3 #c3c3c3, stop: 0.5 #c1c1c1, stop: 0.7 #bababa, stop: 1.0 #b6b6b6); 
-     border: 1px solid #7b7b7b;
-     border-bottom-color: #7b7b7b;
-     border-radius: 4px;
-}
-
-QLabel#lb_nick { margin-top: 4px; font-size: 12px; }
-
-QToolButton#tb_status {
-     border: 1px solid qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #5e5e5e,  stop: 1.0 #838383); 
-     border-right-color: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #5e5e5e,  stop: 1.0 #838383); 
-     border-top-right-radius: 0px; 
-     border-bottom-right-radius: 0px; 
-     padding-left: 2px;   
-     padding-right: 1px;        
-     margin-top: 5px; 
-     margin-bottom: 2px; 
-     margin-left: 5px; 
-     max-width: 22px; 
-     icon-size: 14px; 
-}
-
-QToolButton#tb_activity { 
-     margin-left: 3px;
-     margin-bottom: 1px;
-     max-width: 23px;  
-     max-height: 20px; 
-}
-
-QToolButton#tb_mood { 
-margin-bottom: 1px;
-     max-width: 23px;  
-     max-height: 20px; 
-}
-
-QStackedWidget>QWidget>QLineEdit { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #e6e6e6, stop: 0.1 #ffffff, stop: 0.5 #dededd, stop: 0.8 #fbfbfb, stop: 0.9 #ffffff, stop: 1.0 #e3e3e3); 
-border: 1px solid qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #5e5e5e,  stop: 1.0 #838383);
-     border-radius: 5px; 
-     padding-left: 6px;
-     padding-right: 6px;
-     color: #2b2b2b;
-     margin-right: 10px; 
-     margin-left: 10px;
-}
-
-</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">false</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">false</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">false</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">false</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">true</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString">QFrame {background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #e2e2e2, stop: 1 #a8a8a8); }
-</options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type="bool">true</options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type="QSize">
-            <width>714</width>
-            <height>798</height>
-        </options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">QFrame {background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e2e2e2, stop: 1 #a8a8a8); }
-
-QToolButton { background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #f4f4f3, stop: 0.3 #f1f1f1, stop: 0.5 #d1d0d0, stop: 0.7 #bbbaba, stop: 1.0 #9d9c9b); border: 1px solid #4a4949; border-bottom-color: #4a4949; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-right-radius: 4px; min-width: 3ex; padding: 2px; }
-
-QToolButton:pressed { background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece); border: 1px solid #4a4949; border-bottom-color: #4a4949; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-right-radius: 4px; min-width: 3ex; padding: 2px; }
-</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">true</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-		<options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">51</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">7</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-    </options>
-</skin>

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal/inf.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/NativeMac_tb.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/NativeMac_tb.skn Deleted

@@ -1,1193 +0,0 @@
-<skin version="0.1" path="/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac" author="tux-den" name="Native Mac (Bottom tabs)">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#cacfd4</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#272727</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#f3f3f3</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#464646</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff0000</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#910000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#00008a</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#336600</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">30</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">
-/* ---------- TabDlg --------- */
-TabDlg {
-	background: argb(0,0,0,0);
-	border: none;
-}
-/* End TabDlg--------- */
-
-
-
-
-
-/* ---------- HeaderFrame --------- */
-/* ------------------------ QFrame#headerFrame */
-QFrame#headerFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.5 #cacaca, stop: 1.0 #c2c2c2) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/logo_active.png) no-repeat center center;
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.5 #d0d0d0, stop: 0.6 #e3e3e3, stop: 1.0 #e3e3e3);
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-
-QFrame:!active#headerFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 0.5 #eaeaea, stop: 1.0 #e7e7e7) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/logo_no_active.png) no-repeat center center;
-	border-top: 2px solid #f4f4f4;
-	border-left: 2px solid #ececec;
-	border-right: 2px solid #ececec;
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#hideButton */
-QToolButton#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide.png) center center no-repeat;
-	border-bottom: 0px solid #d0d0d0;
-	icon-size: 0px;
-	margin: 0px;
-	margin-top: 0px;
-	width: 14px;
-	height: 15px;
-}
-
-QToolButton:hover#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:hover#hideButton:!active {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:pressed#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_pressed.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#maximizeButton */
-QToolButton#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize.png) center center no-repeat;
-	icon-size: 0px;
-	margin: 0px;
-	margin-top: 0px;
-	width: 14px;
-	height: 15px;
-}
-
-QToolButton:hover#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:!active:hover#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:pressed#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_pressed.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#closeButton */
-QToolButton#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close.png) center center no-repeat;
-	icon-size: 0px;
-	margin: 0px;
-	margin-left: 1px;
-	margin-top: 0px;
-	width: 17px;
-	height: 15px;
-}
-
-QToolButton:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	min-width: 14px;
-	min-height: 15px;
-}
-
-QToolButton:!active:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	min-width: 14px;
-	min-height: 15px;
-}
-
-QToolButton:pressed#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_pressed.png) no-repeat center argb(0,0,0,0);
-}
-
-/* ------------------------ */
-
-QToolButton:!active#hideButton, QToolButton:!active#closeButton, QToolButton:!active#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_all_no_active.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-/* End HeaderFrame--------- */
-
-
-
-
-
-/* ---------- TopFrame--------- */
-/* ------------------------ QFrame#topFrame */
-QFrame#topFrame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/topframe.png) repeat-x #a7a7a7;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-top: 0px solid #ffffff;
-	margin-left: -10px;
-	margin-right: -6px;
-}
-
-QFrame:!active#topFrame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/topframe_no_active.png) repeat-x #d8d8d8;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	margin-left: -10px;
-	margin-right: -6px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QWidget#avatar */
-QWidget#avatar {
-	margin-left: 19px;
-	margin-bottom: 3px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QPushButton#pb_topic */
-QPushButton#pb_topic {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #545454;
-	border-radius: 3px;
-	margin-bottom: 5px;
-	margin-left: 15px;
-	height: 20px;
-	width: 55px;
-}
-
-QPushButton:!active#pb_topic {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d9d9d9, stop: 1.0 #d1d1d1);
-	border: 1px solid #a8a8a8;
-	border-radius: 3px;
-	margin-bottom: 5px;
-	margin-left: 15px;
-	height: 20px;
-	width: 55px;
-}
-
-QPushButton:pressed#pb_topic {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #4e4e4e;
-	border-radius: 3px;
-	margin-bottom: 5px;
-	height: 20px;
-	width: 55px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QFrame#log */
-QFrame#log {
-	border-top: 1px solid #515151;
-	padding-left: 4px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLineEdit#le_jid */
-QLineEdit#le_jid {
-	background: argb(0,0,0,0);
-	border: none;
-	border-radius: 7px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-left: 2px;
-	margin-top: 2px;
-	margin-bottom: 2px;
-	padding-right: 28px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLineEdit#le_topic */
-QLineEdit#le_topic {
-	background: argb(0,0,0,0);
-	border: none;
-	padding-left: 7px;
-	padding-right: 6px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_count */
-QLabel#lb_count {
-	background: argb(0,0,0,0);
-	border: none;
-	margin-right: 8px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_ident */
-QLabel#lb_ident {
-	background: argb(0,0,0,0);
-	border: none;
-	margin-right: 10px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_status */
-QLabel#lb_status {
-	margin-left: 15px;
-	max-width: 16px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_client */
-QLabel#lb_client {
-	margin-right: 19px;
-	max-width: 16px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QFrame#QSplitter::handle */
-QSplitter::handle:vertical { 
-	background: #cecece; 
-	border: 0px solid #ffffff;
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #515151, stop: 0.5 #515151, stop: 0.6 #dfdfdf, stop: 1.0 #dfdfdf);
-	height: 2px;
-	width: 3px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QFrame#hsplitter */
-QFrame#hsplitter {
-	background: #a9a9a9;
-	border: none;
-	width: 5px;
-}
-
-QFrame:!active#hsplitter {
-	background: #d8d8d8;
-	border: none;
-	width: 5px;
-}
-/* ------------------------ */
-/* End TopFrame--------- */
-
-
-
-/* ---------- BottomFrame --------- */
-/* ------------------------ QFrame#bottomFrame */
-QFrame#bottomFrame { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cecece, stop: 0.7 #a7a7a7, stop: 1.0 #a7a7a7) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/res_active.png) no-repeat right bottom;
-	border-radius: 5px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	padding-left: 17px;
-	padding-right: 12px;
-}
-
-QFrame:!active#bottomFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cecece,  stop: 0.1 #e5e5e5, stop: 0.5 #d8d8d8, stop: 1.0 #d8d8d8) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/res_no_active.png) no-repeat right bottom;
-	border-radius: 5px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	padding-left: 17px;
-	padding-right: 12px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ TypeAheadFindBar>QLineEdit */
-TypeAheadFindBar>QLineEdit {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/find_user.png) no-repeat;
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 10px;
-	margin-left: 26px;
-	margin-right: 10px;
-	margin-top: 10px;
-	margin-bottom: 8px;
-	padding-left: 25px;
-	min-height: 20px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolBar */
-QToolBar {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #cecece);
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #515151, stop: 0.5 #515151, stop: 0.6 #dfdfdf, stop: 1.0 #dfdfdf);
-}
-
-QToolBar#toolbar {
-	background: argb(0,0,0,0);
-	border: none;
-	margin-right: 7px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton */
-QToolButton {
-	background: none;
-	margin-right: 5px;
-	height: 20px;
-	width: 20px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_emoticons */
-QToolButton#tb_emoticons {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d5d5d5, stop: 1.0 #a7a7a7);
-	border: 1px solid #4e4e4e;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	margin-top: 3px;
-	height: 18px;
-	width: 26px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_actions */
-QToolButton#tb_actions {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d5d5d5, stop: 1.0 #a7a7a7);
-	border: 1px solid #4e4e4e;
-	border-radius: 1px;
-	margin-top: 3px;
-	margin-bottom: 5px;
-	margin-right: 15px;
-	height: 18px;
-	width: 26px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_voice */
-QToolButton#tb_voice {
-background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d5d5d5, stop: 1.0 #a7a7a7);
-	border: 1px solid #4e4e4e;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	margin-top: 3px;
-	height: 18px;
-	width: 26px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_pgp */
-QToolButton#tb_pgp {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d5d5d5, stop: 1.0 #a7a7a7);
-	border: 1px solid #4e4e4e;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	margin-top: 3px;
-	height: 18px;
-	width: 26px;
-}
-
-/* ------------------------ */
-
-QToolButton:pressed#tb_pgp, QToolButton:pressed#tb_voice, QToolButton:pressed#tb_actions, QToolButton:pressed#tb_emoticons {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #4e4e4e;
-	margin-bottom: 5px;
-	border-radius: 1px;
-	height: 18px;
-	width: 26px;
-}
-
-/* ------------------------ */
-
-QToolButton:checked#tb_pgp, QToolButton:checked#tb_voice, QToolButton:checked#tb_actions, QToolButton:checked#tb_emoticons {
-background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #666666, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #4e4e4e;
-	margin-bottom: 5px;
-	border-radius: 1px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton::menu-indicator { 
-	image: none; 
-}
-/* ------------------------ */
-/* End BottomFrame --------- */
-
-
-
-
-
-/* ---------- PsiTabBar --------- */
-/* ------------------------ PsiTabBar */
-PsiTabBar {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #878787, stop: 0.9 #9c9c9c, stop: 1.0 #b4b4b4);
-	border: 1px solid #999999;
-	border-top: 1px solid #696969;
-	border-bottom-left-radius: 5px;
-	border-bottom-right-radius: 5px;
-	margin-left: 15px;
-	margin-right: 15px;
-}
-
-PsiTabBar:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bcbcbc, stop: 1.0 #d0d0d0);
-	border-top: 1px solid #999999;
-	border-left: 1px solid #dddddd;
-	border-right: 1px solid #dddddd;
-	border-bottom: 1px solid #dddddd;
-	margin-left: 15px;
-	margin-right: 15px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QTabBar::tab:selected */
-QTabBar::tab:selected { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a7a7a7, stop: 0.9 #b0b0b0, stop: 1.0 #c6c6c6);
-	border-left: 1px solid #696969;
-	border-right: 1px solid #696969;
-	border-top: 0px solid #000000;
-	border-bottom: 1px solid #696969;
-	border-radius: 5px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	padding-left: 4px;
-	padding-top: 3px; 
-	height: 21px;
-	font-size: 11px;
-}
-
-QTabBar::tab:selected:!active { 
-	background: #d8d8d8;
-	border-left: 1px solid #999999;
-	border-right: 1px solid #999999;
-	border-top: 0px solid #000000;
-	border-bottom: 1px solid #999999;
-	border-radius: 5px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	padding-left: 4px;
-	padding-top: 3px; 
-	height: 21px;
-	font-size: 11px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QTabBar::tab */
-QTabBar::tab { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8c8c8c, stop: 1.0 #9c9c9c);
-	border: 1px solid #6b6b6b;
-	border-top: 1px solid #696969;
-	border-radius: 5px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	padding-left: 4px;
-	padding-top: 3px; 
-	height: 20px;
-	font-size: 11px;
-}
-
-QTabBar::tab:!active { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bcbcbc, stop: 1.0 #d0d0d0);
-	border: 1px solid #929292;
-	border-top: 1px solid #999999;
-	border-radius: 5px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	padding-left: 4px;
-	padding-top: 3px; 
-	height: 20px;
-	font-size: 11px;
-}
-/* ------------------------ */
-/* End PsiTabBar --------- */
-</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">true</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>separator</item>
-            <item>button_options</item>
-            <item>button_status</item>
-            <item>separator</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{c77dc9c2-b3c2-490b-be59-cc899d0690f8}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Buttons</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">false</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>spacer</item>
-            <item>spacer</item>
-            <item>menu_add_contact</item>
-            <item>spacer</item>
-            <item>enable_groups</item>
-            <item>menu_account_setup</item>
-            <item>menu_options</item>
-            <item>spacer</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{91ca9b19-0eb7-4215-b999-4eeffdaae252}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Show contacts</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{ada6b447-ff51-4092-9f3f-4c3035e6c64e}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Event notifier</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAK8AAAK6AAAABAAAAAQAAAAIAAAACPwAAAALAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGMANwA3AGQAYwA5AGMAMgAtAGIAMwBjADIALQA0ADkAMABiAC0AYgBlADUAOQAtAGMAYwA4ADkAOQBkADAANgA5ADAAZgA4AH0AAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAOQAxAGMAYQA5AGIAMQA5AC0AMABlAGIANwAtADQAMgAxADUALQBiADkAOQA5AC0ANABlAGUAZgBmAGQAYQBhAGUAMgA1ADIAfQEAAAAAAAAAcQAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGEAZABhADYAYgA0ADQANwAtAGYAZgA1ADEALQA0ADAAOQAyAC0AOQBmADMAZgAtADQAYwAzADAAMwA1AGUANgBjADYANABlAH0AAAAAAP////8AAAAAAAAAAA==</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">default</options.iconsets.activities>
-        <options.iconsets.clients type="QString">default</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">default</options.iconsets.moods>
-        <options.iconsets.status type="QString">oxygen.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">blacksys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">40</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">
-/* ---------- RosterAvatarFrame --------- */
-/* ------------------------ QMainWindow */
-QMainWindow {
-	background: argb(0,0,0,0);
-	border-top: none;
-	border-bottom: 50px solid #c9c9c9;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #d9d9d9);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #d9d9d9);
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-bottom: 21px;
-}
-
-QMainWindow:!active {
-	background: argb(0,0,0,0);
-	border-top: none;
-	border-bottom: 50px solid #eaeaea;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #d9d9d9);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #d9d9d9);
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-bottom: 21px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QFrame#RosterAvatarFrame */
-QFrame#RosterAvatarFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.3 #c5c5c5, stop: 0.5 #b8b8b8, stop: 0.7 #ababab, stop: 1.0 #a7a7a7);
-	border: none;
-	border-top: 1px solid #e3e3e3;
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-top: 1px;
-}
-
-QFrame:!active#RosterAvatarFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 0.3 #e8e8e8, stop: 0.5 #e0e0e0, stop: 0.7 #dadada, stop: 1.0 #d8d8d8);
-	border: none;
-	border-top: 1px solid #f4f4f4;
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-top: 1px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_avatar */
-QLabel#lb_avatar { 
-	background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #bbbbbb, stop: 0.1 #dddddd, stop: 0.3 #cccccc, stop: 0.5 #bbbbbb, stop: 0.7 #aaaaaa, stop: 1.0 #999999); 
-	border: 1px solid #888888;
-	border-radius: 2px;
-}
-
-QLabel:!active#lb_avatar { 
-	background: #dddddd; 
-	border: 1px solid #999999;
-	border-radius: 2px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLineEdit */
-QLineEdit {
-	background: argb(0,0,0,0);
-	border: none;
-	border-radius: 7px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-top: 2px;
-	margin-bottom: 0px;
-	padding-right: 3px;
-}
-
-QLineEdit:hover {
-	background: argb(0,0,0,30);
-	border: none;
-	border-radius: 7px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-top: 2px;
-	margin-bottom: 0px;
-	padding-right: 3px;
-}
-
-QLineEdit:hover:!active {
-	background: argb(0,0,0,30);
-	border: none;
-	border-radius: 7px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-top: 2px;
-	margin-bottom: 0px;
-	padding-right: 3px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_status */
-QToolButton#tb_status {
-	background: argb(0,0,0,0);
-	border: none;
-	border-radius: 7px;
-	border-bottom-left-radius: 12px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-left: 7px;
-	margin-top: 2px;
-	margin-bottom: -3px;
-	padding-bottom: 2px;
-	height: 16px;
-	width: 16px;
-}
-
-QToolButton:hover#tb_status {
-	background: argb(0,0,0,30);
-	border: none;
-	border-radius: 7px;
-	border-bottom-left-radius: 12px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-left: 6px;
-	margin-top: 2px;
-	margin-bottom: -3px;
-	padding-bottom: 2px;
-	height: 16px;
-	width: 16px;
-}
-
-QToolButton:hover#tb_status:!active {
-	background: argb(0,0,0,30);
-	border: none;
-	border-radius: 7px;
-	border-bottom-left-radius: 12px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-left: 6px;
-	margin-top: 2px;
-	margin-bottom: -3px;
-	padding-bottom: 2px;
-	height: 16px;
-	width: 16px;
-}
-
-QToolButton::menu-indicator#tb_status { 
-	image: none; 
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_mood */
-QToolButton#tb_mood {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #545454;
-	border-radius: 3px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-bottom: 1px;
-	margin-right: -1px;
-	height: 15px;
-	width: 15px;
-}
-
-QToolButton:pressed#tb_mood {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-}
-
-QToolButton:!active#tb_mood {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d9d9d9, stop: 1.0 #d1d1d1);
-	border: 1px solid #a8a8a8;
-	border-radius: 3px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-bottom: 1px;
-	margin-right: -1px;
-	height: 15px;
-	width: 15px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_activity */
-QToolButton#tb_activity {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #545454;
-	border-radius: 3px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	icon-size: 14px;
-	margin-bottom: 1px;
-	height: 15px;
-	width: 15px;
-}
-
-QToolButton:pressed#tb_activity {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-}
-
-QToolButton:!active#tb_activity {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d9d9d9, stop: 1.0 #d1d1d1);
-	border: 1px solid #a8a8a8;
-	border-radius: 3px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	icon-size: 14px;
-	margin-bottom: 1px;
-	height: 15px;
-	width: 15px;
-}
-/* ------------------------ */
-/* End RosterAvatarFrame --------- */
-
-
-
-
-
-/* ---------- Roster --------- */
-/* ------------------------ QStackedWidget */
-QStackedWidget {
-	background: #ffffff;
-	margin-bottom: 2px;
-	margin-left: -1px;
-	margin-right: -1px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ PsiContactListView */
-PsiContactListView {
-	background: #ffffff;
-	alternate-background-color: #ffffff;
-	border-top: 1px solid #515151;
-	border-bottom: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #515151, stop: 0.5 #515151, stop: 0.6 #dfdfdf, stop: 1.0 #dfdfdf);
-	padding-top: 1px;
-	padding-left: 4px;
-	padding-right: 6px;
-}
-
-PsiContactListView:!active {
-	background: #ffffff;
-	alternate-background-color: #ffffff;
-	border-top: 1px solid #999999;
-	border-bottom: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #999999, stop: 0.6 #dfdfdf, stop: 1.0 #dfdfdf);
-	padding-top: 1px;
-	padding-left: 4px;
-	padding-right: 6px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ PsiContactListView>QWidget>QLineEdit */
-PsiContactListView>QWidget>QLineEdit { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe);
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 8px;
-	margin-left: 19px;
-	margin-right: 34px;
-	margin-bottom: 14px;
-	padding-left: 8px;
-	font-size: 12px;
-}
-
-PsiContactListView:hover>QWidget>QLineEdit { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe);
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 8px;
-	margin-left: 19px;
-	margin-right: 34px;
-	margin-bottom: 14px;
-	padding-left: 8px;
-	font-size: 12px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ PsiFilteredContactListView */
-PsiFilteredContactListView {
-	margin-left: 4px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QStackedWidget>QWidget */
-QStackedWidget>QWidget {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/psi_filter_active.png) repeat-x;
-}
-
-QStackedWidget>QWidget:!active {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/psi_filter_no_active.png) repeat-x;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QStackedWidget>QWidget>QLineEdit */
-QStackedWidget>QWidget>QLineEdit {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/find_user.png) no-repeat;
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 11px;
-	margin-left: 10px;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 10px;
-	padding-left: 25px;
-	min-height: 20px;
-}
-
-QStackedWidget:hover:!active>QWidget>QLineEdit {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/find_user.png) no-repeat;
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 11px;
-	margin-left: 10px;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 10px;
-	padding-left: 25px;
-	min-height: 20px;
-}
-/* ------------------------ */
-/* End Roster --------- */
-
-
-
-
-
-/* ---------- QToolBar --------- */
-/* ------------------------ QToolBar */
-QToolBar {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cacaca, stop: 1.0 #a7a7a7) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/res_active.png) no-repeat right bottom;
-	border: none;
-	border-radius: 5px;
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px;
-	spacing: 0px;
-}
-
-QToolBar:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #eaeaea, stop: 1.0 #d8d8d8) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/res_no_active.png) no-repeat right bottom;
-	border: none;
-	border-radius: 5px;
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px;
-	spacing: 0px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton */
-QToolButton {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #545454;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d9d9d9, stop: 1.0 #d1d1d1);
-	border: 1px solid #a8a8a8;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton:pressed {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #4e4e4e;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton:checked {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #666666, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #4e4e4e;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton:!active:checked {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #cccccc, stop: 1.0 #cccccc);
-	border: 1px solid #a8a8a8;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton::menu-indicator { 
-	image: none; 
-}
-/* ------------------------ */
-
-
-/* ------------------------ MLabel */
-MLabel {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 1.0 #c9c9c9);
-	border: none;
-	font-size: 12px;
-	padding-left: 13px;
-	padding-bottom: 4px;
-}
-
-MLabel:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #eaeaea, stop: 1.0 #eaeaea);
-	border: none;
-	font-size: 12px;
-	padding-left: 13px;
-	padding-bottom: 4px;
-}
-/* ------------------------ */
-/* End QToolBar --------- */
-</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">false</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">false</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">false</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">false</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">true</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type="QSize">
-            <width>-1</width>
-            <height>-1</height>
-        </options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">QHBoxLayout#layout {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/g_tb_all.png) center center  no-repeat argb(0,0,0,0);
-}
-
-QWidget#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/g_tb_all.png) center center  no-repeat argb(0,0,0,0);
-	icon-size: 0px;
-	min-width: 16px;
-	min-height: 16px;
-}
-
-QToolButton:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/g_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	icon-size: 0px;
-	min-width: 16px;
-	min-height: 16px;
-}
-
-QToolButton:pressed#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/g_tb_close_pressed.png) no-repeat center argb(0,0,0,0);
-	icon-size: 0px;
-	min-width: 16px;
-	min-height: 16px;
-}
-
-QFrame#Frame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/metal_active.png) repeat-x #a7a7a7;
-}
-
-QLabel#lb_top1 {
-	background: argb(0,0,0,0);
-	min-height: 30px;
-
-		
-}
-
-IconLabel#lb_icon {
-	background: argb(0,0,0,0);
-	border: none;
-	min-height: 30px;
-
-}
-
-QLabel#lb_title {
-	background: argb(0,0,0,0);
-	border: none;
-	border-bottom: 1px solid #aaaaaa;
-	min-height: 30px;
-
-}
-
-QFrame#closeFrame {
-	background: argb(0,0,0,0);
-	border: none;
-
-}
-
-QLabel#lb_mid1 {
-	background: argb(0,0,0,0);
-	border: none;
-
-}
-
-QLabel#lb_mid2 {
-	background: argb(0,0,0,0);
-	border: none;
-
-}
-
-QLabel#lb_bottom1 {
-	background: argb(0,0,0,0);
-	border: none;
-}
-</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">true</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">true</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">true</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">40</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">10</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">oxygen-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">adium/native_mac</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">true</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-        <options.ui.decorate-windows type="bool">false</options.ui.decorate-windows>
-    </options>
-</skin>

psi-plus-resources-1.tar.xz/skins/mac/native_mac/NativeMac_tt.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/NativeMac_tt.skn Deleted

@@ -1,1335 +0,0 @@
-<skin version="0.1.1" path="/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac" author="tuxden" name="Native Mac (Top tabs)">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#cacfd4</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#272727</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#f3f3f3</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#464646</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff0000</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#910000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#00008a</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#336600</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">30</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">
-/* ---------- TabDlg --------- */
-TabDlg {
-	background: argb(0,0,0,0);
-	border: none;
-}
-/* End TabDlg--------- */
-
-
-
-
-
-/* ---------- HeaderFrame --------- */
-/* ------------------------ QFrame#headerFrame */
-QFrame#headerFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.5 #cacaca, stop: 1.0 #c2c2c2) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/logo_active.png) no-repeat center center;
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.5 #d0d0d0, stop: 0.6 #e3e3e3, stop: 1.0 #e3e3e3);
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-
-QFrame:!active#headerFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 0.5 #eaeaea, stop: 1.0 #e7e7e7) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/logo_no_active.png) no-repeat center center;
-	border-top: 2px solid #f4f4f4;
-	border-left: 2px solid #ececec;
-	border-right: 2px solid #ececec;
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#hideButton */
-QToolButton#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide.png) center center no-repeat;
-	border-bottom: 0px solid #d0d0d0;
-	icon-size: 0px;
-	margin: 0px;
-	margin-left: 0px;
-	margin-top: 0px;
-	width: 14px;
-	height: 15px;
-}
-
-QToolButton:hover#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:hover#hideButton:!active {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:pressed#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_pressed.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#maximizeButton */
-QToolButton#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize.png) center center no-repeat;
-	icon-size: 0px;
-	margin: 0px;
-	margin-top: 0px;
-	width: 14px;
-	height: 15px;
-}
-
-QToolButton:hover#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:!active:hover#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:pressed#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_pressed.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#closeButton */
-QToolButton#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close.png) center center no-repeat;
-	icon-size: 0px;
-	margin: 0px;
-	margin-left: 2px;
-	margin-top: 0px;
-	width: 17px;
-	height: 15px;
-}
-
-QToolButton:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	min-width: 14px;
-	min-height: 15px;
-}
-
-QToolButton:!active:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	min-width: 14px;
-	min-height: 15px;
-}
-
-QToolButton:pressed#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_pressed.png) no-repeat center argb(0,0,0,0);
-}
-
-/* ------------------------ */
-
-QToolButton:!active#hideButton, QToolButton:!active#closeButton, QToolButton:!active#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_all_no_active.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-/* End HeaderFrame--------- */
-
-
-
-
-
-/* ---------- TopFrame--------- */
-/* ------------------------ QFrame#topFrame */
-QFrame#topFrame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/b_topframe.png) repeat-x #dddddd;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-top: 0px solid #515151;
-	margin-left: -10px;
-	margin-right: -6px;
-}
-
-QFrame:!active#topFrame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/b_topframe_no_active.png) repeat-x #eeeeee;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	margin-left: -10px;
-	margin-right: -6px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QWidget#avatar */
-QWidget#avatar {
-	min-width: 60px;
-	min-height:25px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QPushButton#pb_topic */
-QPushButton#pb_topic {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181);
-	border: 1px solid #404040;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2c2c2c, stop: 0.5 #222222, stop: 1.0 #2e2e2e);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2c2c2c, stop: 0.5 #222222, stop: 1.0 #2e2e2e);
-	border-radius: 11px;
-	margin-left: 12px;
-	padding-left: 4px;
-	padding-right: 2px;
-	height: 21px;
-	width: 50px;
-	color: black;
-}
-
-QPushButton:!active#pb_topic {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181);
-	border: 1px solid #666666;
-}
-
-QPushButton#pb_topic:pressed {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #949494, stop: 0.6 #616161, stop: 1.0 #4f4f4f);
-	border: 1px solid #4e4e4e;
-	border-radius: 11px;
-	padding-left: 4px;
-	height: 21px;
-	width: 50px;
-	color: #eeeeee;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QFrame#log */
-QFrame#log {
-	border-top: 1px solid #454545;
-	padding-left: 4px;
-}
-
-QFrame#log:!active {
-	border-top: 1px solid #676767;
-}
-/* ------------------------ */
-
-/* ---------- QComboBox --------- */
-QComboBox {
-	padding-top: 2px;
-	padding-left: 12px;
-	padding-bottom: 3px;
- }
-
-QComboBox::drop-down {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/qcombobox.png) no-repeat center center;
-	border: 1px solid #404040;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2c2c2c, stop: 0.5 #222222, stop: 1.0 #2e2e2e);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2c2c2c, stop: 0.5 #222222, stop: 1.0 #2e2e2e);
-	border-radius: 10px;
-	height: 20px;
-	width: 32px;
-	margin-top: 5px;
-	margin-left: 12px;
-}
-
-QComboBox::drop-down:pressed {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #949494, stop: 0.6 #616161, stop: 1.0 #4f4f4f) url(/Users/tuxden/Psi+/qcombobox.png) no-repeat center center;
-	border: 1px solid #666666;
-}
-
-QComboBox::drop-down:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181) url(/Users/tuxden/Psi+/qcombobox.png) no-repeat center center;
-	border: 1px solid #666666;
-}
-
-QComboBox#le_jid {
-	background: argb(0,0,0,0);
-	border: none;
-	color: #eeeeee;
-	height: 30px;
-	text-align: center;
-}
-/* ------------------------ */
-
-/* ------------------------ QLineEdit#le_jid */
-QLineEdit#le_jid {
-	background: argb(0,0,0,0);
-	border: none;
-	border-right: 1px solid #222222;
-	border-radius: 0px;
-	margin-right: 10px;
-	margin-left: 0px;
-	margin-top: 0px;
-	padding-right: 12px;
-	height: 20px;
-	color: #eeeeee;
-}
-
-QLineEdit:!active#le_jid {
-	background: argb(0,0,0,0);
-	border-right: 1px solid #444444;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLineEdit#le_topic */
-QLineEdit#le_topic {
-	background: argb(0,0,0,0);
-	border: none;
-	border-radius: 10px;
-	margin-top: 4px;
-	margin-left: 1px;
-	padding-left: 5px;
-	padding-right: 6px;
-	color: #eeeeee;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_count */
-QLabel#lb_count {
-	background: none;
-	border: 1px solid #222222;
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-	margin-right: 8px;
-	color: #eeeeee;
-}
-
-QLabel#lb_count:!active {
-	background: none;
-	border: 1px solid #444444;
-	border-top: none;
-	border-bottom: none;
-	border-right: none;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_ident */
-QLabel#lb_ident {
-	background: none;
-	border: 1px solid #222222;
-	border-top: none;
-	border-bottom: none;
-	margin-top: 3px;
-	margin-right: 10px;
-	padding-left: 8px;
-	padding-right: 8px;
-	color: #eeeeee;
-}
-
-QLabel#lb_ident:!active {
-	background: none;
-	border: 1px solid #444444;
-	border-top: none;
-	border-bottom: none;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_status */
-QLabel#lb_status {
-	background: argb(0,0,0,0);
-	border: 0px;
-	border-right: 1px solid #222222;
-	border-radius: 3px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-left: 15px;
-	padding-right: 12px;
-	max-width: 30px;
-	max-height: 19px;
-}
-
-QLabel#lb_status:!active {
-	border-right: 1px solid #444444;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_client */
-QLabel#lb_client {
-	max-height: -10px;
-	max-width: -10px;
-	margin-right: 30px;
-	margin-left: 30px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QFrame#QSplitter::handle */
-QSplitter::handle:vertical { 
-	background: #cecece; 
-	border: 0px solid #ffffff;
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #515151, stop: 0.5 #515151, stop: 0.6 #dfdfdf, stop: 1.0 #dfdfdf);
-	height: 2px;
-	width: 3px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QFrame#hsplitter */
-QFrame#hsplitter {
-	background: #a9a9a9;
-	border: none;
-	width: 5px;
-}
-
-QFrame:!active#hsplitter {
-	background: #d8d8d8;
-	border: none;
-	width: 5px;
-}
-/* ------------------------ */
-/* End TopFrame--------- */
-
-
-
-/* ---------- BottomFrame --------- */
-/* ------------------------ QFrame#bottomFrame */
-QFrame#bottomFrame { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cecece, stop: 0.7 #a7a7a7, stop: 1.0 #a7a7a7) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/res_active.png) no-repeat right bottom;
-	border-radius: 5px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px;
-	padding-left: 17px;
-	padding-right: 12px;
-}
-
-QFrame:!active#bottomFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cecece,  stop: 0.1 #e5e5e5, stop: 0.5 #d8d8d8, stop: 1.0 #d8d8d8) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/res_no_active.png) no-repeat right bottom;
-}
-/* ------------------------ */
-
-
-/* ------------------------ TypeAheadFindBar>QLineEdit */
-TypeAheadFindBar>QLineEdit {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/find_user.png) no-repeat;
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 10px;
-	margin-left: 26px;
-	margin-right: 10px;
-	margin-top: 10px;
-	margin-bottom: 8px;
-	padding-left: 25px;
-	min-height: 20px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QPushButton#pb_send */
-QPushButton#pb_send {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #8c8c8a;
-	border-top: 1px solid #8c8c8a;
-	border-bottom: 1px solid #8c8c8a;
-	border-radius: 3px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-top: 4px;
-	margin-right: 12px;
-	margin-bottom: 8px;
-	max-width: 40px;
-}
-
-QPushButton:!active#pb_send {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #a8a8a8;
-	border-radius: 3px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-top: 4px;
-	margin-bottom: 8px;
-	max-width: 40px;
-}
-
-QPushButton:pressed#pb_send {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #555555;
-	border-radius: 3px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-bottom: 8px;
-	max-width: 40px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolBar */
-QToolBar {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #cecece);
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #515151, stop: 0.5 #515151, stop: 0.6 #dfdfdf, stop: 1.0 #dfdfdf);
-}
-
-QToolBar#toolbar {
-	background: argb(0,0,0,0);
-	border: none;
-	margin-right: 7px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton */
-QToolButton {
-	background: none;
-	margin-right: 5px;
-	height: 20px;
-	width: 20px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_emoticons */
-QToolButton#tb_emoticons {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181);
-	border: 1px solid #404040;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #494949, stop: 0.5 #434343, stop: 1.0 #484748);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #494949, stop: 0.5 #434343, stop: 1.0 #484748);
-	border-radius: 11px;
-	padding-left: 1px;
-	height: 18px;
-	width: 30px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_actions */
-QToolButton#tb_actions {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181);
-	border: 1px solid #404040;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #494949, stop: 0.5 #434343, stop: 1.0 #484748);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #494949, stop: 0.5 #434343, stop: 1.0 #484748);
-	border-radius: 11px;
-	margin-right: 5px;
-	height: 18px;
-	width: 30px;
-	padding-left: 1px;
-}
-
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_voice */
-QToolButton#tb_voice {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181);
-	border: 1px solid #404040;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #494949, stop: 0.5 #434343, stop: 1.0 #484748);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #494949, stop: 0.5 #434343, stop: 1.0 #484748);
-	border-radius: 11px;
-	height: 18px;
-	width: 30px;
-	padding-left: 1px;
-	icon-size: 0px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_pgp */
-QToolButton#tb_pgp {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181);
-	border: 1px solid #404040;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #494949, stop: 0.5 #434343, stop: 1.0 #484748);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #494949, stop: 0.5 #434343, stop: 1.0 #484748);
-	border-radius: 11px;
-	height: 18px;
-	width: 30px;
-	padding-left: 1px;
-}
-/* ------------------------ */
-
-QToolButton#tb_pgp:!active, QToolButton#tb_voice:!active, QToolButton#tb_actions:!active, QToolButton#tb_emoticons:!active {
-	border: 1px solid #666666;
-	border-radius: 11px;
-	height: 18px;
-	width: 30px;
-	padding-left: 1px;
-}
-
-QToolButton:pressed#tb_pgp, QToolButton:pressed#tb_voice, QToolButton:pressed#tb_actions, QToolButton:pressed#tb_emoticons {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #949494, stop: 0.6 #616161, stop: 1.0 #4f4f4f);
-	border: 1px solid #4e4e4e;
-	border-radius: 11px;
-	height: 18px;
-	width: 30px;
-	padding-left: 1px;
-}
-
-/* ------------------------ */
-
-QToolButton:checked#tb_pgp, QToolButton:checked#tb_voice, QToolButton:checked#tb_actions, QToolButton:checked#tb_emoticons {
-background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #666666, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #4e4e4e;
-	border-radius: 11px;
-	height: 18px;
-	width: 30px;
-	padding-left: 1px;
-}
-
-QToolButton::menu-indicator { 
-	image: none; 
-}
-/* ------------------------ */
-/* End BottomFrame --------- */
-
-
-
-
-
-/* ---------- PsiTabBar --------- */
-/* ------------------------ PsiTabBar */
-PsiTabBar {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c2c2c2, stop: 1.0 #aaaaaa);
-	border: none;
-	border-bottom: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #515151, stop: 0.5 #515151, stop: 0.6 #808080, stop: 1.0 #808080);
-}
-
-PsiTabBar:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e7e7e7, stop: 1.0 #cccccc);
-	border: none;
-	border-bottom: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #999999, stop: 0.6 #ababab, stop: 1.0 #ababab);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QTabBar::tab:selected */
-QTabBar::tab:selected { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 1.0 #747474);
-	border-left: 1px solid #555555;
-	border-right: 1px solid #555555;
-	border-bottom: 1px solid #757575;
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #515151, stop: 0.5 #515151, stop: 0.6 #999999, stop: 1.0 #999999);
-	border-radius: 3px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	padding-left: 4px;
-	padding-top: 3px; 
-	height: 21px;
-	font-size: 11px;
-}
-
-QTabBar::tab:selected:!active { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cccccc, stop: 1.0 #9c9c9c);
-	border-left: 1px solid #999999;
-	border-right: 1px solid #999999;
-	border-bottom: 1px solid #9d9d9d;
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #999999, stop: 0.6 #bbbbbb, stop: 1.0 #bbbbbb);
-	border-radius: 3px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	padding-left: 4px;
-	padding-top: 3px; 
-	height: 21px;
-	font-size: 11px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QTabBar::tab */
-QTabBar::tab { 
-	background: none;
-	border: 1px solid #888888;
-	border-bottom: 0px solid #696969;
-	border-radius: 3px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px;
-	margin-top: 5px;
-	padding-left: 4px;
-	padding-top: 3px; 
-	height: 21px;
-	font-size: 11px;
-}
-
-QTabBar::tab:!active { 
-	background: none;
-	border: 1px solid #bbbbbb;
-	border-top: 1px solid #999999;
-	border-radius: 3px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	padding-left: 4px;
-	padding-top: 3px; 
-	height: 21px;
-	font-size: 11px;
-}
-/* ------------------------ */
-/* End PsiTabBar --------- */</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">true</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>separator</item>
-            <item>button_options</item>
-            <item>button_status</item>
-            <item>separator</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{c77dc9c2-b3c2-490b-be59-cc899d0690f8}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Buttons</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">false</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>spacer</item>
-            <item>spacer</item>
-            <item>menu_add_contact</item>
-            <item>spacer</item>
-            <item>enable_groups</item>
-            <item>menu_account_setup</item>
-            <item>menu_options</item>
-            <item>spacer</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{91ca9b19-0eb7-4215-b999-4eeffdaae252}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Show contacts</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{ada6b447-ff51-4092-9f3f-4c3035e6c64e}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Event notifier</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAKgAAALAAAAABAAAAAQAAAAIAAAACPwAAAALAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGMANwA3AGQAYwA5AGMAMgAtAGIAMwBjADIALQA0ADkAMABiAC0AYgBlADUAOQAtAGMAYwA4ADkAOQBkADAANgA5ADAAZgA4AH0AAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAOQAxAGMAYQA5AGIAMQA5AC0AMABlAGIANwAtADQAMgAxADUALQBiADkAOQA5AC0ANABlAGUAZgBmAGQAYQBhAGUAMgA1ADIAfQEAAAAAAAAAcQAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGEAZABhADYAYgA0ADQANwAtAGYAZgA1ADEALQA0ADAAOQAyAC0AOQBmADMAZgAtADQAYwAzADAAMwA1AGUANgBjADYANABlAH0AAAAAAP////8AAAAAAAAAAA==</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">default</options.iconsets.activities>
-        <options.iconsets.clients type="QString">default</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">oxygen.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">blacksys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">42</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">false</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">/* ---------- RosterAvatarFrame --------- */
-/* ------------------------ QMainWindow */
-QMainWindow {
-	background: argb(0,0,0,0);
-	border-top: none;
-	border-bottom: 50px solid #c9c9c9;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #d9d9d9);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #d9d9d9);
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-bottom: 21px;
-}
-
-QMainWindow:!active {
-	background: argb(0,0,0,0);
-	border-top: none;
-	border-bottom: 50px solid #eaeaea;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #d9d9d9);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 1.0 #d9d9d9);
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-bottom: 21px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QFrame#RosterAvatarFrame */
-QFrame#RosterAvatarFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.3 #c5c5c5, stop: 0.5 #b8b8b8, stop: 0.7 #ababab, stop: 1.0 #a7a7a7);
-	border: none;
-	border-top: 1px solid #e3e3e3;
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-top: 1px;
-}
-
-QFrame:!active#RosterAvatarFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 0.3 #e8e8e8, stop: 0.5 #e0e0e0, stop: 0.7 #dadada, stop: 1.0 #d8d8d8);
-	border: none;
-	border-top: 1px solid #f4f4f4;
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-top: 1px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLabel#lb_avatar */
-QLabel#lb_avatar { 
-	background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #bbbbbb, stop: 0.1 #dddddd, stop: 0.3 #cccccc, stop: 0.5 #bbbbbb, stop: 0.7 #aaaaaa, stop: 1.0 #999999); 
-	border: 1px solid #888888;
-	border-radius: 2px;
-}
-
-QLabel:!active#lb_avatar { 
-	background: #dddddd; 
-	border: 1px solid #999999;
-	border-radius: 2px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QLineEdit */
-QLineEdit {
-	background: argb(0,0,0,0);
-	border: none;
-	border-radius: 7px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-top: 2px;
-	margin-bottom: 0px;
-	padding-right: 3px;
-}
-
-QLineEdit:hover {
-	background: argb(0,0,0,30);
-	border: none;
-	border-radius: 7px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-top: 2px;
-	margin-bottom: 0px;
-	padding-right: 3px;
-}
-
-QLineEdit:hover:!active {
-	background: argb(0,0,0,30);
-	border: none;
-	border-radius: 7px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-top: 2px;
-	margin-bottom: 0px;
-	padding-right: 3px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_status */
-QToolButton#tb_status {
-	background: argb(0,0,0,0);
-	border: none;
-	border-radius: 7px;
-	border-bottom-left-radius: 12px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-left: 7px;
-	margin-top: 2px;
-	margin-bottom: -3px;
-	padding-bottom: 2px;
-	height: 16px;
-	width: 16px;
-}
-
-QToolButton:hover#tb_status {
-	background: argb(0,0,0,30);
-	border: none;
-	border-radius: 7px;
-	border-bottom-left-radius: 12px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-left: 6px;
-	margin-top: 2px;
-	margin-bottom: -3px;
-	padding-bottom: 2px;
-	height: 16px;
-	width: 16px;
-}
-
-QToolButton:hover#tb_status:!active {
-	background: argb(0,0,0,30);
-	border: none;
-	border-radius: 7px;
-	border-bottom-left-radius: 12px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-left: 6px;
-	margin-top: 2px;
-	margin-bottom: -3px;
-	padding-bottom: 2px;
-	height: 16px;
-	width: 16px;
-}
-
-QToolButton::menu-indicator#tb_status { 
-	image: none; 
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_mood */
-QToolButton#tb_mood {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #545454;
-	border-radius: 3px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-bottom: 1px;
-	margin-right: -1px;
-	height: 15px;
-	width: 15px;
-}
-
-QToolButton:pressed#tb_mood {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-}
-
-QToolButton:!active#tb_mood {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d9d9d9, stop: 1.0 #d1d1d1);
-	border: 1px solid #a8a8a8;
-	border-radius: 3px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	icon-size: 14px;
-	margin-bottom: 1px;
-	margin-right: -1px;
-	height: 15px;
-	width: 15px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#tb_activity */
-QToolButton#tb_activity {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #545454;
-	border-radius: 3px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	icon-size: 14px;
-	margin-bottom: 1px;
-	height: 15px;
-	width: 15px;
-}
-
-QToolButton:pressed#tb_activity {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-}
-
-QToolButton:!active#tb_activity {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d9d9d9, stop: 1.0 #d1d1d1);
-	border: 1px solid #a8a8a8;
-	border-radius: 3px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	icon-size: 14px;
-	margin-bottom: 1px;
-	height: 15px;
-	width: 15px;
-}
-/* ------------------------ */
-/* End RosterAvatarFrame --------- */
-
-
-
-
-
-/* ---------- Roster --------- */
-/* ------------------------ QStackedWidget */
-QStackedWidget {
-	background: #ffffff;
-	margin-bottom: 2px;
-	margin-left: -1px;
-	margin-right: -1px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ PsiContactListView */
-PsiContactListView {
-	background: #ffffff;
-	alternate-background-color: #ffffff;
-	border-top: 1px solid #515151;
-	border-bottom: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #515151, stop: 0.5 #515151, stop: 0.6 #dfdfdf, stop: 1.0 #dfdfdf);
-	padding-top: 1px;
-	padding-left: 4px;
-	padding-right: 6px;
-}
-
-PsiContactListView:!active {
-	background: #ffffff;
-	alternate-background-color: #ffffff;
-	border-top: 1px solid #999999;
-	border-bottom: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #999999, stop: 0.6 #dfdfdf, stop: 1.0 #dfdfdf);
-	padding-top: 1px;
-	padding-left: 4px;
-	padding-right: 6px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ PsiContactListView>QWidget>QLineEdit */
-PsiContactListView>QWidget>QLineEdit { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe);
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 8px;
-	margin-left: 19px;
-	margin-right: 34px;
-	margin-bottom: 14px;
-	padding-left: 8px;
-	font-size: 12px;
-}
-
-PsiContactListView:hover>QWidget>QLineEdit { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe);
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 8px;
-	margin-left: 19px;
-	margin-right: 34px;
-	margin-bottom: 14px;
-	padding-left: 8px;
-	font-size: 12px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ PsiFilteredContactListView */
-PsiFilteredContactListView {
-	margin-left: 4px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QStackedWidget>QWidget */
-QStackedWidget>QWidget {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/psi_filter_active.png) repeat-x;
-}
-
-QStackedWidget>QWidget:!active {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/psi_filter_no_active.png) repeat-x;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QStackedWidget>QWidget>QLineEdit */
-QStackedWidget>QWidget>QLineEdit {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/find_user.png) no-repeat;
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 11px;
-	margin-left: 10px;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 10px;
-	padding-left: 25px;
-	min-height: 20px;
-}
-
-QStackedWidget:hover:!active>QWidget>QLineEdit {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c4c5c7, stop: 0.1 #dbdcdf, stop: 0.2 #e8e9ec, stop: 1.0 #fefefe) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/find_user.png) no-repeat;
-	border: 1px solid #cccccc;
-	border-top: 1px solid #5e5e5e;
-	border-bottom: 1px solid #838383;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5e5e5e, stop: 1.0 #838383);
-	border-radius: 11px;
-	margin-left: 10px;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 10px;
-	padding-left: 25px;
-	min-height: 20px;
-}
-/* ------------------------ */
-/* End Roster --------- */
-
-
-
-
-
-/* ---------- QToolBar --------- */
-/* ------------------------ QToolBar */
-QToolBar {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cacaca, stop: 1.0 #a7a7a7) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/res_active.png) no-repeat right bottom;
-	border: none;
-	border-radius: 5px;
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px;
-	spacing: 0px;
-}
-
-QToolBar:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #eaeaea, stop: 1.0 #d8d8d8) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/res_no_active.png) no-repeat right bottom;
-	border: none;
-	border-radius: 5px;
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px;
-	spacing: 0px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton */
-QToolButton {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #545454;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #d9d9d9, stop: 1.0 #d1d1d1);
-	border: 1px solid #a8a8a8;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton:pressed {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #4e4e4e;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton:checked {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #666666, stop: 0.5 #939394, stop: 1.0 #bbbbbb);
-	border: 1px solid #4e4e4e;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton:!active:checked {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #999999, stop: 0.5 #cccccc, stop: 1.0 #cccccc);
-	border: 1px solid #a8a8a8;
-	border-radius: 1px;
-	margin-bottom: 5px;
-	height: 18px;
-	width: 26px;
-}
-
-QToolButton::menu-indicator { 
-	image: none; 
-}
-/* ------------------------ */
-
-
-/* ------------------------ MLabel */
-MLabel {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 1.0 #c9c9c9);
-	border: none;
-	font-size: 12px;
-	padding-left: 13px;
-	padding-bottom: 4px;
-}
-
-MLabel:!active {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #eaeaea, stop: 1.0 #eaeaea);
-	border: none;
-	font-size: 12px;
-	padding-left: 13px;
-	padding-bottom: 4px;
-}
-/* ------------------------ */
-/* End QToolBar --------- */
-</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">false</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">false</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">false</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">true</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type="QSize">
-            <width>-1</width>
-            <height>-1</height>
-        </options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">QHBoxLayout#layout {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/g_tb_all.png) center center  no-repeat argb(0,0,0,0);
-}
-
-QWidget#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/g_tb_all.png) center center  no-repeat argb(0,0,0,0);
-	icon-size: 0px;
-	min-width: 16px;
-	min-height: 16px;
-}
-
-QToolButton:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/g_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	icon-size: 0px;
-	min-width: 16px;
-	min-height: 16px;
-}
-
-QToolButton:pressed#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/g_tb_close_pressed.png) no-repeat center argb(0,0,0,0);
-	icon-size: 0px;
-	min-width: 16px;
-	min-height: 16px;
-}
-
-QFrame#Frame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/metal_active.png) repeat-x #a7a7a7;
-}
-
-QLabel#lb_top1 {
-	background: argb(0,0,0,0);
-	min-height: 30px;
-
-		
-}
-
-IconLabel#lb_icon {
-	background: argb(0,0,0,0);
-	border: none;
-	min-height: 30px;
-
-}
-
-QLabel#lb_title {
-	background: argb(0,0,0,0);
-	border: none;
-	border-bottom: 1px solid #aaaaaa;
-	min-height: 30px;
-
-}
-
-QFrame#closeFrame {
-	background: argb(0,0,0,0);
-	border: none;
-
-}
-
-QLabel#lb_mid1 {
-	background: argb(0,0,0,0);
-	border: none;
-
-}
-
-QLabel#lb_mid2 {
-	background: argb(0,0,0,0);
-	border: none;
-
-}
-
-QLabel#lb_bottom1 {
-	background: argb(0,0,0,0);
-	border: none;
-}
-</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">true</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">true</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">40</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">10</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">oxygen-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">adium/native_mac</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">true</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-	<options.ui.muc.theme type="QString">adium/native_mac</options.ui.muc.theme>
-	<options.ui.muc.userlist.avatars.avatars-at-left type="bool">false</options.ui.muc.userlist.avatars.avatars-at-left>
-	<options.ui.muc.userlist.avatars.radius type="int">3</options.ui.muc.userlist.avatars.radius>
-	<options.ui.muc.userlist.avatars.show type="bool">true</options.ui.muc.userlist.avatars.show>
-	<options.ui.muc.userlist.avatars.size type="int">24</options.ui.muc.userlist.avatars.size>
-        <options.ui.muc.userlist.contact-sort-style type="QString">alpha</options.ui.muc.userlist.contact-sort-style>
-	<options.ui.muc.userlist.nick-coloring type="bool">false</options.ui.muc.userlist.nick-coloring>
-	<options.ui.muc.userlist.show-affiliation-icons type="bool">false</options.ui.muc.userlist.show-affiliation-icons>
-	<options.ui.muc.userlist.show-client-icons type="bool">false</options.ui.muc.userlist.show-client-icons>
-	<options.ui.muc.userlist.show-groups type="bool">true</options.ui.muc.userlist.show-groups>
-	<options.ui.muc.userlist.show-status-icons type="bool">true</options.ui.muc.userlist.show-status-icons>
-	<options.ui.muc.userlist.use-slim-group-headings type="bool">true</options.ui.muc.userlist.use-slim-group-headings>
-	<options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-        <options.ui.decorate-windows type="bool">false</options.ui.decorate-windows>
-        <options.ui.look.colors.chat.composing-color type="QColor">#006400</options.ui.look.colors.chat.composing-color>
-        <options.ui.look.colors.chat.unread-message-color type="QColor">#ff0000</options.ui.look.colors.chat.unread-message-color>
-    </options>
-</skin>

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_all_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_close.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_close_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_hide.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_hide_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_maximize.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_maximize_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/c_tb_all_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_close.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_close_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_close_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_hide.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_hide_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_hide_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_maximize.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_maximize_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_maximize_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/b_topframe.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/b_topframe_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/find_user.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/logo_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/logo_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/psi_filter_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/psi_filter_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/qcombobox.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/res_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/res_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/topframe.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/topframe_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/universal Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/BranchEnd.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/BranchMore.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ChatEdit.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ChatLog.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ChatTopFrame.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/CloseButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/CloseButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/CloseButtonPressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/Dot.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/LunnaCat.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/LunnaCat.skn Deleted

@@ -1,1350 +0,0 @@
-<skin version="1.1_(2011-06-11)" path="D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1" author="majik" name="LunnaCat">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#2f9fff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#2d9bff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#0a373c</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#0a373c</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#14a0b4</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#0f646e</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#4be1e1</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#32a5b9</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#328296</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#001e1e</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#4bd7ff</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#3c7896</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#9bdcc3</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#006e6e</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#009bff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#00d200</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#37eb73</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#4bd7ff</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#ff0004</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#32a5b9</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#001e1e</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#0a373c</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#37aabe</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#0e2e35</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#001e1e</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">true</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">32</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">TabDlg {
-	background-color: #000000;}
-
-/* общий фрейм */
-QFrame {
-	color: #32C8C3;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ChatTopFrame.png) right bottom;
-	background-color: argb(182,200,80,0);
-	border: 0px;
-	padding: 0px;}
-
-/* кнопки в шапке окна в режиме без декора */
-QToolButton#hideButton {
-	width: 16px;
-	height: 16px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MinimizeButton.png) center no-repeat;
-	icon-size: 0px;
-	border: 0px;}
-
-QToolButton#hideButton:hover {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MinimizeButtonHover.png) center no-repeat;}
-
-QToolButton#hideButton:pressed {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MinimizeButtonPressed.png) center no-repeat;}
-
-QToolButton#maximizeButton {
-	width: 16px;
-	height: 16px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MaximizeButton.png) center no-repeat;
-	icon-size: 0px;
-	border: 0px;}
-
-QToolButton#maximizeButton:hover {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MaximizeButtonHover.png) center no-repeat;}
-
-QToolButton#maximizeButton:pressed {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MaximizeButtonPressed.png) center no-repeat;}
-
-QToolButton#closeButton {
-	width: 16px;
-	height: 16px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/CloseButton.png) center no-repeat;
-	icon-size: 0px;
-	border: 0px;}
-
-QToolButton#closeButton:hover {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/CloseButtonHover.png) center no-repeat;}
-
-QToolButton#closeButton:pressed {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/CloseButtonPressed.png) center no-repeat;}
-
-/* верхний фрейм */
-QFrame#topFrame {
-	margin: 0px;
-	margin-bottom: 2px;
-	border: 0px;}
-
-/* кнопка топика */
-QPushButton#pb_topic {
-	margin: 0px;
-	height: 16px;
-	color: #4BD7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.55 #1A474C, stop: 1 #4BD7FF);
-	font-weight: bold;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-QPushButton#pb_topic:hover {
-	color: #DBD7DF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.55 #0F97AC, stop: 1 #8BF7FF);}
-
-QPushButton#pb_topic:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.55 #1A474C, stop: 1 #4BD7FF);}
-
-/* диалог топика */
-QWidget#pte_topic {
-	color: #32C8C3;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: #001E1F;
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-/* иконка статуса */
-QLabel#lb_status {
-	border: 0px;
-	background: argb(182,200,80,0);}
-
-/* топик / джид */
-ActionLineEdit#le_topic,#le_jid {
-	color: #4BD7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.28 argb(188,255,120,40), stop: 0.8 argb(188,255,120,40), stop: 1 #4BD7FF);
-	font-weight: bold;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* джид - ниспадающее меню */
-QComboBox::drop-down#le_jid {
-	height: 20px;
-	border-left: 1px solid #2D9BB8;
-	background-color: argb(188,255,120,50);}
-
-QComboBox::down-arrow#le_jid {
-	width: 9px;
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowDown.png);}
-
-QComboBox#le_jid QAbstractItemView {
-	color: #4BD7FF;
-	selection-background-color: argb(188,255,120,50);
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png);
-	background-color: argb(182,200,80,40);
-show-decoration-selected: 0;
-	border: 1px outset #3C7896;}
-
-QComboBox::focus#le_jid QAbstractItemView {
-	border-color: red;
-	border: 1px;}
-
-/* диалоговое окно букмарок */
-QDialog {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(182,200,80,0);}
-
-QDialog>QFrame {
-	color: #4BD7FF;
-	background: argb(182,200,80,0);}
-
-QDialog>QLineEdit {
-	color: #4BD7FF;
-	background: argb(182,200,80,40);
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-QDialog>QCheckBox {
-	background: argb(182,200,80,0);}
-
-/* иконка клиента */
-QLabel#lb_client {
-	border: 0px;
-	background: argb(182,200,80,0);}
-
-/* счётчик символов */
-QLabel#lb_count {
-	color: #4BD7FF;
-	background: argb(182,200,80,0);
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.28 argb(188,255,120,40), stop: 0.8 argb(188,255,120,40), stop: 1 #4BD7FF);
-	font-weight: bold;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* имя аккаунта */
-QLabel#lb_ident {
-	color: #0A373C;
-	background: argb(188,255,120,0);
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #0A373C, stop: 0.18 #4BD7FF, stop: 0.9 #4BD7FF, stop: 1 #0A373C);
-	font-weight: bold;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* чатлог */
-QFrame#log {
-	margin: 0px;
-	color: #32C8C3;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ChatLog.png) no-repeat right bottom;
-	background-attachment: fixed;
-	background-color: #001415;
-	border: 1px inset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* ростер конференции */
-QFrame#lv_users {
-	border: 1px inset #3C7896;
-	border-radius: 3px;
-	padding: 2px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) left top;
-	background-color: #0A373C;
-	selection-color: #CFFFFF;
-	selection-background-color: argb(188,255,120,70);}
-
-/* нижний фрейм */
-QFrame#bottomFrame {
-	margin: 0px;
-	border: 0px;}
-
-/* поле ввода команд */
-QWidget#mini_prompt {
-	margin-top: -8px;
-	margin-left: 1px;
-	margin-right: -5px;
-	color: #32C8C3;
-	background: argb(182,200,80,0);}
-
-/* строка ввода */
-QWidget#bottomFrame>QWidget>QTextEdit {
-	margin: 0px;
-	color: #32C8C3;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ChatEdit.png) right bottom;
-	background-attachment: fixed;
-	background-color: argb(182,200,80,0);
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-/* кнопка отправки сообщения */
-QPushButton#pb_send {
-	margin: 0px;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.1 #0A374C,  stop: 0.9 #0A374C, stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;}
-
-QPushButton#pb_send:hover {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.12 #0A375C,  stop: 0.88 #0A375C, stop: 1 #4BD7FF);}
-
-QPushButton#pb_send:hover:pressed {
-	background-color:  qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #00171C, stop: 0.1 #2BB7DF, stop: 0.9 #2BB7DF, stop: 1 #00171C);}
-
-/* аватар */
-QLabel#avatar {
-	margin: 0px;
-	background: argb(182,200,80,0);}
-
-/* централ-бар */
-QToolBar {
-	margin: 1px;
-	border: 0px solid #121212;
-	background: argb(182,200,80,0);}
-
-/* кнопки централ-бара и прочие */
-QToolButton {
-	margin-left: 1px;
-	margin-right: 1px;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.36 #1A475C, stop: 0.7 #1A479C,stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 1px;}
-
-QToolButton:hover {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.5 #2A678C, stop: 1 #4BD7FF);}
-
-QToolButton:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.36 #1A475C, stop: 0.7 #1A479C, stop: 1 #4BD7FF);}
-
-QToolButton:checked {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #0B87BF, stop: 0.36 argb(188,255,120,60), stop: 0.7 argb(188,255,120,60), stop: 1 #0B87BF);
-	border: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,255), stop: 0.36 #1A475C, stop: 0.7 #1A479C, stop: 1 argb(188,255,120,255));}
-
-QToolButton::menu-indicator {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Dot.png);}
-
-/* горизонтальный сплиттер */
-QSplitter::handle:vertical {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/SplitterH.png);}
-
-QSplitter::handle:vertical:hover {
-	background: qlineargradient(x0: 1, y0: 0, x2: 1, y2: 0, stop: 0 argb(182,200,80,0), stop: 0.5 argb(182,200,80,100), stop: 1 argb(182,200,80,0));
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/SplitterHH.png);}
-
-QSplitter::handle:vertical:pressed {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/SplitterHP.png);}
-
-/* вертикальный сплиттер */
-QSplitter::handle:horizontal {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/SplitterV.png);}
-
-QSplitter::handle:horizontal:hover {
-	background: qlineargradient(x0: 0, y0: 0, x2: 0, y2: 1, stop: 0 argb(182,200,80,0), stop: 0.5 argb(182,200,80,100), stop: 1 argb(182,200,80,0));
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/SplitterVH.png);}
-
-QSplitter::handle:horizontal:pressed {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/SplitterVP.png);}
-
-/* таб-бар */
-PsiTabBar {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/TabBar.png) right top;
-	background-color: #0A1A2A;
-	alignment: center;}
-
-/* таб-бар - основной цвет шрифта */
-TabDlg {
-	color: #4BD7FF;}
-
-QTabBar::tab {
-	margin-left: 1px;
-	margin-right: 1px;
-	margin-bottom: 3px;
-	height: 20px;
-	font-size: 12px;
-	background: argb(182,200,80,0);
-	border: 1px outset #2C6886;
-	border-radius: 3px;
-	padding-left: 4px;
-	padding-right: 4px;}
-
-QTabBar::tab:selected {
-	font: bold;
-	background: qlineargradient(x0: 1, y1: 0, x2: 1, y2: 0, stop: 0 argb(182,200,80,0), stop: 0.5 argb(182,200,80,180), stop: 1 argb(182,200,80,0));}
-
-QTabBar::tab:hover {
-	background: qlineargradient(x0: 1, y1: 0, x2: 1, y2: 0, stop: 0 argb(182,200,80,0), stop: 0.5 argb(182,200,80,255), stop: 1 argb(182,200,80,0));}
-
-QTabBar::close-button {
-	icon-size: 0px;
-	margin-top: 0px;
-	margin-bottom: 4px;
-	margin-right: 0px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/TabCloseButton.png) center no-repeat;
-	border: 0px;}
-
-QTabBar::close-button:selected { }
-
-QTabBar::close-button:hover {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/TabCloseButtonHover.png) center no-repeat;}
-
-QTabBar::close-button:pressed {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/TabCloseButtonPressed.png) center no-repeat;}
-
-/* окно настроек конференции - табы, рамка, кнопки, список джидов */
-QWidget#MUCConfig QTabBar::tab {
-	color: #4BD7FF;
-	margin-bottom: 3px;
-	width: 100%;
-	background: argb(182,200,80,0);
-	border: 1px outset #2C6886;
-	border-radius: 3px;}
-
-QWidget#MUCConfig QTabBar::tab:selected {
-	font: bold;
-	background: qlineargradient(x0: 1, y1: 0, x2: 1, y2: 0, stop: 0 argb(182,200,80,0), stop: 0.5 argb(182,200,80,180), stop: 1 argb(182,200,80,0));}
-
-QWidget#MUCConfig QTabBar::tab:hover {
-	background: qlineargradient(x0: 1, y1: 0, x2: 1, y2: 0, stop: 0 argb(182,200,80,0), stop: 0.5 argb(182,200,80,255), stop: 1 argb(182,200,80,0));}
-
-QWidget#MUCConfig>QWidget {
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: #3C7896;}
-
-QWidget#MUCConfig>QPushButton {
-	color: black;
-	height: 25px;
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding-left: 8px;
-	padding-right: 8px;}
-
-QWidget#MUCConfig>QPushButton:hover {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.6 #0F97AC, stop: 1 #8BF7FF);}
-
-QWidget#MUCConfig>QPushButton:pressed {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px inset #3C7896;}
-
-QFrame#tv_affiliations {
-	color: #32C8C3;
-	background: argb(182,200,80,0);
-	selection-background-color: #207085;
-	border: 1px inset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-QTreeView::branch:has-siblings:adjoins-item {
-	border-image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/BranchMore.png);}
-
-QTreeView::branch:!has-children:!has-siblings:adjoins-item {
-	border-image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/BranchEnd.png);}
-
-/* окно настроек конференции - фильтр */
-QLabel#label	{
-	color: #4BD7FF;
-	background: argb(182,200,80,0);}
-
-QLineEdit#le_filter {
-	color: #4BD7FF;
-	background: argb(182,200,80,40);
-	border: 1px inset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* окно настроек конференции - получение настроек */
-QFrame#lb_general_message {
-	color:yellow;
-	font-size: 18px;
-	background-color: argb(188,255,120,40);}
-
-/* окно настроек конференции - настройки, внешний и внутренний фрейм */
-QWidget#tab_general QWidget {
-	background: argb(188,255,120,0);}
-
-/* окно настроек конференции - настройки, внутренний фрейм */
-QStackedWidget#sw_general {
-	border: 1px inset #3C7896;
-	border-radius: 3px;
-	padding: 1px;}
-
-/* окно настроек конференции - кнопка уничтожения конференции */
-QWidget#tab_general QPushButton#pb_destroy {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding-left: 8px;
-	padding-right: 8px;}
-
-QWidget#tab_general QPushButton#pb_destroy:hover {
-	font-weight: bold;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.3 #FF0000, stop: 0.8 #FF0000, stop: 1 #8BF7FF);}
-
-QWidget#tab_general QPushButton#pb_destroy:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.1 #FF0000, stop: 0.9 #FF0000, stop: 1 #8BF7FF);}
-
-/* окно настроек конференции - настройки, названия опций */
-QWidget#tab_general QLabel {
-	background: argb(188,255,120,0);}
-
-/* окно настроек конференции - настройки, поля ввода */
-QWidget#tab_general QLineEdit {
-	color: #4BD7FF;
-	background: argb(182,200,80,40);
-	border: 1px inset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* окно настроек конференции - настройки, ниспадающие меню */
-QWidget#tab_general QComboBox {
-	color: #4BD7FF;
-	background: argb(182,200,80,40);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-QWidget#tab_general QComboBox::drop-down {
-	height: 20px;
-	border-left: 1px solid #2D9BB8;
-	background-color: argb(188,255,120,50);}
-
-QWidget#tab_general QComboBox::down-arrow {
-	width: 9px;
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowDown.png);}
-
-QWidget#tab_general QComboBox QAbstractItemView {
-	color: #4BD7FF;
-	selection-background-color: argb(188,255,120,70);
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(182,200,80,40);
-	border: 1px outset #3C7896;}
-
-/* скролл-бары */
-QScrollBar:vertical {
-	margin: 16px 2px 16px 2px;
-	background-color: argb(182,200,80,10);
-	width: 18px;}
-
-QScrollBar:horizontal {
-	margin: 1px 16px 1px 16px;
-	background-color: argb(182,200,80,10);
-	height: 18px;}
-
-QScrollBar::handle:vertical, QScrollBar::handle:horizontal {
-	border: 1px outset #3C7896;
-	border-radius: 2px;}
-
-/* скролл-бар, верхняя стрелка*/
-QScrollBar::sub-line:vertical {
-	margin-left: 1px;
-	margin-right: 1px;
-	height: 9px;
-	background-color: argb(182,200,80,40);
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowUp.png);
-	border: 1px outset #3C7896;
-	subcontrol-position: top;
-	subcontrol-origin: margin;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, нижняя стрелка*/
-QScrollBar::add-line:vertical {
-	margin-left: 1px;
-	margin-right: 1px;
-	height: 9px;
-	background-color: argb(182,200,80,40);
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowDown.png);
-	border: 1px outset #3C7896;
-	subcontrol-position: bottom;
-	subcontrol-origin: margin;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, левая стрелка*/
-QScrollBar::sub-line:horizontal {
-	margin-top: 1px;
-	margin-bottom: 1px;
-	width: 9px;
-	background-color: argb(182,200,80,40);
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowLeft.png);
-	border: 1px solid #3C7896;
-	subcontrol-position: left;
-	subcontrol-origin: margin;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, правая стрелка*/
-QScrollBar::add-line:horizontal {
-	margin-top: 1px;
-	margin-bottom: 1px;
-	width: 9px;
-	background-color: argb(182,200,80,40);
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowRight.png);
-	border: 1px solid #3C7896;
-	subcontrol-position: right;
-	subcontrol-origin: margin;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, стрелки при наведении мышкой */
-QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:horizontal:hover {
-	background-color: argb(182,200,80,100);}
-
-QScrollBar::add-line:vertical:hover, QScrollBar::add-line:horizontal:hover {
-	background-color: argb(182,200,80,100);}
-
-/* скролл-бар - подложка */
-QScrollBar::sub-page:vertical, QScrollBar::add-page:vertical, QScrollBar::sub-page:horizontal, QScrollBar::add-page:horizontal  {
-	background-color: argb(182,200,80,0);
-	border: 1px solid #012929;}
-
-/* скролл-бар в ростере конференции
-Q3ListView>QScrollBar:vertical {
-	width: 0px;} */
-
-/* всплывающие подсказки */
-QToolTip {
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: #001E1F;
-	border: 1px solid #0A373C;}
-
-/* диалоги предупреждения очистки чата и закрытия при непрочитанном сообщении */
-QMessageBox {
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(182,200,80,0);}
-
-/* кнопки диалоговых окон */
-QPushButton {
-	color: black;
-	height: 25px;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding-left: 8px;
-	padding-right: 8px;}
-
-QPushButton:hover {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.6 #0F97AC, stop: 1 #8BF7FF);}
-
-QPushButton:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px inset #3C7896;}
-
-/* чекбоксы */
-QCheckBox::indicator:checked {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/RadioButton.png);}
-
-QCheckBox::indicator:checked:hover {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/RadioButtonHover.png);}
-
-QCheckBox::indicator:unchecked {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/RadioButtonUnchecked.png);}
-
-QCheckBox::indicator:unchecked:hover {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/RadioButtonUncheckedHover.png);}
-
-/* панель поиска */
-TypeAheadFindBar {
-	margin: 0px;
-	padding: 2px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/TabBar.png) right top;
-	border: 1px outset #3C7896;
-	border-radius: 3px;}
-
-TypeAheadFindBar>QLineEdit {
-	margin-left: 1px;
-	margin-right: 1px;
-	color: #4BD7FF;
-	background: argb(182,200,80,40);
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-TypeAheadFindBar>QCheckBox {
-	margin-left: 3px;
-	color: #4BD7FF;
-	background: argb(182,200,80,0);}
-
-TypeAheadFindBar>QToolButton, TypeAheadFindBar>QToolButton:hover  {
-	color: #4BD7FF;
-	background-color: argb(182,200,80,0);
-	border: 0px;}
-
-/* редактор причин кик'и'бана */
-MUCReasonsEditor>QWidget {
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(182,200,80,0);}
-
-QLineEdit#txtReason {
-	color: #4BD7FF;
-	background: argb(182,200,80,0);
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-QListWidget#lstReasons {
-	background: argb(182,200,80,0);
-	selection-background-color: #207085;
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-MUCReasonsEditor>QPushButton#btnOk, MUCReasonsEditor>QPushButton#btnCancel {
-	color: black;
-	height: 25px;
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding-left: 8px;
-	padding-right: 8px;}
-
-MUCReasonsEditor>QPushButton:hover#btnOk, MUCReasonsEditor>QPushButton:hover#btnCancel {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.6 #0F97AC, stop: 1 #8BF7FF);}
-
-MUCReasonsEditor>QPushButton:pressed#btnOk, MUCReasonsEditor>QPushButton:pressed#btnCancel {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px inset #3C7896;}
-
-/* редактор шаблонов быстрой вставки/отправки */
-SendButtonTemplatesEditor>QWidget {
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(182,200,80,0);}
-
-QLineEdit#txtTemplate {
-	color: #4BD7FF;
-	background: argb(182,200,80,0);
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-QListWidget#lstTemplates {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-attachment: fixed;
-	background-color: argb(182,200,80,0);
-	selection-background-color: #207085;
-	border: 1px inset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-SendButtonTemplatesEditor>QPushButton#btnOk, SendButtonTemplatesEditor>QPushButton#btnCancel {
-	color: black;
-	height: 25px;
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding-left: 8px;
-	padding-right: 8px;}
-
-SendButtonTemplatesEditor>QPushButton:hover#btnOk, SendButtonTemplatesEditor>QPushButton:hover#btnCancel {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.6 #0F97AC, stop: 1 #8BF7FF);}
-
-SendButtonTemplatesEditor>QPushButton:pressed#btnOk, SendButtonTemplatesEditor>QPushButton:pressed#btnCancel {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px inset #3C7896;}
-
-/* меню */
-QMenu {
-	margin: 1px;
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(188,255,120,0);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 1px;}
-
-QMenu::disabled, QMenu::item:disabled:selected {
-	color: #3C7896;}
-
-QMenu::item {
-	padding: 2px 24px 2px 24px;
-	border: 1px solid transparent;}
-
-QMenu::item:selected {
-	color: #CFFFFF;
-	background-color: argb(188,255,120,70);}
-
-QMenu::icon {
-	background: argb(188,255,120,0);
-	border: 1px solid argb(188,255,120,0);
-	border-radius: 2px;
-	padding: 1px;}
-
-QMenu::icon:selected {
-	background: argb(188,255,120,0);
-	border: 1px solid argb(188,255,120,0);
-	border-radius: 2px;}
-
-QMenu::icon:selected:disabled {
-	background: argb(188,255,120,0);
-	border: 1px solid argb(188,255,120,0);
-	border-radius: 2px;}
-
-QMenu::icon:checked {
-	background: #012B2A;
-	border: 1px inset #207085;}
-
-QMenu::indicator:checked {
-	margin-left: 2px;
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/RadioButton.png);}
-
-QMenu::indicator:unchecked {
-	margin-left: 2px;
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/RadioButtonUnchecked.png);}
-
-QMenu::separator {
-	background-color: #3C7896;
-	height: 1px;}
-
-/* меню смайлов - подложка */
-IconSelectPopup {
-	margin: 0px;
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(188,255,120,0);
-	border: 1px outset #3C7896;}
-
-/* меню смайлов - иконки */
-IconSelectButton {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.5 #2A678C, stop: 1 #4BD7FF);}
-
-/* общий фрейм - заголовок окна с кастомной декорацией */
-QFrame#headerFrame {
-	margin-top: 4px;
-	margin-left: 4px;
-	margin-right: 4px;
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(188,255,120,0);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	height: 10px;
-	padding: 1px;}
-
-QToolButton#hideButton {
-	height: 10px;
-	margin-top: 2px;
-	margin-bottom: 2px;}
-
-QToolButton#maximizeButton {
-	height: 10px;
-	margin-top: 2px;
-	margin-bottom: 2px;}
-
-QToolButton#closeButton {
-	height: 10px;
-	margin-right: 2px;
-	margin-top: 2px;
-	margin-bottom: 2px;}</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">true</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>menu_add_contact</item>
-            <item>spacer</item>
-            <item>menu_account_setup</item>
-            <item>spacer</item>
-            <item>menu_disco</item>
-            <item>spacer</item>
-            <item>menu_xml_console</item>
-            <item>spacer</item>
-            <item>menu_change_profile</item>
-            <item>spacer</item>
-            <item>view_groups</item>
-            <item>spacer</item>
-            <item>help_about</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">2</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{fd4f2bcc-c40c-4bad-9a0a-6ce0a6620145}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">LunnaCat Advanced Panel</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">false</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{52669374-eefe-4f4e-8104-f2765ace3073}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">LunnaCat Notify Panel</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>button_options</item>
-            <item>menu_options</item>
-            <item>button_status</item>
-            <item>menu_join_groupchat</item>
-            <item>show_offline</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">2</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{3b7d4a97-0ff3-4118-9eb7-aa664bfd9b9c}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">LunnaCat General Panel</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">true</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAMEAAAKKAAAABAAAAAQAAAAIAAAACPwAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewBmAGQANABmADIAYgBjAGMALQBjADQAMABjAC0ANABiAGEAZAAtADkAYQAwAGEALQA2AGMAZQAwAGEANgA2ADIAMAAxADQANQB9AAAAAAD/////AAAAAAAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAMwBiADcAZAA0AGEAOQA3AC0AMABmAGYAMwAtADQAMQAxADgALQA5AGUAYgA3AC0AYQBhADYANgA0AGIAZgBkADkAYgA5AGMAfQEAAAAA/////wAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADUAMgA2ADYAOQAzADcANAAtAGUAZQBmAGUALQA0AGYANABlAC0AOAAxADAANAAtAGYAMgA3ADYANQBhAGMAZQAzADAANwAzAH0AAAAAAP////8AAAAAAAAAAA==</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.status type="QString">stafex_psi_mod.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">lunnacat.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">80</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">true</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">/* всё окно */
-QMainWindow {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Roster.png) left top;
-	background-color: argb(188,255,120,0);}
-
-/* frame of avatar - general settings */
-/* фрейм с аватаром - общие настройки */
-RosterAvatarFrame * {
-	border: 1px outset #3C7896;
-	border-radius: 3px;}
-
-/* frame of avatar - avatar */
-/* фрейм с аватаром - аватар */
-QLabel#lb_avatar {
-	margin-left: 1px;
-	margin-right: -1px;
-	margin-bottom: 0px;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.15 argb(188,255,120,80), stop: 0.5 argb(188,255,120,0) stop: 0.5 argb(188,255,120,0), stop: 0.85 argb(188,255,120,80), stop: 0.96 argb(188,255,120,0));
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;}
-
-/* frame of avatar - nick */
-/* фрейм с аватаром - ник */
-QLabel#lb_nick {
-	margin-top: 1px;
-	margin-left: -1px;
-	margin-right: 0px;
-	margin-bottom: 0px;
-	font-size: 13px;
-	font-weight: bold;
-	color: #4BD7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.25 argb(188,255,120,80), stop: 1 argb(188,255,120,0));
-	border-radius: 0px;
-	border-right: 0px;
-	border-bottom: 0px;}
-
-/* frame of avatar - buttons of PEP and status */
-/* фрейм с аватаром - кнопки PEP и статуса */
-QToolButton#tb_mood, #tb_activity {
-	margin-top: 0px;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.25 argb(188,255,120,80), stop: 1 argb(188,255,120,0));
-	width: 21px;
-	margin-bottom: -1px;
-	min-height: 27px;
-	border: 1px outset #3C7896;}
-
-QToolButton#tb_mood {
-	margin-left: 0px;
-	margin-right: 0px;
-	border-radius: 0px;
-	border-left: 0px;
-	border-right: 0px;}
-
-QToolButton#tb_activity {
-	margin-left: -1px;
-	border-left: 0px;
-	border-radius: 0px;
-	border-top-right-radius: 3px;}
-
-QToolButton#tb_status {
-	margin: -1px;
-	margin-bottom: 1px;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.75 argb(188,255,120,80), stop: 1 argb(188,255,120,0));
-	border-radius: 0px;
-	width: 100%;
-	height: 100%;}
-
-QToolButton#tb_mood:hover, #tb_activity:hover {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.25 argb(188,255,120,150), stop: 1 argb(188,255,120,0));}
-
-QToolButton#tb_status:hover {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.75 argb(188,255,120,150), stop: 1 argb(188,255,120,0));}
-
-QToolButton#tb_mood:pressed, #tb_activity:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.25 argb(188,255,120,250), stop: 1 argb(188,255,120,0));}
-
-QToolButton#tb_status:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.75 argb(188,255,120,250), stop: 1 argb(188,255,120,0));}
-
-/* frame of avatar - button of status, arrow */
-/* фрейм с аватаром - кнопка статуса, стрелка */
-QToolButton#tb_status::menu-indicator {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Dot.png);}
-
-/* frame of avatar - field of status message */
-/* фрейм с аватаром - строка статусного сообщения */
-QLineEdit#le_status_text {
-	margin-left: 0px;
-	margin-right: 1px;
-	margin-top: -1px;
-	margin-bottom: 0px;
-	font-size: 13px;
-	font-style: italic;
-	color: #5AB4E1;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.75 argb(188,255,120,80), stop: 1 argb(188,255,120,0));
-	border-left: 0px;
-	border-radius: 0px;
-	border-bottom-right-radius: 3px;
-	min-height: 21px;}
-
-QLineEdit#le_status_text:hover {
-	color: #5BE7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,0), stop: 0.75 argb(188,255,120,150), stop: 1 argb(188,255,120,0));}
-
-/* фрейм с контактами - внешний */
-QStackedWidget {
-	margin-top: 1px;
-	margin-left: 1px;
-	margin-right: 1px;
-	background-color: #0A373C;
-	border: 1px inset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* фрейм с контактами - внутренний */
-ContactListView {
-	background-color: #0A373C;
-	border: 0px;}
-
-/* фрейм с контактами - отфильтрованный */
-PsiFilteredContactListView {  }
-
-/* пропущенные события */
-MLabel {
-	margin-left: 1px;
-	margin-right: 1px;
-	color: #4BD7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.28 argb(188,255,120,40), stop: 0.8 argb(188,255,120,40), stop: 1 #4BD7FF);
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* тул-бары ( вариант QToolBar) */
-PsiToolBar {
-	margin: 3px;
-	border: 0px;}
-
-/* кнопки на тул-барах */
-QToolButton {
-	margin: 1px;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.36 #1A475C, stop: 0.7 #1A479C,stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 1px;}
-
-QToolButton:hover {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.5 #2A678C, stop: 1 #4BD7FF);}
-
-QToolButton:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.36 #1A475C, stop: 0.7 #1A479C,stop: 1 #4BD7FF);}
-
-QToolButton:checked {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #0B87BF, stop: 0.36 argb(188,255,120,60), stop: 0.7 argb(188,255,120,60), stop: 1 #0B87BF);
-	border: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 argb(188,255,120,255), stop: 0.36 #1A475C, stop: 0.7 #1A479C, stop: 1 argb(188,255,120,255));}
-
-/* кнопка статусов */
-PopupActionButton {
-	margin-left: 1px;
-	margin-right: 1px;
-	min-width: 41px;
-	max-height: 41px;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: -10px;}
-
-PopupActionButton::menu-indicator {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Dot.png);}
-
-PopupActionButton:hover {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.6 #0F97AC, stop: 1 #8BF7FF);}
-
-PopupActionButton:hover:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.6 #2A678C, stop: 1 #4BD7FF);}
-
-/* всплывающие подсказки */
-QToolTip {
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: #001E1F;
-	border: 1px solid #0A373C;}
-
-/* скролл-бары */
-QScrollBar:vertical {
-	margin: 16px 2px 16px 2px;
-	background-color: argb(182,200,80,10);
-	width: 18px;}
-
-QScrollBar:horizontal {
-	margin: 1px 16px 1px 16px;
-	background-color: argb(182,200,80,10);
-	height: 18px;}
-
-QScrollBar::handle:vertical, QScrollBar::handle:horizontal {
-	border: 1px outset #3C7896;
-	border-radius: 2px;}
-
-/* скролл-бар, верхняя стрелка*/
-QScrollBar::sub-line:vertical {
-	margin-left: 1px;
-	margin-right: 1px;
-	height: 9px;
-	background-color: argb(182,200,80,40);
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowUp.png);
-	border: 1px outset #3C7896;
-	subcontrol-position: top;
-	subcontrol-origin: margin;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, нижняя стрелка*/
-QScrollBar::add-line:vertical {
-	margin-left: 1px;
-	margin-right: 1px;
-	height: 9px;
-	background-color: argb(182,200,80,40);
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowDown.png);
-	border: 1px outset #3C7896;
-	subcontrol-position: bottom;
-	subcontrol-origin: margin;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, левая стрелка*/
-QScrollBar::sub-line:horizontal {
-	margin-top: 1px;
-	margin-bottom: 1px;
-	width: 9px;
-	background-color: argb(182,200,80,40);
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowLeft.png);
-	border: 1px solid #3C7896;
-	subcontrol-position: left;
-	subcontrol-origin: margin;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, правая стрелка*/
-QScrollBar::add-line:horizontal {
-	margin-top: 1px;
-	margin-bottom: 1px;
-	width: 9px;
-	background-color: argb(182,200,80,40);
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowRight.png);
-	border: 1px solid #3C7896;
-	subcontrol-position: right;
-	subcontrol-origin: margin;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, стрелки при наведении мышкой */
-QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:horizontal:hover {
-	background-color: argb(182,200,80,100);}
-
-QScrollBar::add-line:vertical:hover, QScrollBar::add-line:horizontal:hover {
-	background-color: argb(182,200,80,100);}
-
-/* скролл-бар - подложка */
-QScrollBar::sub-page:vertical, QScrollBar::add-page:vertical, QScrollBar::sub-page:horizontal, QScrollBar::add-page:horizontal  {
-	background-color: argb(182,200,80,0);
-	border: 1px solid #012929;}
-
-/* выделенный элемент ростера */
-QTreeView {
-	selection-color: #CFFFFF;
-	selection-background-color: #207085;}
-
-/* меню
-ContactListItemMenu {  } */
-
-/* индикатор меню */
-QToolButton::menu-indicator {
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Dot.png);}
-
-/* переименование контакта */
-QLineEdit {
-	color: #4BD7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.12 #001D20, stop: 0.9 #001D20, stop: 1 #4BD7FF);
-	selection-background-color: #678DB2;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* фильтр */
-QStackedWidget>QWidget>QLineEdit {
-	color: #4BD7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.28 #001D20, stop: 0.8 #001D20, stop: 1 #4BD7FF);}
-
-/* меню */
-QMenu {
-	margin: 1px;
-	color: #4BD7FF;
-	selection-color: red;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(188,255,120,0);
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 1px;}
-
-QMenu::disabled, QMenu::item:disabled:selected {
-	color: #3C7896;}
-
-QMenu::item {
-	padding: 2px 24px 2px 24px;
-	border: 1px solid transparent;}
-
-QMenu::item:selected {
-	color: #CFFFFF;
-	background-color: argb(188,255,120,70);}
-
-QMenu::icon {
-	background: argb(188,255,120,0);
-	border: 1px solid argb(188,255,120,0);
-	border-radius: 2px;
-	padding: 1px;}
-
-QMenu::icon:selected {
-	background: argb(188,255,120,0);
-	border: 1px solid argb(188,255,120,0);
-	border-radius: 2px;}
-
-QMenu::icon:selected:disabled {
-	background: argb(188,255,120,0);
-	border: 1px solid argb(188,255,120,0);
-	border-radius: 2px;}
-
-QMenu::icon:checked {
-	background: #012B2A;
-	border: 1px inset #207085;}
-
-QMenu::indicator:checked {
-	margin-left: 2px;
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/RadioButton.png);}
-
-QMenu::indicator:unchecked {
-	margin-left: 2px;
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/RadioButtonUnchecked.png);}
-
-QMenu::separator {
-	background-color: #3C7896;
-	height: 1px;}
-</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show-activity-icons type="bool">true</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">true</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">false</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">true</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">true</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">true</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString">/* всплывающие подсказки */
-QFrame {
-	color: #4BD7FF;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(188,255,120,0);
-	border: 1px solid #004060;
-	padding-bottom: -2px;
-	padding-right: -2px;}</options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">true</options.ui.contactlist.use-transport-icons>
-        <options.ui.mac.use-brushed-metal-windows type="bool">true</options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray">AAAA/wAAAAAAAAABAAAA4gEAAAAGAQAAAAE=</options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type="QSize">
-            <width>862</width>
-            <height>742</height>
-        </options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">true</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">/* Фрейм в целом */
-QWidget {
-	color: #4BD7FF;}
-
-QFrame#Frame {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	border: 1px outset #3C7896;
-	border-radius: 3px;}
-
-/* Фрейм слева от иконки */
-QLabel#lb_top1 {
-	background: argb(188,255,120,0);
-	border: 0px;}
-
-/* Иконка */
-IconLabel#lb_icon {
-	background: argb(188,255,120,0);
-	border: 0px;}
-
-/* Заголовок */
-QLabel#lb_title {
-	color: #4BD7FF;
-	background: argb(188,255,120,0);
-	border: 0px;}
-
-/* Фрейм с кнопкой */
-QFrame#closeFrame {
-	background: argb(188,255,120,0);
-	border: 0px;}
-
-/* Кнопка */
-QToolButton#closeButton {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/TabCloseButton.png) center no-repeat;
-	icon-size: 0px;
-	border: 0px;}
-
-QToolButton#closeButton:hover {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/TabCloseButtonHover.png) center no-repeat;}
-
-QToolButton#closeButton:pressed {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/TabCloseButtonPressed.png) center no-repeat;}
-
-/* Фрейм слева от аватара */
-QLabel#lb_mid1 {
-	background: argb(188,255,120,0);
-	border: 0px;}
-
-/* Фрейм справа от аватара */
-QLabel#lb_mid2 {
-	background: argb(188,255,120,0);
-	border: 0px;}
-
-/* Нижний фрейм */
-QLabel#lb_bottom1 {
-	max-height: 0px;
-	background: argb(188,255,120,0);
-	border: 0px;}</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">true</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">true</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">true</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>#D22A21</item>
-            <item>#D23818</item>
-            <item>#B84CD2</item>
-            <item>#A904D2</item>
-            <item>#804A18</item>
-            <item>#477C94</item>
-            <item>#0050D2</item>
-            <item>#2C5AD2</item>
-            <item>#0070D2</item>
-            <item>#2484D2</item>
-            <item>#05aa96</item>
-            <item>#3AD220</item>
-            <item>#00D246</item>
-            <item>#70CE04</item>
-            <item>#6AD204</item>
-            <item>#16B903</item>
-            <item>#05d219</item>
-            <item>#D2D234</item>
-            <item>#989719</item>
-            <item>#c89614</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">56</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">0</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">planets-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/LunnaCat_Classic_1.1</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">false</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.decorate-windows type="bool">false</options.ui.decorate-windows>
-        <options.ui.look.colors.chat.composing-color type="QColor">#9fffff</options.ui.look.colors.chat.composing-color>
-        <options.ui.look.colors.chat.unread-message-color type="QColor">#00d246</options.ui.look.colors.chat.unread-message-color>
-        <options.ui.look.colors.contactlist.status-change-animation1 type="QColor">#b5e5e5</options.ui.look.colors.contactlist.status-change-animation1>
-        <options.ui.look.colors.contactlist.status-change-animation2 type="QColor">#3c7896</options.ui.look.colors.contactlist.status-change-animation2>
-    </options>
-</skin>

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MaximizeButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MaximizeButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MaximizeButtonPressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MinimizeButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MinimizeButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MinimizeButtonPressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/RadioButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/RadioButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/RadioButtonUnchecked.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/RadioButtonUncheckedHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/Roster.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ScrollBarArrowDown.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ScrollBarArrowLeft.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ScrollBarArrowRight.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ScrollBarArrowUp.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterH.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterHH.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterHP.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterV.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterVH.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterVP.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/TabBar.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/TabCloseButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/TabCloseButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/TabCloseButtonPressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/Tooltip.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/black_theme Deleted

psi-plus-resources-1.tar.xz/skins/universal/black_theme/black_theme.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/black_theme/black_theme.skn Deleted

@@ -1,577 +0,0 @@
-<skin version="0.5" author="tux-den" name="Black theme">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f0f0f0</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#5a5a5a</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#969696</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff000b</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#000000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#000000</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#000000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#cfcfcf</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">3</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">25</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QWidget {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c5c5c5, stop: 0.3 #bfbfbf, stop: 0.5 #b5b5b5, stop: 0.8 #ababab, stop: 1.0 #a6a6a6);
-     border: 4px solid #c5c5c5; 
-     border-bottom-color: #a6a6a6;
-}
-
-QScrollBar:vertical {
-     background-color: #ebebeb;
-     border: 2px solid #cdcdcd;
-     border-bottom-color: #cdcdcd;
-}
-
-QScrollBar::handle:vertical {
-     background-color: #c5c5c5;
-     border: 2px solid #f5f5f5;
-     border-bottom-color: #f5f5f5;
-}
-
-QScrollBar::add-line:vertical {
-     border: 0px; height: 0px;
-     subcontrol-position: bottom;
-}
-
-QScrollBar::sub-line:vertical {
-     border: 0px; height: 0px;
-     subcontrol-position: top;
-}
-
-QScrollBar:horizontall {
-     background-color: #ebebeb;
-     border: 1px solid #cdcdcd;
-     border-bottom-color: #cdcdcd;
-}
-
-QScrollBar::handle:horizontall {
-     background-color: #c5c5c5;
-     border: 2px solid #f5f5f5;
-     border-bottom-color: #f5f5f5;
-}
-
-QScrollBar::add-line:horizontall {
-     border: 0px; height: 0px;
-     subcontrol-position: bottom;
-}
-
-QScrollBar::sub-line:horizontall {
-     border: 0px; height: 0px;
-     subcontrol-position: top;
-}
-
-QToolBar {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c5c5c5, stop: 0.3 #bfbfbf, stop: 0.5 #b5b5b5, stop: 0.8 #ababab, stop: 1.0 #a6a6a6);
-     border: 3px solid #c5c5c5; 
-     border-bottom-color: #a6a6a6;  
-     border-top-left-radius: 4px; 
-     border-bottom-left-radius: 4px; 
-     border-bottom-right-radius: 4px; 
-     border-top-right-radius: 4px; 
-}
-
-QTabBar::tab:selected { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #eaf1fb, stop: 0.4 #b7d4f4, stop: 0.5 #7cb6e9, stop: 1.0 #c9f9ff); 
-     border: 1px solid #3c3396; 
-     border-bottom-color: #55697b; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-     padding: 5px; 
-}
-
-QToolTip { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 1.5px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-} 
-
-QToolButton  { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #f4f4f3, stop: 0.3 #f1f1f1, stop: 0.5 #d1d0d0, stop: 0.7 #bbbaba, stop: 1.0 #9d9c9b); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-radius: 4px; 
-     width: 30px; 
-     height: 22px; 
-}
-
-QToolButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-top-left-radius: 4px; 
-     border-bottom-left-radius: 4px; 
-     border-bottom-right-radius: 4px; 
-     border-top-right-radius: 4px; 
-     width: 30px; 
-     height: 22px; 
-} 
-
-QToolButton:checked { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-top-left-radius: 4px; 
-     border-bottom-left-radius: 4px; 
-     border-bottom-right-radius: 4px; 
-     border-top-right-radius: 4px; 
-     width: 30px; 
-     height: 22px; 
-}
-
-QPushButton { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fcfcfc, stop: 0.3 #f5f5f5, stop: 0.4 #f0efef, stop: 0.5 #e5e6e5, stop: 0.7 #ffffff, stop: 1.0 #ffffff); 
-     border: 1.4px solid #5c5c5c; 
-     border-bottom-color: #5c5c5c; 
-     width: 120px; 
-     height: 20px; 
-     border-radius: 11px; 
-} 
-
-QPushButton:hover:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3c5e1, stop: 0.3 #95bbdf, stop: 0.4 #82b1dd, stop: 0.5 #69a2d7, stop: 0.7 #87b6e3, stop: 1.0 #b3e2f7); 
-     border: 1px solid #1b008c; 
-     border-bottom-color: #5b5b5b; 
-     width: 80px; height: 2px; 
-     border-top-left-radius: 11px; 
-     border-bottom-left-radius: 11px; 
-     border-bottom-right-radius: 11px; 
-     border-top-right-radius: 11px; 
-}
-
-QPushButton#pb_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fcfcfc, stop: 0.3 #f5f5f5, stop: 0.4 #f0efef, stop: 0.5 #e5e6e5, stop: 0.7 #ffffff, stop: 1.0 #ffffff); 
-     border: 1.4px solid #5c5c5c; 
-     border-bottom-color: #5c5c5c; 
-     width: 65px; 
-     height: 20px; 
-     border-top-left-radius: 11px; 
-     border-bottom-left-radius: 11px; 
-     border-bottom-right-radius: 11px; 
-     border-top-right-radius: 11px; 
-     margin:7px; 
-} 
-
-QPushButton:hover:pressed#pb_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3c5e1, stop: 0.3 #95bbdf, stop: 0.4 #82b1dd, stop: 0.5 #69a2d7, stop: 0.7 #87b6e3, stop: 1.0 #b3e2f7); 
-     border: 1px solid #1b008c; 
-     border-bottom-color: #5b5b5b; 
-     width: 80px; 
-     height: 2px; 
-     border-top-left-radius: 11px; 
-     border-bottom-left-radius: 11px; 
-     border-bottom-right-radius: 11px; 
-     border-top-right-radius: 11px; 
-}
-
-QLineEdit { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 3px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px;
-} 
-
-QTextEdit { 
-     background-color: #f5f5f5; 
-     border: 3px solid #c8c8c8; 
-     border-bottom-color: #c8c8c8; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-} 
-
-QFrame#log { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #f5f5f5, stop: 0.7 #f5f5f5, stop: 1.0 #f5f5f5); 
-     border: 1px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-     min-width: 5ex; 
-     padding: 2px; 
-}
-
-Q3ListView { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 1px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-     min-width: 5ex; 
-     padding: 2px; 
-} 
-
-QLabel { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 3px solid #c8c8c8; 
-     border-bottom-color: #ececec;
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-} 
-
-QLabel#lb_status { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 0px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-} 
-
-Q3ListView * { 
-     background-color: #f5f5f5; 
-}
-
-QPushButton#pb_send { 
-     width: 0px; 
-     height: 0px; 
-     margin: -35px; 
-     min-width: 0ex; 
-     padding: 0px; 
-}
-
-QWidget#avatar { 
-     background-color: #f5f5f5; 
-     border: 3px solid #c8c8c8; 
-     border-bottom-color: #c8c8c8; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-}
-
-QLabel#lb_client { 
-     background: argb(0,0,0,0); 
-     border: 0px solid #ffffff; 
-}
-
-QToolButton::menu-indicator {
-     image: none; 
-}
-
-QWidget#pte_topic {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 1px solid #4a4949; 
-}
-
-QFrame#tv_affiliations {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 1px solid #4a4949; 
-}
-
-</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAOQAAAKsAAAABAAAAAQAAAAIAAAACPwAAAAEAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewBjADMAOABkADkAMwAwADcALQAxADMAZQBkAC0ANAA5AGUAMQAtAGIAZQA3ADMALQAwADIAYwA1AGIAMwA0AGUAZgAyAGQANgB9AQAAAAD/////AAAAAAAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADEAMwAwAGIAMwA1ADYAYwAtAGYAZQA3ADUALQA0AGMANAA5AC0AOAA2AGQANQAtADcAYQBkADYAZgAzADUAMwA4AGQANAA2AH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsANgBkADIAMgBhADkANwBmAC0AMgA3ADYAZgAtADQAMABjADAALQA5AGQAYwAwAC0AMgAwAGIAMgA2ADkANgBmAGMAYwA5AGIAfQEAAAAA/////wAAAAAAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA2ADgAOAA5ADYAOAA5ADYALQAyAGQAMgAzAC0ANAAwAGYAMwAtADkANQBkADcALQA2AGYAZQBjAGQAYgAwADgANwAxADYAMgB9AAAAAAD/////AAAAAAAAAAA=</options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>spacer</item>
-            <item>status_all</item>
-            <item>spacer</item>
-            <item>button_options</item>
-            <item>spacer</item>
-            <item>menu_options</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">2</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{c38d9307-13ed-49e1-be73-02c5b34ef2d6}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Status</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>spacer</item>
-            <item>show_offline</item>
-            <item>spacer</item>
-            <item>show_statusmsg</item>
-            <item>spacer</item>
-            <item>menu_join_groupchat</item>
-            <item>spacer</item>
-            <item>show_agents</item>
-            <item>spacer</item>
-            <item>enable_groups</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{130b356c-fe75-4c49-86d5-7ad6f3538d46}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>separator</item>
-            <item>event_notifier</item>
-            <item>separator</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{68896896-2d23-40f3-95d7-6fecdb087162}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAMYAAAKZAAAABAAAAAQAAAAIAAAACPwAAAAxAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewAxADMAMABiADMANQA2AGMALQBmAGUANwA1AC0ANABjADQAOQAtADgANgBkADUALQA3AGEAZAA2AGYAMwA1ADMAOABkADQANgB9AQAAAAD/////AAAAAAAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAYwAzADgAZAA5ADMAMAA3AC0AMQAzAGUAZAAtADQAOQBlADEALQBiAGUANwAzAC0AMAAyAGMANQBiADMANABlAGYAMgBkADYAfQEAAAAA/////wAAAAAAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA2ADgAOAA5ADYAOAA5ADYALQAyAGQAMgAzAC0ANAAwAGYAMwAtADkANQBkADcALQA2AGYAZQBjAGQAYgAwADgANwAxADYAMgB9AAAAAAD/////AAAAAAAAAAA=</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities-16.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">blackroster.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">blacksys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">65</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QToolButton  { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #f4f4f3, stop: 0.3 #f1f1f1, stop: 0.5 #d1d0d0, stop: 0.7 #bbbaba, stop: 1.0 #9d9c9b); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-radius: 4px;  
-     width: 30px; 
-     height: 22px;
-} 
-
-QToolButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-radius: 4px; 
-     width: 30px; 
-     height: 22px;
-} 
-
-QToolButton:checked { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece); 
-     border: 1px solid #4a4949; border-bottom-color: #4a4949; 
-     border-radius: 4px; 
-     width: 30px; 
-     height: 22px;
-}
-
-PopupActionButton { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fcfcfc, stop: 0.3 #f5f5f5, stop: 0.4 #f0efef, stop: 0.5 #e5e6e5, stop: 0.7 #ffffff, stop: 1.0 #ffffff); 
-     border: 1.4px solid #5c5c5c; 
-     border-bottom-color: #5c5c5c; 
-     border-radius: 11px; 
-     width: 75px; 
-     height: 20px; 
-     margin: 1.5px;
-} 
-
-PopupActionButton:hover:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3c5e1, stop: 0.3 #95bbdf, stop: 0.4 #82b1dd, stop: 0.5 #69a2d7, stop: 0.7 #87b6e3, stop: 1.0 #b3e2f7); 
-     border: 1px solid #1b008c; 
-     border-bottom-color: #5b5b5b; 
-     width: 80px; 
-     height: 2px; 
-     border-radius: 11px; 
-}  
-
-QToolBar { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c5c5c5, stop: 0.3 #bfbfbf, stop: 0.5 #b5b5b5, stop: 0.8 #ababab, stop: 1.0 #a6a6a6); 
-     border: 7px solid #c5c5c5; 
-     border-bottom-color: #a6a6a6;
-}
-
-QToolTip { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 1.3px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-}
-
-QLabel#lb_avatar { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 1px solid #8b8b8b;  
-     border-radius: 5px; 
-} 
-
-QLineEdit { 
-    background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #f4f4f3, stop: 0.3 #f1f1f1, stop: 0.5 #d1d0d0, stop: 0.7 #bbbaba, stop: 1.0 #9d9c9b); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-top-left-radius: 0px; 
-     border-top-right-radius: 4px; 
-     border-bottom-left-radius: 0px;
-     border-bottom-right-radius: 4px;  
-     padding-right: 3px;
-     margin: 3px 0px 2px 0px;
-} 
-
-QLabel#lb_nick { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 2px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-     border-radius: 5px; 
-     margin: 2px 2px 2px 2px;
-} 
-
-QMainWindow { 
-     background: #bfbfbf; 
-     border: 7px solid #c5c5c5; 
-     border-bottom-color: #a6a6a6; 
-}
-
-QToolButton::menu-indicator {
-     image: none; 
-}
-
-PopupActionButton::menu-indicator {
-     image: none; 
-}
-
-QStackedWidget>QWidget>QLineEdit {  
-     border-top-left-radius: 6px;
-     border-bottom-left-radius: 6px;
-     padding-left: 6px;
-     padding-right: 6px;
-     margin-bottom: 3px;
-}
-
-QToolButton#tb_status {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #f4f4f3, stop: 0.3 #f1f1f1, stop: 0.5 #d1d0d0, stop: 0.7 #bbbaba, stop: 1.0 #9d9c9b); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-top-left-radius: 4px; 
-     border-top-right-radius: 0px; 
-     border-bottom-left-radius: 4px;
-     border-bottom-right-radius: 0px;  
-     margin: 3px -1px 3px 4px;
-     width: 15px; 
-     height: 15px;
-     icon-size: 14px;
-     padding-left: 2px;
-     padding-right: 1px;
-}
-
-QToolButton:pressed#tb_status {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-radius: 4px; 
-}
-
-QToolButton#tb_activity {
-     margin-bottom: 2px;
-     margin-top: 3px;
-     margin-left: 2px;
-     max-width: 23px;
-}
-
-QToolButton#tb_mood { 
-     margin-bottom: 2px; 
-     margin-top: 3px;
-     max-width: 23px;
-}		
-
-QTreeView { 
-     alternate-background-color: argb(0,0,0,0);
-}
-
-</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">false</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">false</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">false</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">false</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type="bool">false</options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type="QSize">
-            <width>714</width>
-            <height>798</height>
-        </options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString"></options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">false</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">52</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">3</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">black-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/classic</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">true</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-    </options>
-</skin>
-

psi-plus-resources-1.tar.xz/skins/universal/blue_skin Deleted

psi-plus-resources-1.tar.xz/skins/universal/blue_skin/blue_skin.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/blue_skin/blue_skin.skn Deleted

@@ -1,204 +0,0 @@
-<skin version="1.1" path="/home/hryukin/.psi/skins/universal" author="Dealer_WeARE" name="Blue_skin">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#2c9dff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#b5e3ff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#9cbaff</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QString">#00007f</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QString">#375cff</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#000000</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QString">#000000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QString">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QString">#0055ff</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4f64c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#00007f</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#aa0000</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#5555ff</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#22603e</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#910000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#00008a</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#336600</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#a9b5ff</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#a9bcff</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">true</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">32</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QFrame { background-color: #b4ccff; border: 1px solid blue; border-radius: 6px; padding: 2px}
-QToolButton { background-color: #e9edff; border: 1px solid blue; border-radius: 4px; padding: 2px}
-QToolButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-QToolButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}
-QToolButton:checked {border-top: 2px solid blue; border-left: 2px solid blue; padding-bottom: 1px; padding-right: 1px; background-color: #aebece}
-QLabel { background-color: #b5e3ff }
-QLabel#lb_status {background-color: #b4ccff; border: 0px; ; border-radius: 0px; padding: 0px }
-QLabel#lb_client {background-color: #b4ccff; border: 0px; ; border-radius: 0px; padding: 0px }
-QToolBar { background-color: #b5e3ff; border: 1px solid blue; border-radius: 4px; padding: 2px } 
-QTextEdit { background-color: #eefeff } 
-QLineEdit { background-color: #e9edff; border: 1px solid blue; border-radius: 6px; padding: 2px }
-QPushButton { background-color: #e9edff; border: 1px solid blue; border-radius: 4px; } 
-QPushButton#pb_topic { border-radius: 0px }
-QPushButton:hover:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}
-QPushButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-Q3ListView * { background-color: #e9edff; }
-QFrame#log * { background-color: #eefeff } 
-QTabBar::tab { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,  stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,   stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);   border: 2px solid #C4C4C3;  border-bottom-color: #C2C7CB;   border-top-left-radius: 4px;border-top-right-radius: 4px;  min-width: 8ex;  padding: 2px }
-QTabBar::tab:selected, QTabBar::tab:hover { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fafafa, stop: 0.4 #f4f4f4, stop: 0.5 #e7e7e7, stop: 1.0 #fafafa) }
-QTabBar::tab:selected { border-color: #9B9B9B;  border-bottom-color: #C2C7CB }
-QToolTip {background-color: #a9bcff;   border: 2px solid blue;         padding: 2px;  border-radius: 4px; }
-QMenu {background-color: #a9bcff;  border: 1px solid blue}
-QMenu::item { background-color: #a9bcff; border: 1px solid transparent; padding: 2px 25px 2px 20px;}
-QMenu::item:selected {background-color: #e9edff; border-color: darkblue;}
-QMenu::separator { height: 2px; background: lightblue;  }
-QMenu::item:checked { background-color: #e9edff }
-TabDlg { background-color: #b4ccff; }</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.look.font.chat type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</options.ui.look.font.chat>
-        <options.ui.look.font.contactlist type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</options.ui.look.font.contactlist>
-        <options.ui.look.font.message type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</options.ui.look.font.message>
-        <options.ui.look.font.passive-popup type="QString">Sans Serif,8,-1,5,50,0,0,0,0,0</options.ui.look.font.passive-popup>
-        <options.ui.contactlist.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAOgAAAKnAAAABAAAAAQAAAAIAAAACPwAAAAMAAAAAAAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA1ADMANQA2ADMAOAAxAGMALQBiADgANwBmAC0ANAA5AGIAMAAtADkAMwBmADAALQBhADgAZgAwADkAMwBmAGQAYQA5AGEAMAB9AwAAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAYQAzADIAMgAwADAAMgA4AC0AZQBhAGMAMgAtADQAZQBhAGIALQA5ADAAMABlAC0AMAAzADUAZABkAGYAYQA3AGYANgBiADcAfQMAAAAA/////wAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGYAYQA1ADIAYwA1AGEAMAAtADgAYgA5AGMALQA0ADEAZQA2AC0AOABhADIAYgAtAGEANAA5ADgAOAA3ADcAZgA5ADkAMwAwAH0BAAAAAP////8AAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewBkAGMAYwA4ADgAZQBmADkALQA4ADIAMQAwAC0ANAAyADEAZgAtAGIAMgA0AGQALQBiADkAMgBmADQAZgA5ADUANwA1AGIANgB9AQAAAAD/////AAAAAAAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADQAZQBkADcAYgBiADAAMgAtADIANQA5AGIALQA0ADgAMwBkAC0AYQA4ADYANQAtADYAMAAzADUAOABhAGQAOABlADIAMwBmAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAYgAxADQAYQA1AGYAYwBiAC0AMwA5AGYANwAtADQAMgA3AGUALQA4ADQANQBjAC0AZgA2ADAAYwA2ADIAMABiAGMAZgBmAGQAfQEAAAAAAAAAsgAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADAAOQAzADYANQA5AGEAZgAtADkAZAA0ADgALQA0ADUAMwBhAC0AOQAwAGEANgAtAGQAMwBlADEAMQBmAGYANwBlADUAOABhAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAOQA2AGUAMAAyADIAZAA4AC0ANwA4AGEAMQAtADQAYQBmADMALQA5ADQAOQAzAC0AMQAzADIAMgAxADAANABhAGYAYwBlADUAfQAAAAAA/////wAAAAAAAAAA</options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_options</item>
-            <item>separator</item>
-            <item>button_status</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{b14a5fcb-39f7-427e-845c-f60c620bcffd}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Buttons</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>spacer</item>
-            <item>menu_options</item>
-            <item>spacer</item>
-            <item>menu_account_setup</item>
-            <item>spacer</item>
-            <item>menu_join_groupchat</item>
-            <item>spacer</item>
-            <item>set_geoloc</item>
-            <item>spacer</item>
-            <item>view_groups</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{093659af-9d48-453a-90a6-d3e11ff7e58a}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Show contacts</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{96e022d8-78a1-4af3-9493-1322104afce5}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Event notifier</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAOsAAANpAAAABAAAAAQAAAAIAAAACPwAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA5ADYAZQAwADIAMgBkADgALQA3ADgAYQAxAC0ANABhAGYAMwAtADkANAA5ADMALQAxADMAMgAyADEAMAA0AGEAZgBjAGUANQB9AAAAAAD/////AAAAAAAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGIAMQA0AGEANQBmAGMAYgAtADMAOQBmADcALQA0ADIANwBlAC0AOAA0ADUAYwAtAGYANgAwAGMANgAyADAAYgBjAGYAZgBkAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAMAA5ADMANgA1ADkAYQBmAC0AOQBkADQAOAAtADQANQAzAGEALQA5ADAAYQA2AC0AZAAzAGUAMQAxAGYAZgA3AGUANQA4AGEAfQEAAAAA/////wAAAAAAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">default</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.emoticons type="QStringList">
-            <item>quip.jisp</item>
-        </options.iconsets.emoticons>
-        <options.iconsets.moods type="QString">rederick-moods-16.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">stafex_psi_mod.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">oxygen_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">64</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">true</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QMainWindow {background-color: #b4ccff}
-QToolTip {background-color: #a9bcff;   border: 2px solid blue;         padding: 2px;  border-radius: 4px; }
-QToolButton { background-color: #e9edff; border: 1px solid blue; border-radius: 4px; padding: 3px; } 
-QToolButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-QToolButton:checked {border-top: 2px solid blue; border-left: 2px solid blue; padding-bottom: 1px; padding-right: 1px; background-color: #aebece}
-QToolButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}
-QFrame { background-color: #b5e3ff; border: 1px solid blue; border-radius: 6px; padding: 3px} 
-QToolBar { background-color: #b5e3ff; border: 1px solid blue; border-radius: 6px; padding: 4px; margin: 2px; margin-bottom: 1px}
-QToolBar > QToolButton { padding-left: 11px; padding-right: 11px; }
-QPushButton { background-color: #e9edff; border: 1px solid blue; border-radius: 6px;  padding: 6px; }
-QPushButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-QPushButton:hover:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}
-QToolButton::checked {background-color: #b5c8df; }
-QMenu  {background-color: #a9bcff;  border: 1px solid blue}
-QMenu::item { background-color: #a9bcff; border: 1px solid transparent; padding: 2px 25px 2px 20px;}
-QMenu::item:selected {background-color: #e9edff; border-color: darkblue;}
-QMenu::separator { height: 2px; background: lightblue;  }
-QMenu::item:checked { background-color: #e9edff }
-QLineEdit { background-color: #e9edff; border: 1px solid blue; border-radius: 6px; padding: 2px }
-QLabel#lb_avatar { background-color: #b4ccff; border: 0px; padding: 0px;}
-QLabel#lb_nick { background-color: #b4ccff; border: 0px}
-QTreeView { selection-background-color:  white; selection-color: black }
-QStackedWidget { background-color: blue; padding: 0px; border: 0px}</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">true</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">true</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">true</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">true</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">true</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString">QFrame {background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 #a9bcff); border: 1px solid blue; }</options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">false</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">true</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type="bool">false</options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray">AAAA/wAAAAAAAAABAAABJwEAAAAGAQAAAAE=</options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type=""></options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">true</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">QFrame {background-color: #a9b5ff } QToolButton { background-color: #e9edff; border: 1px solid blue; border-radius: 2px}
-QToolButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-QToolButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">true</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">true</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item></item>
-            <item>#aa0000</item>
-            <item>#5500ff</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">true</options.ui.muc.roster-nick-coloring>
-    </options>
-</skin>

psi-plus-resources-1.tar.xz/skins/universal/night Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/bottom.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/bottom_press.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/gr.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/gree.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/green.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/left.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/left_press.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/logo.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/night.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/night.skn Deleted

@@ -1,984 +0,0 @@
-<skin version="0.4" path="C:/Program Files/Psi+/skins/universal/night" author="tux-den" name="Night">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#b1ad84</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#c7caae</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#004209</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#555555</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#8a8a8a</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#e6e6e6</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#e6e6e6</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#8d8d8d</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#e6e6e6</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#bebebe</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#cb7273</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#6fb17a</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#939393</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#e6e6e6</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#e6e6e6</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#e6e6e6</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#e6e6e6</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#000000</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">27</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">TabDlg {
-	background: #11140f;
-	border: none;
-}
-
-PsiTabBar {
-	background: url(C:/Program Files/Psi+/skins/universal/night/gr.png) repeat-x qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #11140f, stop: 1.0 #000000) ;
-	padding-top: 20px;
-	border-left: 3px solid #777777;
-	border-right: 3px solid #777777;
-	border-bottom: 2px solid argb(0,0,100,250);
-	alignment: center;
-}
-
-QToolBar {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,250,200);
-}
-
-QToolBar#toolbar {
-	background: url(C:/Program Files/Psi+/skins/universal/night/gr.png) repeat-x;
-	border: 1px solid argb(0,0,100,150);
-	border-radius: 3px;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-	padding: 0px;
-}
-
-QWidget#pte_topic {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-}
-
-GroupchatTopicDlg {
-	background: #11140f;
-	border: none
-}
-
-QDialog#MUCConfig {
-	background: #11140f;
-	border: none;
-}
-
-QLineEdit#le_filter {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200)
-}
-
-QWidget#tab_affiliations {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200)
-}
-
-QWidget#tab_general {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200)
-}
-
-QFrame#tv_affiliations {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-}
-
-QFrame#log {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-	margin-left: 2px;
-	margin-right: 2px;
-}
-
-QFrame#topFrame {
-	background: #11140f;
-	border-left: 3px solid #777777;
-	border-right: 3px solid #777777;
-	margin-right: 0px;
-}
-
-QDialog {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-}
-
-QDialog>QFrame {
-	color: #ffffff;
-}
-
-QDialog>QLineEdit {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-}
-
-QWidget#bottomFrame {
-	background: #11140f;
-	border-left: 3px solid #777777;
-	border-right: 3px solid #777777;
-	border-bottom: 3px solid #777777;
-}
-
-QWidget#bottomFrame>QWidget>QTextEdit {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	border-radius: 5px;
-	color:  #ffffff;
-	margin-left: 4px;
-	margin-bottom: 4px;
-	margin-right: 4px;
-}
-
-QToolButton {
-	background: argb(0,0,50,100);
-	border: 1px solid #cccccc;
-	border-radius: 4px;
-	width: 22px;
-	height: 18px;
-	margin-left: 4px;
-	margin-right: 4px;
-	margin-top: 2px;
-	margin-bottom: 2px;
-}
-
-QToolButton:hover {
-	background: argb(0,0,100,150);
-	border-radius: 4px;	
-}
-
-QToolButton:pressed {
-	background: argb(0,0,250,130);
-}
-
-QToolButton:checked {
-	background: argb(0,0,250,130);
-	border-radius: 4px;
-}
-
-Q3ListView * {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,250,200)
-}
-
-QFrame#lv_users {
-	background: argb(0,0,0,0);
-	border: 1px solid #777777;
-	selection-background-color: argb(0,0,250,200); 
-	selection-color: #000000; 
-}
-
-QToolButton::menu-indicator {
-	image: none; 
-}
-
-PopupActionButton::menu-indicator {
-	image: none; 
-}
-
-TypeAheadFindBar>QLineEdit {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,250,200);
-	margin-left: 7px;
-
-}
-
-QPushButton#pb_send { 
-	background: argb(0,0,150,100);
-	border: 2px solid #8b8b8b;
-	margin-left: 1px;
-	margin-top: 0px;
-	margin-bottom: 0px;
-	border-radius: 4px;
- } 
-
-QPushButton:hover#pb_send {
-	background: argb(0,0,200,100);
-	border-radius: 4px;	
-}
-
-QPushButton:pressed#pb_send {
-	background: argb(0,0,0,250);
-	border-radius: 4px;
-}
-
-QSplitter::handle:horizontall {
-	border-left: 3px solid #777777;
-	border-right: 3px solid #777777;
- 	background: #11140f;
-}
-
-QSplitter::handle:vertical {
-	background: #11140f;
-}
-
-QTabBar::tab:hover {
-	background: argb(0,0,250,150); 
-	border: 2px solid argb(0,0,100,250);
-	border-radius: 10px; 
-	height: 25px; 
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px; 
-	padding-left: 4px; 
-	font-weight: bold; 
-}
-
-QTabBar::tab:selected {
-	background: argb(0,0,250,200); 
-	border: 2px solid argb(0,0,100,250);
-	border-radius: 10px; height: 25px; 
-	border-bottom-left-radius: 0px;
-	border-bottom: 2px solid argb(0,0,100,250);
-	border-bottom-right-radius: 0px; 
-	font-weight: bold; 
-	padding-left: 4px;
- }
-
-QTabBar::tab { 
-	background: argb(0,0,250,150); 
-	border: 1px solid argb(0,0,100,70);
-	border-radius: 10px;
-	border-bottom: 1px solid argb(0,0,250,150);
-	height: 25px;
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	padding-left: 4px; 
-	font-weight: bold; 
-}
-
-QDialog QTabBar::tab {
-	width: 85px;
-	color: #ffffff;
-}
-
-QDialog QTabBar::tab:selected {
-	width: 85px;
-	color: #000000;
-}
-
-QWidget#avatar {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	border-radius: 5px;
-	color: argb(0,0,250,200);
-	margin-right: 4px;
-	margin-bottom: 4px;
-}
-
-QLineEdit#le_topic { 
-	background: #525252;
-	border: 1px solid #8b8b8b;
-	border-radius: 4px;
-	color:  argb(0,0,230,250);
-	font-weight: bold; 
-	padding-left: 2px;
-	margin-right: 2xp;
-}
-
-QLineEdit#le_jid { 
-	background: #525252;
-	border: 1px solid #8b8b8b;
-	border-radius: 4px;
-	color:  argb(0,0,230,250);
-	font-weight: bold; 
-	padding-left: 2px;
-	margin-left: 2px;
-}
-
-QPushButton#pb_topic {
-	background: url(C:/Program Files/Psi+/skins/universal/night/gree.png);
-	border: 1px solid #cccccc;
-	border-radius: 3px;
-	width: 60px;
-	height: 18px;
-	margin-left: 2px;
-	margin-right: 7px;
-	margin-bottom: 5px;
-	color: #ffffff;
-	font-weight: bold; 
-}
-
-QPushButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/gree.png);
-	border: 1px solid #cccccc;
-	border-radius: 7px;
-	width: 120px;
-	height: 20px;
-	margin-bottom: 4px;
-	margin-top: 4px;
-	margin-left: 2px;
-	color: #ffffff;
-}
-
-QPushButton:pressed { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-	border: 2px solid #717171; 
-	border-bottom-color: #717171; 
-}
-
-QPushButton:pressed#pb_topic { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-	border: 2px solid #717171; 
-	border-bottom-color: #717171; 
-}
-
-QLabel#lb_count { 
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	border-radius: 5px;
-	color:  argb(0,0,250,200);
-	margin-right: 2px; 
-}
-
-QLabel#lb_status { 
-	max-width: 16px;
-	margin-left: 3px;
-}
-
-QLabel#lb_ident { 
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	border-radius: 5px;
-	color:  argb(0,0,250,200);  
-}
-
-QScrollBar:vertical { 
-	border: 1px solid grey; 
-	background: #525252; 
-	width: 15px; margin: 23px 0px 23px 0px;
-	border-radius: 0px; 
-	border-bottom: 0px; 
-	border-top: 0px;
- }
-
-QScrollBar::handle:vertical {
-	background: qlineargradient(y1: 0, x1: 0, y2: 0, x2: 1, stop: 0 #afb0af, stop: 0.5 #4e4f4e, stop: 0.6 #5d5d5d); 
-	border: 3px solid #787878;
-	border-radius: 5px;
-	 margin: -1px 0px -2px 0px;
- }
-
-QScrollBar::add-line:vertical { 
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/night/bottom.png)  center no-repeat; 
-	height: 24px; width: 13px; 
-	subcontrol-position: bottom; 
-	subcontrol-origin: margin; 
-	margin-bottom: 0px;
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px; 
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px; 
-	border-top: 0px;
- }
-
-QScrollBar::sub-line:vertical { 
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/night/top.png) center no-repeat;
-	height: 23px; 
-	width: 13px; 
-	subcontrol-position: top; 
-	subcontrol-origin: margin; 
-	margin-top: 0px; 
-	border-top-left-radius: 6px; 
-	border-top-right-radius: 6px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	border-bottom: 0px; 
-}
-
-QScrollBar::add-line:vertical:pressed { 
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/night/bottom_press.png) center no-repeat; 
-	height: 24px; 
-	width: 13px; 
-	subcontrol-position: bottom;
-	subcontrol-origin: margin; 
-	margin-bottom: 0px; border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	border-bottom-left-radius: 6px; 	
-	border-bottom-right-radius: 6px; 
-	border-top: 0px;
-}
-
-QScrollBar::sub-line:vertical:pressed { 
-	border: 1px solid grey; 
-	background: url(C:/Program Files/Psi+/skins/universal/night/top_press.png) center no-repeat;
-	height: 23px;
-	width: 13px;
-	subcontrol-position: top;
-	subcontrol-origin: margin; 
-	margin-top: 0px; 
-	border-top-left-radius: 6px; 
-	border-top-right-radius: 6px; 
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-	border-bottom: 0px; 
-}
-
-QScrollBar:horizontal { 
-	border: 1px solid grey; 
-	background: #525252; 
-	height: 15px; 
-	margin: 0px 21px 0 21px; 
-}
-
-QScrollBar::handle:horizontal { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,  stop: 0 #afb0af, stop: 0.5 #4e4f4e, stop: 0.6 #5d5d5d);
-	border: 3px solid #787878;
-	border-radius: 5px;
-	margin: 0px 0px 0px 0px;
-}
-
-QScrollBar::add-line:horizontal {
-	background: url(C:/Program Files/Psi+/skins/universal/night/right.png) center no-repeat; 
-	width: 26px; 
-	subcontrol-position: right; 
-	subcontrol-origin: margin;
- }
-
-QScrollBar::sub-line:horizontal { 
-	background: white url(C:/Program Files/Psi+/skins/universal/night/left.png) center no-repeat;
-	width: 25px;
-	subcontrol-position: left; 
-	subcontrol-origin: margin;
-	margin-left: 0px; 
-}
-
-QScrollBar::add-line:horizontal:pressed { 
-	background: url(C:/Program Files/Psi+/skins/universal/night/right_press.png) center no-repeat; 
-	width: 26px; 
-	subcontrol-position: right; 
-	subcontrol-origin: margin;
- }
-
-QScrollBar::sub-line:horizontal:pressed { 
-	background: white url(C:/Program Files/Psi+/skins/universal/night/left_press.png) center no-repeat; 
-	width: 25px; 
-	subcontrol-position: left; 
-	subcontrol-origin: margin;
-	margin-left: 0px;
- }
-
-QMenu { 
-	background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #afb0af, stop: 1.0 #4f504f) ;
-	selection-background-color: #cccccc;
-	border: 0px solid #ffffff;
-	border-radius: 4px;
-
-}
-
-QMenu:selected { 
-	background: argb(0,0,250,200); 
-	color: argb(0,0,0,200); 
-}
-
-QMenu::separator { 
-	background: #000000;
-	height: 1px;
-}
-
-QFrame#headerFrame {
-	background: url(C:/Program Files/Psi+/skins/universal/night/logo.png) no-repeat top center qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #000000, stop: 0.7 #575857, stop: 1.0 #b0b1b0);
-	border: 2px solid #777777;
-	border-bottom: 0px;
-	padding: 4px;
-}
-
-QToolButton#hideButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_hide.png) no-repeat center;
-	border: 2px solid #555555;
-	border-radius: 4px;
-	icon-size: 0px;
-	height: 14px;
-	width: 15px;
-	margin: 0px;
-	margin-top: 0px;
-	margin-bottom: 7px;
-}
-
-QToolButton:hover#hideButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_hide_hover.png) no-repeat center;
-	border: 2px solid #555555;
-	height: 14px;
-	width: 15px;
-}
-
-QToolButton:pressed#hideButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_hide_pressed.png) no-repeat center;
-	border: 2px solid #444444;
-	height: 14px;
-	width: 15px;
-}
-
-QToolButton#maximizeButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_maximize.png) no-repeat center;
-	border: 2px solid #555555;
-	border-radius: 4px;
-	icon-size: 0px;
-	height: 14px;
-	width: 15px;
-	margin: 0px;
-	margin-top: 0px;
-	margin-bottom: 7px;
-}
-
-QToolButton:hover#maximizeButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_maximize_hover.png) no-repeat center;
-	border: 2px solid #555555;
-	height: 14px;
-	width: 15px;
-}
-
-QToolButton:pressed#maximizeButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_maximize_pressed.png) no-repeat center;
-	border: 2px solid #444444;
-	height: 14px;
-	width: 15px;
-}
-
-QToolButton#closeButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_close.png) no-repeat center;
-	border: 2px solid #555555;
-	border-radius: 4px;
-	icon-size: 0px;
-	height: 14px;
-	width: 15px;
-	margin: 0px;
-	margin-top: 0px;
-	margin-bottom: 7px;
-}
-
-QToolButton:hover#closeButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_close_hover.png) no-repeat center;
-	border: 2px solid #555555;
-	height: 14px;
-	width: 15px;
-}
-
-QToolButton:pressed#closeButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_close_pressed.png) no-repeat center;
-	border: 2px solid #444444;
-	height: 14px;
-	width: 15px;
-}</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_options</item>
-            <item>button_status</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{91244720-f64f-49a6-b4cb-0e74476e79f8}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Кнопки</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">false</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>spacer</item>
-            <item>button_options</item>
-            <item>spacer</item>
-            <item>view_groups</item>
-            <item>menu_add_contact</item>
-            <item>menu_disco</item>
-            <item>menu_options</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{bf2b2dd4-cd2a-4a96-bbd0-2a1e02b7571f}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{deee578b-61e1-4c07-a19b-cd80c72cbd08}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAALsAAAMAAAAABAAAAAQAAAAIAAAACPwAAAAHAAAAAAAAAAAAAAACAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAOQAxADIANAA0ADcAMgAwAC0AZgA2ADQAZgAtADQAOQBhADYALQBiADQAYwBiAC0AMABlADcANAA0ADcANgBlADcAOQBmADgAfQAAAAAA/////wAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAYgBmADIAYgAyAGQAZAA0AC0AYwBkADIAYQAtADQAYQA5ADYALQBiAGIAZAAwAC0AMgBhADEAZQAwADIAYgA3ADUANwAxAGYAfQEAAAAA/////wAAAAAAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewBkAGUAZQBlADUANwA4AGIALQA2ADEAZQAxAC0ANABjADAANwAtAGEAMQA5AGIALQBjAGQAOAAwAGMANwAyAGMAYgBkADAAOAB9AAAAAAD/////AAAAAAAAAAA=</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities-16.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.emoticons type="QStringList">
-            <item>Android.jisp</item>
-        </options.iconsets.emoticons>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">white_theme.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">whitesys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">55</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QMainWindow { 
-	background: url(C:/Program Files/Psi+/skins/universal/night/green.png) repeat-x qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #11140f, stop: 1.0 #000000) ;
-	margin-top: -15px;
-}
-
-PsiContactListView {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	border-radius: 7px;
-	margin: 2px;
-	padding: 3px;
-	padding-top: 5px;
-}
-
-QToolBar {
-	background: url(C:/Program Files/Psi+/skins/universal/night/gree.png) repeat-x;
-	border: 1px solid argb(0,0,100,150);
-	border-radius: 8px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-
-QLineEdit {
-	background: argb(0,0,80,150);
-	border: 1px solid argb(0,0,200,200);
-	border-radius: 4px;
-	margin-top: 3px;
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	margin-left: -1px;
-	margin-bottom: 1px;
-	color:  argb(0,0,230,250);
-	font-weight: bold; 
-	padding-left: -2px;
-	padding-right: 6px;
-}
-
-QLabel#lb_nick {
-	color:  argb(0,0,250,200);
-	font-weight: bold; 
-	font-size: 13px;
-}
-
-PopupActionButton {
-	background: argb(0,0,50,100);
-	border: 1px solid #cccccc;
-	border-radius: 4px;
-	width: 40px;
-	height: 20px;
-	margin-bottom: 3px;
-	margin-top: 4px;
-	margin-left: 2px;
-}
-
-PopupActionButton:hover {
-	background: argb(0,0,100,150);
-	border-radius: 4px;
-	border-radius: 4px;	
-}
-
-
-PopupActionButton:pressed {
-	background: argb(0,0,250,130);
-	border: 2px solid #cccccc;
-	border-radius: 4px;	
-}
-
-QToolButton {
-	background: argb(0,0,50,100);
-	border: 1px solid #cccccc;
-	border-radius: 4px;
-	width: 22px;
-	height: 18px;
-	margin: 3px;
-	margin-top: 7px;
-}
-
-QToolButton:hover {
-	background: argb(0,0,100,150);
-	border-radius: 4px;	
-}
-
-QToolButton:pressed {
-	background: argb(0,0,250,130);
-	border: 2px solid #cccccc;
-	border-radius: 4px;
-}
-
-QToolButton:checked {
-	background: argb(0,0,0,250);
-	border-radius: 4px;
-}
-
-QToolButton#tb_mood {
-	margin-bottom: 2px;
-	min-width: 22px;
-	margin-top: 1px;
-
-}
-
-QToolButton#tb_activity {
-	margin-bottom: 2px;
-	min-width: 22px;
-	margin-top: 1px;
-}
-
-QToolButton#tb_status {
-	background: argb(0,0,100,150);
-	border: 1px solid argb(0,0,200,200);
-	margin-top: 4px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	margin-right: -1px;
-	margin-left: 5px;
-	margin-bottom: 3px;
-	padding-left: 1px;
-
-}
-
-QLabel#lb_avatar {
-	border: 1px solid argb(0,0,200,200);
-	border-radius: 4px;
-	padding-right: 1px;
-}
-
-QToolButton::menu-indicator {
-	image: none; 
-}
-
-PopupActionButton::menu-indicator {
-	image: none; 
-}
-
-QTreeView { 
-	alternate-background-color: argb(0,0,0,0);
-	selection-background-color: argb(0,0,250,200); 
-	selection-color: #000000; 
-	border-radius: 5px;
-
-}
-
-QStackedWidget>QWidget>QLineEdit { 
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-	padding-left: 6px;
-	padding-right: 6px;
-	margin-right: 10px; 
-	margin-left: 10px;
-	margin-top: 3px;
-}
-
-QScrollBar:vertical { 
-	border: 1px solid grey;
-	background: argb(0,0,0,0); 
-	width: 13px; 
-	margin: 25px 0px 26px 0px; 
-	border-radius: 0px; 
-	border-bottom: 0px; 
-	border-top: 0px; 
-}
-
-QScrollBar::handle:vertical {
-	background: qlineargradient(y1: 0, x1: 0, y2: 0, x2: 1, stop: 0 #afb0af, stop: 0.5 #4e4f4e, stop: 0.6 #5d5d5d); 
-	border: 2px solid #787878;
-	border-radius: 4px; 
-	margin: -1px 0px -2px 0px;
-}
-
-QScrollBar::add-line:vertical { 
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/night/bottom.png) center no-repeat; height: 24px; width: 11px; 
-	subcontrol-position: bottom; 
-	subcontrol-origin: margin;
-	margin-bottom: 3px; 
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px;
-	border-bottom-left-radius: 6px; 
-	border-bottom-right-radius: 6px; 
-	border-top: 0px;
-}
-
-QScrollBar::sub-line:vertical {
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/night/top.png) center no-repeat; height: 23px; width: 11px; 
-	subcontrol-position: top; 
-	subcontrol-origin: margin; 
-	margin-top: 3px;
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px; 
-	border-bottom: 0px;
-}
-
-QScrollBar::add-line:vertical:pressed { 
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/night/bottom_press.png) center no-repeat;
-	height: 24px;
-	width: 11px; 
-	subcontrol-position: bottom;
-	subcontrol-origin: margin;
-	margin-bottom: 3px;
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px; 
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-	border-top: 0px;
-}
-
-QScrollBar::sub-line:vertical:pressed {
-	border: 1px solid grey; 
-	background: url(C:/Program Files/Psi+/skins/universal/night/top_press.png) center no-repeat;
-	height: 23px; width: 11px; 
-subcontrol-position: top; 
-	subcontrol-origin: margin;
-	margin-top: 3px; 
-	border-top-left-radius: 6px; 
-	border-top-right-radius: 6px; border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	border-bottom: 0px;
-}
-
-QMenu { 
-	background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #afb0af, stop: 1.0 #4f504f) ;
-	selection-background-color: #cccccc;
-	border: 0px solid #ffffff;
-	border-radius: 4px;
-
-}
-
-QMenu:selected { 
-	background: argb(0,0,250,200); 
-	color: argb(0,0,0,200); 
-}
-
-QMenu::separator { 
-	background: #000000;
-	height: 1px;
-}
-
-MLabel {  
-	border: 2px solid argb(0,0,100,100); 
-	border-radius: 6px;
-	color:  argb(0,0,230,250); 
-	font-size: 12px;
-	font-weight: bold; 
-	padding-left: 5px;
-	margin: 3px;
-}</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">false</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">true</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">false</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">false</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">false</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">true</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString">QFrame { 
-	background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #b0b1b0, stop: 1.0 #000000);
-	color:  argb(0,0,250,200);
-	border: 1px solid argb(0,0,250,200);
-}</options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type=""></options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">QFrame { 
-	background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #777777, stop: 1.0 #000000);
-	color: argb(0,0,250,250);
-}
-
-QToolButton {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_close.png) no-repeat center;
-	border: 2px solid #555555;
-	border-radius: 4px;
-	icon-size: 0px;
-	max-height: 14px;
-	min-width: 15px;
-	margin-right: 23px;
-	padding-top: 5px;
-}
-
-QToolButton:hover {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_close_hover.png) no-repeat center;
-	border: 2px solid #555555;
-	min-height: 14px;
-	min-width: 15px;
-	margin-right: 23px;
-}
-
-QToolButton:pressed {
-	background: url(C:/Program Files/Psi+/skins/universal/night/tb_close_pressed.png) no-repeat center;
-	border: 2px solid #444444;
-	min-height: 14px;
-	min-width: 15px;
-	margin-right: 23px;
-}</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">true</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>#bababa</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">true</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">true</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">50</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">5</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">white-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">false</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-		<options.ui.decorate-windows type="bool">true</options.ui.decorate-windows>
-    </options>
-</skin>
-

psi-plus-resources-1.tar.xz/skins/universal/night/right.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/right_press.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_close.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_close_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_close_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_hide.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_hide_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_hide_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_maximize.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_maximize_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_maximize_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/top.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/top_press.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/chat.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/down.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/down_pres.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/left.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/left_pres.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/menu.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/orange.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/psi.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/right.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/right_pres.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/splitter_hor.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/splitter_ver.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/tbar.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/the_orange.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/the_orange.skn Deleted

@@ -1,874 +0,0 @@
-<skin version="0.7" path="C:/Program Files/Psi+/skins/universal/orange" author="tux-den" name="the Orange">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#ffffff</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#000000</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#000000</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4080c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#ffc861</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">true</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">30</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QFrame#log {
-	border: 0px solid #ffffff;
-}
-
-QLineEdit#le_topic { 
-	background-color: argb(0,0,0,0); border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding: 25px; 
-	margin-left: -20px; 
-} 
-  
-QToolBar {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 0.1 #fbfbfb, stop: 0.4 #dee0e6, stop: 0.5 #c2c5d1, stop: 0.6 #c7cad5, stop: 0.7 #e1e3e9, stop: 0.9 #fbfbfb, stop: 1.0 #ffffff); 
-	border: 1px solid #b1b1b1; 
-}
-  
-QFrame#topFrame { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/chat.png) repeat-x #ffffff; 
-	border-right: 3px; 
-} 
-  
-QFrame#bottomFrame { 
-	background: #ffffff; 
-	border: 0px solid #ffffff; 
-} 
-  
-QTextEdit { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	font-size: 12px; 
-	color: #000000; 
-}
-  
-QLineEdit#le_topic { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding: 25px; 
-	margin-left: -20px; 
-} 
-  
-QLineEdit#le_jid { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding: 25px; 
-	margin-left: -20px; 
-} 
-  
-QFrame#lv_users { 
-	background: argb(0,0,0,0); 
-	border: 0px solid #ffffff; 
-	border-radius: 6px; font-size: 12px; 
-	margin-top: 1px; color: #000000; 
-	selection-background-color: argb(40,150,250,100); 
-	selection-color: #000000; 
-}
-  
-QSplitter::handle:horizontall { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/splitter_ver.png) no-repeat center #ffffff; 
-	height: 10px;
-} 
-  
-QSplitter::handle:vertical { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/splitter_hor.png) no-repeat center #ffffff;
-	height: 10px;
-} 
-  
-PsiTabBar { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/tbar.png) repeat-x #ffffff; 
-	border: 2px solid argb(20,100,160,180); 
-	border-left: 0px; 
-	border-right: 0px; 
-	border-bottom: 0px;
-	alignment: center;
-}
-
-QTabBar::tab:hover { 
-	background: argb(20,100,160,100); border: 1px solid argb(20,100,160,100); 
-	border-radius: 10px; 
-	height: 25px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	padding-left: 4px; 
-}
-
-QTabBar::tab:selected { 
-	background: argb(20,100,160,180); 
-	border: 2px solid argb(20,100,160,100); 
-	border-top: 0px solid #ffffff; 
-	border-radius: 10px; 
-	height: 25px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	color: #ffffff; 
-	font-weight: bold; 
-	padding-left: 4px; 
-}
-
-QTabBar::tab { 
-	background: argb(20,100,160,60); 
-	border: 1px solid argb(20,100,160,100); 
-	border-radius: 10px; 
-	height: 25px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px;
-	padding-left: 4px; 
-}
- 
-QLabel#lb_client { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	min-width: 10ex; 
-} 
-  
-QLabel#lb_count { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	margin-right: 10px; 
-} 
-  
-QLabel#lb_ident { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding: 15px; 
-} 
-
-QLabel#lb_status { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding-left: 15px; 
-	min-width: 8ex; 
-}
-
-QPushButton { 
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9bdb70, stop: 0.5 #2e990e,stop: 0.7 #0d7908, stop: 1 #006805); 
-	width: 105px; 
-	height: 22px; 
-	color: #ffffff; 
-	border: 1px solid #006805; 
-	border-radius: 11px; 
-	margin-left: 15px;
-	font-size: 10px;
-} 
-
-QPushButton:hover:pressed { 
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #006805, stop: 0.5 #006805,stop: 0.7 #006805, stop: 1 #006805); 
-	width: 70px; 
-	height: 22px; 
-	color: #ffffff; 
-	border: 1px solid #006805; 
-	border-radius: 11px; 
-	margin-left: 15px;
-} 
-
-QPushButton#pb_topic { 
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9bdb70, stop: 0.5 #2e990e,stop: 0.7 #0d7908, stop: 1 #006805); 
-	width: 70px; 
-	height: 22px; 
-	color: #ffffff; 
-	border: 1px solid #006805; 
-	border-radius: 11px; 
-	margin-left: 15px;
-	font-size: 12px;
-} 
-
-QPushButton#pb_topic:hover:pressed { 
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #006805, stop: 0.5 #006805,stop: 0.7 #006805, stop: 1 #006805); 
-	width: 70px; 
-	height: 22px; 
-	color: #ffffff; 
-	border: 1px solid #006805; 
-	border-radius: 11px; 
-	margin-left: 15px;
-} 
-
-QPushButton#pb_send { 
-	width: 0px; 
-	height: 0px; 
-	margin: -35px; 
-	min-width: 0ex; 
-	padding: 0px; 
-} 
-
-QToolButton { 
-	background-color: argb(0,0,0,0); 
-	border: 2px solid argb(0,0,0,0); 
-	width: 30px; 
-	height: 18px; 
-} 
-
-QToolButton:pressed { 
-	border: 2px solid #cccccc; 
-	width: 30px; 
-	height: 18px; 
-	border-radius: 5px; 
-}
-
-QToolButton:checked { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cccccc, stop: 0.1 #fbfbfb, stop: 0.4 #dee0e6, stop: 0.5 #c2c5d1, stop: 0.6 #c7cad5, stop: 0.7 #e1e3e9, stop: 0.9 #fbfbfb, stop: 1.0 #cccccc); 
-	border: 2px solid #cccccc; 
-	width: 30px; 
-	height: 18px; 
-	border-radius: 5px; 
-}
-
-TabDlg { 
-	background: #ffffff; 
-}
-
-TypeAheadFindBar>QLineEdit { 
-	margin-left: 8px; 
-	min-height: 1.5em; 
-}
-
-QScrollBar:vertical { 
-	background: argb(0,0,0,0); 
-	border: 1px solid grey;
-	width: 15px; 
-	margin: 22px 0px 23px 0px; 
-	border-radius: 0px; 
-	border-bottom: 0px; 
-	border-top: 0px; 
-}
-
-QScrollBar::handle:vertical { 
-	background: qlineargradient(y1: 0, x1: 0, y2: 0, x2: 1, stop: 0 #ffffff, stop: 0.1 #fbfbfb, stop: 0.4 #dee0e6, stop: 0.5 #c2c5d1, stop: 0.6 #c7cad5, stop: 0.7 #e1e3e9, stop: 0.9 #fbfbfb, stop: 1.0 #ffffff); 
-	border: 1px solid grey; 
-	border-radius: 5px; 
-	margin: -1px 0px -2px 0px;
-}
-
-QScrollBar::add-line:vertical { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/down.png) center no-repeat; 
-	border: 1px solid grey;
-	height: 24px; 
-	width: 13px; 
-	subcontrol-position: bottom; 
-	subcontrol-origin: margin; 
-	margin-bottom: 0px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	border-bottom-left-radius: 6px; 
-	border-bottom-right-radius: 6px; 
-	border-top: 0px; 
-}
-
-QScrollBar::sub-line:vertical { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/up.png) center no-repeat; 
-	border: 1px solid grey;
-	height: 23px; 
-	width: 13px; 
-	subcontrol-position: top; 
-	subcontrol-origin: margin; 
-	margin-top: 0px; 
-	border-top-left-radius: 6px; 
-	border-top-right-radius: 6px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	border-bottom: 0px; 
-}
-
-QScrollBar::add-line:vertical:pressed { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/down_pres.png) center no-repeat; 
-	border: 1px solid grey;
-	height: 24px; 
-	width: 13px; 
-	subcontrol-position: bottom; 
-	subcontrol-origin: margin; 
-	margin-bottom: 0px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	border-bottom-left-radius: 6px; 
-	border-bottom-right-radius: 6px; 
-	border-top: 0px; 
-}
-
-QScrollBar::sub-line:vertical:pressed { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/up_pres.png) center no-repeat; 
-	border: 1px solid grey;
-	height: 23px; width: 13px; 
-	subcontrol-position: top; 
-	subcontrol-origin: margin; 
-	margin-top: 0px; 
-	border-top-left-radius: 6px; 
-	border-top-right-radius: 6px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	border-bottom: 0px; 
-}
-
-QScrollBar:horizontal { 
-	background: argb(0,0,0,0); 
-	border: 1px solid grey;
-	height: 15px; 
-	margin: 0px 21px 0 21px; 
-}
-
-QScrollBar::handle:horizontal { 
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 0.1 #fbfbfb, stop: 0.4 #dee0e6, stop: 0.5 #c2c5d1, stop: 0.6 #c7cad5, stop: 0.7 #e1e3e9, stop: 0.9 #fbfbfb, stop: 1.0 #ffffff); 
-	border: 1px solid grey; 
-	border-radius: 5px; 
-	margin: 0px 0px 0px 0px; 
-}
-
-QScrollBar::add-line:horizontal { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/right.png) center no-repeat; 
-	width: 26px; 
-	subcontrol-position: right; 
-	subcontrol-origin: margin; 
-}
-
-QScrollBar::sub-line:horizontal { 
-	background: white url(C:/Program Files/Psi+/skins/universal/orange/left.png) center no-repeat; 
-	width: 25px; 
-	subcontrol-position: left; 
-	subcontrol-origin: margin; 
-	margin-left: 0px; 
-}
-
-QScrollBar::add-line:horizontal:pressed { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/right_pres.png) center no-repeat; 
-	width: 26px; 
-	subcontrol-position: right; 
-	subcontrol-origin: margin; 
-}
-
-QScrollBar::sub-line:horizontal:pressed { 
-	background: white url(C:/Program Files/Psi+/skins/universal/orange/left_pres.png) center no-repeat; 
-	width: 25px; 
-	subcontrol-position: left; 
-	subcontrol-origin: margin; 
-	margin-left: 0px; 
-}
-
-QMenu { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/menu.png) repeat-x #ffffff; 
-	border: 0px solid #ffffff; 
-	border-radius: 4px; 
-}
-
-QMenu:selected { 
-	background: #fdeac3; color: #000000; 
-}
-
-QMenu::separator { 
-	background: #fdeac3; height: 1px; 
-}
-
-QToolButton::menu-indicator { 
-	image: none; 
-}
-
-QMenu::menu-indicator { 
-	image: none; 
-}
-
-QDialog { 
-	
-	background: url(C:/Program Files/Psi+/skins/universal/orange/orange.png) repeat-x #ffffff;
-	margin-top: -7px;
-}
-
-QDialog QTabBar::tab:hover { 
-	background: argb(20,100,160,100); border: 1px solid argb(20,100,160,100); 
-	border-radius: 10px; 
-	width: 120px;
-	height: 25px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	padding-left: 4px; 
-}
-
-QDialog QTabBar::tab:selected { 
-	background: argb(20,100,160,180); 
-	border: 2px solid argb(20,100,160,100); 
-	border-top: 0px solid #ffffff; 
-	border-radius: 10px; 
-	width: 120px;
-	height: 25px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	color: #ffffff; 
-	font-weight: bold; 
-	padding-left: 4px; 
-}
-
-QDialog QTabBar::tab { 
-	background: argb(20,100,160,80); 
-	border: 1px solid argb(20,100,160,100); 
-	border-radius: 10px; 
-	width: 120px;
-	height: 25px; 
-	border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px;
-	padding-left: 4px; 
-	color: #000000;
-}
-
-QDialog QTabBar {
-	border: 2px solid argb(20,100,160,180);
-	border-left: 0px;
-	border-right: 0px;
-	border-top: 0px;
-	alignment: center;
-}
-
-QWidget#tab_affiliations {
-	background: argb(0,0,0,0);
-	border: 0px solid #ffffff:
-}
-
-QWidget#tab_general {
-	background: argb(0,0,0,0);
-	border: 0px solid #ffffff:
-}</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>spacer</item>
-            <item>view_groups</item>
-            <item>spacer</item>
-            <item>menu_add_contact</item>
-            <item>spacer</item>
-            <item>menu_account_setup</item>
-            <item>spacer</item>
-            <item>menu_options</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{d5c6018d-7631-450a-897c-2f01906cae07}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Кнопки</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>view_groups</item>
-            <item>menu_add_contact</item>
-            <item>menu_disco</item>
-            <item>menu_options</item>
-            <item>menu_play_sounds</item>
-            <item>menu_xml_console</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{0bdf02e2-3062-4819-bbe7-960c78b6e742}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">false</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{a697e214-1fef-4a94-9de8-f4296ea914be}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAALcAAALWAAAABAAAAAQAAAAIAAAACPwAAAALAAAAAQAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewAwAGIAZABmADAAMgBlADIALQAzADAANgAyAC0ANAA4ADEAOQAtAGIAYgBlADcALQA5ADYAMABjADcAOABiADYAZQA3ADQAMgB9AAAAAAD/////AAAAAAAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewBkADUAYwA2ADAAMQA4AGQALQA3ADYAMwAxAC0ANAA1ADAAYQAtADgAOQA3AGMALQAyAGYAMAAxADkAMAA2AGMAYQBlADAANwB9AQAAAAD/////AAAAAAAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGEANgA5ADcAZQAyADEANAAtADEAZgBlAGYALQA0AGEAOQA0AC0AOQBkAGUAOAAtAGYANAAyADkANgBlAGEAOQAxADQAYgBlAH0AAAAAAP////8AAAAAAAAAAA==</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities-16.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.emoticons type="QStringList">
-            <item>yaemomidget.jisp</item>
-        </options.iconsets.emoticons>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">YandexBigStatusIcons.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">nuvola-system.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">false</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">32</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">true</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QMainWindow { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/orange.png) repeat-x #ffffff;
-	margin-top: -7px;
-}
-
-QLabel#lb_nick {
-	color: #7b3a00; 
-	font-weight: bold; 
-	font-size: 13px;
-}
-
-QToolButton#tb_status {
-	background-color: argb(20,100,160,40); 
-	border: 2px solid argb(0,0,0,50); 
-	border-right: 0px;
-	border-radius: 6px;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	color: #7b3a00; font-size: 12px; 
-	font-weight: bold;
-	margin-left: 5px;
-	margin-bottom: 4px;
-	margin-top: 1px;
-	max-width: 23px;
-	padding-left: 2px;
-	padding-top: 1px;
-	icon-size: 14px;
-}
-QLineEdit { 
-	background-color: argb(20,100,160,40); 
-	border: 2px solid argb(0,0,0,50); 
-	border-left: 0px;
-	border-radius: 6px; 
-	border-top-left-radius: 0px;
-	border-bottom-left-radius: 0px;
-	color: #7b3a00; 
-	font-size: 12px;
-	font-weight: bold; 
-	padding-left: -2px;
-	padding-right: 6px;
-	margin-left: -1px;
-	margin-bottom: 2px;
-}
-
-PsiContactListView { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/psi.png) no-repeat center buttom #ffffff; 
-	padding: 3px;
-}
-
-MLabel { 
-	background-color: #ffffff; 
-	border: 2px solid argb(0,0,0,50); 
-	border-radius: 6px;
-	color: #7b3a00; 
-	font-size: 12px;
-	font-weight: bold; 
-	padding-left: 5px;
-	margin: 3px;
-}
-
-PopupActionButton { 
-	background: argb(20,100,160,130); 
-	border: 1px solid #ffc941; 
-	width: 30px; 
-	height: 18px; 
-	border-radius: 5px; 
-	width: 40px;
-}
-
-QToolBar { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/tbar.png) repeat-x;
-	border: 0px solid #ffe89b; 
-	min-height: 30px;
-	padding-bottom: 5px;
-}
-
-QToolButton {
-	background: argb(20,100,160,70); 
-	border: 1px solid #ffc941; 
-	width: 30px; 
-	height: 18px; 
-	border-radius: 5px;
-}
-
-QToolButton:pressed { 
-	background: argb(20,100,160,90); 
-	border: 2px solid #ffc941;
-	width: 30px; 
-	height: 18px;
-	border-radius: 5px;
-}
-
-QScrollBar:vertical { 
-	border: 1px solid grey;
-	background: argb(0,0,0,0); 
-	width: 13px; 
-	margin: 25px 0px 26px 0px; 
-	border-radius: 0px; 
-	border-bottom: 0px; 
-	border-top: 0px; 
-}
-
-QScrollBar::handle:vertical {
-	background: qlineargradient(y1: 0, x1: 0, y2: 0, x2: 1, stop: 0 #ffffff, stop: 0.1 #fbfbfb, stop: 0.4 #dee0e6, stop: 0.5 #c2c5d1, stop: 0.6 #c7cad5, stop: 0.7 #e1e3e9, stop: 0.9 #fbfbfb, stop: 1.0 #ffffff); 
-	border: 1px solid grey;
-	border-radius: 4px; 
-	margin: -1px 0px -2px 0px;
-}
-
-QScrollBar::add-line:vertical { 
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/orange/down.png) center no-repeat; height: 24px; width: 11px; 
-	subcontrol-position: bottom; 
-	subcontrol-origin: margin;
-	margin-bottom: 3px; 
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px;
-	border-bottom-left-radius: 6px; 
-	border-bottom-right-radius: 6px; 
-	border-top: 0px;
-}
-
-QScrollBar::sub-line:vertical {
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/orange/up.png) center no-repeat; height: 23px; width: 11px; 
-	subcontrol-position: top; 
-	subcontrol-origin: margin; 
-	margin-top: 3px;
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px; 
-	border-bottom: 0px;
-}
-
-QScrollBar::add-line:vertical:pressed { 
-	border: 1px solid grey; background: url(C:/Program Files/Psi+/skins/universal/orange/down_pres.png) center no-repeat;
-	height: 24px;
-	width: 11px; 
-	subcontrol-position: bottom;
-	subcontrol-origin: margin;
-	margin-bottom: 3px;
-	border-top-left-radius: 0px;
-	border-top-right-radius: 0px; 
-	border-bottom-left-radius: 6px;
-	border-bottom-right-radius: 6px;
-	border-top: 0px;
-}
-
-QScrollBar::sub-line:vertical:pressed {
-	border: 1px solid grey; 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/up_pres.png) center no-repeat;
-	height: 23px; width: 11px; 
-subcontrol-position: top; 
-	subcontrol-origin: margin;
-	margin-top: 3px; 
-	border-top-left-radius: 6px; 
-	border-top-right-radius: 6px; border-bottom-left-radius: 0px; 
-	border-bottom-right-radius: 0px; 
-	border-bottom: 0px;
-}
-
-QTreeView { 
-	alternate-background-color: argb(0,0,0,0);
-	selection-background-color: #fdeac3; 
-	selection-color: #000000;
-	margin: 0px;
-}
-
-QMenu { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/menu.png) repeat-x #ffffff;
-	border: 0px solid #ffffff;
-	border-radius: 4px;
-}
-
-QMenu:selected { 
-	background: #fdeac3; 
-	color: #000000; 
-}
-
-QMenu::separator { 
-	background: #fdeac3;
-	height: 1px;
-}
-
-QToolButton::menu-indicator {
-	image: none; 
-}
-
-QMenu::menu-indicator {
-	image: none; 
-}
-
-PsiContactListView>QWidget>QLineEdit { 
-	background: #fdeac3; 
-	border: 2px solid #cccccc; 
-	padding: 3px;
-	margin: 3px;
-}
-
-QToolButton#tb_activity {
-	margin-left: 2px;
-	max-width: 23px;
-}
-
-QToolButton#tb_mood { 
-	max-width: 23px;
-}
-
-QStackedWidget>QWidget>QLineEdit { 
-	background: #ffffff;
-	border: 2px solid argb(0,0,0,50);
-	border-top-left-radius: 6px;
-	border-bottom-left-radius: 6px;
-	padding-left: 6px;
-	padding-right: 6px;
-	margin-right: 10px; 
-	margin-left: 10px;
-	margin-top: 3px;
-}
-
-QStackedWidget { 
-	background-color: #ffffff; 
-	border: 2px solid #ffe89b;
-	border-radius: 5px;
-}
-
-QDialog { 
-	
-	background: url(C:/Program Files/Psi+/skins/universal/orange/orange.png) repeat-x #ffffff;
-	margin-top: -7px;
-}
-
-QPushButton { 
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9bdb70, stop: 0.5 #2e990e,stop: 0.7 #0d7908, stop: 1 #006805); 
-	width: 105px; 
-	height: 22px; 
-	color: #ffffff; 
-	border: 1px solid #006805; 
-	border-radius: 11px;
-} 
-
-QPushButton:hover:pressed { 
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #006805, stop: 0.5 #006805,stop: 0.7 #006805, stop: 1 #006805); 
-	width: 70px; 
-	height: 22px; 
-	color: #ffffff; 
-	border: 1px solid #006805; 
-	border-radius: 11px; 
-} 
-
-PopupActionButton {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9bdb70, stop: 0.5 #2e990e,stop: 0.7 #0d7908, stop: 1 #006805); 
-	border: 1px solid #ffc941; 
-	width: 45px; 
-	height: 18px; 
-	border-radius: 11px;
-	margin-top: 4px;
-	margin-bottom: 4px;
-}
-
-PopupActionButton:pressed { 
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #006805, stop: 0.5 #006805,stop: 0.7 #006805, stop: 1 #006805);
-	border: 1px solid #ffc941;
-}
-
-PopupActionButton::menu-indicator {
-	image: none; 
-}
-
-</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">true</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">true</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">true</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">true</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">true</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString">QFrame { background: url(C:/Program Files/Psi+/skins/universal/orange/tooltip.png)  repeat-x #ffffff  bottom; }
-		</options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type=""></options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">QFrame { background: url(C:/Program Files/Psi+/skins/universal/orange/tooltip.png)  repeat-x #ffffff  bottom; }
-		</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">true</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">true</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">48</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">4</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">adium-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/classic</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">true</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-    </options>
-</skin>

psi-plus-resources-1.tar.xz/skins/universal/orange/tooltip.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/up.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/up_pres.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/qip_infium Deleted

psi-plus-resources-1.tar.xz/skins/universal/qip_infium/qip_infium.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/qip_infium/qip_infium.skn Deleted

@@ -1,388 +0,0 @@
-<skin version="0.5" author="tux-den" name="QIP Infium">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f7fbff</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#00008c</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#f6f8ff</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#110083</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#1e00b4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#0002b3</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#ff0004</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#0a00a2</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4080c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">false</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">24</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">false</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QFrame#log { 
-     background-color: #f5faff; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #a0a0a0; 
-     border-radius: 1px; 
-}
-
-QToolButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9c9c9c, stop: 0.4 #e2e2e2, stop: 0.5 #e4e4e4, stop: 0.6 #dedede, stop: 1.0 #e3e3e3); 
-     min-height: 1em;  
-     border: 1px solid #545454; 
-     border-bottom-color: #545454; 
-     border-radius: 4px; 
-}
-
-QToolBar {  
-     border: 0px solid #ffffff; 
-}
-
-Q3ListView { 
-     background-color: #f5faff; 
-}
-
-QWidget#bottomFrame>QWidget>QTextEdit { 
-     background-color: #f5faff; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #a0a0a0; 
-     border-radius: 1px; 
-}
-
-QLineEdit#lb_client { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLineEdit#le_topic { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLineEdit#le_jid { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLabel#lb_ident { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLabel#lb_countl { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLabel#lb_status { 
-     background-color: #f0f0f0; 
-     border: 0px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QTabBar::tab { 
-     background-color: #e3e1db; 
-     border: 2px solid #C4C4C3; 
-     border-bottom-color: #C2C7CB; 
-     border-top-left-radius: 4px; 
-     border-top-right-radius: 4px; 
-     min-width: 8ex; 
-     padding: 2px; 
-}
-
-QTabBar::tab:selected, QTabBar::tab:hover { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,  stop: 0 #fafafa, stop: 0.4 #f4f4f4, stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); 
-}
-
-QTabBar::tab:selected { 
-     border-color: #9B9B9B; 
-     border-bottom-color: #C2C7CB; 
-}
-
-QLabel#lb_client { 
-     border: 0px solid #ffffff; 
-}
-
-QToolButton::menu-indicator {
-     image: none; 
-}
-		
-</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_status</item>
-            <item>show_statusmsg</item>
-            <item>show_self</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{d6063d32-ec91-40a9-8cea-2b283c56115d}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Кнопки</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>show_offline</item>
-            <item>enable_groups</item>
-            <item>menu_play_sounds</item>
-            <item>show_hidden</item>
-            <item>menu_file_transfer</item>
-            <item>menu_toolbars</item>
-            <item>menu_new_message</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{0b44e443-5ed9-43c9-9dd2-7d2e277219fb}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>button_options</item>
-            <item>menu_disco</item>
-            <item>menu_add_contact</item>
-            <item>menu_account_setup</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{f814d7eb-c981-43f1-a054-97e39a595fee}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">true</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAALwAAALqAAAABAAAAAQAAAAIAAAACPwAAAADAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewAwAGIANAA0AGUANAA0ADMALQA1AGUAZAA5AC0ANAAzAGMAOQAtADkAZABkADIALQA3AGQAMgBlADIANwA3ADIAMQA5AGYAYgB9AQAAAAD/////AAAAAAAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGQANgAwADYAMwBkADMAMgAtAGUAYwA5ADEALQA0ADAAYQA5AC0AOABjAGUAYQAtADIAYgAyADgAMwBjADUANgAxADEANQBkAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAZgA4ADEANABkADcAZQBiAC0AYwA5ADgAMQAtADQAMwBmADEALQBhADAANQA0AC0AOQA3AGUAMwA5AGEANQA5ADUAZgBlAGUAfQEAAAAA/////wAAAAAAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities-16.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.emoticons type="QStringList">
-            <item>kolobok_light.jisp</item>
-        </options.iconsets.emoticons>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">qipinfium.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">qipinfium_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">45</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">PopupActionButton { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fbfbfb, stop: 0.4 #e9e9e9, stop: 0.5 #e8e8e8, stop: 0.6 #d2d2d2, stop: 1.0 #f7f7f7); 
-     min-height: 1em;  
-     border: 1px solid #a8a8a8; 
-     border-bottom-color: #a8a8a8; 
-     border-radius: 4px; 
-     width: 1000px; 
-     height: 15px; 
-}
-
-PopupActionButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9c9c9c, stop: 0.4 #e2e2e2, stop: 0.5 #e4e4e4, stop: 0.6 #dedede, stop: 1.0 #e3e3e3); 
-     min-height: 1em;  
-     border: 1px solid #545454; 
-     border-bottom-color: #545454; 
-     border-radius: 4px; 
-     width: 1000px; 
-     height: 15px; 
-}
-
-QToolButton { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fbfbfb, stop: 0.4 #e9e9e9, stop: 0.5 #e8e8e8, stop: 0.6 #d2d2d2, stop: 1.0 #f7f7f7); 
-     min-height: 1em;  
-     border: 1px solid #a8a8a8; 
-     border-bottom-color: #a8a8a8; 
-     border-radius: 4px; 
-     width: 20px; 
-     height: 15px; 
-}
-
-QToolButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9c9c9c, stop: 0.4 #e2e2e2, stop: 0.5 #e4e4e4, stop: 0.6 #dedede, stop: 1.0 #e3e3e3); 
-     min-height: 1em;  
-     border: 1px solid #a8a8a8; 
-     border-bottom-color: #a8a8a8; 
-     border-radius: 4px; 
-     width: 20px; 
-     height: 15px; 
-}
-
-QToolButton:checked { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.4 #e2e2e2, stop: 0.5 #e4e4e4, stop: 0.6 #dfdfdf, stop: 1.0 #e3e3e3); 
-     min-height: 1em;  
-     border: 1px solid #a8a8a8; 
-     border-bottom-color: #a8a8a8; 
-     border-radius: 4px; 
-     width: 20px; 
-     height: 15px; 
-}
-
-PsiContactListView { 
-     background-color: #f5faff; 
-     border: 1px solid #cccccc; 
-     border-left: 0px; 
-     border-right: 0px; 
-}
-
-QLabel#lb_nick { 
-     background-color: #f5faff; 
-     border: 1px solid #cccccc; 
-     border-radius: 3px; 
-     margin: 2px 4px 2px 4px;
-}
-
-QLabel#lb_avatar { 
-     background-color: #f5faff; 
-     border-radius: 5px; 
-}
-
-QToolBar { 
-     background-color: #f0f0f0; 
-     border: 0px solid #f0f0f0; 
-}
-
-QToolButton#tb_status {
-     margin: 3px -1px 2px 4px;
-     border-top-left-radius: 4px; 
-     border-top-right-radius: 0px; 
-     border-bottom-left-radius: 4px;
-     border-bottom-right-radius: 0px; 
-     padding-left: 1px; 
-     icon-size: 14px;
-}
-
-QToolButton#tb_activity {
-     margin-bottom: 2px;
-     margin-top: 3px;
-     margin-left: 3px;
-     max-width: 23px;
-}
-
-QToolButton#tb_mood { 
-     margin-bottom: 2px; 
-     margin-top: 3px;
-     max-width: 23px;
-}
-
-QLineEdit { 
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fbfbfb, stop: 0.4 #e9e9e9, stop: 0.5 #e8e8e8, stop: 0.6 #d2d2d2, stop: 1.0 #f7f7f7); 
-     border: 1px solid #a8a8a8; 
-     border-top-left-radius: 0px; 
-     border-top-right-radius: 4px; 
-     border-bottom-left-radius: 0px;
-     border-bottom-right-radius: 4px;  
-     padding-right: 6px;
-     padding-left: 3px;
-     margin: 3px 0px 2px 0px;
-} 
-
-QToolButton::menu-indicator {
-     image: none; 
-}
-
-PopupActionButton::menu-indicator {
-     image: none; 
-}
-
-QStackedWidget>QWidget>QLineEdit {
-     border-radius: 4px; 
-     padding-left: 6px;
-     padding-right: 6px;
-     margin-right: 10px; 
-     margin-left: 10px;
-     margin-top: 3px;
-}
-
-QTreeView { 
-     alternate-background-color: argb(0,0,0,0);
-}
-
-</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">true</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">true</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">true</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">true</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">false</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">true</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type=""></options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">true</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString"></options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">false</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">52</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">3</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">qipinfium-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/classic</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">true</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-    </options>
-</skin>
-

psi-plus-resources-1.tar.xz/skins/universal/sky Deleted

psi-plus-resources-1.tar.xz/skins/universal/sky/sky.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/sky/sky.skn Deleted

@@ -1,533 +0,0 @@
-<skin version="0.5" author="tux-den" name="Sky">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f0f0f0</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#5a5a5a</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#969696</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4080c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">25</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QFrame#topFrame { 
-     background-color: #8ab4f6; 
-     border: none;
-     border-bottom-color: #8ab4f6; 
-     border-radius: 5px;  
-}
-
-QFrame#log { 
-     background-color: #ffffff; 
-     border: 3px solid #e4e4e4;  
-     border-radius: 7px;
-     margin-bottom: -2px; 
-     padding: 2px;
-}
-
-QToolBar { 
-     background-color: #e4e4e4; 
-     border: 4px solid #e4e4e4; 
-     border-bottom-color: #e4e4e4; 
-     border-top-left-radius: 6px; 
-     border-top-right-radius: 6px; 
-}
-
-QLineEdit#le_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding-left: 3px;
-}
-
-QLineEdit#le_jid { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding-left: 3px;
-     padding-right: 3px;
-}
-
-QLabel#lb_status { 
-     background: argb(0,0,0,0);
-     border: none; 
-     padding: 0px; 
-}
-
-QLabel#lb_client { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding: 2px;  
-}
-
-QLabel#lb_count { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding: 2px;  
-}
-
-QLabel#lb_ident { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding: 2px;  
-}
-
-QWidget#bottomFrame { 
-     background-color: #fefefe; 
-     border: 1px solid #8d909c; 
-     border-bottom-color: #8d909c; 
-     border-radius: 5px; 
-}
-
-QWidget#bottomFrame>QWidget>QTextEdit { 
-     background-color: #ececec; 
-     border: 3px solid #e4e4e4; 
-     border-radius: 4px; 
-     margin-left: 10px;
-     margin-bottom: 6px;
-     padding-left: 3px; 
-     padding-top: -2px;
-}
-
-QPushButton#pb_send { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #8d909c; 
-     border-bottom-color: #8d909c; 
-     border-radius: 5px; 
-     min-width: 0ex; 
-     margin-right: 12px;
-     margin-top: 4px;
-     margin-left: 14px;
-     margin-bottom: 10px;
-     width: 30px;  
-}
-
-QPushButton:pressed#pb_send { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 1px solid #717171; 
-     border-bottom-color: #717171; 
-}
-
-QPushButton#pb_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #8d909c; 
-     border-bottom-color: #8d909c; 
-     border-radius: 5px; 
-     width: 80px; 
-     height: 20px;
-     margin-right: 5px;
-     margin-bottom: 3px;
-     margin-top: 2px;
-}
-
-QPushButton:pressed#pb_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 2px solid #717171; 
-     border-bottom-color: #717171; 
-}
-
-QToolButton { 
-     border: 1px solid #e4e4e4; 
-     width: 28px; 
-}
-
-QToolButton:hover { 
-     border: 1px solid #cccccc; 
-     border-radius: 5px;
-}
-
-QToolButton:pressed  { 
-       background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 1px solid #cccccc; 
-        border-radius: 5px;
-}
-
-QToolButton:checked  { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 1px solid #cccccc; 
-     border-radius: 5px;
-}
-
-QToolButton::menu-indicator {
-     image: none; 
-}
-
-QWidget#avatar { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9);  
-     border: 3px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-     border-radius: 5px; 
-     margin-right: 10px;
-     margin-left: 0px;
-     margin-bottom: 5px;
-}
-
-Q3ListView { 
-     background-color: #ffffff; 
-     border: 3px solid #e4e4e4; 
-     border-radius: 7px;  
-     margin-bottom: -2px; 
-     padding: 2px;
-}
-
-QSplitter::handle:horizontall { 
-     background-color: #8ab4f6; 
-     height: 3px; 
-}
-
-QSplitter::handle:vertical { 
-     background-color: #8ab4f6; 
-     height: 4px; 
-}
-
-QLabel#lb_client { 
-     background: argb(0,0,0,0); 
-     border: 0px solid #ffffff;  
-     margin: -2px; 
-}
-
-TabDlg { 
-     background: #8ab4f6;
-}
-
-PsiTabBar {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1.0 #8ab4f6); 
-}
-
-</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_options</item>
-            <item>menu_add_contact</item>
-            <item>show_agents</item>
-            <item>show_self</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">2</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{7d3e6109-8e6b-4455-9151-5fc0a55da650}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Options</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>button_status</item>
-            <item>publish_tune</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">3</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{6ab0e51b-c3ca-42db-bfda-6adc5151b06c}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Кнопки</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>spacer</item>
-            <item>show_offline</item>
-            <item>spacer</item>
-            <item>enable_groups</item>
-            <item>spacer</item>
-            <item>menu_join_groupchat</item>
-            <item>spacer</item>
-            <item>show_statusmsg</item>
-            <item>spacer</item>
-            <item>menu_options</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">2</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{df260686-63dc-474a-86ea-c896ee790a47}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">true</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type="bool">true</options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type="int">3</options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type="QString">{586afccb-9e87-4b3c-8129-ed885a80ce10}</options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type="bool">true</options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type="bool">false</options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAMcAAALNAAAABAAAAAQAAAAIAAAACPwAAAAVAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADcAZAAzAGUANgAxADAAOQAtADgAZQA2AGIALQA0ADQANQA1AC0AOQAxADUAMQAtADUAZgBjADAAYQA1ADUAZABhADYANQAwAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA2AGEAYgAwAGUANQAxAGIALQBjADMAYwBhAC0ANAAyAGQAYgAtAGIAZgBkAGEALQA2AGEAZABjADUAMQA1ADEAYgAwADYAYwB9AQAAAAD/////AAAAAAAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGQAZgAyADYAMAA2ADgANgAtADYAMwBkAGMALQA0ADcANABhAC0AOAA2AGUAYQAtAGMAOAA5ADYAZQBlADcAOQAwAGEANAA3AH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsANQA4ADYAYQBmAGMAYwBiAC0AOQBlADgANwAtADQAYgAzAGMALQA4ADEAMgA5AC0AZQBkADgAOAA1AGEAOAAwAGMAZQAxADAAfQAAAAAA/////wAAAAAAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities-16.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">oxygen.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">oxygen_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">45</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">PopupActionButton { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #8d909c; 
-     border-bottom-color: #8d909c; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-     width: 300px; 
-     height: 18px; 
-}
-
-PopupActionButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 2px solid #717171; 
-     border-bottom-color: #717171; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-     width: 300px; 
-     height: 18px; 
-}
-
-QMainWindow { 
-     background-color: #8ab4f6; 
-}
-
-QToolBar { 
-     background-color: #8ab4f6; 
-     border: 1px solid #8ab4f6; 
-     border-bottom-color: #8ab4f6; 
-}
-
-PsiContactListView { 
-     background-color: #ffffff; 
-     border: 3px solid #ededed; 
-     border-bottom-left-radius: 7px; 
-     border-bottom-right-radius: 7px;  
-     border-top-left-radius: 7px; 
-     border-top-right-radius: 7px; 
-     min-width: 7ex; 
-     padding: 2px; 
-     margin-left: 2px;
-     margin-right: 2px;
-}
-
-
-QToolButton { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 2px solid #799fd8; 
-     border-bottom-color: #799fd8; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-     width: 32px; 
-     height: 18px; 
-}
-
-QToolButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8faed5, stop: 0.4 #6dadfa, stop: 0.7 #368ef9, stop: 1.0 #358bf3); 
-     border: 2px solid #698ebf; 
-     border-bottom-color: #698ebf; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 4px; 
-     width: 32px; 
-     height: 18px; 
-}
-
-QToolButton:checked { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 2px solid #698ebf; 
-     border-bottom-color: #698ebf; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 4px; 
-     width: 32px; 
-     height: 18px; 
-}
-
-QLineEdit { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9);  
-     border: 2px solid #799fd8;  
-     border-top-left-radius: 0px; 
-     border-bottom-left-radius: 0px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px;  
-     margin-top: 1px; 
-     margin-bottom: 1px; 
-     margin-left: -1px; 
-     padding-right: 5px; 
-     padding-left: 2px; 
-}
-
-QLabel#lb_nick {  
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-top-left-radius: 3px; 
-     border-bottom-left-radius: 3px;
-     border-bottom-right-radius: 3px; 
-     border-top-right-radius: 3px; 
-     margin-left: 5px; 
-     margin-right: 2px; 
-     margin-top: 2px; 
-     margin-bottom: 2px; 
-}
-
-QLabel#lb_avatar { 
-     background: #ffffff;
-     border-radius: 5px; 
-}
-
-QToolButton#tb_status {  
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9);  
-     border: 2px solid #799fd8; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 0px; 
-     border-top-right-radius: 0px; 
-     margin-left: 3px; 
-     margin-right: -1px; 
-     margin-top: 2px; 
-     margin-bottom: 3px; 
-     width: 25px; 
-     icon-size: 14px; 
-     padding-left: 1px;
-}
-
-QToolButton#tb_status:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8faed5, stop: 0.4 #6dadfa, stop: 0.7 #368ef9, stop: 1.0 #358bf3); 
-     border: 2px solid #698ebf; 
-     border-bottom-color: #698ebf; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 4px;
-}
-
-QToolButton::menu-indicator {
-     image: none; 
-}
-
-PopupActionButton::menu-indicator {
-     image: none; 
-}
-
-QStackedWidget>QWidget>QLineEdit { 
-     border: 2px solid #799fd8;  
-     border-top-left-radius: 6px;
-     border-bottom-left-radius: 6px;
-     padding-left: 6px;
-     padding-right: 6px;
-     margin-bottom: 3px;
-}
-
-QTreeView { 
-     alternate-background-color: #ffffff;
-}
-
-</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">false</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">false</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">false</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">false</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type="QSize">
-            <width>733</width>
-            <height>841</height>
-        </options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">
-
-QFrame {
-      background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9);
-      border: 1px solid #cccccc;
-}
-		
-</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">false</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">52</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">3</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">oxygen-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/classic</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">true</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">true</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-    </options>
-</skin>
-

psi-plus-resources-1.tar.xz/skins/universal/tkabber Deleted

psi-plus-resources-1.tar.xz/skins/universal/tkabber/tkabber.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/tkabber/tkabber.skn Deleted

@@ -1,206 +0,0 @@
-<skin version="0.3" author="tux-den" name="Tkabber">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f0f0f0</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#5a5a5a</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#969696</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4080c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">false</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">false</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">24</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">false</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QPushButton#pb_topic {  
-	width: 50px; 
-	height:15px; 
-	border: 0px solid #C4C4C3; 
-	min-width:3ex;  
-	padding: 3px;  
-	margin: 1px; 
-}
-
-QPushButton:hover#pb_topic { border: 2px solid #C4C4C3; }
-
-QToolBar { 
-	border: 0px solid #C4C4C3; 
-	min-width: 13ex;  
-	padding: 5px;  
-	margin: 1px; 
-}
-
-QTabBar::tab { 
-	border: 2px solid #fafafa; 
-	border-bottom-color: #a0a0a0;  
-	height: 25px; 
-}
-
-QTabBar::tab:selected { 
-	background-color: #e4e4e4; 
-	border: 2px solid #a0a0a0; 
-	border-bottom-color: #d4d4d4; 
-	height: 25px; 
-}
-
-QDialog QTabBar::tab {
-	width: 85px;
-}
-</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_status</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{211704af-88a4-488c-a46f-b9b658d3ac14}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Кнопки</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>menu_add_contact</item>
-            <item>menu_disco</item>
-            <item>menu_join_groupchat</item>
-            <item>show_offline</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{7cbf7939-0cda-4992-9592-1aa9d5359a82}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{010ee98a-6edd-49ce-ae31-ad6c9f210168}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">true</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAABC0AAAMqAAAABAAAAAQAAAAIAAAACPwAAAADAAAAAgAAAAAAAAADAAAAAAAAAAMAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">ACM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">default</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">default</options.iconsets.moods>
-        <options.iconsets.status type="QString">tkabber.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">tkabber_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">false</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">32</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">false</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">false</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QToolBar { border: 0px solid;  padding: 2px; }
-
-PopupActionButton { 
-	min-height: 1.5em;  
-	border: 2px solid #ffffff; 
-	border-bottom-color: #a0a0a0; 
-	margin: 0px; 
-}
-
-QWidget#avatar { 
-	margin: 10px; 
-}
-
-QTreeView { 
-     alternate-background-color: #ffffff;
-}</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">false</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">true</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">false</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">false</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">false</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">true</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type="QSize">
-            <width>882</width>
-            <height>810</height>
-        </options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">false</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString"></options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">false</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">false</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">true</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">true</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">52</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">0</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">default</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/classic</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">false</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>
-        <options.ui.muc.use-hash-nick-coloring type="bool">true</options.ui.muc.use-hash-nick-coloring>
-        <options.ui.muc.use-highlighting type="bool">true</options.ui.muc.use-highlighting>
-        <options.ui.muc.use-nick-coloring type="bool">true</options.ui.muc.use-nick-coloring>
-        <options.ui.notifications.alert-style type="QString">animate</options.ui.notifications.alert-style>
-    </options>
-</skin>
-

psi-plus-resources-1.tar.xz/sound Deleted

psi-plus-resources-1.tar.xz/sound/attention.wav Deleted

psi-plus-resources-1.tar.xz/sound/chess_error.wav Deleted

psi-plus-resources-1.tar.xz/sound/chess_finish.wav Deleted

psi-plus-resources-1.tar.xz/sound/chess_move.wav Deleted

psi-plus-resources-1.tar.xz/sound/chess_start.wav Deleted

psi-plus-resources-1.tar.xz/sound/email.wav Deleted

psi-plus-resources-1.tar.xz/sound/pepnotify.wav Deleted

psi-plus-resources-1.tar.xz/sound/reminder.wav Deleted

psi-plus-resources-1.tar.xz/sound/watcher.wav Deleted

psi-plus-resources-1.tar.xz/themes Deleted

psi-plus-resources-1.tar.xz/themes/chatview Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images/ChatLog.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images/HR.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images/ScrollBarArrowDown.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images/ScrollBarArrowUp.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/index.html Deleted

@@ -1,259 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <style type="text/css" media="screen,print">
-
-/* скролл-бар*/
-body::-webkit-scrollbar {
-  width:15px;
-  height:15px;}
-
-/* скролл-бар, кнопки перемотки*/
-body::-webkit-scrollbar-button {
-  display: block;
-  width: 15px;
-  height: 15px;}
-
-/* скролл-бар, вверху стрелка вверх*/
-body::-webkit-scrollbar-button:decrement:start {
-	background-color: #012F2F;
-	background-image: url(images/ScrollBarArrowUp.png);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, вверху стрелка вниз*/
-body::-webkit-scrollbar-button:increment:start {
-height: 0px;}
-
-/* скролл-бар, внизу стрелка вверх*/
-body::-webkit-scrollbar-button:decrement:end {
-	background-color: #031C19;
-	background-image: url(images/ScrollBarArrowUp.png);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, внизу стрелка вниз*/
-body::-webkit-scrollbar-button:increment:end {
-	background-color: #031C19;
-	background-image: url(images/ScrollBarArrowDown.png);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, ползунок*/
-body::-webkit-scrollbar-thumb {
-	background-color: #072A2C;
-
-	border: 1px outset #3C7896;
-	border-radius: 2px;}
-
-/* скролл-бар, подложка*/
-body::-webkit-scrollbar-track-piece {
-	margin-top: 1px;
-	margin-bottom: 1px;
-	background-color: #012123;
-	border: 1px inset #3C7896;
-	border-radius: 2px;}
-
-body {
-	background: url('images/ChatLog.png') bottom right no-repeat fixed; /* фоновый рисунок чата */
-	background-color: #001415; /* цвет фона чата */
-	margin: 0;
-	width: 100%;
-	height: 100%;
-	border: 0px;
-	padding: 0 0 2px 0;
-	text-shadow: 1px 1px 3px #101010;}
-
-body > div {
-	margin:0px 3px 0px 3px;
-	line-height:1.4em;
-	word-wrap:break-word !important;
-	white-space: pre-wrap !important;
-	overflow:hidden;}
-
-body > div img {
-	vertical-align: bottom;}
-
-body > div > img:first-child {
-	vertical-align: text-bottom;}
-
-.msg { /* обычные сообщения */
-	color: #32C8C3;}
-
-.style_time { /* стиль времени */
-	font-weight: normal;}
-
-.style_nick { /* стиль ника */
-	font-weight: normal;}
-
-.alert {  /* хайлайт */
-	font-weight: bold;
-	color: #9BDCC3;}
-
-.separator { /* разделитель в конференциях */
-	height: 6px;
-	background: url('images/HR.png');
-	border: 0px;}
-
-.sent {}
-
-.received {}
-
-.infmsg { /* информационные сообщения: тема, статусы... */ }
-
-.usertext {}
-
-.nicklink {
-	text-decoration:none;
-	color:inherit;}
-
-  </style>
-
-</head>
-
-<body>
-
-<script type="text/javascript">
-try {
-
-windowchatServer.jsNamespace().theme = function() {
-	var nicks = {};
-	var nickNumber = 0;
-	var chat = windowchatServer.jsNamespace();
-	
-	var cssBody = chat.util.findStyleSheet(document.styleSheets0, "body").style;
-	var cssSentMsg = chat.util.findStyleSheet(document.styleSheets0, ".sent").style;
-	var cssReceivedMsg = chat.util.findStyleSheet(document.styleSheets0, ".received").style;
-	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets0, ".infmsg").style;
-	var cssUserText = chat.util.findStyleSheet(document.styleSheets0, ".usertext").style;
-	var cssChatSays = chat.util.findStyleSheet(document.styleSheets0, ".msg>span:first").style;
-	var useMessageIcons, messageIconsSize = 0;
-	
-	var applyPsiSettings = function() {
-		chat.util.updateObject(cssBody, eval(""+shared.session.getFont()+"0"));
-		cssBody.color = shared.server.getPaletteColor("Text");
-		cssSentMsg.color = shared.psiOption("options.ui.look.colors.messages.sent");
-		cssReceivedMsg.color = shared.psiOption("options.ui.look.colors.messages.received");
-		cssInfMsg.color = shared.psiOption("options.ui.look.colors.messages.informational");
-		cssUserText.color = shared.psiOption("options.ui.look.colors.messages.usertext");
-		useMessageIcons = shared.psiOption("options.ui.chat.use-message-icons");
-		if (shared.psiOption("options.ui.chat.scaled-message-icons")) {
-			var d = document.createElement("div");
-			d.style.position = "absolute";
-			d.style.top = "-1000;";
-			d.style.visibility = "hidden";
-			d.style.height = "1em";
-			shared.chatElement.appendChild(d);
-			messageIconsSize = parseInt(document.defaultView.getComputedStyle(d, null).height);
-			shared.chatElement.removeChild(d);
-		}
-	}
-	
-	var shared = chat.adapter.initSession();
-	shared.initTheme({
-		chatElement : document.body,
-		scroller : new chat.WindowScroller(true),
-		templates : {
-			message: shared.isMuc?
-				"<div class='msg'>%icon%<span style='color:%nickcolor%'>%time% %sender%</span> %message%</div>"
-				: "<div class='msg'>%icon%<span class='%sentrec%'>%time% %sender%</span> %message%</div>",
-			messageNC: shared.isMuc?
-				"<div style='color:%nickcolor%'>%icon%%time% %sender% %message%</div>"
-				: "<div class='%sentrec%'>%icon%%time% %sender% %message%</div>",
-			receivedMessage: shared.isMuc?
-				"<div class='msg'>%icon%<span style='color:%nickcolor%'>%time% %sender%</span> %alertedmessage%</div>"
-				: null,
-			spooledMessage: "<div class='infmsg'>%icon%%time% %sender% %message%</div>",
-			sys: "<div class='infmsg'>%icon%%message%</div>",
-			sysMessage: "<div class='infmsg'>%icon%%time% *** %message%</div>",
-			sysMessageUT: "<div class='infmsg'>%icon%%time% *** %message%: <span class='usertext'>%usertext%</span></div>",
-			lastMsgDate: "<div class='infmsg'>%icon%*** %date%</div>",
-			subject: shared.isMuc?
-				"<div class='infmsg'>%icon%%time% %message%<div class='usertext'><b>%usertext%</b></div></div>"
-				: "<div class='infmsg'>%icon%<b>*** %usertext%</b></div>",
-			trackbar: '<hr class=\'separator\' />'
-		},
-		dateFormat : "hh:mm:ss",
-		proxy : function() { //optional
-			if (shared.cdata.type == "settings") {
-				applyPsiSettings();
-				return false;
-			} else if (shared.cdata.type == "receipt") {
-				var img = document.getElementById("receipt"+shared.cdata.id);
-				if (img) {
-					var sizeUri = messageIconsSize?"?w="+messageIconsSize+"&h="+messageIconsSize:"";
-					img.src = "icon:psi/notification_chat_delivery_ok"+sizeUri;
-				}
-			}
-			if (shared.cdata.mtype == "message") {
-				var template = shared.cdata.emote && shared.templates.messageNC ||
-					(shared.cdata.spooled && shared.templates.message || null);
-				if (template) {
-					shared.appendHtml(template.toString(), shared.cdata.local?true:null);
-					return false;
-				}
-			}
-		},
-		varHandlers : {
-			sender : function() {
-				var nick = chat.util.escapeHtml(shared.cdata.sender);
-				nick = shared.cdata.mtype == "message" && shared.isMuc?
-					'<a href="addnick://psi/'+encodeURIComponent(shared.cdata.sender)+
-					'" class="nicklink">'+nick+'</a>' : nick;
-				return shared.cdata.emote?"*"+nick:"&lt;"+nick+"&gt;";
-			},
-			alertedmessage : function() {
-				return shared.cdata.alert?"<span class='alert'>"+
-					shared.cdata.message+"</span>":shared.cdata.message;
-			},
-			sentrec : function() {return shared.cdata.spooled?"infmsg":
-				(shared.cdata.local?"sent":"received");},
-			nickcolor : function() {
-				return shared.session.mucNickColor(shared.cdata.sender, shared.cdata.local);
-			},
-			icon : function() {
-				var icon = "";
-				if (useMessageIcons) {
-					switch (shared.cdata.mtype) {
-						case "message":
-							icon = shared.cdata.local?(shared.cdata.awaitingReceipt?
-								"psi/notification_chat_send":"psi/notification_chat_delivery_ok")
-								: "psi/notification_chat_receive";
-							break;
-						case "system":
-						case "subject":
-						case "urls":
-							icon = "psi/notification_chat_info";
-							break;
-						case "lastDate":
-							icon = "psi/notification_chat_time";
-							break;
-					}
-					var sizeStyle = messageIconsSize?" style='width:"+messageIconsSize+"px; height:"+messageIconsSize+"px'":"";
-					var sizeUri = messageIconsSize?"?w="+messageIconsSize+"&h="+messageIconsSize:"";
-					var id = shared.cdata.awaitingReceipt?" id='receipt"+shared.cdata.id+"'":"";
-					icon = icon?"<img src='icon:"+icon+sizeUri+"'"+sizeStyle+id+" />":"";
-				}
-				return icon;
- 			}
-		}
-	});
-	
-	applyPsiSettings();
-	
-	shared.session.signalInited();
-	
-	return {
-		
-	};
-}()
-
-} catch(e) {
-	 document.body.innerHTML = "Theme initialization failed: " + e
-}
-</script>
-</body>
-</html>

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/load.js Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/screenshot.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/new_classic.theme Deleted

Build Results
RPM Lint

Refresh

Comments for request 2701 0

Request History

jirislaby created request almost 10 years ago

update to 20160408

ismdon accepted request almost 10 years ago